#include "openbox.h"
#include "config.h"
#include "obt/prop.h"
-#include "render/theme.h"
+#include "obt/keyboard.h"
+#include "obrender/theme.h"
#define PADDING 2
#define MAX_MENU_WIDTH 400
ObMenuFrame *frame);
static void menu_entry_frame_free(ObMenuEntryFrame *self);
static void menu_frame_update(ObMenuFrame *self);
-static gboolean menu_entry_frame_submenu_hide_timeout(gpointer data);
-static gboolean menu_entry_frame_submenu_show_timeout(gpointer data);
+static gboolean submenu_show_timeout(gpointer data);
static void menu_frame_hide(ObMenuFrame *self);
+static gboolean submenu_hide_timeout(gpointer data);
+
static Window createWindow(Window parent, gulong mask,
XSetWindowAttributes *attrib)
{
RrVisual(ob_rr_inst), mask, attrib);
}
+static void client_dest(ObClient *client, gpointer data)
+{
+ GList *it;
+
+ /* menus can be associated with a client, so null those refs since
+ we are disappearing now */
+ for (it = menu_frame_visible; it; it = g_list_next(it)) {
+ ObMenuFrame *f = it->data;
+ if (f->client == client)
+ f->client = NULL;
+ }
+}
+
void menu_frame_startup(gboolean reconfig)
{
gint i;
if (reconfig) return;
+ client_add_destroy_notify(client_dest, NULL);
menu_frame_map = g_hash_table_new(g_int_hash, g_int_equal);
}
if (reconfig) return;
+ client_remove_destroy_notify(client_dest);
g_hash_table_destroy(menu_frame_map);
}
ObMenuFrame *self;
XSetWindowAttributes attr;
- self = g_new0(ObMenuFrame, 1);
+ self = g_slice_new0(ObMenuFrame);
self->obwin.type = OB_WINDOW_CLASS_MENUFRAME;
self->menu = menu;
self->selected = NULL;
- self->open_submenu = NULL;
self->client = client;
self->direction_right = TRUE;
self->show_from = show_from;
XDestroyWindow(obt_display, self->window);
- g_free(self);
+ g_slice_free(ObMenuFrame, self);
}
}
+ObtIC* menu_frame_ic(ObMenuFrame *self)
+{
+ /* menus are always used through a grab right now, so they can always use
+ the grab input context */
+ return grab_input_context();
+}
+
static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
ObMenuFrame *frame)
{
ObMenuEntryFrame *self;
XSetWindowAttributes attr;
- self = g_new0(ObMenuEntryFrame, 1);
+ self = g_slice_new0(ObMenuEntryFrame);
self->entry = entry;
self->frame = frame;
g_hash_table_remove(menu_frame_map, &self->bullet);
}
- g_free(self);
+ g_slice_free(ObMenuEntryFrame, self);
}
}
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
gint *dx, gint *dy)
{
- Rect *a = NULL;
+ const Rect *a = NULL;
gint pos, half;
*dx = *dy = 0;
*dx = MAX(*dx, a->x - x);
*dy = MAX(*dy, a->y - y);
}
-
- g_free(a);
}
static void menu_entry_frame_render(ObMenuEntryFrame *self)
static void menu_frame_update(ObMenuFrame *self)
{
GList *mit, *fit;
- Rect *a;
+ const Rect *a;
gint h;
menu_pipe_execute(self->menu);
}
}
- g_free(a);
-
menu_frame_render(self);
}
return TRUE;
}
+/*! Stop hiding an open submenu.
+ @child The OnMenuFrame of the submenu to be hidden
+*/
+static void remove_submenu_hide_timeout(ObMenuFrame *child)
+{
+ obt_main_loop_timeout_remove_data(ob_main_loop, submenu_hide_timeout,
+ child, FALSE);
+}
+
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry)
{
self->monitor = parent->monitor;
self->parent = parent;
self->parent_entry = parent_entry;
- parent->open_submenu = parent_entry;
/* set up parent's child to be us */
- if (parent->child)
- menu_frame_hide(parent->child);
- parent->child = self;
+ if ((parent->child) != self) {
+ if (parent->child)
+ menu_frame_hide(parent->child);
+ parent->child = self;
+ parent->child_entry = parent_entry;
+ }
if (!menu_frame_show(self))
return FALSE;
if (self->child)
menu_frame_hide(self->child);
- if (self->parent && self->parent->child == self) {
+ if (self->parent) {
+ remove_submenu_hide_timeout(self);
+
self->parent->child = NULL;
- self->parent->open_submenu = NULL;
+ self->parent->child_entry = NULL;
}
self->parent = NULL;
self->parent_entry = NULL;
if (config_submenu_show_delay) {
/* remove any submenu open requests */
- obt_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_show_timeout);
- /* remove any submenu close delays */
- obt_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_hide_timeout);
+ obt_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
}
if ((it = g_list_last(menu_frame_visible)))
menu_frame_hide(it->data);
}
-void menu_frame_hide_all_client(ObClient *client)
-{
- GList *it = g_list_last(menu_frame_visible);
- if (it) {
- ObMenuFrame *f = it->data;
- if (f->client == client) {
- if (config_submenu_show_delay) {
- /* remove any submenu open requests */
- obt_main_loop_timeout_remove
- (ob_main_loop,
- menu_entry_frame_submenu_show_timeout);
- /* remove any submenu close delays */
- obt_main_loop_timeout_remove
- (ob_main_loop,
- menu_entry_frame_submenu_hide_timeout);
- }
- menu_frame_hide(f);
- }
- }
-}
-
ObMenuFrame* menu_frame_under(gint x, gint y)
{
ObMenuFrame *ret = NULL;
for (it = frame->entries; it; it = g_list_next(it)) {
ObMenuEntryFrame *e = it->data;
+
if (RECT_CONTAINS(e->area, x, y)) {
ret = e;
break;
return ret;
}
-static gboolean menu_entry_frame_submenu_hide_timeout(gpointer data)
+static gboolean submenu_show_timeout(gpointer data)
{
g_assert(menu_frame_visible);
- g_assert(((ObMenuFrame*)data)->parent != NULL);
- menu_frame_hide((ObMenuFrame*)data);
+ menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
return FALSE;
}
-static gboolean menu_entry_frame_submenu_show_timeout(gpointer data)
+static gboolean submenu_hide_timeout(gpointer data)
{
g_assert(menu_frame_visible);
- menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
+ menu_frame_hide((ObMenuFrame*)data);
return FALSE;
}
{
ObMenuEntryFrame *old = self->selected;
ObMenuFrame *oldchild = self->child;
+ ObMenuEntryFrame *oldchild_entry = self->child_entry;
+ /* if the user selected a separator, ignore it and reselect what we had
+ selected before */
if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
entry = old;
- if (old == entry) return;
+ if (old == entry &&
+ (!old || old->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU))
+ return;
+
+ /* if the user left this menu but we have a submenu open, move the
+ selection back to that submenu */
+ if (!entry && oldchild_entry)
+ entry = oldchild_entry;
if (config_submenu_show_delay) {
/* remove any submenu open requests */
- obt_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_show_timeout);
- }
-
- if (!entry && self->open_submenu) {
- /* we moved out of the menu, so move the selection back to the open
- submenu */
- entry = self->open_submenu;
- oldchild = NULL;
-
- /* remove any submenu close delays */
- obt_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_hide_timeout);
+ obt_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
}
self->selected = entry;
if (old)
menu_entry_frame_render(old);
- if (oldchild) {
- /* there is an open submenu */
-
- if (config_submenu_show_delay && !immediate) {
- if (entry == self->open_submenu) {
- /* we moved onto the entry that has an open submenu, so stop
- trying to close the submenu */
- obt_main_loop_timeout_remove
- (ob_main_loop,
- menu_entry_frame_submenu_hide_timeout);
- }
- else if (old == self->open_submenu) {
- /* we just moved off the entry with an open submenu, so
- close the open submenu after a delay */
- obt_main_loop_timeout_add
- (ob_main_loop,
- config_submenu_show_delay * 1000,
- menu_entry_frame_submenu_hide_timeout,
- self->child, g_direct_equal,
- NULL);
- }
+ if (oldchild_entry) {
+ /* There is an open submenu */
+ if (oldchild_entry == self->selected) {
+ /* The open submenu has been reselected, so stop hiding the
+ submenu */
+ remove_submenu_hide_timeout(oldchild);
+ }
+ else if (oldchild_entry == old) {
+ /* The open submenu was selected and is no longer, so hide the
+ submenu */
+ if (immediate || config_submenu_hide_delay == 0)
+ menu_frame_hide(oldchild);
+ else if (config_submenu_hide_delay > 0)
+ obt_main_loop_timeout_add(ob_main_loop,
+ config_submenu_hide_delay * 1000,
+ submenu_hide_timeout,
+ oldchild, g_direct_equal,
+ NULL);
}
- else
- menu_frame_hide(oldchild);
}
if (self->selected) {
menu_entry_frame_render(self->selected);
- /* if we've selected a submenu and it wasn't already open, then
- show it */
- if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU &&
- self->selected != self->open_submenu)
- {
- if (config_submenu_show_delay && !immediate) {
- /* initiate a new submenu open request */
- obt_main_loop_timeout_add
- (ob_main_loop,
- config_submenu_show_delay * 1000,
- menu_entry_frame_submenu_show_timeout,
- self->selected, g_direct_equal,
- NULL);
- } else {
- menu_entry_frame_show_submenu(self->selected);
+ if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+ /* only show if the submenu isn't already showing */
+ if (oldchild_entry != self->selected) {
+ if (immediate || config_submenu_hide_delay == 0)
+ menu_entry_frame_show_submenu(self->selected);
+ else if (config_submenu_hide_delay > 0)
+ obt_main_loop_timeout_add(ob_main_loop,
+ config_submenu_show_delay * 1000,
+ submenu_show_timeout,
+ self->selected, g_direct_equal,
+ NULL);
+ }
+ /* hide the grandchildren of this menu. and move the cursor to
+ the current menu */
+ else if (immediate && self->child && self->child->child) {
+ menu_frame_hide(self->child->child);
+ menu_frame_select(self->child, NULL, TRUE);
}
}
}
GSList *acts = self->entry->data.normal.actions;
ObClient *client = self->frame->client;
ObMenuFrame *frame = self->frame;
+ guint mods = obt_keyboard_only_modmasks(state);
/* release grabs before executing the shit */
- if (!(state & ControlMask)) {
- menu_frame_hide_all();
+ if (!(mods & ControlMask)) {
+ event_cancel_all_key_grabs();
frame = NULL;
}
}
}
}
- menu_frame_select(self, it ? it->data : NULL, TRUE);
+ menu_frame_select(self, it ? it->data : NULL, FALSE);
}
void menu_frame_select_next(ObMenuFrame *self)
}
}
}
- menu_frame_select(self, it ? it->data : NULL, TRUE);
+ menu_frame_select(self, it ? it->data : NULL, FALSE);
+}
+
+void menu_frame_select_first(ObMenuFrame *self)
+{
+ GList *it = NULL;
+
+ if (self->entries) {
+ for (it = self->entries; it; it = g_list_next(it)) {
+ ObMenuEntryFrame *e = it->data;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ break;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL)
+ break;
+ }
+ }
+ menu_frame_select(self, it ? it->data : NULL, FALSE);
+}
+
+void menu_frame_select_last(ObMenuFrame *self)
+{
+ GList *it = NULL;
+
+ if (self->entries) {
+ for (it = g_list_last(self->entries); it; it = g_list_previous(it)) {
+ ObMenuEntryFrame *e = it->data;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ break;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL)
+ break;
+ }
+ }
+ menu_frame_select(self, it ? it->data : NULL, FALSE);
}
projects / dana / openbox.git / blobdiff