bug fixes

NEWS

@@ -2,7 +2,7 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
---- 0.53.1
+--- 0.54.0
 
 New Option For setstyle
 -----------------------

WINGs/Resources/Makefile.in

@@ -108,9 +108,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Resources/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -142,6 +142,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WINGs/Resources
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WINGs/Resources/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WINGs/wballoon.c

@@ -172,18 +172,19 @@ W_BalloonHandleLeaveView(WMView *view)
 {
     Balloon *bPtr = view->screen->balloon;
 
-    if (bPtr->view->flags.mapped && bPtr->forWindow == view->window) {
+    if (bPtr->forWindow == view->window) {
-	W_UnmapView(bPtr->view);
+	if (bPtr->view->flags.mapped) {
-
+	    W_UnmapView(bPtr->view);
+	    bPtr->noDelayTimer = WMAddTimerHandler(NO_DELAY_DELAY,
+						   clearNoDelay, bPtr);
+	}
 	if (bPtr->timer)
 	    WMDeleteTimerHandler(bPtr->timer);
 
 	bPtr->timer = NULL;
 
-	bPtr->noDelayTimer = WMAddTimerHandler(NO_DELAY_DELAY, clearNoDelay, 
+	bPtr->forWindow = None;
-					       bPtr);
     }
-    bPtr->forWindow = None;
 }
 
 
@@ -210,8 +211,6 @@ showBalloon(void *data)
 
     showText(bPtr, x, y, view->size.width, view->size.height, text);
 
-    bPtr->forWindow = view->window;
-
     bPtr->flags.noDelay = 1;
 }
 
@@ -228,8 +227,6 @@ W_BalloonHandleEnterView(WMView *view)
 
     text = WMHashGet(bPtr->table, view);
     if (!text) {
-	bPtr->forWindow = None;
-
 	if (bPtr->view->flags.realized)
 	    W_UnmapView(bPtr->view);
 
@@ -238,11 +235,14 @@ W_BalloonHandleEnterView(WMView *view)
 
     if (bPtr->timer)
 	WMDeleteTimerHandler(bPtr->timer);
+    bPtr->timer = NULL;
 
     if (bPtr->noDelayTimer)
 	WMDeleteTimerHandler(bPtr->noDelayTimer);
     bPtr->noDelayTimer = NULL;
 
+    bPtr->forWindow = view->window;
+
     if (bPtr->flags.noDelay) {
 	bPtr->timer = NULL;
 

WINGs/wtextfield.c

@@ -1070,6 +1070,7 @@ handleTextFieldActionEvents(XEvent *event, void *data)
      case KeyPress:
         if (tPtr->flags.enabled && tPtr->flags.focused)
             handleTextFieldKeyPress(tPtr, event);
+	
         break;
 
      case MotionNotify:

WPrefs.app/Preferences.c

@@ -192,7 +192,7 @@ createPanel(Panel *p)
     for (i=0; i<4; i++) {
 	panel->ballB[i] = WMCreateSwitchButton(panel->ballF);
 	WMResizeWidget(panel->ballB[i], 205, 20);
-	WMMoveWidget(panel->ballB[i], 15, 25+i*30);
+	WMMoveWidget(panel->ballB[i], 15, 20+i*25);
     }
     WMSetButtonText(panel->ballB[0], _("incomplete window titles"));
     WMSetButtonText(panel->ballB[1], _("miniwindow titles"));

WPrefs.app/WPrefs.h

@@ -2,7 +2,7 @@
  * 
  *  WPrefs - Window Maker Preferences Program
  * 
- *  Copyright (c) 1998 Alfredo K. Kojima
+ *  Copyright (c) 1998, 1999 Alfredo K. Kojima
  * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 /****/
 
 #define WVERSION	"0.40"
-#define WMVERSION	"0.53.x"
+#define WMVERSION	"0.54.x"
 
 
 extern char *NOptionValueChanged;

WPrefs.app/po/Makefile.in

@@ -120,9 +120,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -135,6 +135,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WPrefs.app/po/README

@@ -7,6 +7,7 @@ File	Language		Current Maintainer
 pt.po	Portuguese		Eliphas Levy Theodoro <eliphas@conectiva.com.br>
 hr.po	Croatian		Toni Biliæ <tbilic@oliver.efos.hr>
 fr.po	French			Bastien NOCERA <hadess@writeme.com>
+				Hadess <hadess@infonie.fr>
 ko.po	Korean			Byeong-Chan, Kim <redhands@linux.sarang.net>
 cs.po	Czech		 	David ©auer <xsauer@hwlab.felk.cvut.cz>
 ja.po	Japanese		Kazuhide Takahashi <kazu@dgra.ne.jp>

WPrefs.app/xpm/Makefile.in

@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/xpm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Styles/Autumn.style

@@ -1,5 +1,11 @@
 {
   TitleJustify = center;
+  ClipTitleFont = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*";
+  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = white;
@@ -16,7 +22,7 @@
   MenuDisabledColor = gray80;
   MenuTitleBack = (hgradient, firebrick, black);
   MenuTextBack = (hgradient, peru, black);
-  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconBack = (dgradient, "#efb573", "#734221");
   IconTitleColor = white;
   IconTitleBack = "#8b0000";
   MenuStyle = normal;

configure.in

@@ -10,7 +10,7 @@ AC_INIT(src/WindowMaker.h)
 
 
 
-AM_INIT_AUTOMAKE(WindowMaker, 0.53.1)
+AM_INIT_AUTOMAKE(WindowMaker, 0.54.0)
 
 AM_PROG_LIBTOOL
 

po/README

@@ -17,6 +17,7 @@ nl.po	Dutch			Roeland Mertens <roeland@zeus.rug.ac.be>
 gl.po	Galician		Xose Vazquez <xose@arrakis.es>
 fr.po	French			Bastien NOCERA <hadess@writeme.com>
 				Jean-Francois BIGNOLLES <bignolle@grif.fr>
+				Hadess <hadess@infonie.fr>
 it.po	Italian			Roberto Checozzo <croberto@aerre.it>
 ru.po	Russian			Alexey Vyskubov <alexey@alv.stud.pu.ru>
   				Michael Sobolev <mss@transas.com>

src/kwm.c

@@ -780,6 +780,7 @@ void
 wKWMCheckClientInitialState(WWindow *wwin)
 {
     long val;
+    WArea area;
 
     if (getSimpleHint(wwin->client_win, _XA_KWM_WIN_STICKY, &val) && val) {
 
@@ -793,6 +794,17 @@ wKWMCheckClientInitialState(WWindow *wwin)
 
 	wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
     }
+    if (getAreaHint(wwin->client_win, _XA_KWM_WIN_GEOMETRY_RESTORE, &area)
+	&& (wwin->old_geometry.x != area.x1
+	    || wwin->old_geometry.y != area.y1
+	    || wwin->old_geometry.width != area.x2 - area.x1
+	    || wwin->old_geometry.height != area.y2 - area.y1)) {
+
+	wwin->old_geometry.x = area.x1;
+	wwin->old_geometry.y = area.y1;
+	wwin->old_geometry.width = area.x2 - area.x1;
+	wwin->old_geometry.height = area.y2 - area.y1;
+    }
 }
 
 

src/moveres.c

@@ -120,7 +120,7 @@ showPosition(WWindow *wwin, int x, int y)
     int fw, fh;
 
     if (wPreferences.move_display == WDIS_NEW) {
-#if 0
+#if 1
         int width = wwin->frame->core->width;
         int height = wwin->frame->core->height;
 
@@ -160,7 +160,7 @@ static void
 cyclePositionDisplay(WWindow *wwin, int x, int y, int w, int h)
 {
     WScreen *scr = wwin->screen_ptr;
-    
+
     wPreferences.move_display++;
     wPreferences.move_display %= NUM_DISPLAYS;
     
@@ -176,7 +176,6 @@ cyclePositionDisplay(WWindow *wwin, int x, int y, int w, int h)
 	    moveGeometryDisplayCentered(scr, x + w/2, y + h/2);
 	}
 	XMapRaised(dpy, scr->geometry_display);
-	showPosition(wwin, x, y);
     }
 }
 
@@ -1071,6 +1070,11 @@ updateWindowPosition(WWindow *wwin, MoveData *data, Bool doResistance,
 	newY = data->calcY;
 
     if (data->realX != newX || data->realY != newY) {
+
+	if (wPreferences.move_display == WDIS_NEW
+	    && !scr->selected_windows) {
+	    showPosition(wwin, data->realX, data->realY);
+	}
 	if (opaqueMove) {
 	    doWindowMove(wwin, scr->selected_windows,
 			 newX - wwin->frame_x,
@@ -1097,12 +1101,6 @@ updateWindowPosition(WWindow *wwin, MoveData *data, Bool doResistance,
 	}
 
 	if (!scr->selected_windows) {
-
-	    if (wPreferences.move_display == WDIS_NEW) {
-
-		showPosition(wwin, data->realX, data->realY);
-		
-	    }
 	    showPosition(wwin, newX, newY);
 	}
     }
@@ -1450,6 +1448,14 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
     rimg = InitGhostWindowMove(scr);
 #endif
 
+    if (wPreferences.opaque_move && !wPreferences.use_saveunders) {
+	XSetWindowAttributes attr;
+
+	attr.save_under = True;
+	XChangeWindowAttributes(dpy, wwin->frame->core->window,
+				CWSaveUnder, &attr);
+    }
+
     initMoveData(wwin, &moveData);
 
     moveData.mouseX = ev->xmotion.x_root;
@@ -1495,9 +1501,20 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 			       moveData.realY - wwin->frame_y);
 		}
 
-		cyclePositionDisplay(wwin, moveData.realX, moveData.realY, 
+		if (wPreferences.move_display == WDIS_NEW
+		    && !scr->selected_windows) {
+		    showPosition(wwin, moveData.realX, moveData.realY);
+		    XUngrabServer(dpy);
+		}
+		cyclePositionDisplay(wwin, moveData.realX, moveData.realY,
 				     moveData.winWidth, moveData.winHeight);
 
+		if (wPreferences.move_display == WDIS_NEW
+		    && !scr->selected_windows) {
+		    XGrabServer(dpy);
+		    showPosition(wwin, moveData.realX, moveData.realY);
+		}
+
 		if (!opaqueMove) {
                     drawFrames(wwin, scr->selected_windows,
                                moveData.realX - wwin->frame_x,
@@ -1518,6 +1535,11 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 		if (!warped && !wPreferences.no_autowrap) {
 		    int oldWorkspace = scr->current_workspace;
 
+		    if (wPreferences.move_display == WDIS_NEW
+			&& !scr->selected_windows) {
+			showPosition(wwin, moveData.realX, moveData.realY);
+			XUngrabServer(dpy);
+		    }
 		    if (!opaqueMove) {
 			drawFrames(wwin, scr->selected_windows, 
 				   moveData.realX - wwin->frame_x,
@@ -1530,12 +1552,17 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 			    updateMoveData(wwin, &moveData);
 			warped = 1;
 		    }
-
 		    if (!opaqueMove) {
-			drawFrames(wwin, scr->selected_windows,
+			drawFrames(wwin, scr->selected_windows, 
 				   moveData.realX - wwin->frame_x,
 				   moveData.realY - wwin->frame_y);
 		    }
+		    if (wPreferences.move_display == WDIS_NEW
+			&& !scr->selected_windows) {
+			XSync(dpy, False);
+			showPosition(wwin, moveData.realX, moveData.realY);
+			XGrabServer(dpy);
+		    }
 		} else {
 		    warped = 0;
 		}
@@ -1556,8 +1583,12 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 		if (started && !opaqueMove)
 		    drawFrames(wwin, scr->selected_windows, 0, 0);
 
-		if (!opaqueMove)
+		if (!opaqueMove || (wPreferences.move_display==WDIS_NEW
+				    && !scr->selected_windows)) {
 		    XGrabServer(dpy);
+		    if (wPreferences.move_display==WDIS_NEW)
+			showPosition(wwin, moveData.realX, moveData.realY);
+		}
 	    }
 	    break;
 
@@ -1621,6 +1652,14 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 	}
     }
 
+    if (wPreferences.opaque_move && !wPreferences.use_saveunders) {
+	XSetWindowAttributes attr;
+
+	attr.save_under = False;
+	XChangeWindowAttributes(dpy, wwin->frame->core->window,
+				CWSaveUnder, &attr);
+    }
+
     freeMoveData(&moveData);
 
     return 0;

src/rootmenu.c

@@ -1722,8 +1722,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
 	    if (keyboard)
 		wMenuMapAt(menu, 0, 0, True);
 	    else
-		wMenuMapCopyAt(menu, x-menu->frame->core->width/2, 
+		wMenuMapCopyAt(menu, x-menu->frame->core->width/2, y);
-			       y-menu->frame->top_width/2);
 	}
 	return;
     }
@@ -1769,8 +1768,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
 	scr->root_menu = menu;
     }
     if (menu) {
-	wMenuMapAt(menu, x-menu->frame->core->width/2, y-menu->frame->top_width/2,
+	wMenuMapAt(menu, x-menu->frame->core->width/2, y, keyboard);
-		   keyboard);
     }
     
     if (scr->flags.root_menu_changed_shortcuts)

src/switchmenu.c

@@ -102,12 +102,12 @@ OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard)
 		if (keyboard)
 		    wMenuMapAt(switchmenu, 0, 0, True);
 		else
-		    wMenuMapCopyAt(switchmenu, x-switchmenu->frame->core->width/2,
+		    wMenuMapCopyAt(switchmenu, 
-			       y-switchmenu->frame->top_width/2);
+				   x-switchmenu->frame->core->width/2, y);
 	    }
 	} else {
-	    wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2,
+	    wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y,
-		       y-switchmenu->frame->top_width/2, keyboard);
+		       keyboard);
 	}
 	return;
     }
@@ -125,8 +125,8 @@ OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard)
     if (switchmenu) {
 	if (!switchmenu->flags.realized)
 	    wMenuRealize(switchmenu);
-	wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2,
+	wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y, 
-		   y-switchmenu->frame->top_width/2, keyboard);
+		   keyboard);
     }
 }
 

src/wconfig.h.in

@@ -363,7 +363,7 @@
 #define MENU_SELECT_DELAY 200
 
 /* delay for jumpback of scrolled menus */
-#define MENU_JUMP_BACK_DELAY 	200
+#define MENU_JUMP_BACK_DELAY 	300
 
 /* *** animation speed constants *** */