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_focus->texture[0].data.text.color = c_focus;
prompt_a_press->texture[0].data.text.color = c_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),
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,
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) {
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;
void prompt_unref(ObPrompt *self)
{
if (self && --self->ref == 0) {
- guint i;
+ gint i;
prompt_list = g_list_remove(prompt_list, 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;
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);
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);
}
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;
}
RrAppearance *a;
if (e->pressed) a = prompt_a_press;
- else if (self->focus == e) a = prompt_a_focus, g_print("focus!\n");
+ else if (self->focus == e) a = prompt_a_focus;
else a = prompt_a_button;
a->surface.parent = self->a_bg;
static void render_all(ObPrompt *self)
{
- guint i;
+ gint i;
RrPaint(self->a_bg, self->super.window, self->width, self->height);
void prompt_show(ObPrompt *self, ObClient *parent)
{
XSizeHints hints;
+ gint i;
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;
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);
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_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];
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;
/* 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;
}
else if (e->type == ButtonRelease) {
if (but->pressed) {
- /* XXX run stuff */
+ if (self->func) self->func(self, but->result, self->data);
prompt_hide(self);
}
}
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);
}