#ifndef __menu_h
#define __menu_h
-#include "action.h"
#include "window.h"
#include "geom.h"
-#include "render/render.h"
-#include "parser/parse.h"
+#include "obrender/render.h"
#include <glib.h>
gunichar shortcut;
/*! The shortcut's position in the string */
guint shortcut_position;
+ /*! If the shortcut was specified by & and should always be drawn */
+ gboolean shortcut_always_show;
/*! If the shortcut key should be shown in menu entries even when it
is the first character in the string */
gunichar shortcut;
/*! The shortcut's position in the string */
guint shortcut_position;
+ /*! If the shortcut was specified by & and should always be drawn */
+ gboolean shortcut_always_show;
/* state */
gboolean enabled;
/* List of ObActions */
GSList *actions;
- /* Icon shit */
- gint icon_width;
- gint icon_height;
- gint icon_alpha;
- RrPixel32 *icon_data;
+ /* Icon stuff. If you set this, make sure you RrImageRef() it too. */
+ RrImage *icon;
+ gint icon_alpha;
/* Mask icon */
RrPixmapMask *mask;
void menu_entry_ref(ObMenuEntry *self);
void menu_entry_unref(ObMenuEntry *self);
-/*! @param allow_shortcut this should be false when the label is coming from
- outside data like window or desktop titles */
ObMenu* menu_new(const gchar *name, const gchar *title,
gboolean allow_shortcut_selection, gpointer data);
void menu_free(ObMenu *menu);
/*! Repopulate a pipe-menu by running its command */
void menu_pipe_execute(ObMenu *self);
/*! Clear a pipe-menu's entries */
-void menu_clear_pipe_caches();
+void menu_clear_pipe_caches(void);
void menu_show_all_shortcuts(ObMenu *self, gboolean show);
void menu_show(gchar *name, gint x, gint y, gboolean mouse,
struct _ObClient *client);
-gboolean menu_hide_delay_reached();
+gboolean menu_hide_delay_reached(void);
void menu_set_show_func(ObMenu *menu, ObMenuShowFunc func);
void menu_set_hide_func(ObMenu *menu, ObMenuHideFunc func);