X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fopenbox.c;h=f7113c877844bf546b6cb5834b928c547b517815;hb=7c6c4984b39b3e107c1a1f8de88008e0218ea805;hp=5b91ae6550a7a6fd6c11a38c36dcc352e9e05fdc;hpb=d56e90fac8e821f3773372e9342d60de169963b9;p=chaz%2Fopenbox

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 5b91ae65..f7113c87 100644
--- a/engines/openbox/openbox.c
+++ b/engines/openbox/openbox.c
@@ -176,7 +176,7 @@ gboolean startup()
     a_unfocused_title = appearance_new(Surface_Planar, 0);
     a_focused_label = appearance_new(Surface_Planar, 1);
     a_unfocused_label = appearance_new(Surface_Planar, 1);
-    a_icon = appearance_new(Surface_Planar, 0);/*1);*/
+    a_icon = appearance_new(Surface_Planar, 1);
     a_focused_handle = appearance_new(Surface_Planar, 0);
     a_unfocused_handle = appearance_new(Surface_Planar, 0);
 
@@ -781,6 +781,7 @@ static void render_label(ObFrame *self)
 
     /* set the texture's text! */
     a->texture[0].data.text.string = self->frame.client->title;
+    RECT_SET(a->texture[0].position, 0, 0, self->label_width, LABEL_HEIGHT);
 
     paint(self->label, a, 0, 0, self->label_width, LABEL_HEIGHT);
 }
@@ -789,70 +790,80 @@ static void render_icon(ObFrame *self)
 {
     if (self->icon_x < 0) return;
 
-    /* XXX set the texture's icon picture! */
+    if (self->frame.client->nicons) {
+        Icon *icon = client_icon(self->frame.client, BUTTON_SIZE, BUTTON_SIZE);
+        self->a_icon->texture[0].type = RGBA;
+        self->a_icon->texture[0].data.rgba.width = icon->width;
+        self->a_icon->texture[0].data.rgba.height = icon->height;
+        self->a_icon->texture[0].data.rgba.data = icon->data;
+        RECT_SET(self->a_icon->texture[0].position, 0, 0,
+                 BUTTON_SIZE,BUTTON_SIZE);
+    } else
+        self->a_icon->texture[0].type = NoTexture;
+
     paint(self->icon, self->a_icon, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_max(ObFrame *self)
 {
+    Appearance *a;
+
     gboolean press = self->max_press ||
 	self->frame.client->max_vert || self->frame.client->max_horz;
     
     if (self->max_x < 0) return;
 
-    paint(self->max, (client_focused(self->frame.client) ?
-		      (press ?
-		       a_focused_pressed_max :
-		       a_focused_unpressed_max) :
-		      (press ?
-		       a_unfocused_pressed_max :
-		       a_unfocused_unpressed_max)),
-	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
+    a = (client_focused(self->frame.client) ?
+         (press ? a_focused_pressed_max : a_focused_unpressed_max) :
+         (press ? a_unfocused_pressed_max : a_unfocused_unpressed_max));
+    RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
+    paint(self->max, a, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_iconify(ObFrame *self)
 {
+    Appearance *a;
+
     if (self->iconify_x < 0) return;
 
-    paint(self->iconify, (client_focused(self->frame.client) ?
-			  (self->iconify_press ?
-			   a_focused_pressed_iconify :
-			   a_focused_unpressed_iconify) :
-			  (self->iconify_press ?
-			   a_unfocused_pressed_iconify :
-			   a_unfocused_unpressed_iconify)),
-	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
+    a = (client_focused(self->frame.client) ?
+         (self->iconify_press ?
+          a_focused_pressed_iconify : a_focused_unpressed_iconify) :
+         (self->iconify_press ?
+          a_unfocused_pressed_iconify : a_unfocused_unpressed_iconify));
+    RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
+    paint(self->iconify, a, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_desk(ObFrame *self)
 {
+    Appearance *a;
+
     gboolean press = self->desk_press ||
 	self->frame.client->desktop == DESKTOP_ALL;
     
     if (self->desk_x < 0) return;
 
-    paint(self->desk, (client_focused(self->frame.client) ?
-		       (press ?
-			a_focused_pressed_desk :
-			a_focused_unpressed_desk) :
-		       (press ?
-			a_unfocused_pressed_desk :
-			a_unfocused_unpressed_desk)),
-	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
+    a = (client_focused(self->frame.client) ?
+         (press ? a_focused_pressed_desk : a_focused_unpressed_desk) :
+         (press ? a_unfocused_pressed_desk : a_unfocused_unpressed_desk));
+    RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
+    paint(self->desk, a, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 static void render_close(ObFrame *self)
 {
+    Appearance *a;
+
     if (self->close_x < 0) return;
 
-    paint(self->close, (client_focused(self->frame.client) ?
-			  (self->close_press ?
-			   a_focused_pressed_close :
-			   a_focused_unpressed_close) :
-			  (self->close_press ?
-			   a_unfocused_pressed_close :
-			   a_unfocused_unpressed_close)),
-	  0, 0, BUTTON_SIZE, BUTTON_SIZE);
+    a = (client_focused(self->frame.client) ?
+         (self->close_press ?
+          a_focused_pressed_close : a_focused_unpressed_close) :
+         (self->close_press ?
+          a_unfocused_pressed_close : a_unfocused_unpressed_close));
+    RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
+    paint(self->close, a, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
 }
 
 GQuark get_context(Client *client, Window win)