Update for 0.52.0. This is a test version, which brings the Appearance

section to WPrefs for testing purposes.

src/Makefile.in

@@ -139,7 +139,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)

src/config.h

@@ -125,6 +125,9 @@
  * defined by configure */
 #define SYSCONFDIR "/usr/local/etc/WindowMaker"
 
+/* whether XKB language MODELOCK should be enabled */
+/* #undef XKB_MODELOCK */
+
 /* Define if you have the atexit function.  */
 #define HAVE_ATEXIT 1
 
@@ -174,5 +177,5 @@
 #define PACKAGE "WindowMaker"
 
 /* Version number of package */
-#define VERSION "0.51.2"
+#define VERSION "0.52.0"
 

src/config.h.in

@@ -124,6 +124,9 @@
  * defined by configure */
 #undef SYSCONFDIR
 
+/* whether XKB language MODELOCK should be enabled */
+#undef XKB_MODELOCK
+
 /* Define if you have the atexit function.  */
 #undef HAVE_ATEXIT
 

src/dockedapp.c

@@ -66,10 +66,12 @@ typedef struct _AppSettingsPanel {
     WMButton *browseBtn;
 
     WMButton *autoLaunchBtn;
-    
+
     WMButton *okBtn;
     WMButton *cancelBtn;
 
+    Window parent;
+
     /* kluge */
     unsigned int destroyed:1;
     unsigned int choosingIcon:1;
@@ -392,6 +394,8 @@ ShowDockAppSettingsPanel(WAppIcon *aicon)
     
     panel->wwin->client_leader = WMWidgetXID(panel->win);
 
+    panel->parent = parent;
+
     WMMapWidget(panel->win);
     
     wWindowMap(panel->wwin);
@@ -421,10 +425,10 @@ DestroyDockAppSettingsPanel(AppSettingsPanel *panel)
 
     WMDestroyWidget(panel->win);    
 
-    XDestroyWindow(dpy, panel->wwin->client_win);
-    
+    XDestroyWindow(dpy, panel->parent);
+
     panel->editedIcon->panel = NULL;
-    
+
     panel->editedIcon->editing = 0;
 
     free(panel);

src/event.c

@@ -639,11 +639,11 @@ handleButtonPress(XEvent *event)
 	    wSelectWindows(scr, event);
 	}
 #ifdef MOUSE_WS_SWITCH
-	else if (event->xbutton.button==Button4) {
+	else if (event->xbutton.button==Button5) {
 
 	    wWorkspaceRelativeChange(scr, -1);
 
-	} else if (event->xbutton.button==Button5) {
+	} else if (event->xbutton.button==Button4) {
 
 	    wWorkspaceRelativeChange(scr, 1);
 

src/misc.c

@@ -1008,7 +1008,7 @@ ExpandOptions(WScreen *scr, char *cmdline)
 		
 	     case 'W':
 		sprintf(tmpbuf, "0x%x", 
-			(unsigned int)scr->current_workspace);
+			(unsigned int)scr->current_workspace + 1);
 		slen = strlen(tmpbuf);
 		olen += slen;
 		nout = realloc(out,olen);

src/placement.c

@@ -196,7 +196,7 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret)
 
 #define INDEX(x,y)	(((y)+1)*(sw+2) + (x) + 1)
 
-    for (level = WMNormalLevel; level >= WMDesktopLevel; level--) {
+    for (level = MAX_WINDOW_LEVELS-1; level >= WMDesktopLevel; level--) {
 	obj = scr->stacking_list[level];
 	
 	while (obj) {

src/rootmenu.c

@@ -1738,6 +1738,12 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
     if (!menu) {
 	/* menu hasn't changed or could not be read */
 	if (!scr->root_menu) {
+	    wMessageDialog(scr, _("Error"),
+			  _("The applications menu could not be loaded."
+			    "Look at the console output for a detailed"
+			    "description of the errors"),
+			   _("OK"), NULL, NULL);
+
 	    menu = makeDefaultMenu(scr);
 	    scr->root_menu = menu;
 	}

src/winmenu.c

@@ -169,8 +169,7 @@ execMenuCommand(WMenu *menu, WMenuEntry *entry)
 	break;
 
      case MC_PROPERTIES:
-	if (wwin->wm_class || wwin->wm_instance)
-	    wShowInspectorForWindow(wwin);
+	wShowInspectorForWindow(wwin);
 	break;
 
      case MC_HIDE:
@@ -581,7 +580,7 @@ updateMenuForWindow(WMenu *menu, WWindow *wwin)
 
     wMenuSetEnabled(menu, MC_DUMMY_MOVETO, !IS_OMNIPRESENT(wwin));
     
-    if ((wwin->wm_class || wwin->wm_instance) && !wwin->flags.inspector_open) {
+    if (!wwin->flags.inspector_open) {
 	wMenuSetEnabled(menu, MC_PROPERTIES, True);
     } else {
 	wMenuSetEnabled(menu, MC_PROPERTIES, False);

src/winspector.c

@@ -1026,7 +1026,7 @@ createInspectorForWindow(WWindow *wwin)
     WMMoveWidget(panel->saveBtn, (2 * (btn_width + 10)) + 15, 310);
     WMSetButtonText(panel->saveBtn, _("Save"));
     WMResizeWidget(panel->saveBtn, btn_width, 28);
-    if (wPreferences.flags.noupdates)
+    if (wPreferences.flags.noupdates || !(wwin->wm_class || wwin->wm_instance))
 	WMSetButtonEnabled(panel->saveBtn, False);
 
     panel->applyBtn = WMCreateCommandButton(panel->win);
@@ -1362,8 +1362,8 @@ createInspectorForWindow(WWindow *wwin)
     } else {
 	int tmp;
 	
-	if (wwin->transient_for!=None
-	    && wwin->transient_for!=scr->root_win)
+	if ((wwin->transient_for!=None && wwin->transient_for!=scr->root_win)
+	    || !wwin->wm_class || !wwin->wm_instance)
 	    tmp = False;
 	else
 	    tmp = True;
@@ -1380,7 +1380,12 @@ createInspectorForWindow(WWindow *wwin)
     else
 	WMSetButtonEnabled(panel->attrChk[3], True);
 
+    
+    if (!wwin->wm_class && !wwin->wm_instance) {
+	WMSetPopUpButtonItemEnabled(panel->pagePopUp, 0, False);
+    }
 
+    
     WMRealizeWidget(panel->win);
 
     WMMapSubwidgets(panel->win);
@@ -1428,6 +1433,7 @@ createInspectorForWindow(WWindow *wwin)
 
     showIconFor(WMWidgetScreen(panel->alwChk), panel, wwin->wm_instance, 
 		wwin->wm_class, UPDATE_TEXT_FIELD);
+
     return panel;
 }