Select the menu item under the mouse when the mouse is moved (Fix bug 5237)

[dana/openbox.git] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 9127257..b49a221 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -38,12 +38,15 @@
 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
                          LeaveWindowMask)
 #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+                         ButtonPressMask | ButtonReleaseMask | \
+                         PointerMotionMask)
 
 GList *menu_frame_visible;
 GHashTable *menu_frame_map;
 
 static RrAppearance *a_sep;
+static guint submenu_show_timer = 0;
+static guint submenu_hide_timer = 0;
 
 static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
                                               ObMenuFrame *frame);
@@ -179,7 +182,8 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
     self->text = createWindow(self->window, 0, NULL);
     g_hash_table_insert(menu_frame_map, &self->window, self);
     g_hash_table_insert(menu_frame_map, &self->text, self);
-    if (entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+    if ((entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ||
+        (entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) {
         self->icon = createWindow(self->window, 0, NULL);
         g_hash_table_insert(menu_frame_map, &self->icon, self);
     }
@@ -207,7 +211,8 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
         XDestroyWindow(obt_display, self->window);
         g_hash_table_remove(menu_frame_map, &self->text);
         g_hash_table_remove(menu_frame_map, &self->window);
-        if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+        if ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ||
+            (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) {
             XDestroyWindow(obt_display, self->icon);
             g_hash_table_remove(menu_frame_map, &self->icon);
         }
@@ -322,11 +327,18 @@ void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
                                gint *dx, gint *dy)
 {
     const Rect *a = NULL;
-    gint pos, half;
+    Rect search = self->area;
+    gint pos, half, monitor;
 
     *dx = *dy = 0;
+    RECT_SET_POINT(search, x, y);
 
-    a = screen_physical_area_monitor(screen_find_monitor_point(x, y));
+    if (self->parent)
+        monitor = self->parent->monitor;
+    else
+        monitor = screen_find_monitor(&search);
+
+    a = screen_physical_area_monitor(monitor);
 
     half = g_list_length(self->entries) / 2;
     pos = g_list_index(self->entries, self->selected);
@@ -513,7 +525,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         g_assert_not_reached();
     }
 
-    if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+    if (((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ||
+         (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) &&
         self->entry->data.normal.icon)
     {
         RrAppearance *clear;
@@ -1009,8 +1022,8 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
 */
 static void remove_submenu_hide_timeout(ObMenuFrame *child)
 {
-    obt_main_loop_timeout_remove_data(ob_main_loop, submenu_hide_timeout,
-                                      child, FALSE);
+    if (submenu_hide_timer) g_source_remove(submenu_hide_timer);
+    submenu_hide_timer = 0;
 }
 
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
@@ -1034,8 +1047,11 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
         parent->child_entry = parent_entry;
     }
 
-    if (!menu_frame_show(self))
+    if (!menu_frame_show(self)) {
+        parent->child = NULL;
+        parent->child_entry = NULL;
         return FALSE;
+    }
 
     menu_frame_place_submenu(self, &x, &y);
     menu_frame_move_on_screen(self, x, y, &dx, &dy);
@@ -1061,14 +1077,15 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
 
 static void menu_frame_hide(ObMenuFrame *self)
 {
+    ObMenu *const menu = self->menu;
     GList *it = g_list_find(menu_frame_visible, self);
     gulong ignore_start;
 
     if (!it)
         return;
 
-    if (self->menu->hide_func)
-        self->menu->hide_func(self, self->menu->data);
+    if (menu->hide_func)
+        menu->hide_func(self, menu->data);
 
     if (self->child)
         menu_frame_hide(self->child);
@@ -1095,6 +1112,9 @@ static void menu_frame_hide(ObMenuFrame *self)
     event_end_ignore_all_enters(ignore_start);
 
     menu_frame_free(self);
+
+    if (menu->cleanup_func)
+        menu->cleanup_func(menu, menu->data);
 }
 
 void menu_frame_hide_all(void)
@@ -1103,7 +1123,8 @@ void menu_frame_hide_all(void)
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
-        obt_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
+        if (submenu_show_timer) g_source_remove(submenu_show_timer);
+        submenu_show_timer = 0;
     }
     if ((it = g_list_last(menu_frame_visible)))
         menu_frame_hide(it->data);
@@ -1184,7 +1205,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
-        obt_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout);
+        if (submenu_show_timer) g_source_remove(submenu_show_timer);
+        submenu_show_timer = 0;
     }
 
     self->selected = entry;
@@ -1204,12 +1226,13 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
                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 if (config_submenu_hide_delay > 0) {
+                if (submenu_hide_timer) g_source_remove(submenu_hide_timer);
+                submenu_hide_timer =
+                    g_timeout_add_full(G_PRIORITY_DEFAULT,
+                                       config_submenu_hide_delay,
+                                       submenu_hide_timeout, oldchild, NULL);
+            }
         }
     }
 
@@ -1221,12 +1244,15 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
             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);
+                else if (config_submenu_hide_delay > 0) {
+                    if (submenu_show_timer)
+                        g_source_remove(submenu_show_timer);
+                    submenu_show_timer =
+                        g_timeout_add_full(G_PRIORITY_DEFAULT,
+                                           config_submenu_show_delay,
+                                           submenu_show_timeout,
+                                           self->selected, NULL);
+                }
             }
             /* hide the grandchildren of this menu. and move the cursor to
                the current menu */
@@ -1250,7 +1276,8 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self)
     /* pass our direction on to our child */
     f->direction_right = self->frame->direction_right;
 
-    menu_frame_show_submenu(f, self->frame, self);
+    if (!menu_frame_show_submenu(f, self->frame, self))
+        menu_frame_free(f);
 }
 
 void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)