X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=1c7e2261e25bc20f1ceae2e6dda97216f3751868;hb=972e1fc5a32e7d798fb3023012e73af20b5b03c7;hp=debdc3828fc4c39525dbe62d6be6188c9b0de637;hpb=457fdc5ccbb65dc4b5e6cd972e048e3218527b91;p=chaz%2Fopenbox

diff --git a/openbox/prompt.c b/openbox/prompt.c
index debdc382..1c7e2261 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -22,13 +22,15 @@
 #include "openbox.h"
 #include "client.h"
 #include "prop.h"
+#include "modkeys.h"
+#include "event.h"
 #include "gettext.h"
 
 static GList *prompt_list = NULL;
 
 /* we construct these */
 static RrAppearance *prompt_a_button;
-static RrAppearance *prompt_a_hover;
+static RrAppearance *prompt_a_focus;
 static RrAppearance *prompt_a_press;
 /* we change the max width which would screw with others */
 static RrAppearance *prompt_a_msg;
@@ -39,31 +41,35 @@ static void render_button(ObPrompt *self, ObPromptElement *e);
 
 void prompt_startup(gboolean reconfig)
 {
-    RrColor *c_button, *c_hover, *c_press;
+    RrColor *c_button, *c_focus, *c_press;
 
     prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close);
-    prompt_a_hover = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
+    prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
     prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
 
     c_button = prompt_a_button->texture[0].data.mask.color;
-    c_hover = prompt_a_button->texture[0].data.mask.color;
+    c_focus = prompt_a_button->texture[0].data.mask.color;
     c_press = prompt_a_button->texture[0].data.mask.color;
 
     RrAppearanceRemoveTextures(prompt_a_button);
-    RrAppearanceRemoveTextures(prompt_a_hover);
+    RrAppearanceRemoveTextures(prompt_a_focus);
     RrAppearanceRemoveTextures(prompt_a_press);
 
     RrAppearanceAddTextures(prompt_a_button, 1);
-    RrAppearanceAddTextures(prompt_a_hover, 1);
+    RrAppearanceAddTextures(prompt_a_focus, 1);
     RrAppearanceAddTextures(prompt_a_press, 1);
 
     /* totally cheating here.. */
     prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
-    prompt_a_hover->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_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_button->texture[0].data.text.color = c_button;
-    prompt_a_hover->texture[0].data.text.color = c_hover;
+    prompt_a_focus->texture[0].data.text.color = c_focus;
     prompt_a_press->texture[0].data.text.color = c_press;
 
     prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
@@ -82,23 +88,29 @@ void prompt_startup(gboolean reconfig)
 void prompt_shutdown(gboolean reconfig)
 {
     RrAppearanceFree(prompt_a_button);
-    RrAppearanceFree(prompt_a_hover);
+    RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
     RrAppearanceFree(prompt_a_msg);
 }
 
-ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
+ObPrompt* prompt_new(const gchar *msg,
+                     const ObPromptAnswer *answers, gint n_answers,
+                     gint default_result, gint cancel_result,
+                     ObPromptCallback func, gpointer data)
 {
     ObPrompt *self;
     XSetWindowAttributes attrib;
-    guint i;
-    const gchar *const *c;
+    gint i;
 
     attrib.override_redirect = FALSE;
     attrib.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color);
 
     self = g_new0(ObPrompt, 1);
     self->ref = 1;
+    self->func = func;
+    self->data = data;
+    self->default_result = default_result;
+    self->cancel_result = cancel_result;
     self->super.type = Window_Prompt;
     self->super.window = XCreateWindow(ob_display,
                                        RootWindow(ob_display, ob_screen),
@@ -108,11 +120,17 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
                                        CWOverrideRedirect | CWBorderPixel,
                                        &attrib);
 
+    /* make it a dialog type window */
     PROP_SET32(self->super.window, net_wm_window_type, atom,
                prop_atoms.net_wm_window_type_dialog);
 
+    /* listen for key presses on the window */
+    self->event_mask = KeyPressMask;
+
+    /* we make a copy of this appearance for each prompt */
     self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
 
+    /* set up the text message widow */
     self->msg.text = g_strdup(msg);
     self->msg.window = XCreateWindow(ob_display, self->super.window,
                                      0, 0, 1, 1, 0,
@@ -120,23 +138,24 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
                                      CopyFromParent, 0, NULL);
     XMapWindow(ob_display, self->msg.window);
 
-    self->n_buttons = 0;
-    for (c = answers; *c != NULL; ++c)
-        ++self->n_buttons;
+    /* set up the buttons from the answers */
 
+    self->n_buttons = n_answers;
     if (!self->n_buttons)
         self->n_buttons = 1;
 
-    self->button = g_new(ObPromptElement, self->n_buttons);
+    self->button = g_new0(ObPromptElement, self->n_buttons);
 
-    if (!answers) {
+    if (n_answers == 0) {
         g_assert(self->n_buttons == 1); /* should be set to this above.. */
         self->button[0].text = g_strdup(_("OK"));
     }
     else {
         g_assert(self->n_buttons > 0);
-        for (i = 0; i < self->n_buttons; ++i)
-            self->button[i].text = g_strdup(answers[i]);
+        for (i = 0; i < self->n_buttons; ++i) {
+            self->button[i].text = g_strdup(answers[i].text);
+            self->button[i].result = answers[i].result;
+        }
     }
 
     for (i = 0; i < self->n_buttons; ++i) {
@@ -147,6 +166,10 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
         XMapWindow(ob_display, self->button[i].window);
         g_hash_table_insert(window_map, &self->button[i].window,
                             PROMPT_AS_WINDOW(self));
+
+        /* listen for button presses on the buttons */
+        XSelectInput(ob_display, self->button[i].window,
+                     ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
     }
 
     prompt_list = g_list_prepend(prompt_list, self);
@@ -162,7 +185,7 @@ void prompt_ref(ObPrompt *self)
 void prompt_unref(ObPrompt *self)
 {
     if (self && --self->ref == 0) {
-        guint i;
+        gint i;
 
         prompt_list = g_list_remove(prompt_list, self);
 
@@ -183,7 +206,7 @@ void prompt_unref(ObPrompt *self)
 static void prompt_layout(ObPrompt *self)
 {
     gint l, r, t, b;
-    guint i;
+    gint i;
     gint allbuttonsw, allbuttonsh, buttonx;
     gint w, h;
     gint maxw;
@@ -191,6 +214,8 @@ static void prompt_layout(ObPrompt *self)
     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(self->a_bg, &l, &t, &r, &b);
@@ -211,18 +236,21 @@ static void prompt_layout(ObPrompt *self)
         gint bw, bh;
 
         prompt_a_button->texture[0].data.text.string = self->button[i].text;
-        prompt_a_hover->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;
         RrMinSize(prompt_a_button, &bw, &bh);
         self->button[i].width = bw;
         self->button[i].height = bh;
-        RrMinSize(prompt_a_hover, &bw, &bh);
+        RrMinSize(prompt_a_focus, &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_press, &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;
+
         allbuttonsw += self->button[i].width + (i > 0 ? BUTTON_SEPARATION : 0);
         allbuttonsh = MAX(allbuttonsh, self->button[i].height);
     }
@@ -242,11 +270,11 @@ static void prompt_layout(ObPrompt *self)
     self->msg.x = l + (w - self->msg.width) / 2;
     self->msg.y = t;
 
-    /* position the button buttons */
-    buttonx = l + (w - allbuttonsw) / 2;
-    for (i = 0; i < self->n_buttons; ++i) {
-        self->button[i].x = buttonx;
-        buttonx += self->button[i].width + BUTTON_SEPARATION;
+    /* position the button buttons on the right of the dialog */
+    buttonx = l + w;
+    for (i = self->n_buttons - 1; i >= 0; --i) {
+        self->button[i].x = buttonx - self->button[i].width;
+        buttonx -= self->button[i].width + BUTTON_SEPARATION;
         self->button[i].y = t + h - allbuttonsh;
         self->button[i].y += (allbuttonsh - self->button[i].height) / 2;
     }
@@ -268,23 +296,29 @@ static void prompt_layout(ObPrompt *self)
 
 static void render_button(ObPrompt *self, ObPromptElement *e)
 {
-    prompt_a_button->surface.parent = self->a_bg;
-    prompt_a_button->surface.parentx = e->x;
-    prompt_a_button->surface.parentx = e->y;
+    RrAppearance *a;
+
+    if (e->pressed) a = prompt_a_press;
+    else if (self->focus == e) a = prompt_a_focus;
+    else a = prompt_a_button;
+
+    a->surface.parent = self->a_bg;
+    a->surface.parentx = e->x;
+    a->surface.parentx = e->y;
 
-    prompt_a_button->texture[0].data.text.string = e->text;
-    RrPaint(prompt_a_button, e->window, e->width, e->height);
+    a->texture[0].data.text.string = e->text;
+    RrPaint(a, e->window, e->width, e->height);
 }
 
 static void render_all(ObPrompt *self)
 {
-    guint i;
+    gint i;
 
     RrPaint(self->a_bg, self->super.window, self->width, self->height);
 
     prompt_a_msg->surface.parent = self->a_bg;
     prompt_a_msg->surface.parentx = self->msg.x;
-    prompt_a_msg->surface.parentx = self->msg.y;
+    prompt_a_msg->surface.parenty = self->msg.y;
 
     prompt_a_msg->texture[0].data.text.string = self->msg.text;
     prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
@@ -297,11 +331,25 @@ static void render_all(ObPrompt *self)
 void prompt_show(ObPrompt *self, ObClient *parent)
 {
     XSizeHints hints;
+    gint i;
+
+    if (self->mapped) {
+        /* activate the prompt */
+        PROP_MSG(self->super.window, net_active_window,
+                 1, /* from an application.. */
+                 event_curtime,
+                 0,
+                 0);
+        return;
+    }
 
-    if (self->mapped) return;
-
-    prompt_layout(self);
-    render_all(self);
+    /* set the focused button (if not found then the first button is used) */
+    self->focus = &self->button[0];
+    for (i = 0; i < self->n_buttons; ++i)
+        if (self->button[i].result == self->default_result) {
+            self->focus = &self->button[i];
+            break;
+        }
 
     /* you can't resize the prompt */
     hints.flags = PMinSize | PMaxSize;
@@ -309,8 +357,12 @@ void prompt_show(ObPrompt *self, ObClient *parent)
     hints.min_height = hints.max_height = self->height;
     XSetWMNormalHints(ob_display, self->super.window, &hints);
 
-    XSetTransientForHint(ob_display, (parent ? parent->window : 0),
-                         self->super.window);
+    XSetTransientForHint(ob_display, self->super.window,
+                         (parent ? parent->window : 0));
+
+    /* set up the dialog and render it */
+    prompt_layout(self);
+    render_all(self);
 
     client_manage(self->super.window, self);
 
@@ -323,15 +375,107 @@ void prompt_hide(ObPrompt *self)
     self->mapped = FALSE;
 }
 
-void prompt_hide_window(Window window)
+gboolean prompt_key_event(ObPrompt *self, XEvent *e)
+{
+    gboolean shift;
+    guint shift_mask;
+
+    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);
+
+    /* only accept shift */
+    if (e->xkey.state != 0 && e->xkey.state != shift_mask)
+        return FALSE;
+
+    if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+        prompt_cancel(self);
+    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);
+    }
+    else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) ||
+             e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
+             e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
+    {
+        gint i;
+        gboolean left;
+        ObPromptElement *oldfocus;
+
+        left = e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
+            (e->xkey.keycode == ob_keycode(OB_KEY_TAB) && shift);
+        oldfocus = self->focus;
+
+        for (i = 0; i < self->n_buttons; ++i)
+            if (self->focus == &self->button[i]) break;
+        i += (left ? -1 : 1);
+        if (i < 0) i = self->n_buttons - 1;
+        else if (i >= self->n_buttons) i = 0;
+        self->focus = &self->button[i];
+
+        if (oldfocus != self->focus) render_button(self, oldfocus);
+        render_button(self, self->focus);
+    }
+    return TRUE;
+}
+
+gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
 {
-    GList *it;
-    ObPrompt *p = NULL;
+    gint i;
+    ObPromptElement *but;
+
+    if (e->type != ButtonPress && e->type != ButtonRelease &&
+        e->type != MotionNotify) return FALSE;
+
+    /* find the button */
+    but = NULL;
+    for (i = 0; i < self->n_buttons; ++i)
+        if (self->button[i].window ==
+            (e->type == MotionNotify ? e->xmotion.window : e->xbutton.window))
+        {
+            but = &self->button[i];
+            break;
+        }
+    if (!but) return FALSE;
 
-    for (it = prompt_list; it; it = g_list_next(it)) {
-        p = it->data;
-        if (p->super.window == window) break;
+    if (e->type == ButtonPress) {
+        ObPromptElement *oldfocus;
+
+        oldfocus = self->focus;
+
+        but->pressed = TRUE;
+        self->focus = but;
+
+        if (oldfocus != but) render_button(self, oldfocus);
+        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);
+        }
+    }
+    else if (e->type == MotionNotify) {
+        gboolean press;
+
+        press = (e->xmotion.x >= 0 && e->xmotion.y >= 0 &&
+                 e->xmotion.x < but->width && e->xmotion.y < but->height);
+
+        if (press != but->pressed) {
+            but->pressed = press;
+            render_button(self, but);
+        }
     }
-    g_assert(it != NULL);
-    prompt_hide(p);
+    return TRUE;
+}
+
+void prompt_cancel(ObPrompt *self)
+{
+    if (self->func) self->func(self, self->cancel_result, self->data);
+    prompt_hide(self);
 }