#include "geom.h"
#include "window.h"
-#include "render/render.h"
+#include "obrender/render.h"
+#include "obt/keyboard.h"
#include <glib.h>
struct _ObMenuFrame
{
/* stuff to be an ObWindow */
- Window_InternalType type;
+ ObWindow obwin;
Window window;
struct _ObMenu *menu;
ObMenuFrame *parent;
ObMenuEntryFrame *parent_entry;
ObMenuFrame *child;
+ ObMenuEntryFrame *child_entry;
GList *entries;
ObMenuEntryFrame *selected;
+ /* show entries from the menu starting at this index */
+ guint show_from;
+
/* If the submenus are being drawn to the right or the left */
gboolean direction_right;
Rect area;
Strut item_margin;
gint inner_w; /* inside the borders */
- gint title_h; /* height of all title items */
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 text_h; /* height of the items */
gint monitor; /* monitor on which to show the menu in xinerama */
- RrAppearance *a_title;
+ /* We make a copy of this for each menu, so that we don't have to re-render
+ the background of the entire menu each time we render an item inside it.
+ */
RrAppearance *a_items;
+
+ gboolean got_press; /* don't allow a KeyRelease event to run things in the
+ menu until it has seen a KeyPress. this is to
+ avoid having the keybinding used to show the menu
+ end up running something inside the menu */
+ guint press_keycode; /* the KeyCode that was used in the last KeyPress */
+ gboolean press_doexec; /* if the upcoming KeyRelease should be used to
+ execute the menu item that was selected by the
+ KeyPress */
};
struct _ObMenuEntryFrame
Window icon;
Window text;
Window bullet;
-
- RrAppearance *a_normal;
- RrAppearance *a_disabled;
- RrAppearance *a_selected;
-
- RrAppearance *a_icon;
- 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;
- RrAppearance *a_text_title;
};
extern GHashTable *menu_frame_map;
void menu_frame_startup(gboolean reconfig);
void menu_frame_shutdown(gboolean reconfig);
-ObMenuFrame* menu_frame_new(struct _ObMenu *menu, struct _ObClient *client);
+ObMenuFrame* menu_frame_new(struct _ObMenu *menu,
+ guint show_from,
+ struct _ObClient *client);
void menu_frame_free(ObMenuFrame *self);
+ObtIC* menu_frame_ic(ObMenuFrame *self);
+
void menu_frame_move(ObMenuFrame *self, gint x, gint y);
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
gint *dx, gint *dy);
gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
- gint button);
+ gboolean mouse);
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry);
-void menu_frame_hide(ObMenuFrame *self);
-void menu_frame_hide_all();
+void menu_frame_hide_all(void);
void menu_frame_hide_all_client(struct _ObClient *client);
+void menu_frame_render(ObMenuFrame *self);
+
void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
gboolean immediate);
void menu_frame_select_previous(ObMenuFrame *self);
void menu_frame_select_next(ObMenuFrame *self);
+void menu_frame_select_first(ObMenuFrame *self);
+void menu_frame_select_last(ObMenuFrame *self);
ObMenuFrame* menu_frame_under(gint x, gint y);
ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y);
void menu_entry_frame_show_submenu(ObMenuEntryFrame *self);
-void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time);
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state);
#endif