From 9df0e16707ca449295b037c73cce4484ce4f1f13 Mon Sep 17 00:00:00 2001 From: kojima Date: Sat, 3 Apr 1999 03:51:17 +0000 Subject: [PATCH] new/changelog fix --- ChangeLog | 4 + INSTALL | 7 +- NEWS | 8 + WINGs/notification.c | 3 +- WPrefs.app/Appearance.c | 1 - WPrefs.app/WPrefs.c | 19 ++ WindowMaker/Defaults/WindowMaker.in | 1 + WindowMaker/menu | 1 - WindowMaker/plmenu | 1 - acinclude.m4 | 9 - aclocal.m4 | 9 - configure | 336 +++++++++++++++++------------------- src/WindowMaker.h | 32 +++- src/defaults.c | 257 +++++++++++---------------- src/event.c | 6 +- src/framewin.c | 5 + src/icon.c | 48 +++++- src/kwm.c | 118 +++++++++++++ src/main.c | 3 + src/menu.c | 142 ++++++++------- src/menu.h | 6 - src/moveres.c | 7 + src/startup.c | 3 + src/window.c | 36 ++++ util/Makefile.am | 4 +- util/Makefile.in | 4 +- util/getstyle.c | 3 +- util/setstyle.c | 36 +++- util/wmsetbg.c | 8 +- 29 files changed, 679 insertions(+), 438 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9cea3e4..bc246bdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ Changes since version 0.52.0: - patched wmsetbg to work with dynamically loadable texture renderer code - added libwmfun to distribution (forgot to do so in 0.52.0) +- added alternative menu style option +- changed configuration updating to use notifications +- fixed window move through workspaces in nonopaquemove +- added message to immediately reread configuration data Changes since version 0.51.2: diff --git a/INSTALL b/INSTALL index ca025da8..9e32ef48 100644 --- a/INSTALL +++ b/INSTALL @@ -265,10 +265,9 @@ PLATFORM SPECIFIC NOTES: installing a new version of it by hand (compiling yourself), uninstall the package from RedHat before. - * make a symbolic link from /usr/X11 to /usr/X11R6 - (type ln -s /usr/X11R6 /usr/X11 ) and make sure you have a symbolic - link from /usr/include/X11 to /usr/X11R6/include/X11 (if not, - type ln -s /usr/X11R6/include/X11 /usr/include/X11 ) + * make sure you have a symbolic link from /usr/include/X11 to + /usr/X11R6/include/X11 (if not, type ln -s /usr/X11R6/include/X11 + /usr/include/X11 ) * make sure you have /lib/cpp pointing to the cpp program diff --git a/NEWS b/NEWS index 30ef4d41..4c5e914e 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,14 @@ NEWS for veteran Window Maker users ----------------------------------- +--- 0.52.1 + +New Option +---------- + +AlternativeMenuStyle=YES; will make textures in menus to be unsegmented. + + --- 0.52.0 diff --git a/WINGs/notification.c b/WINGs/notification.c index c70e9800..0607b44a 100644 --- a/WINGs/notification.c +++ b/WINGs/notification.c @@ -181,7 +181,8 @@ WMPostNotification(WMNotification *notification) while (orec) { tmp = orec->next; - if (!orec->object || orec->object == notification->object) { + if (!orec->object || !notification->object + || orec->object == notification->object) { /* tell the observer */ if (orec->observerAction) { (*orec->observerAction)(orec->observer, notification); diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index abc2fb85..aafe795c 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -419,7 +419,6 @@ renderTexture(WMScreen *scr, proplist_t texture, int width, int height, } } else if (strcasecmp(&type[1], "pixmap")==0) { RImage *timage; - int w, h; char *path; RColor color; diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index ee4cad20..74d4654c 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -124,6 +124,8 @@ save(WMWidget *w, void *data) proplist_t p1, p2; proplist_t keyList; proplist_t key; + char *msg = "Reconfigure"; + XEvent ev; /* puts("gathering data");*/ @@ -157,6 +159,23 @@ save(WMWidget *w, void *data) /* puts("storing data");*/ PLSave(WindowMakerDB, YES); + + + memset(&ev, 0, sizeof(XEvent)); + + ev.xclient.type = ClientMessage; + ev.xclient.message_type = XInternAtom(WMScreenDisplay(WMWidgetScreen(w)), + "_WINDOWMAKER_COMMAND", False); + ev.xclient.window = DefaultRootWindow(WMScreenDisplay(WMWidgetScreen(w))); + ev.xclient.format = 8; + + for (i = 0; i <= strlen(msg); i++) { + ev.xclient.data.b[i] = msg[i]; + } + XSendEvent(WMScreenDisplay(WMWidgetScreen(w)), + DefaultRootWindow(WMScreenDisplay(WMWidgetScreen(w))), + False, SubstructureRedirectMask, &ev); + XFlush(WMScreenDisplay(WMWidgetScreen(w))); } diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in index 8f977169..317cac36 100644 --- a/WindowMaker/Defaults/WindowMaker.in +++ b/WindowMaker/Defaults/WindowMaker.in @@ -1,4 +1,5 @@ { + AlternativeMenuStyle = NO; DisableMiniwindows = NO; OpenTransientOnOwnerWorkspace = NO; EdgeResistance = 30; diff --git a/WindowMaker/menu b/WindowMaker/menu index 6e08f9fb..fe9cc90c 100644 --- a/WindowMaker/menu +++ b/WindowMaker/menu @@ -209,7 +209,6 @@ "Start kwm" RESTART kwm "Start IceWM" RESTART icewm "Exit..." EXIT - "Kill session..." SHUTDOWN "Exit" END "Applications" END diff --git a/WindowMaker/plmenu b/WindowMaker/plmenu index 5442d72d..f0af75bb 100644 --- a/WindowMaker/plmenu +++ b/WindowMaker/plmenu @@ -101,6 +101,5 @@ ("Start kwm", RESTART, kwm), ("Start IceWM", RESTART, icewm), ("Exit...", EXIT), - ("Kill session...", SHUTDOWN) ) ) diff --git a/acinclude.m4 b/acinclude.m4 index 9936cc66..f0f906b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -120,15 +120,6 @@ fi # # Check for symbolic links # -AC_MSG_CHECKING(for /usr/X11 symbolic link) -rh_missing_usr_x11=no -if test -d "/usr/X11"; then -AC_MSG_RESULT(found) -else -AC_MSG_RESULT(uh oh) -rh_missing_usr_x11=yes -mins_found=yes -fi AC_MSG_CHECKING(for /usr/include/X11 symbolic link) rh_missing_usr_include_x11=no if test -d "/usr/include/X11"; then diff --git a/aclocal.m4 b/aclocal.m4 index dbb17dde..393706b2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -132,15 +132,6 @@ fi # # Check for symbolic links # -AC_MSG_CHECKING(for /usr/X11 symbolic link) -rh_missing_usr_x11=no -if test -d "/usr/X11"; then -AC_MSG_RESULT(found) -else -AC_MSG_RESULT(uh oh) -rh_missing_usr_x11=yes -mins_found=yes -fi AC_MSG_CHECKING(for /usr/include/X11 symbolic link) rh_missing_usr_include_x11=no if test -d "/usr/include/X11"; then diff --git a/configure b/configure index 424a4329..e0b70f94 100755 --- a/configure +++ b/configure @@ -1905,18 +1905,8 @@ fi # # Check for symbolic links # -echo $ac_n "checking for /usr/X11 symbolic link""... $ac_c" 1>&6 -echo "configure:1910: checking for /usr/X11 symbolic link" >&5 -rh_missing_usr_x11=no -if test -d "/usr/X11"; then -echo "$ac_t""found" 1>&6 -else -echo "$ac_t""uh oh" 1>&6 -rh_missing_usr_x11=yes -mins_found=yes -fi echo $ac_n "checking for /usr/include/X11 symbolic link""... $ac_c" 1>&6 -echo "configure:1920: checking for /usr/include/X11 symbolic link" >&5 +echo "configure:1910: checking for /usr/include/X11 symbolic link" >&5 rh_missing_usr_include_x11=no if test -d "/usr/include/X11"; then echo "$ac_t""found" 1>&6 @@ -1930,7 +1920,7 @@ fi # Check for /lib/cpp # echo $ac_n "checking for /lib/cpp""... $ac_c" 1>&6 -echo "configure:1934: checking for /lib/cpp" >&5 +echo "configure:1924: checking for /lib/cpp" >&5 rh_missing_lib_cpp=no if test -f "/lib/cpp"; then echo "$ac_t""found" 1>&6 @@ -1962,12 +1952,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1966: checking for vprintf" >&5 +echo "configure:1956: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2014,12 +2004,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2018: checking for _doprnt" >&5 +echo "configure:2008: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2069,19 +2059,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2073: checking for working alloca.h" >&5 +echo "configure:2063: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2102,12 +2092,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2106: checking for alloca" >&5 +echo "configure:2096: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2167,12 +2157,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2171: checking whether alloca needs Cray hooks" >&5 +echo "configure:2161: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2201: checking for $ac_func" >&5 +echo "configure:2191: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2252,7 +2242,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2256: checking stack direction for C alloca" >&5 +echo "configure:2246: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2260,7 +2250,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2303,12 +2293,12 @@ fi for ac_func in gethostname select poll strerror strncasecmp setpgid atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2307: checking for $ac_func" >&5 +echo "configure:2297: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2361,12 +2351,12 @@ done DLLIBS="" echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:2365: checking for dlopen" >&5 +echo "configure:2355: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2407,7 +2397,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2411: checking for dlopen in -ldl" >&5 +echo "configure:2401: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2415,7 +2405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2455,17 +2445,17 @@ if test "x$HAVEDL" = xyes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2459: checking for $ac_hdr" >&5 +echo "configure:2449: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2499,7 +2489,7 @@ if test "x$CPP_PATH" = x; then # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2503: checking for $ac_word" >&5 +echo "configure:2493: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2555,12 +2545,12 @@ EOF echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2559: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2549: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2576,7 +2566,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2597,12 +2587,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2601: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2591: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2611,7 +2601,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2636,17 +2626,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h\ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2640: checking for $ac_hdr" >&5 +echo "configure:2630: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2676,12 +2666,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2680: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2670: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2693,7 +2683,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2714,12 +2704,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2718: checking for working const" >&5 +echo "configure:2708: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2791,12 +2781,12 @@ fi #AC_TYPE_SIZE_T #AC_TYPE_PID_T echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2795: checking return type of signal handlers" >&5 +echo "configure:2785: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2813,7 +2803,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2841,12 +2831,12 @@ EOF INTLIBS="" echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:2845: checking for gettext" >&5 +echo "configure:2835: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -2887,7 +2877,7 @@ if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2891: checking for gettext in -lintl" >&5 +echo "configure:2881: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2895,7 +2885,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2933,7 +2923,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2937: checking for $ac_word" >&5 +echo "configure:2927: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3039,7 +3029,7 @@ if test "$enable_kanji" = yes; then case $host_os in freebsd*) echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:3043: checking for setlocale in -lxpg4" >&5 +echo "configure:3033: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3047,7 +3037,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3181,7 +3171,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3185: checking for X" >&5 +echo "configure:3175: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3243,12 +3233,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3317,14 +3307,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3430,17 +3420,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3434: checking whether -R must be followed by a space" >&5 +echo "configure:3424: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3456,14 +3446,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3495,7 +3485,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3499: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3489: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3503,7 +3493,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3536,7 +3526,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3540: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3530: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3544,7 +3534,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3584,12 +3574,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3588: checking for gethostbyname" >&5 +echo "configure:3578: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3633,7 +3623,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3637: checking for gethostbyname in -lnsl" >&5 +echo "configure:3627: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3641,7 +3631,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3682,12 +3672,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3686: checking for connect" >&5 +echo "configure:3676: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3731,7 +3721,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3735: checking for connect in -lsocket" >&5 +echo "configure:3725: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3739,7 +3729,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3774,12 +3764,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3778: checking for remove" >&5 +echo "configure:3768: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3823,7 +3813,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3827: checking for remove in -lposix" >&5 +echo "configure:3817: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3831,7 +3821,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3866,12 +3856,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3870: checking for shmat" >&5 +echo "configure:3860: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3915,7 +3905,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3919: checking for shmat in -lipc" >&5 +echo "configure:3909: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3923,7 +3913,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3967,7 +3957,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3971: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3961: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3975,7 +3965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4032,7 +4022,7 @@ fi if test "$use_locale" = yes; then echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:4036: checking for _Xsetlocale in -lX11" >&5 +echo "configure:4026: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4040,7 +4030,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4103,7 +4093,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:4107: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:4097: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4111,7 +4101,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4163,7 +4153,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:4167: checking for XShmAttach in -lXext" >&5 +echo "configure:4157: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4171,7 +4161,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4206,12 +4196,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:4210: checking for shmget" >&5 +echo "configure:4200: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -4283,7 +4273,7 @@ LIBPL="" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6 -echo "configure:4287: checking for PLGetString in -lPropList" >&5 +echo "configure:4277: checking for PLGetString in -lPropList" >&5 ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4291,7 +4281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lPropList $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4331,17 +4321,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for proplist.h""... $ac_c" 1>&6 -echo "configure:4335: checking for proplist.h" >&5 +echo "configure:4325: checking for proplist.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4409,7 +4399,7 @@ if test "$xpm" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:4413: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:4403: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4417,7 +4407,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4458,17 +4448,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:4462: checking for X11/xpm.h" >&5 +echo "configure:4452: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4530,7 +4520,7 @@ if test "$png" = yes ; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:4534: checking for png_get_valid in -lpng" >&5 +echo "configure:4524: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4538,7 +4528,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4579,17 +4569,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:4583: checking for png.h" >&5 +echo "configure:4573: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4640,7 +4630,7 @@ if test "$jpeg" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4644: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:4634: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4648,7 +4638,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4692,17 +4682,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:4696: checking for jpeglib.h" >&5 +echo "configure:4686: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4753,7 +4743,7 @@ if test "$gif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:4757: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:4747: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4761,7 +4751,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4803,7 +4793,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:4807: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:4797: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4811,7 +4801,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4856,17 +4846,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:4860: checking for gif_lib.h" >&5 +echo "configure:4850: checking for gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4927,7 +4917,7 @@ if test "$tif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:4931: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4921: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4935,7 +4925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4978,7 +4968,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:4982: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4972: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4986,7 +4976,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5030,7 +5020,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:5034: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:5024: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5038,7 +5028,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $ljpeg -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5084,17 +5074,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:5088: checking for tiffio.h" >&5 +echo "configure:5078: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* diff --git a/src/WindowMaker.h b/src/WindowMaker.h index efd3eb3c..a790ff93 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -210,6 +210,34 @@ typedef enum { WProgramState = (nstate) +/* notifications */ + +#ifdef MAINFILE +#define NOTIFICATION(n) char *WN##n = #n +#else +#define NOTIFICATION(n) extern char *WN##n +#endif + +NOTIFICATION(WindowAppearanceSettingsChanged); + +NOTIFICATION(IconAppearanceSettingsChanged); + +NOTIFICATION(IconTileSettingsChanged); + +NOTIFICATION(MenuAppearanceSettingsChanged); + +NOTIFICATION(MenuTitleAppearanceSettingsChanged); + + +/* appearance settings clientdata flags */ +enum { + WFontSettings = 1 << 0, + WTextureSettings = 1 << 1, + WColorSettings = 1 << 2 +}; + + + typedef struct { int x1, y1; int x2, y2; @@ -285,7 +313,9 @@ typedef struct WPreferences { char disable_root_mouse; /* disable button events in root window */ char auto_focus; /* focus window when it's mapped */ - + + char alt_menu_style; + char *icon_back_file; /* background image for icons */ WCoord *root_menu_pos; /* initial position of the root menu*/ diff --git a/src/defaults.c b/src/defaults.c index c6f51763..d4cb1b27 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -170,9 +170,8 @@ static int setIconPosition(); static int setClipTitleFont(); static int setClipTitleColor(); -#ifdef NEWSTUFF -static int setButtonImages(); -#endif +static int setNothing(); + static int updateUsableArea(); @@ -190,6 +189,28 @@ static int updateUsableArea(); + +#define REFRESH_WINDOW_TEXTURES (1<<0) +#define REFRESH_MENU_TEXTURE (1<<1) +#define REFRESH_MENU_FONT (1<<2) +#define REFRESH_MENU_COLOR (1<<3) +#define REFRESH_MENU_TITLE_TEXTURE (1<<4) +#define REFRESH_MENU_TITLE_FONT (1<<5) +#define REFRESH_MENU_TITLE_COLOR (1<<6) +#define REFRESH_WINDOW_TITLE_COLOR (1<<7) +#define REFRESH_WINDOW_FONT (1<<8) +#define REFRESH_FORE_COLOR (1<<9) +#define REFRESH_ICON_TILE (1<<10) +#define REFRESH_ICON_FONT (1<<11) +#define REFRESH_WORKSPACE_BACK (1<<12) + +#define REFRESH_BUTTON_IMAGES (1<<13) + +#define REFRESH_ICON_TITLE_COLOR (1<<14) +#define REFRESH_ICON_TITLE_BACK (1<<15) + + + static WOptionEnumeration seFocusModes[] = { {"Manual", WKF_CLICK, 0}, {"ClickToFocus", WKF_CLICK, 1}, {"Auto", WKF_POINTER, 0}, {"FocusFollowMouse", WKF_POINTER, 1}, @@ -309,7 +330,7 @@ WDefaultEntry staticOptionList[] = { }, {"DisableMiniwindows", "NO", NULL, &wPreferences.disable_miniwindows, getBool, NULL - } + }, }; @@ -446,23 +467,20 @@ WDefaultEntry optionList[] = { &wPreferences.dont_blink, getBool, NULL }, #ifdef WEENDOZE_CYCLE - {"WindozeCycling","NO", NULL, + {"WindozeCycling","NO", NULL, &wPreferences.windoze_cycling, getBool, NULL }, - {"PopupSwitchMenu","YES",NULL, + {"PopupSwitchMenu","YES", NULL, &wPreferences.popup_switchmenu, getBool, NULL }, #endif /* WEENDOZE_CYCLE */ /* style options */ -#ifdef NEWSTUFF - {"WindowButtonImages", DEF_BUTTON_IMAGES, NULL, - &wPreferences.button_images, getRImage, setButtonImages + {"AlternativeMenuStyle", "NO", (void*)REFRESH_MENU_TEXTURE, + &wPreferences.alt_menu_style, getBool, setNothing }, -#else {"WidgetColor", "(solid, gray)", NULL, NULL, getTexture, setWidgetColor, }, -#endif {"WorkspaceSpecificBack","()", NULL, NULL, getWSSpecificBackground, setWorkspaceSpecificBack }, @@ -479,7 +497,7 @@ WDefaultEntry optionList[] = { &wPreferences.title_justification, getEnum, setJustify }, {"WindowTitleFont", DEF_TITLE_FONT, NULL, - NULL, getFont, setWinTitleFont + NULL, getFont, setWinTitleFont, }, {"MenuTitleFont", DEF_MENU_TITLE_FONT, NULL, NULL, getFont, setMenuTitleFont @@ -907,6 +925,7 @@ wReadStaticDefaults(proplist_t dict) } } + void wDefaultsCheckDomains(void *foo) { @@ -1032,103 +1051,8 @@ wDefaultsCheckDomains(void *foo) } #endif /* !LITE */ - WMAddTimerHandler(DEFAULTS_CHECK_INTERVAL, wDefaultsCheckDomains, foo); -} - - - -#define REFRESH_WINDOW_TEXTURES (1<<0) -#define REFRESH_MENU_TEXTURES (1<<1) -#define REFRESH_WINDOW_FONT (1<<2) -#define REFRESH_MENU_TITLE_FONT (1<<3) -#define REFRESH_MENU_FONT (1<<4) -#define REFRESH_FORE_COLOR (1<<5) -#define REFRESH_ICON_TILE (1<<6) -#define REFRESH_ICON_FONT (1<<7) -#define REFRESH_WORKSPACE_BACK (1<<8) - -#define REFRESH_BUTTON_IMAGES (1<<9) - -static void -refreshMenus(WScreen *scr, int flags) -{ - WMenu *menu; - -#ifndef LITE - menu = scr->root_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - menu = scr->switch_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - -#endif /* !LITE */ - - menu = scr->workspace_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - menu = scr->window_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - menu = scr->icon_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - if (scr->dock) { - menu = scr->dock->menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - } - menu = scr->clip_menu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - menu = scr->clip_submenu; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); - - menu = scr->clip_options; - if (menu) - wMenuRefresh(!menu->flags.brother ? menu : menu->brother, flags); -} - - -static void -refreshAppIcons(WScreen *scr, int flags) -{ - WAppIcon *aicon = scr->app_icon_list; - - while (aicon) { - if (aicon->icon) { - aicon->icon->force_paint = 1; - } - aicon = aicon->next; - } -} - - -static void -refreshWindows(WScreen *scr, int flags) -{ - WWindow *wwin; - - wwin = scr->focused_window; - while (wwin) { - if (flags & REFRESH_WINDOW_FONT) { - wWindowConfigureBorders(wwin); - } - if ((flags & (REFRESH_ICON_TILE|REFRESH_WINDOW_TEXTURES)) && - wwin->flags.miniaturized && wwin->icon) { - wwin->icon->force_paint = 1; - } - if (flags & REFRESH_WINDOW_TEXTURES) { - wwin->frame->flags.need_texture_remake = 1; - } - wwin = wwin->prev; - } + if (!foo) + WMAddTimerHandler(DEFAULTS_CHECK_INTERVAL, wDefaultsCheckDomains, foo); } @@ -1194,59 +1118,62 @@ wReadDefaults(WScreen *scr, proplist_t new_dict) } } - if (needs_refresh!=0) { + if (needs_refresh!=0 && !scr->flags.startup) { int foo; foo = 0; - if (needs_refresh & REFRESH_MENU_TEXTURES) - foo |= MR_TEXT_BACK; - if (needs_refresh & REFRESH_MENU_FONT) - foo |= MR_RESIZED; + if (needs_refresh & REFRESH_MENU_TITLE_TEXTURE) + foo |= WTextureSettings; if (needs_refresh & REFRESH_MENU_TITLE_FONT) - foo |= MR_TITLE_TEXT; - + foo |= WFontSettings; + if (needs_refresh & REFRESH_MENU_TITLE_COLOR) + foo |= WColorSettings; if (foo) - refreshMenus(scr, foo); - - if (needs_refresh & (REFRESH_WINDOW_TEXTURES|REFRESH_WINDOW_FONT| - REFRESH_ICON_TILE)) - refreshWindows(scr, needs_refresh); - - if (needs_refresh & REFRESH_ICON_TILE) - refreshAppIcons(scr, needs_refresh); - -#ifdef NEWSTUFF - if ((needs_refresh & REFRESH_BUTTON_IMAGES) - && wPreferences.button_images) { - - int w, h; - RImage *image = wPreferences.button_images; - RImage *tmp; - int theight; - - w = wPreferences.button_images->width / 2; - h = wPreferences.button_images->height / PRED_BPIXMAPS; - - theight = scr->title_font->height + TITLEBAR_EXTRA_HEIGHT - 3; - - for (i = 0; i < PRED_BPIXMAPS; i++) { - tmp = RGetSubImage(image, 0, i * h, w, h); - if (scr->button_images[0][i]) - RDestroyImage(scr->button_images[0][i]); - - scr->button_images[0][i] = RScaleImage(tmp, theight, theight); - RDestroyImage(tmp); + WMPostNotificationName(WNMenuTitleAppearanceSettingsChanged, NULL, + (void*)foo); - tmp = RGetSubImage(image, w, i * h, image->width - w, h); - if (scr->button_images[1][i]) - RDestroyImage(scr->button_images[1][i]); + foo = 0; + if (needs_refresh & REFRESH_MENU_TEXTURE) + foo |= WTextureSettings; + if (needs_refresh & REFRESH_MENU_FONT) + foo |= WFontSettings; + if (needs_refresh & REFRESH_MENU_COLOR) + foo |= WColorSettings; + if (foo) + WMPostNotificationName(WNMenuAppearanceSettingsChanged, NULL, + (void*)foo); - scr->button_images[1][i] = RScaleImage(tmp, theight, theight); - RDestroyImage(tmp); + foo = 0; + if (needs_refresh & REFRESH_WINDOW_FONT) { + foo |= WFontSettings; + } + if (needs_refresh & REFRESH_WINDOW_TEXTURES) { + foo |= WTextureSettings; + } + if (needs_refresh & REFRESH_WINDOW_TITLE_COLOR) { + foo |= WColorSettings; + } + if (foo) + WMPostNotificationName(WNWindowAppearanceSettingsChanged, NULL, + (void*)foo); + + if (!(needs_refresh & REFRESH_ICON_TILE)) { + foo = 0; + if (needs_refresh & REFRESH_ICON_FONT) { + foo |= WFontSettings; + } + if (needs_refresh & REFRESH_ICON_TITLE_COLOR) { + foo |= WTextureSettings; + } + if (needs_refresh & REFRESH_ICON_TITLE_BACK) { + foo |= WTextureSettings; } + if (foo) + WMPostNotificationName(WNIconAppearanceSettingsChanged, NULL, + (void*)foo); } -#endif /* NEWSTUFF */ - wRefreshDesktop(scr); + if (needs_refresh & REFRESH_ICON_TILE) + WMPostNotificationName(WNIconTileSettingsChanged, NULL, NULL); } } @@ -2623,7 +2550,7 @@ setWTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) if (index == WS_UNFOCUSED) XSetForeground(dpy, scr->info_text_gc, color->pixel); - return REFRESH_FORE_COLOR; + return REFRESH_WINDOW_TITLE_COLOR; } @@ -2655,7 +2582,7 @@ setMenuTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) #endif /* !TITLE_TEXT_SHADOW */ XSetForeground(dpy, scr->menu_title_gc, color->pixel); - return REFRESH_FORE_COLOR; + return REFRESH_MENU_TITLE_COLOR; } @@ -2685,7 +2612,7 @@ setMenuTextColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo) } XChangeGC(dpy, scr->disabled_menu_entry_gc, gcm, &gcv); - return REFRESH_FORE_COLOR; + return REFRESH_MENU_COLOR; #undef gcm } @@ -2722,9 +2649,10 @@ setIconTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo) { XSetForeground(dpy, scr->icon_title_gc, color->pixel); - return REFRESH_FORE_COLOR; + return REFRESH_ICON_TITLE_COLOR; } + static int setIconTitleBack(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo) { @@ -2734,7 +2662,7 @@ setIconTitleBack(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo) XQueryColor (dpy, scr->w_colormap, color); scr->icon_title_texture = wTextureMakeSolid(scr, color); - return REFRESH_WINDOW_TEXTURES; + return REFRESH_ICON_TITLE_BACK; } @@ -2939,7 +2867,7 @@ setMenuTitleBack(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *f } scr->menu_title_texture[0] = *texture; - return REFRESH_MENU_TEXTURES; + return REFRESH_MENU_TITLE_TEXTURE; } @@ -2955,7 +2883,7 @@ setMenuTextBack(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *fo scr->menu_item_auxtexture = wTextureMakeSolid(scr, &scr->menu_item_texture->any.color); - return REFRESH_MENU_TEXTURES; + return REFRESH_MENU_TEXTURE; } @@ -2998,13 +2926,20 @@ updateUsableArea(WScreen *scr, WDefaultEntry *entry, void *bar, void *foo) } +static int +setNothing(WScreen *scr, WDefaultEntry *entry, int *value, void *foo) +{ + return (int)entry->extra_data; +} + +/* static int setButtonImages(WScreen *scr, WDefaultEntry *entry, int *value, void *foo) { return REFRESH_BUTTON_IMAGES; } - +*/ /* * Very ugly kluge. diff --git a/src/event.c b/src/event.c index a45fa6c8..6841e188 100644 --- a/src/event.c +++ b/src/event.c @@ -83,6 +83,7 @@ extern Atom _XA_WM_CHANGE_STATE; extern Atom _XA_WM_DELETE_WINDOW; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; extern Atom _XA_WINDOWMAKER_WM_FUNCTION; +extern Atom _XA_WINDOWMAKER_COMMAND; #ifdef OFFIX_DND extern Atom _XA_DND_PROTOCOL; @@ -867,6 +868,10 @@ handleClientMessage(XEvent *event) } else { /* stopping */ wColormapAllowClientInstallation(scr, False); } + } else if (event->xclient.message_type == _XA_WINDOWMAKER_COMMAND) { + + wDefaultsCheckDomains("bla"); + } else if (event->xclient.message_type == _XA_WINDOWMAKER_WM_FUNCTION) { WApplication *wapp; int done=0; @@ -1715,7 +1720,6 @@ handleMotionNotify(XEvent *event) { WMenu *menu; WScreen *scr = wScreenForRootWindow(event->xmotion.root); - WWindow *wwin; if (wPreferences.scrollable_menus) { if (event->xmotion.x_root <= 1 || diff --git a/src/framewin.c b/src/framewin.c index 263f41a1..6f99153e 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -803,6 +803,11 @@ wFrameWindowPaint(WFrameWindow *fwin) titlelen); free(title); + + if (fwin->left_button) + handleButtonExpose(&fwin->left_button->descriptor, NULL); + if (fwin->right_button) + handleButtonExpose(&fwin->right_button->descriptor, NULL); } } diff --git a/src/icon.c b/src/icon.c index b9a59501..acec88e0 100644 --- a/src/icon.c +++ b/src/icon.c @@ -57,6 +57,43 @@ static void miniwindowMouseDown(WObjDescriptor *desc, XEvent *event); static void miniwindowDblClick(WObjDescriptor *desc, XEvent *event); +/****** Notification Observers ******/ + +static void +appearanceObserver(void *self, WMNotification *notif) +{ + WIcon *icon = (WIcon*)self; + int flags = (int)WMGetNotificationClientData(notif); + + if (flags & WTextureSettings) { + icon->force_paint = 1; + } + if (flags & WFontSettings) { + icon->force_paint = 1; + } + /* + if (flags & WColorSettings) { + } + */ + XClearArea(dpy, icon->core->window, 0, 0, 1, 1, True); +/* wIconPaint(icon);*/ +} + + +static void +tileObserver(void *self, WMNotification *notif) +{ + WIcon *icon = (WIcon*)self; + + icon->force_paint = 1; + XClearArea(dpy, icon->core->window, 0, 0, 1, 1, True); +/* wIconPaint(icon);*/ +} + +/************************************/ + + + INLINE static void getSize(Drawable d, unsigned int *w, unsigned int *h, unsigned int *dep) { @@ -138,7 +175,11 @@ wIconCreate(WWindow *wwin) wIconUpdate(icon); XFlush(dpy); - + + WMAddNotificationObserver(appearanceObserver, icon, + WNIconAppearanceSettingsChanged, icon); + WMAddNotificationObserver(tileObserver, icon, + WNIconTileSettingsChanged, icon); return icon; } @@ -191,6 +232,9 @@ wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile) wIconUpdate(icon); + WMAddNotificationObserver(tileObserver, icon, + WNIconTileSettingsChanged, icon); + return icon; } @@ -202,6 +246,8 @@ wIconDestroy(WIcon *icon) WCoreWindow *core = icon->core; WScreen *scr = core->screen_ptr; + WMRemoveNotificationObserver(icon); + if (icon->handlerID) WMDeleteTimerHandler(icon->handlerID); diff --git a/src/kwm.c b/src/kwm.c index c2f36749..0df190aa 100644 --- a/src/kwm.c +++ b/src/kwm.c @@ -1636,5 +1636,123 @@ wKWMSendEventMessage(WWindow *wwin, WKWMEventMessage message) sendToModules(wwin ? wwin->screen_ptr : NULL, msg, wwin, 0); } +#if 0 +static void +connectKFM(WScreen *scr) +{ + char *pidf; + char buffer[128]; + char *ptr; + FILE *f; + + pidf = wstrappend(whomedir(), "/.kde/share/apps/kfm/pid"); + strcpy(buffer, getenv("DISPLAY")); + + ptr = strchr(buffer, ':'); + if (ptr) + *ptr = '_'; + + ptr = strrchr(buffer, '.'); + if (ptr) + *ptr = 0; + { + char b[32]; + + sprintf(b, ".%i", scr->screen); + strcat(buffer, b); + } + ptr = pidf; + pidf = wstrappend(ptr, buffer); + free(ptr); + + /* pid file */ + f = fopen(pidf, "r"); + + char buffer[ 1024 ]; + buffer[0] = 0; + fgets( buffer, 1023, f ); + int pid = atoi( buffer ); + if ( pid <= 0 ) + { + warning("ERROR: Invalid PID"); + fclose( f ); + return; + } + + // Is the PID ok ? + if ( kill( pid, 0 ) != 0 ) + { + // Did we already try to start a new kfm ? + if ( flag == 0 && allowRestart ) + { + flag = 1; + // Try to start a new kfm + system( "kfm -d &" ); + sleep( 10 ); + fclose( f ); + init(); + return; + } + + warning("ERROR: KFM crashed"); + fclose( f ); + return; + } + + // Read the socket's name + buffer[0] = 0; + fscanf(f, "%s", buffer); + fclose( f ); + char * slot = strdup( buffer ); + if ( slot == (void *) 0 ) + { + warning("ERROR: Invalid Slot"); + return; + } + + // Connect to KFM + ipc = new KfmIpc( slot ); + free(slot); + + connect( ipc, SIGNAL( finished() ), this, SLOT( slotFinished() ) ); + connect( ipc, SIGNAL( error( int, const char* ) ), + this, SLOT( slotError( int, const char* ) ) ); + connect( ipc, SIGNAL( dirEntry( const char*, const char*, const char*, const char*, const char*, int ) ), + this, SLOT( slotDirEntry( const char*, const char*, const char*, const char*, const char*, int ) ) ); + + // Read the password + QString fn = KApplication::localkdedir() + "/share/apps/kfm/magic"; + f = fopen( fn.data(), "rb" ); + if ( f == 0L ) + { + QString ErrorMessage; + ksprintf(&ErrorMessage, i18n("You dont have the file %s\n" + "Could not do Authorization"), fn.data()); + + QMessageBox::message( i18n("KFM Error"), ErrorMessage ); + return; + } + char *p = fgets( buffer, 1023, f ); + fclose( f ); + if ( p == 0L ) + { + QString ErrorMessage; + ksprintf(&ErrorMessage, i18n("The file %s is corrupted\n" + "Could not do Authorization"), fn.data()); + QMessageBox::message( i18n("KFM Error"), ErrorMessage ); + return; + } + + ipc->auth( buffer ); + + ok = TRUE; +} + +void +wKWMSendRootSelection(WScreen *scr, int x, int y, int w, int h, Bool control) +{ + +} +#endif #endif /* KWM_HINTS */ diff --git a/src/main.c b/src/main.c index b51095bc..77724a7b 100644 --- a/src/main.c +++ b/src/main.c @@ -39,6 +39,8 @@ */ #include +#define MAINFILE + #include "WindowMaker.h" #include "window.h" #include "funcs.h" @@ -106,6 +108,7 @@ Atom _XA_WINDOWMAKER_STATE; Atom _XA_WINDOWMAKER_WM_FUNCTION; Atom _XA_WINDOWMAKER_NOTICEBOARD; +Atom _XA_WINDOWMAKER_COMMAND; #ifdef OFFIX_DND Atom _XA_DND_PROTOCOL; diff --git a/src/menu.c b/src/menu.c index 786769d8..b7abf244 100644 --- a/src/menu.c +++ b/src/menu.c @@ -81,12 +81,51 @@ static void menuTitleMouseDown(WCoreWindow *sender, void *data, XEvent *event); static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event); +static void updateTexture(WMenu *menu); static void selectEntry(WMenu *menu, int entry_no); static void closeCascade(WMenu *menu); +/****** Notification Observers ******/ + +static void +appearanceObserver(void *self, WMNotification *notif) +{ + WMenu *menu = (WMenu*)self; + int flags = (int)WMGetNotificationClientData(notif); + + if (!menu->flags.realized) + return; + + if (WMGetNotificationName(notif) == WNMenuAppearanceSettingsChanged) { + if (flags & WFontSettings) { + menu->flags.realized = 0; + wMenuRealize(menu); + } + if (flags & WTextureSettings) { + updateTexture(menu); + } + if (flags & (WTextureSettings|WColorSettings)) { + wMenuPaint(menu); + } + } else if (menu->flags.titled) { + + if (flags & WFontSettings) { + menu->flags.realized = 0; + wMenuRealize(menu); + } + if (flags & WTextureSettings) { + menu->frame->flags.need_texture_remake = 1; + } + if (flags & (WColorSettings|WTextureSettings)) + wFrameWindowPaint(menu->frame); + } +} + +/************************************/ + /* *---------------------------------------------------------------------- @@ -140,10 +179,7 @@ wMenuCreate(WScreen *screen, char *title, int main_menu) menu->frame->flags.justification = WTJ_LEFT; -#ifndef NEWSTUFF - /* XXX */ menu->frame->rbutton_image = screen->b_pixmaps[WBUT_CLOSE]; -#endif menu->entry_no = 0; menu->alloced_entries = 0; @@ -187,8 +223,13 @@ wMenuCreate(WScreen *screen, char *title, int main_menu) brother = 0; menu->brother->flags.brother = 1; menu->brother->brother = menu; + + WMAddNotificationObserver(appearanceObserver, menu, + WNMenuTitleAppearanceSettingsChanged, menu); + + WMAddNotificationObserver(appearanceObserver, menu, + WNMenuAppearanceSettingsChanged, menu); } - return menu; } @@ -225,38 +266,6 @@ insertEntry(WMenu *menu, WMenuEntry *entry, int index) } -void -wMenuRefresh(WMenu *menu, int flags) -{ - int i; - - if (flags & MR_TEXT_BACK) { - menu->frame->flags.need_texture_remake = 1; - } - - if (flags & (MR_RESIZED|MR_TITLE_TEXT)) { - menu->flags.realized = 0; - } - - wMenuRealize(menu); - - if (menu->flags.titled) - wFrameWindowPaint(menu->frame); - - if (!menu->flags.brother) { - if (menu->brother) - wMenuRefresh(menu->brother, flags); - - for (i=0; i < menu->cascade_no; i++) { - if (!menu->cascades[i]->flags.brother) - wMenuRefresh(menu->cascades[i], flags); - else - wMenuRefresh(menu->cascades[i]->brother, flags); - } - } -} - - WMenuEntry* wMenuInsertCallback(WMenu *menu, int index, char *text, @@ -429,6 +438,41 @@ wMenuRemoveItem(WMenu *menu, int index) } +static void +updateTexture(WMenu *menu) +{ + WScreen *scr = menu->menu->screen_ptr; + + /* setup background texture */ + if (scr->menu_item_texture->any.type != WTEX_SOLID) { + if (!menu->flags.brother) { + FREE_PIXMAP(menu->menu_texture_data); + + if (wPreferences.alt_menu_style) { + wTextureRender(scr, scr->menu_item_texture, + &menu->menu_texture_data, menu->menu->width, + menu->menu->height, WREL_MENUENTRY); + } else { + wTextureRender(scr, scr->menu_item_texture, + &menu->menu_texture_data, menu->menu->width, + menu->entry_height, WREL_MENUENTRY); + } + + XSetWindowBackgroundPixmap(dpy, menu->menu->window, + menu->menu_texture_data); + XClearWindow(dpy, menu->menu->window); + + XSetWindowBackgroundPixmap(dpy, menu->brother->menu->window, + menu->menu_texture_data); + XClearWindow(dpy, menu->brother->menu->window); + } + } else { + XSetWindowBackground(dpy, menu->menu->window, + scr->menu_item_texture->any.color.pixel); + XClearWindow(dpy, menu->menu->window); + } +} + void wMenuRealize(WMenu *menu) @@ -504,28 +548,7 @@ wMenuRealize(WMenu *menu) + menu->frame->top_width + menu->frame->bottom_width); - /* setup background texture */ - if (scr->menu_item_texture->any.type != WTEX_SOLID) { - if (!menu->flags.brother) { - FREE_PIXMAP(menu->menu_texture_data); - - wTextureRender(scr, scr->menu_item_texture, - &menu->menu_texture_data, menu->menu->width, - menu->entry_height, WREL_MENUENTRY); - - XSetWindowBackgroundPixmap(dpy, menu->menu->window, - menu->menu_texture_data); - XClearWindow(dpy, menu->menu->window); - - XSetWindowBackgroundPixmap(dpy, menu->brother->menu->window, - menu->menu_texture_data); - XClearWindow(dpy, menu->brother->menu->window); - } - } else { - XSetWindowBackground(dpy, menu->menu->window, - scr->menu_item_texture->any.color.pixel); - XClearWindow(dpy, menu->menu->window); - } + updateTexture(menu); menu->flags.realized = 1; @@ -541,6 +564,8 @@ wMenuDestroy(WMenu *menu, int recurse) { int i; + WMRemoveNotificationObserver(menu); + /* remove any pending timers */ if (menu->timer) WMDeleteTimerHandler(menu->timer); @@ -741,6 +766,7 @@ paintEntry(WMenu *menu, int index, int selected) } } + static void move_menus(WMenu *menu, int x, int y) { diff --git a/src/menu.h b/src/menu.h index d407d253..b8b864b4 100644 --- a/src/menu.h +++ b/src/menu.h @@ -24,11 +24,6 @@ #include "wcore.h" -#define MR_RESIZED 1 -#define MR_TITLE_BACK 2 -#define MR_TEXT_BACK 4 -#define MR_TITLE_TEXT 8 - #define MI_DIAMOND 0 #define MI_CHECK 1 #define MI_MINIWINDOW 2 @@ -102,7 +97,6 @@ typedef struct WMenu { } WMenu; -void wMenuRefresh(WMenu *menu, int flags); void wMenuPaint(WMenu *menu); void wMenuDestroy(WMenu *menu, int recurse); void wMenuRealize(WMenu *menu); diff --git a/src/moveres.c b/src/moveres.c index 4a267bcd..01a13268 100644 --- a/src/moveres.c +++ b/src/moveres.c @@ -1530,6 +1530,10 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev) if (!warped && !wPreferences.no_autowrap) { int oldWorkspace = scr->current_workspace; + drawFrames(wwin, scr->selected_windows, + moveData.realX - wwin->frame_x, + moveData.realY - wwin->frame_y); + if (checkWorkspaceChange(wwin, &moveData, opaqueMove)) { if (scr->current_workspace != oldWorkspace && wPreferences.edge_resistance > 0 @@ -1538,6 +1542,9 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev) warped = 1; } + drawFrames(wwin, scr->selected_windows, + moveData.realX - wwin->frame_x, + moveData.realY - wwin->frame_y); } else { warped = 0; } diff --git a/src/startup.c b/src/startup.c index 80ef931e..ccee2219 100644 --- a/src/startup.c +++ b/src/startup.c @@ -119,6 +119,7 @@ extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS; extern Atom _XA_WINDOWMAKER_STATE; extern Atom _XA_WINDOWMAKER_WM_FUNCTION; extern Atom _XA_WINDOWMAKER_NOTICEBOARD; +extern Atom _XA_WINDOWMAKER_COMMAND; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; @@ -664,6 +665,8 @@ StartUp(Bool defaultScreenOnly) _XA_WINDOWMAKER_NOTICEBOARD = XInternAtom(dpy, "_WINDOWMAKER_NOTICEBOARD", False); + + _XA_WINDOWMAKER_COMMAND = XInternAtom(dpy, "_WINDOWMAKER_COMMAND", False); #ifdef OFFIX_DND _XA_DND_SELECTION = XInternAtom(dpy, "DndSelection", False); diff --git a/src/window.c b/src/window.c index be1bc479..534990af 100644 --- a/src/window.c +++ b/src/window.c @@ -129,9 +129,29 @@ static void titlebarDblClick(WCoreWindow *sender, void *data, XEvent *event); static void resizebarMouseDown(WCoreWindow *sender, void *data, XEvent *event); +/****** Notification Observers ******/ +static void +appearanceObserver(void *self, WMNotification *notif) +{ + WWindow *wwin = (WWindow*)self; + int flags = (int)WMGetNotificationClientData(notif); + if (!wwin->frame || !wwin->frame->titlebar) + return; + if (flags & WFontSettings) { + wWindowConfigureBorders(wwin); + } + if (flags & WTextureSettings) { + wwin->frame->flags.need_texture_remake = 1; + } + if (flags & (WTextureSettings | WColorSettings)) { + wFrameWindowPaint(wwin->frame); + } +} + +/************************************/ WWindow* wWindowFor(Window window) @@ -151,6 +171,7 @@ wWindowFor(Window window) if (frame->flags.is_client_window_frame) return frame->child; } + return NULL; } @@ -169,6 +190,7 @@ wWindowCreate() wwin->client_descriptor.parent = wwin; wwin->client_descriptor.self = wwin; wwin->client_descriptor.parent_type = WCLASS_WINDOW; + return wwin; } @@ -178,6 +200,8 @@ wWindowDestroy(WWindow *wwin) { int i; + WMRemoveNotificationObserver(wwin); + wwin->flags.destroyed = 1; for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) { @@ -1136,6 +1160,15 @@ wManageWindow(WScreen *scr, Window window) #endif /* + *------------------------------------------------------------ + * Setup Notification Observers + *------------------------------------------------------------ + */ + WMAddNotificationObserver(appearanceObserver, wwin, + WNWindowAppearanceSettingsChanged, wwin); + + + /* *-------------------------------------------------- * * Cleanup temporary stuff @@ -1171,6 +1204,9 @@ wManageInternalWindow(WScreen *scr, Window window, Window owner, wwin = wWindowCreate(); + WMAddNotificationObserver(appearanceObserver, wwin, + WNWindowAppearanceSettingsChanged, wwin); + wwin->flags.internal_window = 1; WSETUFLAG(wwin, omnipresent, 1); diff --git a/util/Makefile.am b/util/Makefile.am index 6b1bb10c..95bb920c 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -20,11 +20,11 @@ wdwrite_LDADD = $(liblist) wxcopy_LDADD = @XLFLAGS@ @XLIBS@ -wxpaste_LDADD = @XLFLAGS@ @XLIBS@ +wxpaste_LDADD = @XLFLAGS@ @XLIBS@ getstyle_LDADD = $(liblist) -setstyle_LDADD = $(liblist) +setstyle_LDADD = @XLFLAGS@ @XLIBS@ $(liblist) seticons_LDADD= $(liblist) diff --git a/util/Makefile.in b/util/Makefile.in index 42167de5..38f1c8fb 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -106,11 +106,11 @@ wdwrite_LDADD = $(liblist) wxcopy_LDADD = @XLFLAGS@ @XLIBS@ -wxpaste_LDADD = @XLFLAGS@ @XLIBS@ +wxpaste_LDADD = @XLFLAGS@ @XLIBS@ getstyle_LDADD = $(liblist) -setstyle_LDADD = $(liblist) +setstyle_LDADD = @XLFLAGS@ @XLIBS@ $(liblist) seticons_LDADD = $(liblist) diff --git a/util/getstyle.c b/util/getstyle.c index 6ed7a79c..e8570357 100644 --- a/util/getstyle.c +++ b/util/getstyle.c @@ -21,7 +21,7 @@ */ -#define PROG_VERSION "getstyle (Window Maker) 0.2" +#define PROG_VERSION "getstyle (Window Maker) 0.3" @@ -68,6 +68,7 @@ static char *options[] = { "IconBack", "IconTitleColor", "IconTitleBack", + "AlternativeMenuStyle", #ifdef TITLE_TEXT_SHADOW "Shadow", "FShadowColor", diff --git a/util/setstyle.c b/util/setstyle.c index 52aa6a88..47aad12f 100644 --- a/util/setstyle.c +++ b/util/setstyle.c @@ -21,7 +21,7 @@ */ -#define PROG_VERSION "setstyle (Window Maker) 0.2" +#define PROG_VERSION "setstyle (Window Maker) 0.3" #include #include @@ -29,6 +29,8 @@ #include #include +#include + #include #include "../src/wconfig.h" @@ -229,6 +231,11 @@ hackStyle(proplist_t style) } } } + + if (!PLGetDictionaryEntry(style, PLMakeString("AlternativeMenuStyle"))) { + PLInsertDictionaryEntry(style, PLMakeString("AlternativeMenuStyle"), + PLMakeString("NO")); + } } @@ -370,8 +377,33 @@ main(int argc, char **argv) hackStyle(style); PLMergeDictionaries(prop, style); - + PLSave(prop, YES); + { + Display *dpy; + XEvent ev; + + dpy = XOpenDisplay(""); + if (dpy) { + int i; + char *msg = "Reconfigure"; + + memset(&ev, 0, sizeof(XEvent)); + + ev.xclient.type = ClientMessage; + ev.xclient.message_type = XInternAtom(dpy, "_WINDOWMAKER_COMMAND", + False); + ev.xclient.window = DefaultRootWindow(dpy); + ev.xclient.format = 8; + + for (i = 0; i <= strlen(msg); i++) { + ev.xclient.data.b[i] = msg[i]; + } + XSendEvent(dpy, DefaultRootWindow(dpy), False, + SubstructureRedirectMask, &ev); + XFlush(dpy); + } + } exit(0); } diff --git a/util/wmsetbg.c b/util/wmsetbg.c index c61c2c2a..8f472034 100644 --- a/util/wmsetbg.c +++ b/util/wmsetbg.c @@ -206,12 +206,12 @@ parseTexture(RContext *rc, char *text) case 'H': gtype = RHorizontalGradient; iwidth = scrWidth; - iheight = 1; + iheight = 8; break; case 'V': case 'v': gtype = RVerticalGradient; - iwidth = 1; + iwidth = 8; iheight = scrHeight; break; default: @@ -299,12 +299,12 @@ parseTexture(RContext *rc, char *text) case 'H': gtype = RHorizontalGradient; iwidth = scrWidth; - iheight = 1; + iheight = 8; break; case 'V': case 'v': gtype = RVerticalGradient; - iwidth = 1; + iwidth = 8; iheight = scrHeight; break; default: -- 2.11.4.GIT