-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
menu.h for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ 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
typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry,
- guint state, gpointer data);
+ guint state, gpointer data, Time time);
typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
struct _ObMenu
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;
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;
};
struct _ObSeparatorMenuEntry {
- gchar foo; /* placeholder */
+ gchar *label;
};
struct _ObMenuEntry
void menu_startup(gboolean reconfig);
void menu_shutdown(gboolean reconfig);
-ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
+ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data);
void menu_free(ObMenu *menu);
/* Repopulate a pipe-menu by running its command */
void menu_pipe_execute(ObMenu *self);
+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_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
/* functions for building menus */
-ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, gchar *label,
+ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label,
GSList *actions);
-ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, gchar *submenu);
-ObMenuEntry* menu_add_separator(ObMenu *menu, 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 */