-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
menuframe.c for the Openbox window manager
Copyright (c) 2003 Ben Jansens
static void menu_frame_render(ObMenuFrame *self);
static void menu_frame_update(ObMenuFrame *self);
-static Window createWindow(Window parent, unsigned long mask,
+static Window createWindow(Window parent, gulong mask,
XSetWindowAttributes *attrib)
{
return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
void menu_frame_move_on_screen(ObMenuFrame *self)
{
- Rect *a;
+ Rect *a = NULL;
guint i;
gint dx = 0, dy = 0;
gint pos, half;
menu_frame_render(self);
}
-void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
+gboolean menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
{
GList *it;
if (g_list_find(menu_frame_visible, self))
- return;
+ return TRUE;
+
+ if (menu_frame_visible == NULL) {
+ /* no menus shown yet */
+ if (!grab_pointer(TRUE, OB_CURSOR_NONE))
+ return FALSE;
+ if (!grab_keyboard(TRUE)) {
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ return FALSE;
+ }
+ }
if (parent) {
if (parent->child)
}
self->parent = parent;
- if (menu_frame_visible == NULL) {
- /* no menus shown yet */
- grab_pointer(TRUE, OB_CURSOR_NONE);
- grab_keyboard(TRUE);
- }
-
/* determine if the underlying menu is already visible */
for (it = menu_frame_visible; it; it = g_list_next(it)) {
ObMenuFrame *f = it->data;
menu_frame_move_on_screen(self);
XMapWindow(ob_display, self->window);
+
+ return TRUE;
}
void menu_frame_hide(ObMenuFrame *self)
if (func)
func(entry, state, data);
- else {
- GSList *it;
-
- for (it = acts; it; it = g_slist_next(it))
- action_run(it->data, client, state);
- }
+ else
+ action_run(acts, client, state);
}
}