remove the group option for the restacking commands in rc.xml, cuz groups are clever now

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 1988f108ab45f108eed34c3d269cd3df7556cf23..791c5c073537157bc7ed390b07266aec4937af15 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1009,7 +1009,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                              e->xclient.data.l[0] == 2),
                             e->xclient.data.l[1]);
         } else if (msgtype == prop_atoms.net_wm_moveresize) {
-            ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
+            ob_debug("net_wm_moveresize for 0x%lx direction %d\n",
+                     client->window, e->xclient.data.l[2]);
             if ((Atom)e->xclient.data.l[2] ==
                 prop_atoms.net_wm_moveresize_size_topleft ||
                 (Atom)e->xclient.data.l[2] ==
@@ -1039,6 +1040,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
                                  e->xclient.data.l[1], e->xclient.data.l[3],
                                  e->xclient.data.l[2]);
             }
+            else if ((Atom)e->xclient.data.l[2] ==
+                     prop_atoms.net_wm_moveresize_cancel)
+                moveresize_end(TRUE);
         } else if (msgtype == prop_atoms.net_moveresize_window) {
             gint oldg = client->gravity;
             gint tmpg, x, y, w, h;
@@ -1175,9 +1179,9 @@ static void event_handle_dock(ObDock *s, XEvent *e)
     switch (e->type) {
     case ButtonPress:
         if (e->xbutton.button == 1)
-            stacking_raise(DOCK_AS_WINDOW(s), FALSE);
+            stacking_raise(DOCK_AS_WINDOW(s));
         else if (e->xbutton.button == 2)
-            stacking_lower(DOCK_AS_WINDOW(s), FALSE);
+            stacking_lower(DOCK_AS_WINDOW(s));
         break;
     case EnterNotify:
         dock_hide(FALSE);