changes to the timer api, pass the timer to the callback function.

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index ba1aed0b4fbdd388560fe9787f126142bdc8f62c..0a9617098a3ef4add6e6169006d64610f6a442fe 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -42,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);
@@ -109,6 +109,14 @@ void popup_size_to_string(Popup *self, gchar *text)
     self->w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2);
 }
 
+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)
 {
     gint x, y, w, h;