X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=6c3b418a50c1face281f6b01cdb6771a1c17d841;hb=5186d04c613056c44490bd3f6766fd969e83305a;hp=a66bef93b2106c2cf3dd9e70d3b3fcd85ef8ad9d;hpb=54ad34a039d5d83d61c481aaef18d1ea7876d36e;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index a66bef93..6c3b418a 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -8,13 +8,14 @@
 
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+                         ButtonPressMask | ButtonReleaseMask | \
+                         VisibilityChangeMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
                            ButtonMotionMask | ExposureMask | \
                            EnterWindowMask | LeaveWindowMask)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
-		           f->cbwidth)
+		           f->cbwidth_y)
 
 static void layout_title(ObFrame *self);
 
@@ -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 */
@@ -51,6 +53,14 @@ ObFrame *frame_new()
     mask = CWEventMask;
     attrib.event_mask = ELEMENT_EVENTMASK;
     self->title = createWindow(self->window, mask, &attrib);
+
+    mask |= CWCursor;
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
+    self->tlresize = createWindow(self->title, mask, &attrib);
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
+    self->trresize = createWindow(self->title, mask, &attrib);
+
+    mask &= ~CWCursor;
     self->label = createWindow(self->title, mask, &attrib);
     self->max = createWindow(self->title, mask, &attrib);
     self->close = createWindow(self->title, mask, &attrib);
@@ -59,11 +69,12 @@ ObFrame *frame_new()
     self->icon = createWindow(self->title, mask, &attrib);
     self->iconify = createWindow(self->title, mask, &attrib);
     self->handle = createWindow(self->window, mask, &attrib);
+
     mask |= CWCursor;
     attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
     self->lgrip = createWindow(self->handle, mask, &attrib);
     attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
-    self->rgrip = createWindow(self->handle, mask, &attrib);
+    self->rgrip = createWindow(self->handle, mask, &attrib); 
 
     self->focused = FALSE;
 
@@ -75,7 +86,8 @@ ObFrame *frame_new()
 
     /* set colors/appearance/sizes for stuff that doesn't change */
     XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->label, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->handle, ob_rr_theme->b_color->pixel);
     XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel);
     XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
 
@@ -95,6 +107,10 @@ ObFrame *frame_new()
                   ob_rr_theme->grip_width, ob_rr_theme->handle_height);
     XResizeWindow(ob_display, self->rgrip,
                   ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+    XResizeWindow(ob_display, self->tlresize,
+                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+    XResizeWindow(ob_display, self->trresize,
+                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
 
     /* set up the dynamic appearances */
     self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
@@ -168,18 +184,18 @@ void frame_adjust_shape(ObFrame *self)
 
 	num = 0;
 	if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
-	    xrect[0].x = -ob_rr_theme->bevel;
-	    xrect[0].y = -ob_rr_theme->bevel;
-	    xrect[0].width = self->width + self->bwidth * 2;
+	    xrect[0].x = -ob_rr_theme->bwidth;
+	    xrect[0].y = -ob_rr_theme->bwidth;
+	    xrect[0].width = self->width + self->rbwidth * 2;
 	    xrect[0].height = ob_rr_theme->title_height +
 		self->bwidth * 2;
 	    ++num;
 	}
 
 	if (self->decorations & OB_FRAME_DECOR_HANDLE) {
-	    xrect[1].x = -ob_rr_theme->bevel;
+	    xrect[1].x = -ob_rr_theme->bwidth;
 	    xrect[1].y = FRAME_HANDLE_Y(self);
-	    xrect[1].width = self->width + self->bwidth * 2;
+	    xrect[1].width = self->width + self->rbwidth * 2;
 	    xrect[1].height = ob_rr_theme->handle_height +
 		self->bwidth * 2;
 	    ++num;
@@ -192,31 +208,49 @@ void frame_adjust_shape(ObFrame *self)
 #endif
 }
 
-void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
+void frame_adjust_area(ObFrame *self, gboolean moved,
+                       gboolean resized, gboolean fake)
 {
     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;
-            self->cbwidth = ob_rr_theme->cbwidth;
+            self->cbwidth_x = self->cbwidth_y = ob_rr_theme->cbwidth;
         } else {
-            self->bwidth = self->cbwidth = 0;
+            self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
         }
-        STRUT_SET(self->innersize, self->cbwidth, self->cbwidth,
-                  self->cbwidth, self->cbwidth);
-        self->width = self->client->area.width + self->cbwidth * 2;
-        g_assert(self->width > 0);
+        self->rbwidth = self->bwidth;
+
+        if (self->max_horz)
+            self->bwidth = self->cbwidth_x = 0;
+
+        STRUT_SET(self->innersize,
+                  self->cbwidth_x,
+                  self->cbwidth_y,
+                  self->cbwidth_x,
+                  self->cbwidth_y);
+        self->width = self->client->area.width + self->cbwidth_x * 2 -
+            (self->max_horz ? self->rbwidth * 2 : 0);
+        self->width = MAX(self->width, 1); /* no lower than 1 */
 
         /* set border widths */
-        XSetWindowBorderWidth(ob_display, self->plate,  self->cbwidth);
-        XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->title,  self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->handle, self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->lgrip,  self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->rgrip,  self->bwidth);
-  
-        /* position/size and map/unmap all the windows */
+        if (!fake) {
+            XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
+            XSetWindowBorderWidth(ob_display, self->title,  self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->lgrip,  self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->rgrip,  self->rbwidth);
+        }
 
+        if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
+            self->innersize.top += ob_rr_theme->title_height + self->rbwidth +
+                (self->rbwidth - self->bwidth);
+        if (self->decorations & OB_FRAME_DECOR_HANDLE)
+            self->innersize.bottom += ob_rr_theme->handle_height +
+                self->rbwidth + (self->rbwidth - self->bwidth);
+  
         /* they all default off, they're turned on in layout_title */
         self->icon_x = -1;
         self->desk_x = -1;
@@ -226,55 +260,71 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
         self->max_x = -1;
         self->close_x = -1;
 
-        if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
-            XMoveResizeWindow(ob_display, self->title,
-                              -self->bwidth, -self->bwidth,
-                              self->width, ob_rr_theme->title_height);
-            self->innersize.top += ob_rr_theme->title_height + self->bwidth;
-            XMapWindow(ob_display, self->title);
+        /* position/size and map/unmap all the windows */
 
+        if (!fake) {
+            if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+                XMoveResizeWindow(ob_display, self->title,
+                                  -self->bwidth, -self->bwidth,
+                                  self->width, ob_rr_theme->title_height);
+                XMapWindow(ob_display, self->title);
+
+                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);
+        }
+
+        if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             /* layout the title bar elements */
             layout_title(self);
-        } else
-            XUnmapWindow(ob_display, self->title);
 
-        if (self->decorations & OB_FRAME_DECOR_HANDLE) {
-            XMoveResizeWindow(ob_display, self->handle,
-                              -self->bwidth, FRAME_HANDLE_Y(self),
-                              self->width, ob_rr_theme->handle_height);
-            self->innersize.bottom += ob_rr_theme->handle_height +
-                self->bwidth;
-            XMapWindow(ob_display, self->handle);
-
-            if (self->decorations & OB_FRAME_DECOR_GRIPS) {
-                XMoveWindow(ob_display, self->lgrip,
-                            -self->bwidth, -self->bwidth);
-                XMoveWindow(ob_display, self->rgrip,
-                            -self->bwidth + self->width -
-                            ob_rr_theme->grip_width, -self->bwidth);
-                XMapWindow(ob_display, self->lgrip);
-                XMapWindow(ob_display, self->rgrip);
-            } else {
-                XUnmapWindow(ob_display, self->lgrip);
-                XUnmapWindow(ob_display, self->rgrip);
-            }
-
-            /* XXX make a subwindow with these dimentions?
-               ob_rr_theme->grip_width + self->bwidth, 0,
-               self->width - (ob_rr_theme->grip_width + self->bwidth) * 2,
-               ob_rr_theme->handle_height);
-            */
-        } else
-            XUnmapWindow(ob_display, self->handle);
-
-        /* move and resize the plate */
-        XMoveResizeWindow(ob_display, self->plate,
-                          self->innersize.left - self->cbwidth,
-                          self->innersize.top - self->cbwidth,
-                          self->client->area.width,
-                          self->client->area.height);
-        /* when the client has StaticGravity, it likes to move around. */
-        XMoveWindow(ob_display, self->client->window, 0, 0);
+        if (!fake) {
+            if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+                XMoveResizeWindow(ob_display, self->handle,
+                                  -self->bwidth, FRAME_HANDLE_Y(self),
+                                  self->width, ob_rr_theme->handle_height);
+                XMapWindow(ob_display, self->handle);
+
+                if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                    XMoveWindow(ob_display, self->lgrip,
+                                -self->rbwidth, -self->rbwidth);
+                    XMoveWindow(ob_display, self->rgrip,
+                                -self->rbwidth + self->width -
+                                ob_rr_theme->grip_width, -self->rbwidth);
+                    XMapWindow(ob_display, self->lgrip);
+                    XMapWindow(ob_display, self->rgrip);
+                } else {
+                    XUnmapWindow(ob_display, self->lgrip);
+                    XUnmapWindow(ob_display, self->rgrip);
+                }
+
+                /* XXX make a subwindow with these dimentions?
+                   ob_rr_theme->grip_width + self->bwidth, 0,
+                   self->width - (ob_rr_theme->grip_width + self->bwidth) * 2,
+                   ob_rr_theme->handle_height);
+                */
+            } else
+                XUnmapWindow(ob_display, self->handle);
+
+            /* move and resize the plate */
+            XMoveResizeWindow(ob_display, self->plate,
+                              self->innersize.left - self->cbwidth_x,
+                              self->innersize.top - self->cbwidth_y,
+                              self->client->area.width + self->cbwidth_x * 2,
+                              self->client->area.height + self->cbwidth_y * 2);
+            /* when the client has StaticGravity, it likes to move around. */
+            XMoveWindow(ob_display, self->client->window,
+                        self->cbwidth_x, self->cbwidth_y);
+        }
 
         STRUT_SET(self->size,
                   self->innersize.left + self->bwidth,
@@ -300,17 +350,19 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
         frame_client_gravity(self, &self->area.x, &self->area.y);
     }
 
-    /* move and resize the top level frame.
-       shading can change without being moved or resized */
-    XMoveResizeWindow(ob_display, self->window,
-                      self->area.x, self->area.y,
-                      self->width,
-                      self->area.height - self->bwidth * 2);
+    if (!fake) {
+        /* move and resize the top level frame.
+           shading can change without being moved or resized */
+        XMoveResizeWindow(ob_display, self->window,
+                          self->area.x, self->area.y,
+                          self->area.width - self->bwidth * 2,
+                          self->area.height - self->bwidth * 2);
 
-    if (resized) {
-        framerender_frame(self);
+        if (resized) {
+            framerender_frame(self);
 
-        frame_adjust_shape(self);
+            frame_adjust_shape(self);
+        }
     }
 }
 
@@ -359,7 +411,7 @@ void frame_grab_client(ObFrame *self, ObClient *client)
     /* map the client so it maps when the frame does */
     XMapWindow(ob_display, client->window);
 
-    frame_adjust_area(self, TRUE, TRUE);
+    frame_adjust_area(self, TRUE, TRUE, FALSE);
 
     /* set all the windows for the frame in the window_map */
     g_hash_table_insert(window_map, &self->window, client);
@@ -375,6 +427,8 @@ void frame_grab_client(ObFrame *self, ObClient *client)
     g_hash_table_insert(window_map, &self->handle, client);
     g_hash_table_insert(window_map, &self->lgrip, client);
     g_hash_table_insert(window_map, &self->rgrip, client);
+    g_hash_table_insert(window_map, &self->tlresize, client);
+    g_hash_table_insert(window_map, &self->trresize, client);
 }
 
 void frame_release_client(ObFrame *self, ObClient *client)
@@ -416,6 +470,8 @@ void frame_release_client(ObFrame *self, ObClient *client)
     g_hash_table_remove(window_map, &self->handle);
     g_hash_table_remove(window_map, &self->lgrip);
     g_hash_table_remove(window_map, &self->rgrip);
+    g_hash_table_remove(window_map, &self->tlresize);
+    g_hash_table_remove(window_map, &self->trresize);
 
     frame_free(self);
 }
@@ -545,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))
@@ -555,6 +611,10 @@ ObFrameContext frame_context_from_string(char *name)
         return OB_FRAME_CONTEXT_HANDLE;
     else if (!g_ascii_strcasecmp("frame", name))
         return OB_FRAME_CONTEXT_FRAME;
+    else if (!g_ascii_strcasecmp("tlcorner", name))
+        return OB_FRAME_CONTEXT_TLCORNER;
+    else if (!g_ascii_strcasecmp("trcorner", name))
+        return OB_FRAME_CONTEXT_TRCORNER;
     else if (!g_ascii_strcasecmp("blcorner", name))
         return OB_FRAME_CONTEXT_BLCORNER;
     else if (!g_ascii_strcasecmp("brcorner", name))
@@ -578,24 +638,40 @@ 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->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;
-    if (win == self->lgrip)  return OB_FRAME_CONTEXT_BLCORNER;
-    if (win == self->rgrip)  return OB_FRAME_CONTEXT_BRCORNER;
-    if (win == self->max)    return OB_FRAME_CONTEXT_MAXIMIZE;
-    if (win == self->iconify)return OB_FRAME_CONTEXT_ICONIFY;
-    if (win == self->close)  return OB_FRAME_CONTEXT_CLOSE;
-    if (win == self->icon)   return OB_FRAME_CONTEXT_ICON;
-    if (win == self->desk)   return OB_FRAME_CONTEXT_ALLDESKTOPS;
-    if (win == self->shade)  return OB_FRAME_CONTEXT_SHADE;
+    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->title)    return OB_FRAME_CONTEXT_TITLEBAR;
+    if (win == self->label)    return OB_FRAME_CONTEXT_TITLEBAR;
+    if (win == self->handle)   return OB_FRAME_CONTEXT_HANDLE;
+    if (win == self->lgrip)    return OB_FRAME_CONTEXT_BLCORNER;
+    if (win == self->rgrip)    return OB_FRAME_CONTEXT_BRCORNER;
+    if (win == self->tlresize) return OB_FRAME_CONTEXT_TLCORNER;
+    if (win == self->trresize) return OB_FRAME_CONTEXT_TRCORNER;
+    if (win == self->max)      return OB_FRAME_CONTEXT_MAXIMIZE;
+    if (win == self->iconify)  return OB_FRAME_CONTEXT_ICONIFY;
+    if (win == self->close)    return OB_FRAME_CONTEXT_CLOSE;
+    if (win == self->icon)     return OB_FRAME_CONTEXT_ICON;
+    if (win == self->desk)     return OB_FRAME_CONTEXT_ALLDESKTOPS;
+    if (win == self->shade)    return OB_FRAME_CONTEXT_SHADE;
 
     return OB_FRAME_CONTEXT_NONE;
 }
@@ -684,16 +760,16 @@ void frame_frame_gravity(ObFrame *self, int *x, int *y)
     switch (self->client->gravity) {
     default:
     case NorthWestGravity:
-    case WestGravity:
-    case SouthWestGravity:
-	break;
     case NorthGravity:
+    case NorthEastGravity:
+	break;
+    case WestGravity:
     case CenterGravity:
-    case SouthGravity:
+    case EastGravity:
 	*y += (self->size.top + self->size.bottom) / 2;
 	break;
-    case NorthEastGravity:
-    case EastGravity:
+    case SouthWestGravity:
+    case SouthGravity:
     case SouthEastGravity:
 	*y += self->size.top + self->size.bottom;
 	break;