attrib.override_redirect = FALSE;
- self = g_new0(ObPrompt, 1);
+ self = g_slice_new0(ObPrompt);
self->ref = 1;
self->func = func;
self->cleanup = cleanup;
/* set the window's title */
if (title)
- OBT_PROP_SETS(self->super.window, NET_WM_NAME, utf8, title);
+ OBT_PROP_SETS(self->super.window, NET_WM_NAME, title);
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
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 */
/* activate the prompt */
OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW,
1, /* from an application.. */
- event_curtime,
+ event_time(),
0,
0, 0);
return;
{
gboolean shift;
guint shift_mask, mods;
+ KeySym sym;
if (e->type != KeyPress) return FALSE;
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)