make key grabbing per window instead of always root

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 081b3528db0f65f78a30cf78d50d3a9e3e43afed..49a79fb4d266ccd2bc8cb126201375372d1882d9 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -7,17 +7,19 @@
 
 #include <glib.h>
 
-extern GHashTable *menu_map;
-
 struct Menu;
 struct MenuEntry;
 
 typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
 typedef void(*menu_controller_update)(struct Menu *self);
-typedef void(*menu_controller_mouseover)(struct MenuEntry *self, 
+typedef void(*menu_controller_mouseover)(struct MenuEntry *self,
                                          gboolean enter);
 
+extern GHashTable *menu_hash;
+
 typedef struct Menu {
+    ObWindow obwin;
+
     char *label;
     char *name;
     
@@ -104,6 +106,8 @@ void menu_show_full(Menu *menu, int x, int y, Client *client);
 
 void menu_hide(Menu *self);
 
+void menu_clear(Menu *self);
+
 MenuEntry *menu_entry_new_full(char *label, Action *action,
                                MenuEntryRenderType render_type,
                                gpointer submenu);
@@ -133,6 +137,7 @@ void menu_entry_render(MenuEntry *self);
 void menu_entry_fire(MenuEntry *self);
 
 void menu_render(Menu *self);
+void menu_render_full(Menu *self);
 
 void menu_control_mouseover(MenuEntry *entry, gboolean enter);
 #endif