X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=0a9617098a3ef4add6e6169006d64610f6a442fe;hb=cadab91e522c6426cc79df4f06e7c05232cb0a64;hp=be0057b21d2049ac769a741513407d3911c190d7;hpb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;p=chaz%2Fopenbox

diff --git a/openbox/popup.c b/openbox/popup.c
index be0057b2..0a961709 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,11 +1,15 @@
+#include "popup.h"
+
 #include "openbox.h"
 #include "frame.h"
+#include "client.h"
 #include "window.h"
 #include "stacking.h"
 #include "render/render.h"
 #include "render/theme.h"
 
-typedef struct Popup {
+struct _ObPopup
+{
     ObWindow obwin;
     Window bg;
 
@@ -16,13 +20,13 @@ typedef struct Popup {
     RrAppearance *a_bg;
     RrAppearance *a_icon;
     RrAppearance *a_text;
-    int gravity;
-    int x;
-    int y;
-    int w;
-    int h;
+    gint gravity;
+    gint x;
+    gint y;
+    gint w;
+    gint h;
     gboolean mapped;
-} Popup;
+};
 
 Popup *popup_new(gboolean hasicon)
 {
@@ -38,7 +42,7 @@ Popup *popup_new(gboolean hasicon)
     self->a_bg = self->a_icon = self->a_text = NULL;
 
     attrib.override_redirect = True;
-    self->bg = XCreateWindow(ob_display, ob_root,
+    self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
                              0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
                              InputOutput, RrVisual(ob_rr_inst),
                              CWOverrideRedirect, &attrib);
@@ -74,23 +78,23 @@ void popup_free(Popup *self)
     }
 }
 
-void popup_position(Popup *self, int gravity, int x, int y)
+void popup_position(Popup *self, gint gravity, gint x, gint y)
 {
     self->gravity = gravity;
     self->x = x;
     self->y = y;
 }
 
-void popup_size(Popup *self, int w, int h)
+void popup_size(Popup *self, gint w, gint h)
 {
     self->w = w;
     self->h = h;
 }
 
-void popup_size_to_string(Popup *self, char *text)
+void popup_size_to_string(Popup *self, gchar *text)
 {
-    int textw, texth;
-    int iconw;
+    gint textw, texth;
+    gint iconw;
 
     if (!self->a_text)
         self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
@@ -105,11 +109,19 @@ void popup_size_to_string(Popup *self, char *text)
     self->w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2);
 }
 
-void popup_show(Popup *self, char *text, ObClientIcon *icon)
+void popup_set_text_align(Popup *self, RrJustify align)
+{
+    if (!self->a_text)
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+
+    self->a_text->texture[0].data.text.justify = align;
+}
+
+void popup_show(Popup *self, gchar *text, ObClientIcon *icon)
 {
-    int x, y, w, h;
-    int textw, texth;
-    int iconw;
+    gint x, y, w, h;
+    gint textw, texth;
+    gint iconw;
 
     /* create the shit if needed */
     if (!self->a_bg)