all repos — openbox @ c2e4d42e6d086b60d4ecd9ef2e51ef9ed7575dfc

openbox fork - make it a bit more like ryudo 

ignore enter events on top menu and submenu popup
Dana Jansens danakj@orodu.net
commit

c2e4d42e6d086b60d4ecd9ef2e51ef9ed7575dfc

parent

ab75dd867259d2a3165f1b2fdc255764106370c5

1 files changed, 14 insertions(+), 5 deletions(-)

jump to
M openbox/menuframe.c → openbox/menuframe.c 
@@ -932,6 +932,7 @@ 
 gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
                                  gint button)
 {
+    gint px, py;
     guint i;
 
     if (menu_frame_is_visible(self))

@@ -957,14 +958,20 @@ menu_frame_move(self, x, y);
 
     XMapWindow(ob_display, self->window);
 
+    if (screen_pointer_pos(&px, &py)) {
+        ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
+        if (e && e->frame == self)
+            e->ignore_enters++;
+    }
+
     return TRUE;
 }
 
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
                                  ObMenuEntryFrame *parent_entry)
 {
-    ObMenuEntryFrame *e;
     gint x, y, dx, dy;
+    gint px, py;
 
     if (menu_frame_is_visible(self))
         return TRUE;

@@ -994,9 +1001,11 @@ menu_frame_move(self, x + dx, y + dy);
 
     XMapWindow(ob_display, self->window);
 
-    if (screen_pointer_pos(&dx, &dy) && (e = menu_entry_frame_under(dx, dy)) &&
-        e->frame == self)
-        ++e->ignore_enters;
+    if (screen_pointer_pos(&px, &py)) {
+        ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
+        if (e && e->frame == self)
+            e->ignore_enters++;
+    }
 
     return TRUE;
 }

@@ -1086,7 +1095,7 @@ for (it = frame->entries; it; it = g_list_next(it)) {
             ObMenuEntryFrame *e = it->data;
 
             if (RECT_CONTAINS(e->area, x, y)) {
-                ret = e;            
+                ret = e;
                 break;
             }
         }