From: Dana Jansens Date: Thu, 7 Feb 2008 04:33:02 +0000 (-0500) Subject: make the prompt buttons respond to button presses. keyboard input code is there too... X-Git-Tag: mikabox-3.4.7~24^2~15 X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=a5005506a89ecffe13e04cbcda5c20a2fa6ba25d make the prompt buttons respond to button presses. keyboard input code is there too but not working yet. --- diff --git a/openbox/client.c b/openbox/client.c index 1eba49f..cd26deb 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -272,6 +272,8 @@ void client_manage(Window window, ObPrompt *prompt) /* choose the events we want to receive on the CLIENT window */ attrib_set.event_mask = CLIENT_EVENTMASK; + if (prompt) + attrib_set.event_mask |= KeyPressMask; attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK; XChangeWindowAttributes(ob_display, window, CWEventMask|CWDontPropagate, &attrib_set); @@ -3347,7 +3349,7 @@ void client_close(ObClient *self) if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return; if (self->prompt) { - prompt_hide(self); + prompt_hide(self->prompt); return; } diff --git a/openbox/event.c b/openbox/event.c index 0d7ff2a..b264391 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -89,6 +89,7 @@ static void event_process(const XEvent *e, gpointer data); static void event_handle_root(XEvent *e); static gboolean event_handle_menu_keyboard(XEvent *e); static gboolean event_handle_menu(XEvent *e); +static void event_handle_prompt(ObPrompt *p, XEvent *e); static void event_handle_dock(ObDock *s, XEvent *e); static void event_handle_dockapp(ObDockApp *app, XEvent *e); static void event_handle_client(ObClient *c, XEvent *e); @@ -704,7 +705,9 @@ static void event_process(const XEvent *ec, gpointer data) } #endif - if (e->type == ButtonPress || e->type == ButtonRelease) { + if (prompt) + event_handle_prompt(prompt, e); + else if (e->type == ButtonPress || e->type == ButtonRelease) { /* If the button press was on some non-root window, or was physically on the root window, then process it */ if (window != RootWindow(ob_display, ob_screen) || @@ -1672,6 +1675,21 @@ static ObMenuFrame* find_active_or_last_menu(void) return ret; } +static void event_handle_prompt(ObPrompt *p, XEvent *e) +{ + g_print("prompt event\n"); + switch (e->type) { + case ButtonPress: + case ButtonRelease: + case MotionNotify: + prompt_mouse_event(p, e); + break; + case KeyPress: + prompt_key_event(p, e); + break; + } +} + static gboolean event_handle_menu_keyboard(XEvent *ev) { guint keycode, state; diff --git a/openbox/misc.h b/openbox/misc.h index 2b5584d..01c2da1 100644 --- a/openbox/misc.h +++ b/openbox/misc.h @@ -51,6 +51,7 @@ typedef enum OB_KEY_RIGHT, OB_KEY_UP, OB_KEY_DOWN, + OB_KEY_TAB, OB_NUM_KEYS } ObKey; diff --git a/openbox/prompt.c b/openbox/prompt.c index 84023d7..a72b6a4 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -22,13 +22,14 @@ #include "openbox.h" #include "client.h" #include "prop.h" +#include "modkeys.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 +40,31 @@ 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.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,7 +83,7 @@ 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); } @@ -108,6 +109,7 @@ 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); @@ -147,8 +149,15 @@ 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); } + /* set the focus to the first button */ + self->focus = &self->button[0]; + prompt_list = g_list_prepend(prompt_list, self); return self; @@ -211,12 +220,12 @@ 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); @@ -268,12 +277,18 @@ 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, g_print("focus!\n"); + 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) @@ -323,15 +338,90 @@ void prompt_hide(ObPrompt *self) self->mapped = FALSE; } -void prompt_hide_window(Window window) +void prompt_key_event(ObPrompt *self, XEvent *e) +{ + gboolean shift; + guint shift_mask; + + if (e->type != KeyPress) return; + + 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; + + 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_hide(self); + } + else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB)) { + guint i; + ObPromptElement *oldfocus; + + oldfocus = self->focus; + + for (i = 0; i < self->n_buttons; ++i) + if (self->focus == &self->button[i]) break; + i += (shift ? -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); + } +} + +void prompt_mouse_event(ObPrompt *self, XEvent *e) { - GList *it; - ObPrompt *p = NULL; + guint i; + ObPromptElement *but; + + if (e->type != ButtonPress && e->type != ButtonRelease && + e->type != MotionNotify) return; + + /* find the button */ + 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 (e->type == ButtonPress) { + ObPromptElement *oldfocus; - for (it = prompt_list; it; it = g_list_next(it)) { - p = it->data; - if (p->super.window == window) break; + 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) { + /* XXX run stuff */ + 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); } diff --git a/openbox/prompt.h b/openbox/prompt.h index 8d0bc98..02c1edd 100644 --- a/openbox/prompt.h +++ b/openbox/prompt.h @@ -26,12 +26,14 @@ typedef struct _ObPromptElement ObPromptElement; #include "geom.h" #include "render/render.h" #include +#include struct _ObPromptElement { gchar *text; Window window; gint x, y, width, height; + gboolean pressed; }; struct _ObPrompt @@ -52,6 +54,9 @@ struct _ObPrompt /* one for each answer */ ObPromptElement *button; guint n_buttons; + + /* points to the button with the focus */ + ObPromptElement *focus; }; void prompt_startup(gboolean reconfig); @@ -64,6 +69,8 @@ void prompt_unref(ObPrompt *self); /*! Show the prompt. It will be centered within the given area rectangle */ void prompt_show(ObPrompt *self, struct _ObClient *parent); void prompt_hide(ObPrompt *self); -void prompt_hide_window(Window window); + +void prompt_key_event(ObPrompt *self, XEvent *e); +void prompt_mouse_event(ObPrompt *self, XEvent *e); #endif