show and hide the new left/right resize bars at the right time

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 5ee055308e849b534215b27be269e0bd4db9750c..ed88859a396266cfa28c041fd0e4f59e24a49e4c 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -138,6 +138,11 @@ ObFrame *frame_new(ObClient *client)
     self->trtresize = createWindow(self->title, NULL, mask, &attrib);
     self->trrresize = createWindow(self->title, NULL, mask, &attrib);
 
+    attrib.cursor = ob_cursor(OB_CURSOR_WEST);
+    self->leftresize = createWindow(self->inner, NULL, mask, &attrib);
+    attrib.cursor = ob_cursor(OB_CURSOR_EAST);
+    self->rightresize = createWindow(self->inner, NULL, mask, &attrib);
+
     mask &= ~CWCursor;
     self->label = createWindow(self->title, NULL, mask, &attrib);
     self->max = createWindow(self->title, NULL, mask, &attrib);
@@ -357,6 +362,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
             XSetWindowBorderWidth(ob_display, self->lgrip,  self->rbwidth);
             XSetWindowBorderWidth(ob_display, self->rgrip,  self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->leftresize, self->bwidth);
+            XSetWindowBorderWidth(ob_display, self->rightresize, self->bwidth);
         }
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
@@ -441,6 +448,28 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             } else
                 XUnmapWindow(ob_display, self->handle);
 
+            if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                XMoveResizeWindow(ob_display, self->leftresize,
+                                  -(ob_rr_theme->fbwidth * 2) - 1,
+                                  0,
+                                  1,
+                                  self->client->area.height +
+                                  self->cbwidth_y * 2);
+                XMoveResizeWindow(ob_display, self->rightresize,
+                                  self->client->area.width +
+                                  self->cbwidth_x * 2,
+                                  0,
+                                  1,
+                                  self->client->area.height +
+                                  self->cbwidth_y * 2);
+
+                XMapWindow(ob_display, self->leftresize);
+                XMapWindow(ob_display, self->rightresize);
+            } else {
+                XUnmapWindow(ob_display, self->leftresize);
+                XUnmapWindow(ob_display, self->rightresize);
+            }
+
             /* move and resize the inner border window which contains the plate
              */
             XMoveResizeWindow(ob_display, self->inner,
@@ -560,6 +589,7 @@ void frame_grab_client(ObFrame *self)
 {
     /* reparent the client to the frame */
     XReparentWindow(ob_display, self->client->window, self->plate, 0, 0);
+
     /*
       When reparenting the client window, it is usually not mapped yet, since
       this occurs from a MapRequest. However, in the case where Openbox is
@@ -598,6 +628,8 @@ void frame_grab_client(ObFrame *self)
     g_hash_table_insert(window_map, &self->tllresize, self->client);
     g_hash_table_insert(window_map, &self->trtresize, self->client);
     g_hash_table_insert(window_map, &self->trrresize, self->client);
+    g_hash_table_insert(window_map, &self->leftresize, self->client);
+    g_hash_table_insert(window_map, &self->rightresize, self->client);
 }
 
 void frame_release_client(ObFrame *self)
@@ -656,6 +688,8 @@ void frame_release_client(ObFrame *self)
     g_hash_table_remove(window_map, &self->tllresize);
     g_hash_table_remove(window_map, &self->trtresize);
     g_hash_table_remove(window_map, &self->trrresize);
+    g_hash_table_remove(window_map, &self->leftresize);
+    g_hash_table_remove(window_map, &self->rightresize);
 
     ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE);
 }
@@ -831,6 +865,8 @@ ObFrameContext frame_context_from_string(const gchar *name)
 {
     if (!g_ascii_strcasecmp("Desktop", name))
         return OB_FRAME_CONTEXT_DESKTOP;
+    else if (!g_ascii_strcasecmp("Root", name))
+        return OB_FRAME_CONTEXT_ROOT;
     else if (!g_ascii_strcasecmp("Client", name))
         return OB_FRAME_CONTEXT_CLIENT;
     else if (!g_ascii_strcasecmp("Titlebar", name))
@@ -849,6 +885,10 @@ ObFrameContext frame_context_from_string(const gchar *name)
         return OB_FRAME_CONTEXT_TOP;
     else if (!g_ascii_strcasecmp("Bottom", name))
         return OB_FRAME_CONTEXT_BOTTOM;
+    else if (!g_ascii_strcasecmp("Left", name))
+        return OB_FRAME_CONTEXT_LEFT;
+    else if (!g_ascii_strcasecmp("Right", name))
+        return OB_FRAME_CONTEXT_RIGHT;
     else if (!g_ascii_strcasecmp("Maximize", name))
         return OB_FRAME_CONTEXT_MAXIMIZE;
     else if (!g_ascii_strcasecmp("AllDesktops", name))
@@ -874,7 +914,7 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
         return OB_FRAME_CONTEXT_MOVE_RESIZE;
 
     if (win == RootWindow(ob_display, ob_screen))
-        return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_ROOT ;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
     if (win == client->window) {
         /* conceptually, this is the desktop, as far as users are
@@ -926,6 +966,8 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
     if (win == self->tllresize) return OB_FRAME_CONTEXT_TLCORNER;
     if (win == self->trtresize) return OB_FRAME_CONTEXT_TRCORNER;
     if (win == self->trrresize) return OB_FRAME_CONTEXT_TRCORNER;
+    if (win == self->leftresize) return OB_FRAME_CONTEXT_LEFT;
+    if (win == self->rightresize) return OB_FRAME_CONTEXT_RIGHT;
     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;