RrColor *c_button, *c_focus, *c_press, *c_pfocus;
/* note: this is not a copy, don't free it */
- prompt_a_bg = ob_rr_theme->osd_hilite_bg;
+ prompt_a_bg = ob_rr_theme->osd_bg;
prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close);
prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
attrib.override_redirect = FALSE;
- self = g_new0(ObPrompt, 1);
+ self = g_slice_new0(ObPrompt);
self->ref = 1;
self->func = func;
self->cleanup = cleanup;
CopyFromParent,
CWOverrideRedirect,
&attrib);
+ self->ic = obt_keyboard_context_new(self->super.window,
+ self->super.window);
/* make it a dialog type window */
OBT_PROP_SET32(self->super.window, NET_WM_WINDOW_TYPE, ATOM,
prompt_list = g_list_remove(prompt_list, self);
+ obt_keyboard_context_unref(self->ic);
+
for (i = 0; i < self->n_buttons; ++i) {
window_remove(self->button[i].window);
XDestroyWindow(obt_display, self->button[i].window);
XDestroyWindow(obt_display, self->msg.window);
XDestroyWindow(obt_display, self->super.window);
- g_free(self);
+ g_slice_free(ObPrompt, self);
}
}
b += OUTSIDE_MARGIN;
{
- Rect *area = screen_physical_area_all_monitors();
+ const Rect *area = screen_physical_area_all_monitors();
maxw = MIN(MAX_WIDTH, area->width*4/5);
- g_free(area);
}
/* find the button sizes and how much space we need for them */
{
RrAppearance *a;
- if (e->pressed && self->focus == e) a = prompt_a_pfocus;
- else if (self->focus == e) a = prompt_a_focus;
- else if (e->pressed) a = prompt_a_press;
- else a = prompt_a_button;
+ if (e->hover && self->focus == e) a = prompt_a_pfocus;
+ else if (self->focus == e) a = prompt_a_focus;
+ else if (e->pressed) a = prompt_a_press;
+ else a = prompt_a_button;
a->surface.parent = prompt_a_bg;
a->surface.parentx = e->x;
gboolean prompt_key_event(ObPrompt *self, XEvent *e)
{
gboolean shift;
- guint shift_mask;
+ guint shift_mask, mods;
+ KeySym sym;
if (e->type != KeyPress) return FALSE;
shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT);
- shift = !!(e->xkey.state & shift_mask);
+ mods = obt_keyboard_only_modmasks(e->xkey.state);
+ shift = !!(mods & shift_mask);
/* only accept shift */
- if (e->xkey.state != 0 && e->xkey.state != shift_mask)
+ if (mods != 0 && mods != shift_mask)
return FALSE;
- if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE))
+ sym = obt_keyboard_keypress_to_keysym(e);
+
+ if (sym == XK_Escape)
prompt_cancel(self);
- else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) ||
- ob_keycode_match(e->xkey.keycode, OB_KEY_SPACE))
- {
+ else if (sym == XK_Return || sym == XK_KP_Enter || sym == XK_space)
prompt_run_callback(self, self->focus->result);
- }
- else if (ob_keycode_match(e->xkey.keycode, OB_KEY_TAB) ||
- ob_keycode_match(e->xkey.keycode, OB_KEY_LEFT) ||
- ob_keycode_match(e->xkey.keycode, OB_KEY_RIGHT))
- {
+ else if (sym == XK_Tab || sym == XK_Left || sym == XK_Right) {
gint i;
gboolean left;
ObPromptElement *oldfocus;
- left = ob_keycode_match(e->xkey.keycode, OB_KEY_LEFT) ||
- (ob_keycode_match(e->xkey.keycode, OB_KEY_TAB) && shift);
+ left = (sym == XK_Left) || ((sym == XK_Tab) && shift);
oldfocus = self->focus;
for (i = 0; i < self->n_buttons; ++i)
oldfocus = self->focus;
- but->pressed = TRUE;
+ but->pressed = but->hover = TRUE;
self->focus = but;
if (oldfocus != but) render_button(self, oldfocus);
render_button(self, but);
}
else if (e->type == ButtonRelease) {
- if (but->pressed)
+ if (but->hover)
prompt_run_callback(self, but->result);
+ but->pressed = FALSE;
}
else if (e->type == MotionNotify) {
- gboolean press;
+ if (but->pressed) {
+ gboolean hover;
- press = (e->xmotion.x >= 0 && e->xmotion.y >= 0 &&
- e->xmotion.x < but->width && e->xmotion.y < but->height);
+ hover = (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);
+ if (hover != but->hover) {
+ but->hover = hover;
+ render_button(self, but);
+ }
}
}
return TRUE;