merge r6484-6489 from trunk

diff --git a/README b/README
index fbcb5a63f5fd7f4801b5edbc4a71109b5bc7554d..9c6686406103920941eebe149d60f204f4e06a50 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Openbox
-Copyright (C) 2004-2005  Mikael Magnusson
+Copyright (C) 2004-2007  Mikael Magnusson
 Copyright (C) 2002-2007  Dana Jansens
 
 ----

diff --git a/data/rc.xml b/data/rc.xml
index 78185786caa1036e27f80e198314a4ed33514b40..d4b532829c7a758fea4e3fd87847f54b249e9632 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -229,7 +229,7 @@
       <action name="Resize"/>
     </mousebind> 
 
-    <mousebind button="A-Middle" action="Click">
+    <mousebind button="A-Middle" action="Press">
       <action name="Lower"/>
       <action name="FocusToBottom"/>
       <action name="Unfocus"/>

diff --git a/openbox/action.c b/openbox/action.c
index 0f1a04d2dbcdf74c354cc38325917fdb570605d9..8c8064f89a21ab86acc5f145efbcdb6f981e9558 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1309,7 +1309,7 @@ void action_focus(union ActionData *data)
 void action_unfocus (union ActionData *data)
 {
     if (data->client.any.c == focus_client)
-        focus_fallback(FALSE);
+        focus_fallback(TRUE);
 }
 
 void action_iconify(union ActionData *data)

diff --git a/openbox/client.c b/openbox/client.c
index 3d6ae529571be2db2bcce58792b4ea5d38daf24a..dd47fff450e9c771d1de65f92b50290de36dd475 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1181,7 +1181,7 @@ static void client_get_state(ObClient *self)
                 self->below = TRUE;
             else if (state[i] == prop_atoms.net_wm_state_demands_attention)
                 self->demands_attention = TRUE;
-            else if (state[i] == prop_atoms.openbox_wm_state_undecorated)
+            else if (state[i] == prop_atoms.ob_wm_state_undecorated)
                 self->undecorated = TRUE;
         }
 
@@ -2296,7 +2296,7 @@ static void client_change_state(ObClient *self)
     if (self->demands_attention)
         netstate[num++] = prop_atoms.net_wm_state_demands_attention;
     if (self->undecorated)
-        netstate[num++] = prop_atoms.openbox_wm_state_undecorated;
+        netstate[num++] = prop_atoms.ob_wm_state_undecorated;
     PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
 
     if (self->frame)
@@ -3224,7 +3224,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2)
                 action = self->demands_attention ?
                     prop_atoms.net_wm_state_remove :
                     prop_atoms.net_wm_state_add;
-            else if (state == prop_atoms.openbox_wm_state_undecorated)
+            else if (state == prop_atoms.ob_wm_state_undecorated)
                 action = undecorated ? prop_atoms.net_wm_state_remove :
                     prop_atoms.net_wm_state_add;
         }
@@ -3254,7 +3254,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2)
                 below = TRUE;
             } else if (state == prop_atoms.net_wm_state_demands_attention) {
                 demands_attention = TRUE;
-            } else if (state == prop_atoms.openbox_wm_state_undecorated) {
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
                 undecorated = TRUE;
             }
 
@@ -3281,7 +3281,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2)
                 below = FALSE;
             } else if (state == prop_atoms.net_wm_state_demands_attention) {
                 demands_attention = FALSE;
-            } else if (state == prop_atoms.openbox_wm_state_undecorated) {
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
                 undecorated = FALSE;
             }
         }

diff --git a/openbox/event.c b/openbox/event.c
index e431e8f40972c47fdaad81c12f26b65b8fb63d6c..3acb5d1ff6b2c5cd6397e325c02095a4a26eff1a 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -681,7 +681,7 @@ static void event_handle_root(XEvent *e)
                 screen_set_num_desktops(d);
         } else if (msgtype == prop_atoms.net_showing_desktop) {
             screen_show_desktop(e->xclient.data.l[0] != 0, NULL);
-        } else if (msgtype == prop_atoms.openbox_control) {
+        } else if (msgtype == prop_atoms.ob_control) {
             if (e->xclient.data.l[0] == 1)
                 ob_reconfigure();
             else if (e->xclient.data.l[0] == 2)

diff --git a/openbox/focus.c b/openbox/focus.c
index f947fe33fd5f8e587acfdbd8a4eac890dc15bcb6..0c32df6cc2517f750b71555c977cbe52c0db956c 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -28,6 +28,7 @@
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
+#include "keyboard.h"
 #include "focus.h"
 #include "stacking.h"
 #include "popup.h"

diff --git a/openbox/openbox.c b/openbox/openbox.c
index d550156407b2f5b434d204c954385dfd7e00b85f..2de1f7e7709bdd2558628a7d603fedb8b065ca89 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -150,7 +150,7 @@ gint main(gint argc, gchar **argv)
          * remote_control = 1 -> reconfigure 
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
-                 openbox_control, remote_control, 0, 0, 0);
+                 ob_control, remote_control, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(EXIT_SUCCESS);
     }
@@ -242,7 +242,7 @@ gint main(gint argc, gchar **argv)
 
                 if (config_type != NULL)
                     PROP_SETS(RootWindow(ob_display, ob_screen),
-                              openbox_config, config_type);
+                              ob_config, config_type);
 
                 /* we're done with parsing now, kill it */
                 parse_shutdown(i);

diff --git a/openbox/prop.c b/openbox/prop.c
index 5b611f2d417722e30c5fe05a795f27a795ed9039..36e520171d061a1558482317e34587fa312e4e79 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -171,9 +171,9 @@ void prop_startup()
 */
 
     CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_config, "_OPENBOX_CONFIG");
-    CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
-    CREATE(openbox_control, "_OPENBOX_CONTROL");
+    CREATE(ob_config, "_OB_CONFIG");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
+    CREATE(ob_control, "_OB_CONTROL");
 }
 
 #include <X11/Xutil.h>

diff --git a/openbox/prop.h b/openbox/prop.h
index 8f81eff0ebea7c34b0e72d4ecd74cbb608f72d87..35eb1979211c3a1bde3e84764408edf4df03d17a 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -190,10 +190,10 @@ typedef struct Atoms {
 
     /* Openbox specific atoms */
      
-    Atom openbox_wm_state_undecorated;
-    Atom openbox_pid;
-    Atom openbox_config;
-    Atom openbox_control;
+    Atom ob_wm_state_undecorated;
+    Atom openbox_pid; /* this is depreecated in favour of ob_control */
+    Atom ob_config;
+    Atom ob_control;
 } Atoms;
 Atoms prop_atoms;
 

diff --git a/openbox/screen.c b/openbox/screen.c
index 97fa88494b8fe28b8b1c39c73952c6044a893f20..d71c9eaafd5c039a9d3932f6399ec3d2ed2611fe 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -289,10 +289,10 @@ gboolean screen_annex(const gchar *program_name)
     supported[i++] = prop_atoms.kde_net_wm_frame_strut;
     supported[i++] = prop_atoms.kde_net_wm_window_type_override;
 
-    supported[i++] = prop_atoms.openbox_wm_state_undecorated;
+    supported[i++] = prop_atoms.ob_wm_state_undecorated;
     supported[i++] = prop_atoms.openbox_pid;
-    supported[i++] = prop_atoms.openbox_config;
-    supported[i++] = prop_atoms.openbox_control;
+    supported[i++] = prop_atoms.ob_config;
+    supported[i++] = prop_atoms.ob_control;
     g_assert(i == num_support);
 
     PROP_SETA32(RootWindow(ob_display, ob_screen),