X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=503876655570f93d13d9e3462c1cc8a9ed95d25b;hb=5648f0d75c22c817c740a9345e50dfd2ac2f6ffc;hp=e200654a6543ebd6631a6a6a2960ac1ecae60d43;hpb=ba461267060b9d81981b069fbee238584e522ccc;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index e200654a..50387665 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -284,6 +284,7 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
 {
     ObMenu *self;
     ObMenuFrame *frame;
+    guint i;
 
     if (!(self = menu_from_name(name))) return;
 
@@ -298,18 +299,27 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     menu_frame_hide_all();
 
     frame = menu_frame_new(self, client);
-    if (client && x < 0 && y < 0)
-        menu_frame_move(frame,
-                        client->frame->area.x + client->frame->size.left,
-                        client->frame->area.y + client->frame->size.top);
-    else
+    if (client && x < 0 && y < 0) {
+        x = client->frame->area.x + client->frame->size.left;
+        y = client->frame->area.y + client->frame->size.top;
+        menu_frame_move(frame, x, y);
+    } else
         menu_frame_move(frame,
                         x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
-    if (!menu_frame_show(frame, NULL)) {
+    for (i = 0; i < screen_num_monitors; ++i) {
+        Rect *a = screen_physical_area_monitor(i);
+        if (RECT_CONTAINS(*a, x, y)) {
+            frame->monitor = i;
+            break;
+        }
+    }
+    if (!menu_frame_show(frame, NULL))
         menu_frame_free(frame);
-    } else {
-        if (frame->entries)
-            menu_frame_select_next(frame);
+    else if (frame->entries) {
+        ObMenuEntryFrame *e = frame->entries->data;
+        if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+            e->entry->data.normal.enabled)
+                menu_frame_select(frame, e);
     }
 }