1. remove some old event handling that was not used at all. yay less bandwidth.

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 4d32064c3d9c0aea05bb501074a201c733821f94..d18a7aa4adb09ab32d711292dbeefb89945bac96 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -32,10 +32,9 @@
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \
                          FocusChangeMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask | \
-                         VisibilityChangeMask)
+                         ButtonPressMask | ButtonReleaseMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
-                           ButtonMotionMask | ExposureMask | \
+                           ButtonMotionMask | \
                            EnterWindowMask | LeaveWindowMask)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
@@ -81,8 +80,6 @@ ObFrame *frame_new(ObClient *client)
 
     self = g_new0(ObFrame, 1);
 
-    self->obscured = TRUE;
-
     visual = check_32bit_client(client);
 
     /* create the non-visible decor windows */
@@ -103,6 +100,12 @@ ObFrame *frame_new(ObClient *client)
     self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
                                 mask, &attrib);
 
+    attrib.event_mask = ELEMENT_EVENTMASK;
+    self->inner = createWindow(self->window, visual, mask, &attrib);
+
+    mask &= ~CWEventMask;
+    self->plate = createWindow(self->inner, visual, mask, &attrib);
+
     /* create the visible decor windows */
 
     if (visual) {
@@ -111,7 +114,6 @@ ObFrame *frame_new(ObClient *client)
         attrib.colormap = RrColormap(ob_rr_inst);
     }
     attrib.event_mask = ELEMENT_EVENTMASK;
-    self->inner = createWindow(self->window, NULL, mask, &attrib);
     self->title = createWindow(self->window, NULL, mask, &attrib);
 
     mask |= CWCursor;
@@ -138,11 +140,6 @@ ObFrame *frame_new(ObClient *client)
     attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
     self->rgrip = createWindow(self->handle, NULL, mask, &attrib); 
 
-    /* create the plate window which holds the client */
-
-    mask &= ~(CWEventMask | CWCursor);
-    self->plate = createWindow(self->inner, visual, mask, &attrib);
-
     self->focused = FALSE;
 
     /* the other stuff is shown based on decor settings */
@@ -435,12 +432,10 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                               self->client->area.height +
                               self->cbwidth_y * 2);
 
-            /* move and resize the plate */
-            XMoveResizeWindow(ob_display, self->plate,
-                              self->cbwidth_x,
-                              self->cbwidth_y,
-                              self->client->area.width,
-                              self->client->area.height);
+            /* move the plate */
+            XMoveWindow(ob_display, self->plate,
+                        self->cbwidth_x, self->cbwidth_y);
+
             /* when the client has StaticGravity, it likes to move around. */
             XMoveWindow(ob_display, self->client->window, 0, 0);
         }
@@ -514,6 +509,13 @@ 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);