/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
menu.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
This program is free software; you can redistribute it and/or modify
#include "config.h"
#include "screen.h"
#include "menuframe.h"
+#include "keyboard.h"
#include "geom.h"
#include "misc.h"
#include "client_menu.h"
#include "client_list_menu.h"
+#include "client_list_combined_menu.h"
#include "parser/parse.h"
typedef struct _ObMenuParseState ObMenuParseState;
menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
(GDestroyNotify)menu_destroy_hash_value);
- client_list_menu_startup();
+ client_list_menu_startup(reconfig);
+ client_list_combined_menu_startup(reconfig);
client_menu_startup();
menu_parse_inst = parse_startup();
parse_shutdown(menu_parse_inst);
menu_parse_inst = NULL;
+ client_list_menu_shutdown(reconfig);
+ client_list_combined_menu_shutdown(reconfig);
+
menu_frame_hide_all();
g_hash_table_destroy(menu_hash);
menu_hash = NULL;
ObMenuFrame *frame;
guint i;
- if (!(self = menu_from_name(name))) return;
+ if (!(self = menu_from_name(name))
+ || keyboard_interactively_grabbed()) return;
/* if the requested menu is already the top visible menu, then don't
bother */
menu_frame_move(frame, x, y);
} else
menu_frame_move(frame,
- x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
+ x - ob_rr_theme->mbwidth, y - ob_rr_theme->mbwidth);
for (i = 0; i < screen_num_monitors; ++i) {
Rect *a = screen_physical_area_monitor(i);
if (RECT_CONTAINS(*a, x, y)) {