#include "screen.h"
#include "prop.h"
#include "actions.h"
+#include "event.h"
#include "grab.h"
#include "openbox.h"
#include "mainloop.h"
static gboolean menu_entry_frame_submenu_timeout(gpointer data);
static void menu_frame_hide(ObMenuFrame *self);
+static gboolean menu_entry_frame_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;
}
+static void remove_submenu_hide_timeout(ObMenuFrame *self /* parent of submenu to hide */)
+{
+ ob_main_loop_timeout_remove(ob_main_loop,
+ menu_entry_frame_submenu_hide_timeout);
+ if (self)
+ self->submenu_to_hide = NULL;
+}
+
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry)
{
self->parent = parent;
self->parent_entry = parent_entry;
+ remove_submenu_hide_timeout(parent);
+
/* 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;
+ }
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;
+
+ remove_submenu_hide_timeout(self->parent);
if (!it)
return;
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);
}
return FALSE;
}
+static gboolean menu_entry_frame_submenu_hide_timeout(gpointer data)
+{
+ 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 *temp;
+ gboolean reselection;
+
+
+ if (!oldchild) {
+ /* self is the last visible (sub)menu */
+ if (self->parent && self->parent_entry != self->parent->selected) {
+ /* Legend:
+ (config_submenu_hide_delay != 0)
+ In the parent menu corresponding entry "A" selected,
+ this submenu ('self') shown, cursor moved in the parent
+ menu to another entry "B", then cursor moved for the
+ first time into this submenu.
+ Results:
+ parent menu selection is "B" instead of "A",
+ */
+ temp = self->parent->selected;
+ self->parent->selected = self->parent_entry;
+ if (temp)
+ menu_entry_frame_render(temp);
+ menu_entry_frame_render(self->parent_entry);
+ }
+ remove_submenu_hide_timeout(self->parent);
+ }
+ else if (oldchild->child) {
+ /* self is the (at least) grandparent of the last visible submenu */
+ menu_frame_hide(oldchild->child);
+ if (temp = oldchild->selected) {
+ oldchild->selected = NULL;
+ menu_entry_frame_render(temp);
+ }
+ }
+
if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
entry = old;
if (old)
menu_entry_frame_render(old);
- if (oldchild)
- menu_frame_hide(oldchild);
+
+ reselection = FALSE;
+ if (oldchild) {
+ if (self->submenu_to_hide == entry) {
+ /* Legend:
+ (config_submenu_hide_delay != 0)
+ Some entry "A" selected; corresponding submenu shown;
+ cursor moved to another entry "B" and moved back
+ to the entry "A", when submenu hide request added,
+ but submenu not hided.
+ */
+ reselection = TRUE;
+ remove_submenu_hide_timeout(self);
+ }
+ else if (!immediate && config_submenu_hide_delay) {
+ if (self->submenu_to_hide == NULL) {
+ ob_main_loop_timeout_add(ob_main_loop,
+ config_submenu_hide_delay * 1000,
+ menu_entry_frame_submenu_hide_timeout,
+ oldchild, g_direct_equal,
+ NULL);
+ self->submenu_to_hide = old;
+ }
+ }
+ else
+ menu_frame_hide(oldchild);
+ }
if (self->selected) {
menu_entry_frame_render(self->selected);
- if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+ if (!reselection &&
+ (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,