ultra-keyboard-controlled-menus

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index bdae34e3df04deed7c7576c024d2656dc0c31b4b..37470e3cc15e678fa68df450fb1c4ac8c62a6826 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -8,7 +8,8 @@
 
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+                         ButtonPressMask | ButtonReleaseMask | \
+                         VisibilityChangeMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
                            ButtonMotionMask | ExposureMask | \
                            EnterWindowMask | LeaveWindowMask)
@@ -36,6 +37,7 @@ ObFrame *frame_new()
     self = g_new(ObFrame, 1);
 
     self->visible = FALSE;
+    self->obscured = TRUE;
     self->decorations = 0;
 
     /* create all of the decor windows */
@@ -81,8 +83,6 @@ ObFrame *frame_new()
     XMapWindow(ob_display, self->lgrip);
     XMapWindow(ob_display, self->rgrip);
     XMapWindow(ob_display, self->label);
-    XMapWindow(ob_display, self->tlresize);
-    XMapWindow(ob_display, self->trresize);
 
     /* set colors/appearance/sizes for stuff that doesn't change */
     XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
@@ -213,6 +213,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 {
     if (resized) {
         self->decorations = self->client->decorations;
+        self->max_horz = self->client->max_horz;
 
         if (self->decorations & OB_FRAME_DECOR_BORDER) {
             self->bwidth = ob_rr_theme->bwidth;
@@ -222,10 +223,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         }
         self->rbwidth = self->bwidth;
 
-        if (self->client->max_vert && self->client->max_horz)
-            self->decorations &= ~OB_FRAME_DECOR_HANDLE;
-
-        if (self->client->max_horz)
+        if (self->max_horz)
             self->bwidth = self->cbwidth_x = 0;
 
         STRUT_SET(self->innersize,
@@ -234,7 +232,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                   self->cbwidth_x,
                   self->cbwidth_y);
         self->width = self->client->area.width + self->cbwidth_x * 2 -
-            (self->client->max_horz ? self->rbwidth * 2 : 0);
+            (self->max_horz ? self->rbwidth * 2 : 0);
         self->width = MAX(self->width, 1); /* no lower than 1 */
 
         /* set border widths */
@@ -271,10 +269,16 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                   self->width, ob_rr_theme->title_height);
                 XMapWindow(ob_display, self->title);
 
-                XMoveWindow(ob_display, self->tlresize, 0, 0);
-                XMoveWindow(ob_display, self->trresize,
-                            self->width - ob_rr_theme->grip_width, 0);
-
+                if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                    XMoveWindow(ob_display, self->tlresize, 0, 0);
+                    XMoveWindow(ob_display, self->trresize,
+                                self->width - ob_rr_theme->grip_width, 0);
+                    XMapWindow(ob_display, self->tlresize);
+                    XMapWindow(ob_display, self->trresize);
+                } else {
+                    XUnmapWindow(ob_display, self->tlresize);
+                    XUnmapWindow(ob_display, self->trresize);
+                }
             } else
                 XUnmapWindow(ob_display, self->title);
         }
@@ -334,7 +338,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                  self->client->area.width +
                  self->size.left + self->size.right,
                  (self->client->shaded ?
-                   ob_rr_theme->title_height + self->bwidth*2:
+                   ob_rr_theme->title_height + self->rbwidth * 2:
                    self->client->area.height +
                    self->size.top + self->size.bottom));
 
@@ -597,8 +601,8 @@ static void layout_title(ObFrame *self)
 
 ObFrameContext frame_context_from_string(char *name)
 {
-    if (!g_ascii_strcasecmp("root", name))
-        return OB_FRAME_CONTEXT_ROOT;
+    if (!g_ascii_strcasecmp("desktop", name))
+        return OB_FRAME_CONTEXT_DESKTOP;
     else if (!g_ascii_strcasecmp("client", name))
         return OB_FRAME_CONTEXT_CLIENT;
     else if (!g_ascii_strcasecmp("titlebar", name))
@@ -634,13 +638,27 @@ ObFrameContext frame_context(ObClient *client, Window win)
 {
     ObFrame *self;
 
-    if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
+    if (win == RootWindow(ob_display, ob_screen))
+        return OB_FRAME_CONTEXT_DESKTOP;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
-    if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
+    if (win == client->window) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
 
     self = client->frame;
+    if (win == self->plate) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
+
     if (win == self->window)   return OB_FRAME_CONTEXT_FRAME;
-    if (win == self->plate)    return OB_FRAME_CONTEXT_CLIENT;
     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;