- Moved fullscreen level back above menus

- Small changes to the info panel messages
- Different geomview
- Fixed problem with waitpid returning <0 in monitor

src/WindowMaker.h

@@ -67,10 +67,10 @@ enum {
     WMNormalLevel = 0,
     WMFloatingLevel = 3,
     WMDockLevel = 5,
-    WMFullscreenLevel = 7,
     WMSubmenuLevel = 15,
     WMMainMenuLevel = 20,
     WMStatusLevel = 21,
+    WMFullscreenLevel = 50,
     WMModalLevel = 100,
     WMPopUpLevel = 101,
     WMScreensaverLevel = 1000,

src/dialog.c

@@ -1395,10 +1395,11 @@ wShowInfoPanel(WScreen *scr)
         strbuf = wstrappend(strbuf, _("\nSound enabled"));
     }
 
-    strbuf = wstrappend(strbuf, _("; Antialiased text"));
-
 #ifdef VIRTUAL_DESKTOP
-    strbuf = wstrappend(strbuf, _(", VirtualDesktop"));
+    if (wPreferences.vedge_thickness == 0)
+        strbuf = wstrappend(strbuf, _(", VirtualDesktop disabled"));
+    else
+        strbuf = wstrappend(strbuf, _(", VirtualDesktop enabled"));
 #endif
 
 #ifdef XINERAMA

src/geomview.c

@@ -9,8 +9,9 @@ typedef struct W_GeometryView {
     W_Class widgetClass;
     WMView *view;
 
-    WMColor *black;
-    WMColor *gray;
+    WMColor *color;
+    WMColor *bgColor;
+
     WMFont *font;
 
     WMSize textSize;
@@ -39,6 +40,7 @@ WCreateGeometryView(WMScreen *scr)
     WGeometryView *gview;
     char buffer[64];
     static W_Class widgetClass = 0;
+    WMColor *color;
 
     if (!widgetClass) {
         widgetClass = W_RegisterUserWidget();
@@ -68,8 +70,8 @@ WCreateGeometryView(WMScreen *scr)
         return NULL;
     }
 
-    gview->black = WMBlackColor(scr);
-    gview->gray = WMGrayColor(scr);
+    gview->bgColor = WMCreateRGBColor(scr, 0x3333, 0x6666, 0x9999, True);
+    gview->color = WMWhiteColor(scr);
 
     WMCreateEventHandler(gview->view, ExposureMask, handleEvents, gview);
 
@@ -79,6 +81,8 @@ WCreateGeometryView(WMScreen *scr)
                                             strlen(buffer));
     gview->textSize.height = WMFontHeight(gview->font);
 
+    WMSetWidgetBackgroundColor(gview, gview->bgColor);
+
     W_ResizeView(gview->view, gview->textSize.width+8,
                  gview->textSize.height+6);
 
@@ -125,7 +129,7 @@ paint(WGeometryView *gview)
 
     WMDrawImageString(W_VIEW_SCREEN(gview->view),
                       W_VIEW_DRAWABLE(gview->view),
-                      gview->black, gview->gray, gview->font,
+                      gview->color, gview->bgColor, gview->font,
                       (W_VIEW_WIDTH(gview->view)-gview->textSize.width)/2,
                       (W_VIEW_HEIGHT(gview->view)-gview->textSize.height)/2,
                       buffer, strlen(buffer));

src/monitor.c

@@ -94,6 +94,7 @@ int MonitorLoop(int argc, char **argv)
     char **child_argv= wmalloc(sizeof(char*)*(argc+2));
     int i, status;
     time_t last_start;
+    Bool error = False;
 
     for (i= 0; i < argc; i++)
         child_argv[i]= argv[i];
@@ -122,10 +123,14 @@ int MonitorLoop(int argc, char **argv)
             if ((exited=waitpid(-1, &status, 0)) < 0)
             {
                 wsyserror(_("Error during monitoring of Window Maker process."));
+                error = True;
                 break;
             }
         } while (exited != pid);
 
+        if (error)
+            break;
+
         child_argv[argc]= "--for-real-";
         
         /* Check if the wmaker process exited due to a crash */