wow... this is a big commit...

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 40b9f84415e1b7f8595f462e1a334b6827cfe353..1d7cb542a168050dc5baeea85eeec96f9fbd0d55 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -1,3 +1,22 @@
+/* -*- 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
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef ob__menuframe_h
 #define ob__menuframe_h
 
@@ -39,12 +58,15 @@ struct _ObMenuFrame
 
     /* On-screen area (including borders!) */
     Rect area;
+    Strut item_margin;
     gint inner_w; /* inside the borders */
     gint title_h; /* includes the bwidth below it */
     gint item_h;  /* height of all normal items */
     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;
 
@@ -69,7 +91,10 @@ struct _ObMenuEntryFrame
     RrAppearance *a_selected;
 
     RrAppearance *a_icon;
-    RrAppearance *a_bullet;
+    RrAppearance *a_mask;
+    RrAppearance *a_bullet_normal;
+    RrAppearance *a_bullet_selected;
+    RrAppearance *a_separator;
     RrAppearance *a_text_normal;
     RrAppearance *a_text_disabled;
     RrAppearance *a_text_selected;
@@ -81,7 +106,7 @@ 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_show(ObMenuFrame *self, ObMenuFrame *parent);
+gboolean menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent);
 void menu_frame_hide(ObMenuFrame *self);
 
 void menu_frame_hide_all();
@@ -96,6 +121,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, gboolean hide);
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time);
 
 #endif