X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fopenbox.c;h=aa4c71ead35a1b34d13a26144dd0afd4ad73ebb7;hb=739c958ac58154f8b1896113701e1c7f580d4cde;hp=792ed2480b048936ba49ce80d05a101f621251df;hpb=a0a55d5761b7c104ac66ba6dc64d33cd66a211b5;p=chaz%2Fopenbox

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 792ed248..aa4c71ea 100644
--- a/engines/openbox/openbox.c
+++ b/engines/openbox/openbox.c
@@ -2,6 +2,7 @@
 #include "../../kernel/openbox.h"
 #include "../../kernel/screen.h"
 #include "../../kernel/extensions.h"
+#include "../../kernel/dispatch.h"
 #include "../../kernel/themerc.h"
 #include "../../kernel/frame.h"
 #include "../../render/render.h"
@@ -12,8 +13,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)
@@ -126,6 +127,9 @@ static void render_iconify(ObFrame *self);
 static void render_desk(ObFrame *self);
 static void render_close(ObFrame *self);
 
+static void frame_mouse_press(const ObEvent *e, ObFrame *self);
+static void frame_mouse_release(const ObEvent *e, ObFrame *self);
+
 gboolean startup()
 {
     g_quark_from_string("none");
@@ -238,10 +242,8 @@ void shutdown()
 static Window createWindow(Window parent, unsigned long mask,
 			   XSetWindowAttributes *attrib)
 {
-    /* XXX DONT USE THE DEFAULT SHIT */
     return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 DefaultDepth(ob_display, ob_screen), InputOutput,
-			 DefaultVisual(ob_display, ob_screen),
+			 render_depth, InputOutput, render_visual,
 			 mask, attrib);
                        
 }
@@ -314,6 +316,11 @@ Frame *frame_new()
     self->max_press = self->close_press = self->desk_press = 
 	self->iconify_press = FALSE;
 
+    dispatch_register(Event_X_ButtonPress, (EventHandler)frame_mouse_press,
+                      self);
+    dispatch_register(Event_X_ButtonRelease, (EventHandler)frame_mouse_release,
+                      self);
+
     return (Frame*)self;
 }
 
@@ -329,6 +336,9 @@ static void frame_free(ObFrame *self)
 
     XDestroyWindow(ob_display, self->frame.window);
 
+    dispatch_register(0, (EventHandler)frame_mouse_press, self);
+    dispatch_register(0, (EventHandler)frame_mouse_release, self);
+
     g_free(self);
 }
 
@@ -636,7 +646,7 @@ static void layout_title(ObFrame *self)
     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;
@@ -764,7 +774,7 @@ 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;
@@ -867,49 +877,37 @@ 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)
+static void frame_mouse_press(const ObEvent *e, ObFrame *self)
 {
+    Window win = e->data.x.e->xbutton.window;
     if (win == self->max) {
         self->max_press = TRUE;
         render_max(self);
-    }
-    else if (win == self->close) {
+    } else if (win == self->close) {
         self->close_press = TRUE;
         render_close(self);
-    }
-    else if (win == self->iconify) {
+    } else if (win == self->iconify) {
         self->iconify_press = TRUE;
         render_iconify(self);
-    }
-    else if (win == self->desk) { 
+    } else if (win == self->desk) { 
         self->desk_press = TRUE;
         render_desk(self);
     }
 }
 
-void frame_mouse_release(ObFrame *self, Window win, int x, int y)
+static void frame_mouse_release(const ObEvent *e, ObFrame *self)
 {
+    Window win = e->data.x.e->xbutton.window;
     if (win == self->max) {
         self->max_press = FALSE;
         render_max(self);
-    }
-    else if (win == self->close) {
+    } else if (win == self->close) {
         self->close_press = FALSE; 
         render_close(self);
-    }
-    else if (win == self->iconify) {
+    } else if (win == self->iconify) {
         self->iconify_press = FALSE;
         render_iconify(self);
-    }
-    else if (win == self->desk) {
+    } else if (win == self->desk) {
         self->desk_press = FALSE;
         render_desk(self);
     }