X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=aa5eb06f0ed4cf3db46c215364792e718d3b019b;hb=3167fc223ea82851ae954b348a5ff1c0ce6b6d79;hp=b9183a9bdc840e26b51097c9bf532176911a1744;hpb=9a4ce94579bc7161d4ed55b20f00b3f76deff3e2;p=chaz%2Fopenbox

diff --git a/openbox/prompt.c b/openbox/prompt.c
index b9183a9b..aa5eb06f 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -20,6 +20,7 @@
 #include "openbox.h"
 #include "screen.h"
 #include "client.h"
+#include "event.h"
 #include "obt/display.h"
 #include "obt/keyboard.h"
 #include "obt/prop.h"
@@ -47,8 +48,8 @@ void prompt_startup(gboolean reconfig)
     prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
 
     c_button = 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;
+    c_focus = prompt_a_focus->texture[0].data.mask.color;
+    c_press = prompt_a_press->texture[0].data.mask.color;
 
     RrAppearanceRemoveTextures(prompt_a_button);
     RrAppearanceRemoveTextures(prompt_a_focus);
@@ -92,18 +93,24 @@ void prompt_shutdown(gboolean reconfig)
     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 = OB_WINDOW_CLASS_PROMPT;
     self->super.window = XCreateWindow(obt_display, obt_root(ob_screen),
                                        0, 0, 1, 1, ob_rr_theme->obwidth,
@@ -119,8 +126,10 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
     /* 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(obt_display, self->super.window,
                                      0, 0, 1, 1, 0,
@@ -128,23 +137,24 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
                                      CopyFromParent, 0, NULL);
     XMapWindow(obt_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) {
@@ -160,9 +170,6 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
                      ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
     }
 
-    /* set the focus to the first button */
-    self->focus = &self->button[0];
-
     prompt_list = g_list_prepend(prompt_list, self);
 
     return self;
@@ -176,7 +183,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);
 
@@ -197,7 +204,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;
@@ -261,11 +268,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;
     }
@@ -303,7 +310,7 @@ static void render_button(ObPrompt *self, ObPromptElement *e)
 
 static void render_all(ObPrompt *self)
 {
-    guint i;
+    gint i;
 
     RrPaint(self->a_bg, self->super.window, self->width, self->height);
 
@@ -322,11 +329,25 @@ static void render_all(ObPrompt *self)
 void prompt_show(ObPrompt *self, ObClient *parent)
 {
     XSizeHints hints;
+    gint i;
+
+    if (self->mapped) {
+        /* activate the prompt */
+        OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW,
+                     1, /* from an application.. */
+                     event_curtime,
+                     0,
+                     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;
@@ -334,8 +355,12 @@ void prompt_show(ObPrompt *self, ObClient *parent)
     hints.min_height = hints.max_height = self->height;
     XSetWMNormalHints(obt_display, self->super.window, &hints);
 
-    XSetTransientForHint(obt_display, (parent ? parent->window : 0),
-                         self->super.window);
+    XSetTransientForHint(obt_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);
 
@@ -348,35 +373,43 @@ void prompt_hide(ObPrompt *self)
     self->mapped = FALSE;
 }
 
-void prompt_key_event(ObPrompt *self, XEvent *e)
+gboolean prompt_key_event(ObPrompt *self, XEvent *e)
 {
     gboolean shift;
     guint shift_mask;
 
-    if (e->type != KeyPress) return;
+    if (e->type != KeyPress) return FALSE;
 
     shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT);
     shift = !!(e->xkey.state & shift_mask);
 
     /* only accept shift */
     if (e->xkey.state != 0 && e->xkey.state != shift_mask)
-        return;
+        return FALSE;
 
     if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
-        prompt_hide(self);
-    else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
-        /* XXX run stuff */
+        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)) {
-        guint i;
+    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 += (shift ? -1 : 1);
+        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];
@@ -384,17 +417,19 @@ void prompt_key_event(ObPrompt *self, XEvent *e)
         if (oldfocus != self->focus) render_button(self, oldfocus);
         render_button(self, self->focus);
     }
+    return TRUE;
 }
 
-void prompt_mouse_event(ObPrompt *self, XEvent *e)
+gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
 {
-    guint i;
+    gint i;
     ObPromptElement *but;
 
     if (e->type != ButtonPress && e->type != ButtonRelease &&
-        e->type != MotionNotify) return;        
+        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))
@@ -402,7 +437,7 @@ void prompt_mouse_event(ObPrompt *self, XEvent *e)
             but = &self->button[i];
             break;
         }
-    g_assert(but != NULL);
+    if (!but) return FALSE;
 
     if (e->type == ButtonPress) {
         ObPromptElement *oldfocus;
@@ -417,7 +452,7 @@ void prompt_mouse_event(ObPrompt *self, XEvent *e)
     }
     else if (e->type == ButtonRelease) {
         if (but->pressed) {
-            /* XXX run stuff */
+            if (self->func) self->func(self, but->result, self->data);
             prompt_hide(self);
         }
     }
@@ -432,4 +467,11 @@ void prompt_mouse_event(ObPrompt *self, XEvent *e)
             render_button(self, but);
         }
     }
+    return TRUE;
+}
+
+void prompt_cancel(ObPrompt *self)
+{
+    if (self->func) self->func(self, self->cancel_result, self->data);
+    prompt_hide(self);
 }