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

1 files changed, 11 insertions, 2 deletions

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 1d7cb542..a3c359e5 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -48,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;
 
@@ -104,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);
 
-gboolean 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();