X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fopenbox.c;h=3fccd2330b1d0357fa344fc40fc886cfa298cd27;hb=ccc5f020514e9c3e0a2a8e858eacc6d0140675a3;hp=36e1641169e1836fd0a2311b7840d336a30a8003;hpb=9dc2a9171cb4d7c9ff62342808686b1c96735194;p=chaz%2Fopenbox

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 36e16411..3fccd233 100644
--- a/engines/openbox/openbox.c
+++ b/engines/openbox/openbox.c
@@ -12,8 +12,8 @@
 #include <X11/Xlib.h>
 #include <glib.h>
 
-#define TITLE_HEIGHT    (s_winfont_height + s_bevel * 2)
 #define LABEL_HEIGHT    (s_winfont_height)
+#define TITLE_HEIGHT    (LABEL_HEIGHT + s_bevel * 2)
 #define HANDLE_Y(f)     (f->innersize.top + f->frame.client->area.height + \
 		         f->cbwidth)
 #define BUTTON_SIZE     (LABEL_HEIGHT - 2)
@@ -594,30 +594,29 @@ void frame_release_client(ObFrame *self, Client *client)
 static void layout_title(ObFrame *self)
 {
     const char *lc;
-    int x, sep;
+    int x;
     gboolean n, d, i, l, m ,c;
 
     n = d = i = l = m = c = FALSE;
-    sep = s_bevel + 1;
 
     /* figure out whats being shown, and the width of the label */
-    self->label_width = self->width - sep * 2;
+    self->label_width = self->width - (s_bevel + 1) * 2;
     for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!(self->frame.client->decorations & Decor_Icon)) break;
 	    n = TRUE;
-	    self->label_width -= BUTTON_SIZE + sep;
+	    self->label_width -= BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'D':
 	    if (!(self->frame.client->decorations & Decor_AllDesktops)) break;
 	    d = TRUE;
-	    self->label_width -= BUTTON_SIZE + sep;
+	    self->label_width -= BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'I':
 	    if (!(self->frame.client->decorations & Decor_Iconify)) break;
 	    i = TRUE;
-	    self->label_width -= BUTTON_SIZE + sep;
+	    self->label_width -= BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'L':
 	    l = TRUE;
@@ -625,19 +624,19 @@ static void layout_title(ObFrame *self)
 	case 'M':
 	    if (!(self->frame.client->decorations & Decor_Maximize)) break;
 	    m = TRUE;
-	    self->label_width -= BUTTON_SIZE + sep;
+	    self->label_width -= BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'C':
 	    if (!(self->frame.client->decorations & Decor_Close)) break;
 	    c = TRUE;
-	    self->label_width -= BUTTON_SIZE + sep;
+	    self->label_width -= BUTTON_SIZE + s_bevel + 1;
 	    break;
 	}
     }
     if (self->label_width < 1) self->label_width = 1;
 
     XResizeWindow(ob_display, self->label, self->label_width,
-                  s_winfont_height);
+                  LABEL_HEIGHT);
   
     if (!n) {
 	self->frame.client->decorations &= ~Decor_Icon;
@@ -669,50 +668,50 @@ static void layout_title(ObFrame *self)
 	self->close_x = -1;
     }
 
-    x = sep;
+    x = s_bevel + 1;
     for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!n) break;
 	    self->icon_x = x;
 	    XMapWindow(ob_display, self->icon);
-	    XMoveWindow(ob_display, self->icon, x, sep + 1);
-	    x += BUTTON_SIZE + sep;
+	    XMoveWindow(ob_display, self->icon, x, s_bevel + 1);
+	    x += BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'D':
 	    if (!d) break;
 	    self->desk_x = x;
 	    XMapWindow(ob_display, self->desk);
 	    XMoveWindow(ob_display, self->desk, x, s_bevel + 1);
-	    x += BUTTON_SIZE + sep;
+	    x += BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'I':
 	    if (!i) break;
 	    self->iconify_x = x;
 	    XMapWindow(ob_display, self->iconify);
 	    XMoveWindow(ob_display, self->iconify, x, s_bevel + 1);
-	    x += BUTTON_SIZE + sep;
+	    x += BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'L':
 	    if (!l) break;
 	    self->label_x = x;
 	    XMapWindow(ob_display, self->label);
 	    XMoveWindow(ob_display, self->label, x, s_bevel);
-	    x += self->label_width + sep;
+	    x += self->label_width + s_bevel + 1;
 	    break;
 	case 'M':
 	    if (!m) break;
 	    self->max_x = x;
 	    XMapWindow(ob_display, self->max);
 	    XMoveWindow(ob_display, self->max, x, s_bevel + 1);
-	    x += BUTTON_SIZE + sep;
+	    x += BUTTON_SIZE + s_bevel + 1;
 	    break;
 	case 'C':
 	    if (!c) break;
 	    self->close_x = x;
 	    XMapWindow(ob_display, self->close);
 	    XMoveWindow(ob_display, self->close, x, s_bevel + 1);
-	    x += BUTTON_SIZE + sep;
+	    x += BUTTON_SIZE + s_bevel + 1;
 	    break;
 	}
     }
@@ -721,39 +720,40 @@ static void layout_title(ObFrame *self)
 static void render(ObFrame *self)
 {
     if (self->frame.client->focused) {
-	XSetWindowBorder(ob_display, self->frame.plate,
-			 s_cb_focused_color->pixel);
+        XSetWindowBorder(ob_display, self->frame.plate,
+                         s_cb_focused_color->pixel);
     } else {
-	XSetWindowBorder(ob_display, self->frame.plate,
-			 s_cb_unfocused_color->pixel);
+        XSetWindowBorder(ob_display, self->frame.plate,
+                         s_cb_unfocused_color->pixel);
     }
 
     if (self->frame.client->decorations & Decor_Titlebar) {
-	paint(self->title, (self->frame.client->focused ?
-			    self->a_focused_title :
-			    self->a_unfocused_title),
-	      self->width, TITLE_HEIGHT);
-	render_label(self);
-	render_max(self);
-	render_icon(self);
-	render_iconify(self);
-	render_desk(self);
-	render_close(self);
+        paint(self->title, (self->frame.client->focused ?
+                            self->a_focused_title :
+                            self->a_unfocused_title),
+              0, 0, self->width, TITLE_HEIGHT);
+        render_label(self);
+        render_max(self);
+        render_icon(self);
+        render_iconify(self);
+        render_desk(self);
+        render_close(self);
     }
 
     if (self->frame.client->decorations & Decor_Handle) {
-	paint(self->handle, (self->frame.client->focused ?
-			     self->a_focused_handle :
-			     self->a_unfocused_handle),
-	      HANDLE_WIDTH(self), s_handle_height);
-	paint(self->lgrip, (self->frame.client->focused ?
-			    a_focused_grip :
-			    a_unfocused_grip),
-	      GRIP_WIDTH, s_handle_height);
-	paint(self->rgrip, (self->frame.client->focused ?
-			    a_focused_grip :
-			    a_unfocused_grip),
-	      GRIP_WIDTH, s_handle_height);
+        paint(self->handle, (self->frame.client->focused ?
+                             self->a_focused_handle :
+                             self->a_unfocused_handle),
+              GRIP_WIDTH + self->bwidth, 0,
+              HANDLE_WIDTH(self), s_handle_height);
+        paint(self->lgrip, (self->frame.client->focused ?
+                            a_focused_grip :
+                            a_unfocused_grip),
+              0, 0, GRIP_WIDTH, s_handle_height);
+        paint(self->rgrip, (self->frame.client->focused ?
+                            a_focused_grip :
+                            a_unfocused_grip),
+              0, 0, GRIP_WIDTH, s_handle_height);
     }
 }
 
@@ -764,12 +764,12 @@ static void render_label(ObFrame *self)
     if (self->label_x < 0) return;
 
     a = (self->frame.client->focused ?
-         self->a_focused_label : self->a_focused_label);
+         self->a_focused_label : self->a_unfocused_label);
 
     /* set the texture's text! */
     a->texture[0].data.text.string = self->frame.client->title;
 
-    paint(self->label, a, self->label_width, LABEL_HEIGHT);
+    paint(self->label, a, 0, 0, self->label_width, LABEL_HEIGHT);
 }
 
 static void render_icon(ObFrame *self)
@@ -777,7 +777,7 @@ static void render_icon(ObFrame *self)
     if (self->icon_x < 0) return;
 
     /* XXX set the texture's icon picture! */
-    paint(self->icon, self->a_icon, BUTTON_SIZE, BUTTON_SIZE);
+    paint(self->icon, self->a_icon, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_max(ObFrame *self)
@@ -794,7 +794,7 @@ static void render_max(ObFrame *self)
 		      (press ?
 		       a_unfocused_pressed_max :
 		       a_unfocused_unpressed_max)),
-	  BUTTON_SIZE, BUTTON_SIZE);
+	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_iconify(ObFrame *self)
@@ -808,7 +808,7 @@ static void render_iconify(ObFrame *self)
 			  (self->iconify_press ?
 			   a_unfocused_pressed_iconify :
 			   a_unfocused_unpressed_iconify)),
-	  BUTTON_SIZE, BUTTON_SIZE);
+	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_desk(ObFrame *self)
@@ -825,7 +825,7 @@ static void render_desk(ObFrame *self)
 		       (press ?
 			a_unfocused_pressed_desk :
 			a_unfocused_unpressed_desk)),
-	  BUTTON_SIZE, BUTTON_SIZE);
+	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_close(ObFrame *self)
@@ -839,7 +839,7 @@ static void render_close(ObFrame *self)
 			  (self->close_press ?
 			   a_unfocused_pressed_close :
 			   a_unfocused_unpressed_close)),
-	  BUTTON_SIZE, BUTTON_SIZE);
+	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 GQuark get_context(Client *client, Window win)
@@ -866,3 +866,51 @@ GQuark get_context(Client *client, Window win)
 
     return g_quark_try_string("none");
 }
+
+void frame_mouse_enter(ObFrame *self, Window win)
+{
+}
+
+void frame_mouse_leave(ObFrame *self, Window win)
+{
+}
+
+void frame_mouse_press(ObFrame *self, Window win, int x, int y)
+{
+    if (win == self->max) {
+        self->max_press = TRUE;
+        render_max(self);
+    }
+    else if (win == self->close) {
+        self->close_press = TRUE;
+        render_close(self);
+    }
+    else if (win == self->iconify) {
+        self->iconify_press = TRUE;
+        render_iconify(self);
+    }
+    else if (win == self->desk) { 
+        self->desk_press = TRUE;
+        render_desk(self);
+    }
+}
+
+void frame_mouse_release(ObFrame *self, Window win, int x, int y)
+{
+    if (win == self->max) {
+        self->max_press = FALSE;
+        render_max(self);
+    }
+    else if (win == self->close) {
+        self->close_press = FALSE; 
+        render_close(self);
+    }
+    else if (win == self->iconify) {
+        self->iconify_press = FALSE;
+        render_iconify(self);
+    }
+    else if (win == self->desk) {
+        self->desk_press = FALSE;
+        render_desk(self);
+    }
+}