X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=bdc05266b95b32f4111ac2bc2354b016153d7c6e;hb=5d5be2ba2a6e0b3886e0076475ed9d7a2d4ac9ab;hp=4780bda011b21fa66485ec49d7f138de3f689109;hpb=ec9dd7fdd7531d2ca951a0b812bf8e63b6e9a377;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 4780bda0..bdc05266 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   menu.h for the Openbox window manager
+   Copyright (c) 2003-2007   Dana 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 __menu_h
 #define __menu_h
 
@@ -20,17 +38,28 @@ typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
 typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
 typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
-typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry,
+                                  guint state, gpointer data, Time time);
 typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
 
-extern ObParseInst *menu_parse_inst;
-
 struct _ObMenu
 {
     /* Name of the menu. Used in the showmenu action. */
     gchar *name;
     /* Displayed title */
     gchar *title;
+    /*! The shortcut key that would be used to activate this menu if it was
+      displayed as a submenu */
+    gunichar shortcut;
+    /*! The shortcut's position in the string */
+    guint shortcut_position;
+
+    /*! If the shortcut key should be shown in menu entries even when it
+      is the first character in the string */
+    gboolean show_all_shortcuts;
+
+    /* Command to execute to rebuild the menu */
+    gchar *execute;
 
     /* ObMenuEntry list */
     GList *entries;
@@ -41,6 +70,9 @@ struct _ObMenu
     ObMenuUpdateFunc update_func;
     ObMenuExecuteFunc execute_func;
     ObMenuDestroyFunc destroy_func;
+
+    /* Pipe-menu parent, we get destroyed when it is destroyed */
+    ObMenu *pipe_creator;
 };
 
 typedef enum
@@ -52,6 +84,10 @@ typedef enum
 
 struct _ObNormalMenuEntry {
     gchar *label;
+    /*! The shortcut key that would be used to activate this menu entry */
+    gunichar shortcut;
+    /*! The shortcut's position in the string */
+    guint shortcut_position;
 
     /* state */
     gboolean enabled;
@@ -63,6 +99,12 @@ struct _ObNormalMenuEntry {
     gint icon_width;
     gint icon_height;
     RrPixel32 *icon_data;
+
+    /* Mask icon */
+    RrPixmapMask *mask;
+    RrColor *mask_normal_color;
+    RrColor *mask_disabled_color;
+    RrColor *mask_selected_color;
 };
 
 struct _ObSubmenuMenuEntry {
@@ -71,7 +113,7 @@ struct _ObSubmenuMenuEntry {
 };
 
 struct _ObSeparatorMenuEntry {
-    gchar foo; /* placeholder */
+    gchar *label;
 };
 
 struct _ObMenuEntry
@@ -88,31 +130,37 @@ struct _ObMenuEntry
     } data;
 };
 
-void menu_startup();
-void menu_shutdown();
-
-void menu_parse();
+void menu_startup(gboolean reconfig);
+void menu_shutdown(gboolean reconfig);
 
-ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
-void menu_free(gchar *name);
+ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data);
+void menu_free(ObMenu *menu);
 
-gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin);
+/* Repopulate a pipe-menu by running its command */
+void menu_pipe_execute(ObMenu *self);
 
-void menu_set_update_func(gchar *name, ObMenuUpdateFunc func);
-void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func);
-void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func);
+void menu_show_all_shortcuts(ObMenu *self, gboolean show);
 
 void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
+void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
+void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
+void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
+
 /* functions for building menus */
-void menu_clear_entries(gchar *name);
-ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
+ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label,
                              GSList *actions);
-ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu);
-ObMenuEntry* menu_add_separator(gchar *name, gint id);
+ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, const gchar *submenu);
+ObMenuEntry* menu_add_separator(ObMenu *menu, gint id, const gchar *label);
+
+void menu_clear_entries(ObMenu *menu);
+void menu_entry_remove(ObMenuEntry *self);
+
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label);
 
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
+/* fills in the submenus, for use when a menu is being shown */
 void menu_find_submenus(ObMenu *self);
 
 #endif