X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=503876655570f93d13d9e3462c1cc8a9ed95d25b;hb=de1559a09497ae4ead44a6e70b556123a5bab35c;hp=e1a2e6d82413269583d3171fc4d8aa29de1a3479;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index e1a2e6d8..50387665 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -51,7 +51,7 @@ static void parse_menu_separator(ObParseInst *i,
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data);
 
-static void client_dest(gpointer client)
+static void client_dest(ObClient *client, gpointer data)
 {
     /* menus can be associated with a client, so close any that are since
        we are disappearing now */
@@ -98,7 +98,7 @@ void menu_startup(gboolean reconfig)
     g_assert(menu_parse_state.parent == NULL);
 
     if (!reconfig)
-        client_add_destructor(client_dest);
+        client_add_destructor(client_dest, NULL);
 }
 
 void menu_shutdown(gboolean reconfig)
@@ -176,10 +176,12 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             GSList *acts = NULL;
 
             for (node = node->children; node; node = node->next)
-                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
-                    acts = g_slist_append(acts, action_parse
-                                          (i, doc, node,
-                                           OB_USER_ACTION_MENU_SELECTION));
+                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) {
+                    ObAction *a = action_parse
+                        (i, doc, node, OB_USER_ACTION_MENU_SELECTION);
+                    if (a)
+                        acts = g_slist_append(acts, a);
+                }
             menu_add_normal(state->parent, -1, label, acts);
             g_free(label);
         }
@@ -282,16 +284,43 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
 {
     ObMenu *self;
     ObMenuFrame *frame;
+    guint i;
 
     if (!(self = menu_from_name(name))) return;
 
+    /* if the requested menu is already the top visible menu, then don't
+       bother */
+    if (menu_frame_visible) {
+        frame = menu_frame_visible->data;
+        if (frame->menu == self)
+            return;
+    }
+
     menu_frame_hide_all();
 
     frame = menu_frame_new(self, client);
-    menu_frame_move(frame, x, y);
-    menu_frame_show(frame, NULL);
-    if (frame->entries)
-        menu_frame_select_next(frame);
+    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);
+    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) {
+        ObMenuEntryFrame *e = frame->entries->data;
+        if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+            e->entry->data.normal.enabled)
+                menu_frame_select(frame, e);
+    }
 }
 
 static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
@@ -324,7 +353,7 @@ void menu_entry_free(ObMenuEntry *self)
         case OB_MENU_ENTRY_TYPE_NORMAL:
             g_free(self->data.normal.label);
             while (self->data.normal.actions) {
-                action_free(self->data.normal.actions->data);
+                action_unref(self->data.normal.actions->data);
                 self->data.normal.actions =
                     g_slist_delete_link(self->data.normal.actions,
                                         self->data.normal.actions);
@@ -357,7 +386,7 @@ void menu_clear_entries(ObMenu *self)
 #endif
 
     while (self->entries) {
-	menu_entry_free(self->entries->data);
+        menu_entry_free(self->entries->data);
         self->entries = g_list_delete_link(self->entries, self->entries);
     }
 }