+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ menuframe.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "menuframe.h"
#include "client.h"
#include "menu.h"
void menu_frame_move_on_screen(ObMenuFrame *self)
{
- Rect *a;
+ Rect *a = NULL;
guint i;
gint dx = 0, dy = 0;
gint pos, half;
tw = MIN(tw, MAX_MENU_WIDTH) + ob_rr_theme->padding * 2;
w = MAX(w, tw);
- th = ob_rr_theme->mtitlefont_height + ob_rr_theme->padding * 2;
+ th = ob_rr_theme->menu_title_height;
h += (self->title_h = th + ob_rr_theme->bwidth);
XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
if (g_list_find(menu_frame_visible, self))
return;
+ if (menu_frame_visible == NULL) {
+ /* no menus shown yet */
+ if (!grab_pointer(TRUE, OB_CURSOR_NONE))
+ return;
+ if (!grab_keyboard(TRUE)) {
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ return;
+ }
+ }
+
if (parent) {
if (parent->child)
menu_frame_hide(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;
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);
}
}