diff --git a/AUTHORS b/AUTHORS index 88916bc2..26fb1ed5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -143,7 +143,7 @@ Fix for unassociated alpha tiff Craig Nellist selection in textfield -Dan Pascu +Dan Pascu dock ghost (superfluous mode) fix, enhancement for scrollable menus, clip, numerous other stuff, project maintainer diff --git a/BUGS b/BUGS index 03b17be8..b975cad3 100644 --- a/BUGS +++ b/BUGS @@ -20,4 +20,3 @@ - mysterious crash with WM_COLORMAP_WINDOWS - mysterious mess in dock icons (specially netscape) -- PPosition handling diff --git a/ChangeLog b/ChangeLog index 5ddbaad9..0d2d5f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ Changes since version 0.60.0: - fixed crash with Assertion "bad_root_window" && 0' failed. on startup - fixed crash when more than 1 dockapp fails to launch on startup - added a different dock setup config for each screen size +- fixed PPosition handling Changes since version 0.53.0: diff --git a/Makefile.in b/Makefile.in index 2aaaac4b..60703ffb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,7 @@ mkinstalldirs src/config.h.in src/stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 198e1f61..3e41b2ef 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -45,7 +45,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST) testnot_SOURCES = testnot.c -testnot_LDADD = libWINGs.a $(LIBLIST) +testnot_LDADD = libWUtil.a @LIBPL@ wmquery_SOURCES = wmquery.c diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in index 72ecf365..9ee51ada 100644 --- a/WINGs/Makefile.in +++ b/WINGs/Makefile.in @@ -131,7 +131,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST) testnot_SOURCES = testnot.c -testnot_LDADD = libWINGs.a $(LIBLIST) +testnot_LDADD = libWUtil.a @LIBPL@ wmquery_SOURCES = wmquery.c @@ -197,7 +197,7 @@ testcolorpanel_DEPENDENCIES = libWINGs.a \ $(top_builddir)/wrlib/libwraster.la testcolorpanel_LDFLAGS = testnot_OBJECTS = testnot.o -testnot_DEPENDENCIES = libWINGs.a $(top_builddir)/wrlib/libwraster.la +testnot_DEPENDENCIES = libWUtil.a testnot_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -211,7 +211,7 @@ DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libWINGs_a_SOURCES) $(libWUtil_a_SOURCES) $(wtest_SOURCES) $(wmquery_SOURCES) $(wmfile_SOURCES) $(fontl_SOURCES) $(testmywidget_SOURCES) $(testcolorpanel_SOURCES) $(testnot_SOURCES) OBJECTS = $(libWINGs_a_OBJECTS) $(libWUtil_a_OBJECTS) $(wtest_OBJECTS) $(wmquery_OBJECTS) $(wmfile_OBJECTS) $(fontl_OBJECTS) $(testmywidget_OBJECTS) $(testcolorpanel_OBJECTS) $(testnot_OBJECTS) diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in index aa1e6bc5..dfac19ca 100644 --- a/WINGs/Resources/Makefile.in +++ b/WINGs/Resources/Makefile.in @@ -104,7 +104,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WINGs/WUtil.h b/WINGs/WUtil.h index a2952e67..4ff1851b 100644 --- a/WINGs/WUtil.h +++ b/WINGs/WUtil.h @@ -258,7 +258,7 @@ int WMCountInBag(WMBag *bag, void *item); * > 0 if a > b * = 0 if a = b */ -void WMSortBag(WMBag *bag, int (*comparer)(void*,void*)); +void WMSortBag(WMBag *bag, int (*comparer)(const void*, const void*)); void WMEmptyBag(WMBag *bag); diff --git a/WINGs/bag.c b/WINGs/bag.c index c15b527b..6070b3ca 100644 --- a/WINGs/bag.c +++ b/WINGs/bag.c @@ -157,7 +157,7 @@ WMCountInBag(WMBag *bag, void *item) void -WMSortBag(WMBag *bag, int (*comparer)(void*, void*)) +WMSortBag(WMBag *bag, int (*comparer)(const void*, const void*)) { qsort(bag->items, bag->count, sizeof(void*), comparer); } diff --git a/WINGs/notification.c b/WINGs/notification.c index 2fd27afa..56a8cfa1 100644 --- a/WINGs/notification.c +++ b/WINGs/notification.c @@ -440,7 +440,7 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue, for (i = 0; i < WMGetBagItemCount(queue->asapQueue); i++) { tmp = WMGetFromBag(queue->asapQueue, i); - if (strcmp(notification->name, tmp) == 0) { + if (strcmp(notification->name, tmp->name) == 0) { WMRemoveFromBag(queue->asapQueue, tmp); WMReleaseNotification(tmp); break; @@ -449,7 +449,7 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue, for (i = 0; i < WMGetBagItemCount(queue->idleQueue); i++) { tmp = WMGetFromBag(queue->idleQueue, i); - if (strcmp(notification->name, tmp) == 0) { + if (strcmp(notification->name, tmp->name) == 0) { WMRemoveFromBag(queue->idleQueue, tmp); WMReleaseNotification(tmp); break; diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c index 02c0e842..adbaef23 100644 --- a/WINGs/wfontpanel.c +++ b/WINGs/wfontpanel.c @@ -647,7 +647,7 @@ listFamilies(WMScreen *scr, WMFontPanel *panel) *fontList[i] = '\0'; continue; } - addFontToFamily(families, (char**)fields); + addFontToFamily(families, fields); } } diff --git a/WINGs/wwindow.c b/WINGs/wwindow.c index 6263ea98..ab6a4acd 100644 --- a/WINGs/wwindow.c +++ b/WINGs/wwindow.c @@ -311,12 +311,12 @@ setSizeHints(WMWindow *win) hints->flags = 0; if (win->flags.upos_set) { - hints->flags |= USPosition; + hints->flags |= USPosition; /* shouldn't be PPosition ? --Dan */ hints->x = win->upos.x; hints->y = win->upos.y; } if (win->usize.width>0 && win->usize.height>0) { - hints->flags |= USSize; + hints->flags |= USSize; /* shouldn't be PSize ? --Dan */ hints->width = win->usize.width; hints->height = win->usize.height; } diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in index c780bb3d..0cc88b02 100644 --- a/WPrefs.app/Makefile.in +++ b/WPrefs.app/Makefile.in @@ -145,7 +145,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(WPrefs_SOURCES) OBJECTS = $(WPrefs_OBJECTS) diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in index cfcf5e38..457dd81f 100644 --- a/WPrefs.app/po/Makefile.in +++ b/WPrefs.app/po/Makefile.in @@ -115,7 +115,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in index 26ee7e33..e42d5208 100644 --- a/WPrefs.app/tiff/Makefile.in +++ b/WPrefs.app/tiff/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in index 7603d58b..c3f2f877 100644 --- a/WPrefs.app/xpm/Makefile.in +++ b/WPrefs.app/xpm/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Backgrounds/Makefile.in b/WindowMaker/Backgrounds/Makefile.in index e09d9959..5c8163ac 100755 --- a/WindowMaker/Backgrounds/Makefile.in +++ b/WindowMaker/Backgrounds/Makefile.in @@ -104,7 +104,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in index e9538d6a..1f3a678c 100755 --- a/WindowMaker/Defaults/Makefile.in +++ b/WindowMaker/Defaults/Makefile.in @@ -106,7 +106,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in index 55320399..996f5b9f 100755 --- a/WindowMaker/IconSets/Makefile.in +++ b/WindowMaker/IconSets/Makefile.in @@ -106,7 +106,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Icons/Makefile.in b/WindowMaker/Icons/Makefile.in index da901173..7fdf756c 100755 --- a/WindowMaker/Icons/Makefile.in +++ b/WindowMaker/Icons/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in index ffa4c1be..09650820 100755 --- a/WindowMaker/Makefile.in +++ b/WindowMaker/Makefile.in @@ -107,7 +107,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Pixmaps/Makefile.in b/WindowMaker/Pixmaps/Makefile.in index 4b7c84da..67a06415 100755 --- a/WindowMaker/Pixmaps/Makefile.in +++ b/WindowMaker/Pixmaps/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Styles/Makefile.in b/WindowMaker/Styles/Makefile.in index 9ef15145..73935930 100755 --- a/WindowMaker/Styles/Makefile.in +++ b/WindowMaker/Styles/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/WindowMaker/Themes/Makefile.in b/WindowMaker/Themes/Makefile.in index aee30bd2..315c9390 100755 --- a/WindowMaker/Themes/Makefile.in +++ b/WindowMaker/Themes/Makefile.in @@ -104,7 +104,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 246193bd..817b5cac 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -98,7 +98,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/doc/Makefile.in b/doc/Makefile.in index 2d85b11d..8883b604 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -105,7 +105,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/po/Makefile.in b/po/Makefile.in index de8a1c3d..b58b6c44 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -115,7 +115,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/src/Makefile.in b/src/Makefile.in index ece1060b..0e3653b2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -141,7 +141,7 @@ wconfig.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(wmaker_SOURCES) OBJECTS = $(wmaker_OBJECTS) diff --git a/src/client.c b/src/client.c index b88cfdee..331c20a1 100644 --- a/src/client.c +++ b/src/client.c @@ -718,7 +718,7 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry, #ifdef IGNORE_PPOSITION wwin->normal_hints->flags &= ~PPosition; #endif - if (pre_icccm && !wwin->screen_ptr->flags.startup && geometry) { + if (!pre_icccm && !wwin->screen_ptr->flags.startup && geometry) { if (wwin->normal_hints->flags & (USPosition|PPosition)) { *x = wwin->normal_hints->x; *y = wwin->normal_hints->y; diff --git a/test/Makefile.in b/test/Makefile.in index b66fe6ae..1613c205 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -126,7 +126,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(wtest_SOURCES) OBJECTS = $(wtest_OBJECTS) diff --git a/util/Makefile.in b/util/Makefile.in index bba4aca8..348a8a27 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -188,7 +188,7 @@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(wxcopy_SOURCES) $(wxpaste_SOURCES) $(wdwrite_SOURCES) $(getstyle_SOURCES) $(setstyle_SOURCES) $(seticons_SOURCES) $(geticonset_SOURCES) $(wmsetbg_SOURCES) OBJECTS = $(wxcopy_OBJECTS) $(wxpaste_OBJECTS) $(wdwrite_OBJECTS) $(getstyle_OBJECTS) $(setstyle_OBJECTS) $(seticons_OBJECTS) $(geticonset_OBJECTS) $(wmsetbg_OBJECTS) diff --git a/wmlib/Makefile.in b/wmlib/Makefile.in index 44e951aa..7c8f16ff 100644 --- a/wmlib/Makefile.in +++ b/wmlib/Makefile.in @@ -127,7 +127,7 @@ DIST_COMMON = COPYING.LIB Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libWMaker_a_SOURCES) OBJECTS = $(libWMaker_a_OBJECTS) diff --git a/wrlib/Makefile.in b/wrlib/Makefile.in index 1d753f53..ac1b5ce0 100644 --- a/wrlib/Makefile.in +++ b/wrlib/Makefile.in @@ -166,7 +166,7 @@ Makefile.in NEWS TODO alloca.c configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libwraster_la_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES) OBJECTS = $(libwraster_la_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS)