woa.. let you do mouse actions while in an interactive keyboard action, and let you...

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index eb223f64737e90ce0e0ef15eda752ba37081e48c..8feef931b4200674586f94027a2d8b4ddc1c0b53 100644 (file)
--- 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 | \
                            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;
@@ -165,6 +169,8 @@ static void set_theme_statics(ObFrame *self)
     /* set colors/appearance/sizes for stuff that doesn't change */
     XSetWindowBorder(ob_display, self->window,
                      RrColorPixel(ob_rr_theme->frame_b_color));
+    XSetWindowBorder(ob_display, self->inner,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
     XSetWindowBorder(ob_display, self->title,
                      RrColorPixel(ob_rr_theme->frame_b_color));
     XSetWindowBorder(ob_display, self->handle,
@@ -342,6 +348,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         /* set border widths */
         if (!fake) {
             XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
+            XSetWindowBorderWidth(ob_display, self->inner, self->bwidth);
             XSetWindowBorderWidth(ob_display, self->title,  self->rbwidth);
             XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
             XSetWindowBorderWidth(ob_display, self->lgrip,  self->rbwidth);
@@ -426,8 +433,10 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             /* move and resize the inner border window which contains the plate
              */
             XMoveResizeWindow(ob_display, self->inner,
-                              self->innersize.left - self->cbwidth_x,
-                              self->innersize.top - self->cbwidth_y,
+                              self->innersize.left - self->cbwidth_x -
+                              self->bwidth,
+                              self->innersize.top - self->cbwidth_y -
+                              self->bwidth,
                               self->client->area.width +
                               self->cbwidth_x * 2,
                               self->client->area.height +
@@ -457,12 +466,14 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                    self->client->area.height +
                    self->size.top + self->size.bottom));
 
-    if (moved) {
+    if (moved || resized) {
         /* find the new coordinates, done after setting the frame.size, for
            frame_client_gravity. */
         self->area.x = self->client->area.x;
         self->area.y = self->client->area.y;
-        frame_client_gravity(self, &self->area.x, &self->area.y);
+        frame_client_gravity(self, &self->area.x, &self->area.y,
+                             self->client->area.width,
+                             self->client->area.height);
     }
 
     if (!fake) {
@@ -498,6 +509,13 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                       ob_rr_theme->label_height);
 }
 
+void frame_adjust_client_area(ObFrame *self)
+{
+    /* resize the plate */
+    XResizeWindow(ob_display, self->plate,
+                  self->client->area.width, self->client->area.height);
+}
+
 void frame_adjust_state(ObFrame *self)
 {
     framerender_frame(self);
@@ -510,13 +528,6 @@ void frame_adjust_focus(ObFrame *self, gboolean hilite)
     XFlush(ob_display);
 }
 
-void frame_adjust_client_area(ObFrame *self)
-{
-    /* resize the plate */
-    XResizeWindow(ob_display, self->plate,
-                  self->client->area.width, self->client->area.height);
-}
-
 void frame_adjust_title(ObFrame *self)
 {
     framerender_frame(self);
@@ -824,7 +835,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 +844,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;
@@ -853,7 +863,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
     return OB_FRAME_CONTEXT_NONE;
 }
 
-void frame_client_gravity(ObFrame *self, gint *x, gint *y)
+void frame_client_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -866,13 +876,13 @@ void frame_client_gravity(ObFrame *self, gint *x, gint *y)
     case NorthGravity:
     case SouthGravity:
     case CenterGravity:
-        *x -= (self->size.left + self->size.right) / 2;
+        *x -= (self->size.left + w) / 2;
         break;
 
     case NorthEastGravity:
     case SouthEastGravity:
     case EastGravity:
-        *x -= self->size.left + self->size.right;
+        *x -= (self->size.left + self->size.right + w) - 1;
         break;
 
     case ForgetGravity:
@@ -892,13 +902,13 @@ void frame_client_gravity(ObFrame *self, gint *x, gint *y)
     case CenterGravity:
     case EastGravity:
     case WestGravity:
-        *y -= (self->size.top + self->size.bottom) / 2;
+        *y -= (self->size.top + h) / 2;
         break;
 
     case SouthWestGravity:
     case SouthEastGravity:
     case SouthGravity:
-        *y -= self->size.top + self->size.bottom;
+        *y -= (self->size.top + self->size.bottom + h) - 1;
         break;
 
     case ForgetGravity:
@@ -908,7 +918,7 @@ void frame_client_gravity(ObFrame *self, gint *x, gint *y)
     }
 }
 
-void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -920,12 +930,12 @@ void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
     case NorthGravity:
     case CenterGravity:
     case SouthGravity:
-        *x += (self->size.left + self->size.right) / 2;
+        *x += (self->size.left + w) / 2;
         break;
     case NorthEastGravity:
     case EastGravity:
     case SouthEastGravity:
-        *x += self->size.left + self->size.right;
+        *x += (self->size.left + self->size.right + w) - 1;
         break;
     case StaticGravity:
     case ForgetGravity:
@@ -943,12 +953,12 @@ void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
     case WestGravity:
     case CenterGravity:
     case EastGravity:
-        *y += (self->size.top + self->size.bottom) / 2;
+        *y += (self->size.top + h) / 2;
         break;
     case SouthWestGravity:
     case SouthGravity:
     case SouthEastGravity:
-        *y += self->size.top + self->size.bottom;
+        *y += (self->size.top + self->size.bottom + h) - 1;
         break;
     case StaticGravity:
     case ForgetGravity: