X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=88c74b68d048baf3519a753303b547be07e4b7c0;hb=HEAD;hp=77398c5fa7ba01c006e28d97fdaa081ab934dcfc;hpb=197ee0ad4732c8668fe38a6b49e0a747866ef3ea;p=chaz%2Fopenbox

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 77398c5f..88c74b68 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -34,7 +34,6 @@ static RrAppearance *prompt_a_bg;
 static RrAppearance *prompt_a_button;
 static RrAppearance *prompt_a_focus;
 static RrAppearance *prompt_a_press;
-static RrAppearance *prompt_a_pfocus;
 /* we change the max width which would screw with others */
 static RrAppearance *prompt_a_msg;
 
@@ -54,58 +53,12 @@ static void prompt_run_callback(ObPrompt *self, gint result);
 
 void prompt_startup(gboolean reconfig)
 {
-    RrColor *c_button, *c_focus, *c_press, *c_pfocus;
-
     /* note: this is not a copy, don't free it */
     prompt_a_bg = ob_rr_theme->osd_bg;
 
-    prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close);
-    prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
-    prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
-    prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
-
-    c_button = prompt_a_button->texture[0].data.mask.color;
-    c_focus = prompt_a_focus->texture[0].data.mask.color;
-    c_press = prompt_a_press->texture[0].data.mask.color;
-    c_pfocus = prompt_a_press->texture[0].data.mask.color;
-
-    RrAppearanceRemoveTextures(prompt_a_button);
-    RrAppearanceRemoveTextures(prompt_a_focus);
-    RrAppearanceRemoveTextures(prompt_a_press);
-    RrAppearanceRemoveTextures(prompt_a_pfocus);
-
-    /* texture[0] is the text and texture[1-4] (for prompt_a_focus and
-       prompt_a_pfocus) is lineart to show where keyboard focus is */
-    RrAppearanceAddTextures(prompt_a_button, 1);
-    RrAppearanceAddTextures(prompt_a_focus, 5);
-    RrAppearanceAddTextures(prompt_a_press, 1);
-    RrAppearanceAddTextures(prompt_a_pfocus, 5);
-
-    /* totally cheating here.. */
-    prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
-    prompt_a_focus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
-    prompt_a_press->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
-    prompt_a_pfocus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
-
-    prompt_a_button->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
-    prompt_a_focus->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
-    prompt_a_press->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
-    prompt_a_pfocus->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
-
-    prompt_a_button->texture[0].data.text.color = c_button;
-    prompt_a_focus->texture[0].data.text.color = c_focus;
-    prompt_a_press->texture[0].data.text.color = c_press;
-    prompt_a_pfocus->texture[0].data.text.color = c_pfocus;
-
-    prompt_a_focus->texture[1].data.lineart.color = c_focus;
-    prompt_a_focus->texture[2].data.lineart.color = c_focus;
-    prompt_a_focus->texture[3].data.lineart.color = c_focus;
-    prompt_a_focus->texture[4].data.lineart.color = c_focus;
-
-    prompt_a_pfocus->texture[1].data.lineart.color = c_press;
-    prompt_a_pfocus->texture[2].data.lineart.color = c_press;
-    prompt_a_pfocus->texture[3].data.lineart.color = c_press;
-    prompt_a_pfocus->texture[4].data.lineart.color = c_press;
+    prompt_a_button = RrAppearanceCopy(ob_rr_theme->osd_unpressed_button);
+    prompt_a_focus = RrAppearanceCopy(ob_rr_theme->osd_focused_button);
+    prompt_a_press = RrAppearanceCopy(ob_rr_theme->osd_pressed_button);    
 
     prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
     prompt_a_msg->texture[0].data.text.flow = TRUE;
@@ -122,11 +75,12 @@ void prompt_startup(gboolean reconfig)
 
 void prompt_shutdown(gboolean reconfig)
 {
-    GList *it;
+    GList *it, *next;
 
     if (!reconfig) {
-        for (it = prompt_list; it; it = g_list_next(it)) {
+        for (it = prompt_list; it; it = next) {
             ObPrompt *p = it->data;
+            next = it->next;
             if (p->cleanup) p->cleanup(p, p->data);
         }
 
@@ -136,7 +90,6 @@ void prompt_shutdown(gboolean reconfig)
     RrAppearanceFree(prompt_a_button);
     RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
-    RrAppearanceFree(prompt_a_pfocus);
     RrAppearanceFree(prompt_a_msg);
 }
 
@@ -175,7 +128,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *title,
 
     /* set the window's title */
     if (title)
-        OBT_PROP_SETS(self->super.window, NET_WM_NAME, utf8, title);
+        OBT_PROP_SETS(self->super.window, NET_WM_NAME, title);
 
     /* listen for key presses on the window */
     self->event_mask = KeyPressMask;
@@ -281,7 +234,6 @@ static void prompt_layout(ObPrompt *self)
         prompt_a_button->texture[0].data.text.string = self->button[i].text;
         prompt_a_focus->texture[0].data.text.string = self->button[i].text;
         prompt_a_press->texture[0].data.text.string = self->button[i].text;
-        prompt_a_pfocus->texture[0].data.text.string = self->button[i].text;
         RrMinSize(prompt_a_button, &bw, &bh);
         self->button[i].width = bw;
         self->button[i].height = bh;
@@ -291,9 +243,6 @@ static void prompt_layout(ObPrompt *self)
         RrMinSize(prompt_a_press, &bw, &bh);
         self->button[i].width = MAX(self->button[i].width, bw);
         self->button[i].height = MAX(self->button[i].height, bh);
-        RrMinSize(prompt_a_pfocus, &bw, &bh);
-        self->button[i].width = MAX(self->button[i].width, bw);
-        self->button[i].height = MAX(self->button[i].height, bh);
 
         self->button[i].width += BUTTON_HMARGIN * 2;
         self->button[i].height += BUTTON_VMARGIN * 2;
@@ -414,9 +363,8 @@ static void render_button(ObPrompt *self, ObPromptElement *e)
 {
     RrAppearance *a;
 
-    if (e->hover && self->focus == e) a = prompt_a_pfocus;
+    if (e->hover && e->pressed)       a = prompt_a_press;
     else if (self->focus == e)        a = prompt_a_focus;
-    else if (e->pressed)              a = prompt_a_press;
     else                              a = prompt_a_button;
 
     a->surface.parent = prompt_a_bg;
@@ -424,7 +372,7 @@ static void render_button(ObPrompt *self, ObPromptElement *e)
     a->surface.parenty = e->y;
 
     /* draw the keyfocus line */
-    if (a == prompt_a_pfocus || a == prompt_a_focus)
+    if (self->focus == e)
         setup_button_focus_tex(e, a, TRUE);
 
     a->texture[0].data.text.string = e->text;
@@ -432,7 +380,7 @@ static void render_button(ObPrompt *self, ObPromptElement *e)
 
     /* turn off the keyfocus line so that it doesn't affect size calculations
      */
-    if (a == prompt_a_pfocus || a == prompt_a_focus)
+    if (self->focus == e)
         setup_button_focus_tex(e, a, FALSE);
 }
 
@@ -647,7 +595,7 @@ static void prompt_run_callback(ObPrompt *self, gint result)
 {
     prompt_ref(self);
     if (self->func) {
-        gboolean clean = self->func(self, self->focus->result, self->data);
+        gboolean clean = self->func(self, result, self->data);
         if (clean && self->cleanup)
             self->cleanup(self, self->data);
     }