X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=f344f9e5c79afa08e782e6b94323e385e67972d3;hb=5888e7ed4b7a6499f80ea4d4c6f10b16f99243a5;hp=a223aa5eead7686894bb0e1690e5174becb10552;hpb=bb8b9ddbc5c7932f184aeed744f4762b5c95fe28;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index a223aa5e..f344f9e5 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -119,11 +119,13 @@ Frame *frame_new()
     self->iconify = createWindow(self->title, mask, &attrib);
     self->handle = createWindow(self->window, mask, &attrib);
     mask |= CWCursor;
-    attrib.cursor = ob_cursors.ll_angle;
+    attrib.cursor = ob_cursors.bl;
     self->lgrip = createWindow(self->handle, mask, &attrib);
-    attrib.cursor = ob_cursors.lr_angle;
+    attrib.cursor = ob_cursors.br;
     self->rgrip = createWindow(self->handle, mask, &attrib);
 
+    self->focused = FALSE;
+
     /* the other stuff is shown based on decor settings */
     XMapWindow(ob_display, self->plate);
     XMapWindow(ob_display, self->lgrip);
@@ -140,7 +142,7 @@ Frame *frame_new()
     XResizeWindow(ob_display, self->iconify,
                   theme_button_size, theme_button_size);
     XResizeWindow(ob_display, self->icon,
-                  theme_button_size, theme_button_size);
+                  theme_button_size + 2, theme_button_size + 2);
     XResizeWindow(ob_display, self->close,
                   theme_button_size, theme_button_size);
     XResizeWindow(ob_display, self->desk,
@@ -386,8 +388,9 @@ void frame_adjust_state(Frame *self)
     framerender_frame(self);
 }
 
-void frame_adjust_focus(Frame *self)
+void frame_adjust_focus(Frame *self, gboolean hilite)
 {
+    self->focused = hilite;
     framerender_frame(self);
 }
 
@@ -497,7 +500,7 @@ static void layout_title(Frame *self)
 	    if (!(self->client->decorations & Decor_Icon)) break;
             if (n) { *lc = ' '; break; } /* rm duplicates */
 	    n = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= theme_button_size + 2 + theme_bevel + 1;
 	    break;
 	case 'D':
 	    if (!(self->client->decorations & Decor_AllDesktops)) break;
@@ -555,10 +558,10 @@ static void layout_title(Frame *self)
 	    if (!n) break;
 	    self->icon_x = x;
             RECT_SET(self->a_icon->area, 0, 0,
-                     theme_button_size, theme_button_size);
+                     theme_button_size + 2, theme_button_size + 2);
 	    XMapWindow(ob_display, self->icon);
-	    XMoveWindow(ob_display, self->icon, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->icon, x, theme_bevel);
+	    x += theme_button_size + 2 + theme_bevel + 1;
 	    break;
 	case 'D':
 	    if (!d) break;