X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=3252bb3c76a2ae115e55728000eaaed5c01ffd5c;hb=HEAD;hp=4887173b40c04ed1e8592011b38f2d4c9ed01e4b;hpb=f53fa1e589589a6ea2a0e91d372d9771fa1cdd04;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 4887173b..3252bb3c 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -38,7 +38,8 @@
 #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;
@@ -1241,9 +1242,9 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
         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)
+                if (immediate || config_submenu_show_delay == 0)
                     menu_entry_frame_show_submenu(self->selected);
-                else if (config_submenu_hide_delay > 0) {
+                else if (config_submenu_show_delay > 0) {
                     if (submenu_show_timer)
                         g_source_remove(submenu_show_timer);
                     submenu_show_timer =