prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 6cb76a5e67dcceda758287e8dd6e6b8c501254e8..9beb8f2a591615f21076d80e8210f4cd5005ba7d 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,20 +2,25 @@
 #define __menu_h
 
 #include "action.h"
+#include "window.h"
 #include "render/render.h"
 #include "geom.h"
 
 #include <glib.h>
 
+struct _ObClient;
+
 struct Menu;
 struct MenuEntry;
 
-typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
+typedef void(*menu_controller_show)(struct Menu *self,
+                                    int x, int y, struct _ObClient *);
 typedef void(*menu_controller_update)(struct Menu *self);
 typedef void(*menu_controller_mouseover)(struct MenuEntry *self,
                                          gboolean enter);
 
 extern GHashTable *menu_hash;
+extern GSList *menu_visible;
 
 typedef struct Menu {
     ObWindow obwin;
@@ -43,7 +48,7 @@ typedef struct Menu {
 
 
     /* render stuff */
-    Client *client;
+    struct _ObClient *client;
     Window frame;
     Window title;
     RrAppearance *a_title;
@@ -54,6 +59,7 @@ typedef struct Menu {
     int item_h;
     Point location;
     Size size;
+    guint xin_area; /* index of the xinerama head/area */
 
     /* plugin stuff */
     char *plugin;
@@ -101,8 +107,8 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
                     menu_controller_show show, menu_controller_update update);
 void menu_free(char *name);
 
-void menu_show(char *name, int x, int y, Client *client);
-void menu_show_full(Menu *menu, int x, int y, Client *client);
+void menu_show(char *name, int x, int y, struct _ObClient *client);
+void menu_show_full(Menu *menu, int x, int y, struct _ObClient *client);
 
 void menu_hide(Menu *self);
 
@@ -131,6 +137,7 @@ void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
 void menu_add_entry(Menu *menu, MenuEntry *entry);
 
 MenuEntry *menu_find_entry(Menu *menu, Window win);
+MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y);
 
 void menu_entry_render(MenuEntry *self);