X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=f531b70c2f10ca6d1483d4ea32589d55bdb45557;hb=9d9ca8d1cf76a63767aef4bd74f5caceaad5ff23;hp=8c6d4cb81c2fc579123d8093e44d6cd740d00a14;hpb=415c0d2721149a18ec53de8ebc5b8313b176d4d7;p=chaz%2Fopenbox

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 8c6d4cb8..f531b70c 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -21,6 +21,7 @@
 #include "screen.h"
 #include "openbox.h"
 #include "client.h"
+#include "group.h"
 #include "prop.h"
 #include "modkeys.h"
 #include "event.h"
@@ -33,17 +34,27 @@ 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;
 
+/* sizing stuff */
+#define OUTSIDE_MARGIN 4
+#define MSG_BUTTON_SEPARATION 4
+#define BUTTON_SEPARATION 4
+#define BUTTON_VMARGIN 4
+#define BUTTON_HMARGIN 12
+#define MAX_WIDTH 400
+
 static void prompt_layout(ObPrompt *self);
 static void render_all(ObPrompt *self);
 static void render_button(ObPrompt *self, ObPromptElement *e);
 static void prompt_resize(ObPrompt *self, gint w, gint h);
+static void prompt_run_callback(ObPrompt *self, gint result);
 
 void prompt_startup(gboolean reconfig)
 {
-    RrColor *c_button, *c_focus, *c_press;
+    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_hilite_bg;
@@ -51,31 +62,50 @@ void prompt_startup(gboolean reconfig)
     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, 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_press;
+
+    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_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
     prompt_a_msg->texture[0].data.text.flow = TRUE;
@@ -92,16 +122,29 @@ void prompt_startup(gboolean reconfig)
 
 void prompt_shutdown(gboolean reconfig)
 {
+    GList *it;
+
+    if (!reconfig) {
+        for (it = prompt_list; it; it = g_list_next(it)) {
+            ObPrompt *p = it->data;
+            if (p->cleanup) p->cleanup(p, p->data);
+        }
+
+        g_assert(prompt_list == NULL);
+    }
+
     RrAppearanceFree(prompt_a_button);
     RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
+    RrAppearanceFree(prompt_a_pfocus);
     RrAppearanceFree(prompt_a_msg);
 }
 
-ObPrompt* prompt_new(const gchar *msg,
+ObPrompt* prompt_new(const gchar *msg, const gchar *title,
                      const ObPromptAnswer *answers, gint n_answers,
                      gint default_result, gint cancel_result,
-                     ObPromptCallback func, gpointer data)
+                     ObPromptCallback func, ObPromptCleanup cleanup,
+                     gpointer data)
 {
     ObPrompt *self;
     XSetWindowAttributes attrib;
@@ -112,6 +155,7 @@ ObPrompt* prompt_new(const gchar *msg,
     self = g_new0(ObPrompt, 1);
     self->ref = 1;
     self->func = func;
+    self->cleanup = cleanup;
     self->data = data;
     self->default_result = default_result;
     self->cancel_result = cancel_result;
@@ -128,6 +172,10 @@ ObPrompt* prompt_new(const gchar *msg,
     PROP_SET32(self->super.window, net_wm_window_type, atom,
                prop_atoms.net_wm_window_type_dialog);
 
+    /* set the window's title */
+    if (title)
+        PROP_SETS(self->super.window, net_wm_name, title);
+
     /* listen for key presses on the window */
     self->event_mask = KeyPressMask;
 
@@ -188,6 +236,9 @@ void prompt_unref(ObPrompt *self)
     if (self && --self->ref == 0) {
         gint i;
 
+        if (self->mapped)
+            prompt_hide(self);
+
         prompt_list = g_list_remove(prompt_list, self);
 
         for (i = 0; i < self->n_buttons; ++i) {
@@ -209,13 +260,6 @@ static void prompt_layout(ObPrompt *self)
     gint w, h;
     gint maxw;
 
-    const gint OUTSIDE_MARGIN = 4;
-    const gint MSG_BUTTON_SEPARATION = 4;
-    const gint BUTTON_SEPARATION = 4;
-    const gint BUTTON_VMARGIN = 4;
-    const gint BUTTON_HMARGIN = 12;
-    const gint MAX_WIDTH = 600;
-
     RrMargins(prompt_a_bg, &l, &t, &r, &b);
     l += OUTSIDE_MARGIN;
     t += OUTSIDE_MARGIN;
@@ -236,6 +280,7 @@ 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;
@@ -245,6 +290,10 @@ 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;
@@ -320,20 +369,71 @@ static void prompt_resize(ObPrompt *self, gint w, gint h)
         XResizeWindow(ob_display, self->super.window, w, h);
 }
 
+static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
+                                   gboolean on)
+{
+    gint i, l, r, t, b;
+
+    for (i = 1; i < 5; ++i)
+        a->texture[i].type = on ? RR_TEXTURE_LINE_ART : RR_TEXTURE_NONE;
+
+    if (!on) return;
+
+    RrMargins(a, &l, &t, &r, &b);
+    l += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+    r += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+    t += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+    b += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+
+    /* top line */
+    a->texture[1].data.lineart.x1 = l;
+    a->texture[1].data.lineart.x2 = e->width - r - 1;
+    a->texture[1].data.lineart.y1 = t;
+    a->texture[1].data.lineart.y2 = t;
+
+    /* bottom line */
+    a->texture[2].data.lineart.x1 = l;
+    a->texture[2].data.lineart.x2 = e->width - r - 1;
+    a->texture[2].data.lineart.y1 = e->height - b - 1;
+    a->texture[2].data.lineart.y2 = e->height - b - 1;
+
+    /* left line */
+    a->texture[3].data.lineart.x1 = l;
+    a->texture[3].data.lineart.x2 = l;
+    a->texture[3].data.lineart.y1 = t;
+    a->texture[3].data.lineart.y2 = e->height - b - 1;
+
+    /* right line */
+    a->texture[4].data.lineart.x1 = e->width - r - 1;
+    a->texture[4].data.lineart.x2 = e->width - r - 1;
+    a->texture[4].data.lineart.y1 = t;
+    a->texture[4].data.lineart.y2 = e->height - b - 1;
+}
+
 static void render_button(ObPrompt *self, ObPromptElement *e)
 {
     RrAppearance *a;
 
-    if (e->pressed) a = prompt_a_press;
-    else if (self->focus == e) a = prompt_a_focus;
-    else a = prompt_a_button;
+    if (e->pressed && self->focus == e) a = prompt_a_pfocus;
+    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;
     a->surface.parentx = e->x;
-    a->surface.parentx = e->y;
+    a->surface.parenty = e->y;
+
+    /* draw the keyfocus line */
+    if (a == prompt_a_pfocus || a == prompt_a_focus)
+        setup_button_focus_tex(e, a, TRUE);
 
     a->texture[0].data.text.string = e->text;
     RrPaint(a, e->window, e->width, e->height);
+
+    /* turn off the keyfocus line so that it doesn't affect size calculations
+     */
+    if (a == prompt_a_pfocus || a == prompt_a_focus)
+        setup_button_focus_tex(e, a, FALSE);
 }
 
 static void render_all(ObPrompt *self)
@@ -354,7 +454,7 @@ static void render_all(ObPrompt *self)
         render_button(self, &self->button[i]);
 }
 
-void prompt_show(ObPrompt *self, ObClient *parent)
+void prompt_show(ObPrompt *self, ObClient *parent, gboolean modal)
 {
     gint i;
 
@@ -376,8 +476,33 @@ void prompt_show(ObPrompt *self, ObClient *parent)
             break;
         }
 
-    XSetTransientForHint(ob_display, self->super.window,
-                         (parent ? parent->window : 0));
+    if (parent) {
+        Atom states[1];
+        gint nstates;
+        Window p;
+        XWMHints h;
+
+        if (parent->group) {
+            /* make it transient for the window's group */
+            h.flags = WindowGroupHint;
+            h.window_group = parent->group->leader;
+            p = RootWindow(ob_display, ob_screen);
+        }
+        else {
+            /* make it transient for the window directly */
+            h.flags = 0;
+            p = parent->window;
+        }
+
+        XSetWMHints(ob_display, self->super.window, &h);
+        PROP_SET32(self->super.window, wm_transient_for, window, p);
+
+        states[0] = prop_atoms.net_wm_state_modal;
+        nstates = (modal ? 1 : 0);
+        PROP_SETA32(self->super.window, net_wm_state, atom, states, nstates);
+    }
+    else
+        PROP_ERASE(self->super.window, wm_transient_for);
 
     /* set up the dialog and render it */
     prompt_layout(self);
@@ -401,8 +526,6 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
 
     if (e->type != KeyPress) return FALSE;
 
-    g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB));
-
     shift_mask = modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT);
     shift = !!(e->xkey.state & shift_mask);
 
@@ -415,8 +538,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
     else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) ||
              e->xkey.keycode == ob_keycode(OB_KEY_SPACE))
     {
-        if (self->func) self->func(self, self->focus->result, self->data);
-        prompt_hide(self);
+        prompt_run_callback(self, self->focus->result);
     }
     else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) ||
              e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
@@ -474,10 +596,8 @@ gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
         render_button(self, but);
     }
     else if (e->type == ButtonRelease) {
-        if (but->pressed) {
-            if (self->func) self->func(self, but->result, self->data);
-            prompt_hide(self);
-        }
+        if (but->pressed)
+            prompt_run_callback(self, but->result);
     }
     else if (e->type == MotionNotify) {
         gboolean press;
@@ -495,6 +615,41 @@ gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
 
 void prompt_cancel(ObPrompt *self)
 {
-    if (self->func) self->func(self, self->cancel_result, self->data);
+    prompt_run_callback(self, self->cancel_result);
+}
+
+static gboolean prompt_show_message_cb(ObPrompt *p, int res, gpointer data)
+{
+    return TRUE; /* call the cleanup func */
+}
+
+static void prompt_show_message_cleanup(ObPrompt *p, gpointer data)
+{
+    prompt_unref(p);
+}
+
+ObPrompt* prompt_show_message(const gchar *msg, const gchar *title,
+                              const gchar *answer)
+{
+    ObPrompt *p;
+    ObPromptAnswer ans[] = {
+        { answer, 0 }
+    };
+
+    p = prompt_new(msg, title, ans, 1, 0, 0,
+                   prompt_show_message_cb, prompt_show_message_cleanup, NULL);
+    prompt_show(p, NULL, FALSE);
+    return p;
+}
+
+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);
+        if (clean && self->cleanup)
+            self->cleanup(self, self->data);
+    }
     prompt_hide(self);
+    prompt_unref(self);
 }