drop the DoNotPropogate thing. metacity doesn't set it at all, and i cant tell any...

grab mouse buttons on the client window itself for client bindings. this fixes the weird "click and drag doesnt work when the window is focused" behavior ive been seeing with kdesktop. hooray !

diff --git a/openbox/client.c b/openbox/client.c
index c3c59f0a61283d15ef451043e4ede7a1cfbf1544..256190b97ff7ed74a670daadfe466807384d9274 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -262,9 +262,7 @@ void client_manage(Window window)
 
     /* choose the events we want to receive on the CLIENT window */
     attrib_set.event_mask = CLIENT_EVENTMASK;
-    attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK;
-    XChangeWindowAttributes(ob_display, window,
-                            CWEventMask|CWDontPropagate, &attrib_set);
+    XChangeWindowAttributes(ob_display, window, CWEventMask, &attrib_set);
 
 
     /* create the ObClient struct, and populate it from the hints on the

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 27172d525c614c7933b297d1f9108e3947c7edd6..517ed6e695c362ac6b3ae0d2fdfa2705a1e0e887 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -108,7 +108,7 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
             } else if (CLIENT_CONTEXT(i, client)) {
-                win = client->frame->plate;
+                win = client->window;
                 mode = GrabModeSync; /* this is handled in event */
                 mask = ButtonPressMask; /* can't catch more than this with Sync
                                            mode the release event is