X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=dc9d16014ecb0f2f4f89db6644a646c1833dece4;hb=138d3e38d88dbcb1426bd1eb0cd8c43dd01777ad;hp=bfbc7a9927fdd11fe928475c88062d8fbff3702e;hpb=a806f052145f0945f993589893b4a7d3cf184c66;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index bfbc7a99..dc9d1601 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -29,13 +29,17 @@
 #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 | \
-                           ButtonMotionMask | PointerMotionHintMask | \
+                           ButtonMotionMask | \
                            EnterWindowMask | LeaveWindowMask)
+/* The inner window does not need enter/leave events.
+   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)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
                            f->cbwidth_y)
@@ -100,7 +104,7 @@ ObFrame *frame_new(ObClient *client)
     self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
                                 mask, &attrib);
 
-    attrib.event_mask = ELEMENT_EVENTMASK;
+    attrib.event_mask = INNER_EVENTMASK;
     self->inner = createWindow(self->window, visual, mask, &attrib);
 
     mask &= ~CWEventMask;
@@ -824,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)
@@ -833,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;