#include "screen.h"
#include "prop.h"
#include "actions.h"
+#include "event.h"
#include "grab.h"
#include "openbox.h"
#include "mainloop.h"
ObMenuFrame *frame);
static void menu_entry_frame_free(ObMenuEntryFrame *self);
static void menu_frame_update(ObMenuFrame *self);
-static gboolean menu_entry_frame_submenu_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)
{
void menu_frame_move(ObMenuFrame *self, gint x, gint y)
{
RECT_SET_POINT(self->area, x, y);
+ self->monitor = screen_find_monitor_point(x, y);
XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
}
*dx = *dy = 0;
- a = screen_physical_area_monitor(self->monitor);
+ a = screen_physical_area_monitor(screen_find_monitor_point(x, y));
half = g_list_length(self->entries) / 2;
pos = g_list_index(self->entries, self->selected);
gboolean mouse)
{
gint px, py;
- guint i;
if (menu_frame_is_visible(self))
return TRUE;
if (!menu_frame_show(self))
return FALSE;
- /* find the monitor the menu is on */
- for (i = 0; i < screen_num_monitors; ++i) {
- Rect *a = screen_physical_area_monitor(i);
- gboolean contains = RECT_CONTAINS(*a, x, y);
- g_free(a);
- if (contains) {
- self->monitor = i;
- break;
- }
- }
-
if (self->menu->place_func)
self->menu->place_func(self, &x, &y, mouse, self->menu->data);
else
return TRUE;
}
+/*! Stop hiding an open submenu.
+ @child The OnMenuFrame of the submenu to be hidden
+*/
+static void remove_submenu_hide_timeout(ObMenuFrame *child)
+{
+ ob_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->parent_entry = 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;
static void menu_frame_hide(ObMenuFrame *self)
{
GList *it = g_list_find(menu_frame_visible, self);
+ gulong ignore_start;
if (!it)
return;
if (self->child)
menu_frame_hide(self->child);
- if (self->parent)
+ if (self->parent) {
+ remove_submenu_hide_timeout(self);
+
self->parent->child = NULL;
+ self->parent->child_entry = NULL;
+ }
self->parent = NULL;
self->parent_entry = NULL;
ungrab_keyboard();
}
+ ignore_start = event_start_ignore_all_enters();
XUnmapWindow(ob_display, self->window);
+ event_end_ignore_all_enters(ignore_start);
menu_frame_free(self);
}
if (config_submenu_show_delay) {
/* remove any submenu open requests */
- ob_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_timeout);
+ ob_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
}
if ((it = g_list_last(menu_frame_visible)))
menu_frame_hide(it->data);
if (config_submenu_show_delay) {
/* remove any submenu open requests */
ob_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_timeout);
+ submenu_show_timeout);
}
menu_frame_hide(f);
}
return ret;
}
-static gboolean menu_entry_frame_submenu_timeout(gpointer data)
+static gboolean submenu_show_timeout(gpointer data)
{
g_assert(menu_frame_visible);
menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
return FALSE;
}
+static gboolean submenu_hide_timeout(gpointer data)
+{
+ g_assert(menu_frame_visible);
+ menu_frame_hide((ObMenuFrame*)data);
+ return FALSE;
+}
+
void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
gboolean immediate)
{
ObMenuEntryFrame *old = self->selected;
ObMenuFrame *oldchild = self->child;
+ ObMenuEntryFrame *oldchild_entry = self->child_entry;
+ ObMenuEntryFrame *temp;
+ /* 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 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 */
- ob_main_loop_timeout_remove(ob_main_loop,
- menu_entry_frame_submenu_timeout);
+ ob_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
}
self->selected = entry;
if (old)
menu_entry_frame_render(old);
- if (oldchild)
- menu_frame_hide(oldchild);
+
+ 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) {
+ ob_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 (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+ /* only show if the submenu isn't already showing */
+ if (oldchild_entry != self->selected &&
+ self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ {
if (config_submenu_show_delay && !immediate) {
/* initiate a new submenu open request */
ob_main_loop_timeout_add(ob_main_loop,
config_submenu_show_delay * 1000,
- menu_entry_frame_submenu_timeout,
+ submenu_show_timeout,
self->selected, g_direct_equal,
NULL);
- } else {
+ } else
menu_entry_frame_show_submenu(self->selected);
- }
}
}
}