#include "client.h"
#include "prop.h"
#include "modkeys.h"
+#include "event.h"
#include "gettext.h"
static GList *prompt_list = NULL;
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);
XSizeHints hints;
gint i;
- if (self->mapped) return;
+ if (self->mapped) {
+ /* activate the prompt */
+ PROP_MSG(self->super.window, net_active_window,
+ 1, /* from an application.. */
+ event_curtime,
+ 0,
+ 0);
+ return;
+ }
/* set the focused button (if not found then the first button is used) */
self->focus = &self->button[0];
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);
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;
g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB));
/* 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_cancel(self);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
+ 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)) {
+ 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];
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)
{
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))
but = &self->button[i];
break;
}
- g_assert(but != NULL);
+ if (!but) return FALSE;
if (e->type == ButtonPress) {
ObPromptElement *oldfocus;
render_button(self, but);
}
}
+ return TRUE;
}
void prompt_cancel(ObPrompt *self)