X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.h;h=9beb8f2a591615f21076d80e8210f4cd5005ba7d;hb=a46b4ee4341dcf5c86b9182b5b970825f2e11692;hp=ea5d7454e714c1631daaaf5d3ca58cf33039cb1a;hpb=7af1c6a9c3a57f3ded34fad3f9f4a30fe377a65e;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index ea5d7454..9beb8f2a 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,15 +2,19 @@
 #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);
@@ -44,7 +48,7 @@ typedef struct Menu {
 
 
     /* render stuff */
-    Client *client;
+    struct _ObClient *client;
     Window frame;
     Window title;
     RrAppearance *a_title;
@@ -55,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;
@@ -102,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);