#ifndef __menu_h
#define __menu_h
-#include "action.h"
#include "window.h"
#include "geom.h"
#include "render/render.h"
typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry,
struct _ObMenuFrame *frame,
struct _ObClient *client,
- guint state, gpointer data, Time time);
+ guint state, gpointer data);
typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
/*! @param x is the mouse x coordinate. on return it should be the x coordinate
for the menu
for the menu
*/
typedef void (*ObMenuPlaceFunc)(struct _ObMenuFrame *frame, gint *x, gint *y,
- gint button, gpointer data);
+ gboolean mouse, gpointer data);
struct _ObMenu
{
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;
RrColor *mask_selected_color;
RrColor *mask_disabled_color;
RrColor *mask_disabled_selected_color;
+
+ gpointer data;
};
struct _ObSubmenuMenuEntry {
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);
void menu_show_all_shortcuts(ObMenu *self, gboolean show);
-void menu_show(gchar *name, gint x, gint y, gint button,
+void menu_show(gchar *name, gint x, gint y, gboolean mouse,
struct _ObClient *client);
gboolean menu_hide_delay_reached();