more mis-merging

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index 3d3ba30..32acabc 100644 (file)
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -1,15 +1,14 @@
 .TH "OPENBOX" "1" 
 .SH "NAME" 
-openbox \(em Next generation, highly configurable window manager 
- 
+openbox \(em A minimalistic, highly configurable, next generation window 
+manager with extensive standards support. 
 .SH "SYNOPSIS" 
 .PP 
 \fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-version\fP]  [\fB\-\-replace\fP]  [\fB\-\-reconfigure\fP]  [\fB\-\-sm-disable\fP]  [\fB\-\-sync\fP]  [\fB\-\-debug\fP]  [\fB\-\-debug-focus\fP]  [\fB\-\-debug-xinerama\fP]  
 .SH "DESCRIPTION" 
 .PP 
-Openbox is a next generation, highly 
-configurable window manager. Openbox is compliant with the 
-latest window manager standards. 
+Openbox is minimalistic, highly configurable, next generation window 
+manager with extensive standards support. 
 .PP 
 You can start Openbox in three ways: 
 .PP 
@@ -91,4 +90,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Wed 16 May 2007, 01:19 
+.\" created by instant / docbook-to-man, Wed 16 May 2007, 13:08 

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 758b6a7..499bb91 100644 (file)
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -391,7 +391,7 @@ void client_menu_startup()
     e->data.normal.mask_disabled_selected_color =
         ob_rr_theme->menu_disabled_selected_color;
 
-    e = menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, TRUE);
+    menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, TRUE);
 
     menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE);
 

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 66aeebc..0fb1952 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -426,16 +426,21 @@ void stacking_add_nonintrusive(ObWindow *win)
         }
     }
     if (!it_below) {
-        if (client_search_transient(client, focus_client)) {
-            /* it's focused so put it at the top */
-            stacking_list = g_list_append(stacking_list, win);
-            stacking_raise(win);
-        } else {
-            /* there is no window to put this directly above, so put it at the
-               bottom */
-            stacking_list = g_list_prepend(stacking_list, win);
-            stacking_lower(win);
-        }
+        /* There is no window to put this directly above, so put it at the
+           top, so you know it is there.
+
+           It used to do this only if the window was focused and lower
+           it otherwise.
+
+           We also put it at the top not the bottom to fix a bug with
+           fullscreen windows. When focusLast is off and followsMouse is
+           on, when you switch desktops, the fullscreen window loses
+           focus and goes into its lower layer. If this puts it at the
+           bottom then when you come back to the desktop, the window is
+           at the bottom and won't get focus back.
+        */
+        stacking_list = g_list_append(stacking_list, win);
+        stacking_raise(win);
     } else {
         /* make sure it's not in the wrong layer though ! */
         for (; it_below; it_below = g_list_next(it_below))