bug fixes in icon placement, attribute inspector, balloon, workspace display

timeout

ChangeLog

@@ -23,7 +23,10 @@ Changes since version 0.53.0:
 - fixed crash bug in Paths section of WPrefs
 - optimized image rendering for 15/16 bpp
 - user menus' paths were changed. See NEWS.
-
+- added a timeout for the workspace name fading
+- HP-UX compiler compatibility workarounds (Sebastien Bauer
+						seb_bauer@bigfoot.com)
+- fixed crash with attributes panel
 
 Changes since version 0.52.0:
 .............................

Makefile.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc
+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\
+	contrib
 
 EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL \
 	Install acconfig.h\

README

@@ -120,6 +120,10 @@ way (not that the normal way is difficult, but...).
 
 * TODO: plans for the future
 
+* contrib/ has some contributed patches that are not supported by Window Maker
+  because they conflict with design filosophies of the developers or some 
+  other reason.
+
 * util/ has various utility programs.
 
 * WPrefs.app/ is the configuration program. 

WINGs/wballoon.c

@@ -28,6 +28,7 @@ typedef struct W_Balloon {
     struct {
 	WMAlignment alignment:2;
 	unsigned enabled:1;
+
 	unsigned noDelay:1;
     } flags;
 } Balloon;

WPrefs.app/po/Makefile.am

@@ -5,7 +5,7 @@ nlsdir = $(NLSDIR)
 CLEANFILES = $(CATALOGS)
 
 EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po\
-		zh_CN.po fi.po
+		zh_CN.po fi.po it.po
 
 POTFILES  = \
 	$(top_builddir)/WPrefs.app/main.c \

WPrefs.app/po/README

@@ -15,3 +15,4 @@ zh_TW.Big5.po Chinese		Li Wei Jih <lwj83@cs.ccu.edu.tw>
 zh_CN.po Chinese		Wang Jian <wangjian2@asiainfo.com>
 es.po   Spanish			Alvaro Herrera <alvherre@webhost.cl>
 fi.po	Finnish			Tomi Kajala <tomi@iki.fi>
+it.po	Italian			Michele Campeotto <micampe@tv.record.unipd.it>

WindowMaker/Makefile.am

@@ -37,6 +37,7 @@ prefsdata_DATA =\
 	plmenu.fr\
 	plmenu.hr\
 	plmenu.zh_CN\
+	plmenu.it\
 	wmmacros\
 	xtree.dat
 

WindowMaker/README

@@ -64,3 +64,4 @@ menu.zh_CN Chinese	Wang Jian <wangjian2@asiainfo.com>
 plmenu.dk Danish 	Birger Langkjer <birger.langkjer@image.dk>
 plmenu.zh_CN Chinese	Wang Jian <wangjian2@asiainfo.com>
 plmenu.hr Croatian	Toni Bilic <tbilic@efos.hr>
+plmenu.it Italian	Michele Campeotto <micampe@tv.record.unipd.it>

configure.in

@@ -216,7 +216,7 @@ dnl ==================
 dnl List of supported locales
 dnl -------------------------
 supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk"
-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi"
+supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it"
 
 for lang in $LINGUAS; do
 	ok=0
@@ -751,7 +751,7 @@ dnl AC_SUBST(DOCTYPES)
 
 AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \
 	WINGs/Makefile WINGs/Resources/Makefile src/Makefile src/wconfig.h \
-	wrlib/Makefile doc/Makefile WindowMaker/Makefile \
+	wrlib/Makefile doc/Makefile WindowMaker/Makefile contrib/Makefile \
 	WindowMaker/Backgrounds/Makefile WindowMaker/Defaults/Makefile \
 	WindowMaker/IconSets/Makefile WindowMaker/Icons/Makefile \
 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \

po/README

@@ -18,7 +18,7 @@ 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>
+it.po	Italian			Michele Campeotto <micampe@tv.record.unipd.it>
 ru.po	Russian			Alexey Vyskubov <alexey@alv.stud.pu.ru>
   				Michael Sobolev <mss@transas.com>
 tr.po	Turkish  	        F. Kagan Gurkaynak <kgf@wpi.edu>

src/dock.c

@@ -3550,7 +3550,7 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
 #endif
     }
 
-    wRaiseFrame(icon->core);
+/*    wRaiseFrame(icon->core);*/
 
     if (!wPreferences.flags.noclip)
         clip = scr->workspaces[scr->current_workspace]->clip;

src/placement.c

@@ -32,6 +32,7 @@
 #include "framewin.h"
 #include "window.h"
 #include "icon.h"
+#include "appicon.h"
 #include "actions.h"
 #include "funcs.h"
 #include "application.h"
@@ -72,7 +73,8 @@ iconPosition(WCoreWindow *wcore, int sx1, int sy1, int sx2, int sy2,
     parent = wcore->descriptor.parent;
 
     /* if it is an application icon */
-    if (wcore->descriptor.parent_type == WCLASS_APPICON) {
+    if (wcore->descriptor.parent_type == WCLASS_APPICON
+	&& !((WAppIcon*)parent)->docked) {
 	*retX = ((WAppIcon*)parent)->x_pos;
 	*retY = ((WAppIcon*)parent)->y_pos;
 

src/winspector.c

@@ -806,11 +806,11 @@ revertSettings(WMButton *button, InspectorPanel *panel)
     char *wm_class = NULL;
     int workspace, level;
 
-    if (WMGetButtonSelected(panel->instRb) != 0)
+    if (panel->instRb && WMGetButtonSelected(panel->instRb) != 0)
         wm_instance = wwin->wm_instance;
-    else if (WMGetButtonSelected(panel->clsRb) != 0)
+    else if (panel->clsRb && WMGetButtonSelected(panel->clsRb) != 0)
         wm_class = wwin->wm_class;
-    else if (WMGetButtonSelected(panel->bothRb) != 0) {
+    else if (panel->bothRb && WMGetButtonSelected(panel->bothRb) != 0) {
         wm_instance = wwin->wm_instance;
         wm_class = wwin->wm_class;
     }

src/workspace.c

@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
+#include <time.h>
 
 #include "WindowMaker.h"
 #include "wcore.h"
@@ -228,6 +229,7 @@ typedef struct WorkspaceNameData {
     int count;
     RImage *back;
     RImage *text;
+    time_t timeout;
 } WorkspaceNameData;
 
 
@@ -237,7 +239,8 @@ hideWorkpaceName(void *data)
 {
     WScreen *scr = (WScreen*)data;
 
-    if (!scr->workspace_name_data || scr->workspace_name_data->count == 0) {
+    if (!scr->workspace_name_data || scr->workspace_name_data->count == 0
+	|| time(NULL) > scr->workspace_name_data->timeout) {
 	XUnmapWindow(dpy, scr->workspace_name);
 
 	if (scr->workspace_name_data) {
@@ -406,8 +409,13 @@ showWorkspaceName(WScreen *scr, int workspace)
 
     data->count = 10;
 
+    /* set a 2 second timeout for the effect */
+    data->timeout = time(NULL) + 1 +
+	(WORKSPACE_NAME_DELAY + WORKSPACE_NAME_FADE_DELAY*data->count)/1000;
+
     scr->workspace_name_data = data;
 
+
     return;
 
 erro:
@@ -437,9 +445,9 @@ wWorkspaceChange(WScreen *scr, int workspace)
 
     if (workspace != scr->current_workspace) {
         wWorkspaceForceChange(scr, workspace);
-    } else {
+    } /*else {
 	showWorkspaceName(scr, workspace);
-    }
+    }*/
 }
 
 
@@ -494,7 +502,7 @@ wWorkspaceForceChange(WScreen *scr, int workspace)
 
     if ((tmp = scr->focused_window)!= NULL) {
 	if (IS_OMNIPRESENT(tmp) || tmp->flags.changing_workspace)
-	    foc = tmp;
+	    foc2 = tmp; /* for gnome stuff.. used to be foc = tmp */
 
 	while (tmp) {
 	    if (tmp->frame->workspace!=workspace && !tmp->flags.selected) {