X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=dc9d16014ecb0f2f4f89db6644a646c1833dece4;hb=d91c67bf93fd8ca024c32d38b00377a6fef606c9;hp=cdacf101c70d6b9afad7bb9766db9470f4701701;hpb=79cd7b4b2c21c975c441831760708d4919208f6d;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index cdacf101..dc9d1601 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -29,8 +29,7 @@
 #include "moveresize.h"
 #include "render/theme.h"
 
-#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \
-                         FocusChangeMask)
+#define PLATE_EVENTMASK (SubstructureRedirectMask | FocusChangeMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
                          ButtonPressMask | ButtonReleaseMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
@@ -40,8 +39,7 @@
    If it does get them, then it needs its own context for enter events
    because sloppy focus will focus the window when you enter the inner window
    from the frame. */
-#define INNER_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
-                         ButtonMotionMask)
+#define INNER_EVENTMASK (ButtonPressMask)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
                            f->cbwidth_y)
@@ -830,7 +828,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
     }
 
     self = client->frame;
-    if (win == self->plate) {
+    if (win == self->inner || win == self->plate) {
         /* conceptually, this is the desktop, as far as users are
            concerned */
         if (client->type == OB_CLIENT_TYPE_DESKTOP)
@@ -839,7 +837,6 @@ ObFrameContext frame_context(ObClient *client, Window win)
     }
 
     if (win == self->window)    return OB_FRAME_CONTEXT_FRAME;
-    if (win == self->inner)     return OB_FRAME_CONTEXT_FRAME;
     if (win == self->title)     return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->label)     return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->handle)    return OB_FRAME_CONTEXT_HANDLE;