don't menu menus jump around at all anymore. open them on screen in the first place

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index f2aa9a0047d483a3cca7ba678d4a56bac2ed1079..a3c359e511e96776170c68fee2c7bef3cc65b7e7 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menuframe.h 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
@@ -47,11 +48,15 @@ struct _ObMenuFrame
     struct _ObClient *client;
 
     ObMenuFrame *parent;
+    ObMenuEntryFrame *parent_entry;
     ObMenuFrame *child;
 
     GList *entries;
     ObMenuEntryFrame *selected;
 
+    /* If the submenus are being drawn to the right or the left */
+    gboolean direction_right;
+
     /* If a titlebar is displayed for the menu or not (for top-level menus) */
     gboolean show_title;
 
@@ -64,6 +69,8 @@ struct _ObMenuFrame
     gint text_x;  /* offset at which the text appears in the items */
     gint text_w;  /* width of the text area in the items */
 
+    gint monitor; /* monitor on which to show the menu in xinerama */
+
     Window title;
     Window items;
 
@@ -101,9 +108,14 @@ ObMenuFrame* menu_frame_new(struct _ObMenu *menu, struct _ObClient *client);
 void menu_frame_free(ObMenuFrame *self);
 
 void menu_frame_move(ObMenuFrame *self, gint x, gint y);
-void menu_frame_move_on_screen(ObMenuFrame *self);
+void menu_frame_move_on_screen(ObMenuFrame *self, gint *dx, gint *dy);
+
+void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y);
+void menu_frame_place_submenu(ObMenuFrame *self);
 
-void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent);
+gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y);
+gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
+                                 ObMenuEntryFrame *parent_entry);
 void menu_frame_hide(ObMenuFrame *self);
 
 void menu_frame_hide_all();
@@ -118,6 +130,6 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y);
 
 void menu_entry_frame_show_submenu(ObMenuEntryFrame *self);
 
-void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state);
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time);
 
 #endif