From 9eb4f894d0d0e4ddd0dee58fa8850974e4fa8faa Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sat, 17 Apr 1999 23:11:34 +0000
Subject: [PATCH] *** empty log message ***

---
 NEWS             |  2 +-
 configure.in     |  2 +-
 src/appicon.c    | 11 +++++------
 src/main.c       |  1 +
 src/proplist.c   |  2 +-
 src/startup.c    |  1 +
 src/wconfig.h.in |  2 +-
 src/window.c     |  3 ++-
 src/workspace.c  |  9 ++++-----
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index a1bd69f6..e14c1ede 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
---- 0.52.1
+--- 0.53.0
 
 New Options
 -----------
diff --git a/configure.in b/configure.in
index 896e4291..961a40a2 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_INIT(src/WindowMaker.h)
 
 
 
-AM_INIT_AUTOMAKE(WindowMaker, 0.52.1)
+AM_INIT_AUTOMAKE(WindowMaker, 0.53.0)
 
 AM_PROG_LIBTOOL
 
diff --git a/src/appicon.c b/src/appicon.c
index 942c4196..d268ad66 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -646,6 +646,7 @@ iconExpose(WObjDescriptor *desc, XEvent *event)
     wAppIconPaint(desc->parent);
 }
 
+
 static void
 iconDblClick(WObjDescriptor *desc, XEvent *event)
 {
@@ -676,17 +677,15 @@ iconDblClick(WObjDescriptor *desc, XEvent *event)
        return;
     }
 #endif /* REDUCE_APPICONS */
-    
-    printf("%i\n",wapp->refcount);
-    
+
     unhideHere = (event->xbutton.state & ShiftMask);
-    
+
     /* go to the last workspace that the user worked on the app */
-    if (!unhideHere)
+    if (!unhideHere && wapp->last_workspace != scr->current_workspace)
 	wWorkspaceChange(scr, wapp->last_workspace);
 
     wUnhideApplication(wapp, event->xbutton.button==Button2, unhideHere);
-    
+
     if (event->xbutton.state & MOD_MASK) {
 	wHideOtherApplications(aicon->icon->owner);
     }
diff --git a/src/main.c b/src/main.c
index f76915da..a105a012 100644
--- a/src/main.c
+++ b/src/main.c
@@ -169,6 +169,7 @@ Exit(int status)
     exit(status);
 }
 
+
 void
 Restart(char *manager, Bool abortOnFailure)
 {
diff --git a/src/proplist.c b/src/proplist.c
index a1b7e11f..b80aa4b2 100644
--- a/src/proplist.c
+++ b/src/proplist.c
@@ -429,7 +429,7 @@ get_object(FILE *f)
 	    ungetc(c, f);
 	    pl = get_string(f);
 	} else {
-	    COMPLAIN(_("was expecting a string, dictionary, data or array."));
+	    COMPLAIN(_("was expecting a string, dictionary, data or array. If it's a string, try enclosing it with \"."));
 	    if (c=='#' || c=='/') {
 		wwarning(_("Comments are not allowed inside WindowMaker owned domain files."));
 	    }
diff --git a/src/startup.c b/src/startup.c
index 568d3e8c..daa5d812 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -317,6 +317,7 @@ handleSig(int sig)
             XCloseDisplay(dpy);
         dpy = XOpenDisplay("");
         if (dpy) {
+	    XGrabServer(dpy);
             crashAction = wShowCrashingDialogPanel(sig);
             XCloseDisplay(dpy);
             dpy = NULL;
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 2599e335..51afcc39 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -309,7 +309,7 @@
 #define DEF_CLIP_TITLE_FONT "\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*\""
 #define DEF_INFO_TEXT_FONT "\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*\""
 
-#define DEF_WORKSPACE_NAME_FONT "-*-times-bold-i-normal--24-*"
+#define DEF_WORKSPACE_NAME_FONT "-*-lucida-bold-r-normal--24-*"
 #endif /* !I18N_MB */
 
 #define HELVETICA10_FONT "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
diff --git a/src/window.c b/src/window.c
index 697f9538..9f763440 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1570,6 +1570,8 @@ wWindowFocus(WWindow *wwin, WWindow *owin)
 	return;
     }
 
+    oowner = wWindowFor(owin->transient_for);
+
     /* new window is owner of old window */
     if (wwin == oowner) {
 	wWindowUnfocus(owin);
@@ -1582,7 +1584,6 @@ wWindowFocus(WWindow *wwin, WWindow *owin)
     }
 
     /* new window has same owner of old window */
-    oowner = wWindowFor(owin->transient_for);
     if (oowner == nowner) {
 	/* prevent unfocusing of owner */
 	oowner->flags.semi_focused = 0;
diff --git a/src/workspace.c b/src/workspace.c
index 22b673fc..57095354 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -236,7 +236,6 @@ static void
 hideWorkpaceName(void *data)
 {
     WScreen *scr = (WScreen*)data;
-    
 
     if (!scr->workspace_name_data || scr->workspace_name_data->count == 0) {
 	XUnmapWindow(dpy, scr->workspace_name);
@@ -253,6 +252,9 @@ hideWorkpaceName(void *data)
 	RImage *img = RCloneImage(scr->workspace_name_data->back);
 	Pixmap pix;
 
+	scr->workspace_name_timer = WMAddTimerHandler(30, hideWorkpaceName,
+						      scr);
+
 	RCombineImagesWithOpaqueness(img, scr->workspace_name_data->text,
 				     scr->workspace_name_data->count*255/10);
 
@@ -266,9 +268,6 @@ hideWorkpaceName(void *data)
 	XFlush(dpy);
 
 	scr->workspace_name_data->count--;
-
-	scr->workspace_name_timer = WMAddTimerHandler(40, hideWorkpaceName,
-						      scr);
     }
 }
 
@@ -375,7 +374,7 @@ showWorkspaceName(WScreen *scr, int workspace)
 
     scr->workspace_name_data = data;
 
-    scr->workspace_name_timer = WMAddTimerHandler(200, hideWorkpaceName, scr);
+    scr->workspace_name_timer = WMAddTimerHandler(300, hideWorkpaceName, scr);
 
     return;
 
-- 
2.11.4.GIT