remove grab_pointer_window, nothing used it

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 243fc55b35119c52a22b7e69b725ab3db53e7632..e2436810791b717e3221a71a6840ca6efe194c07 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -2,7 +2,7 @@
 
    menu.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -201,8 +201,15 @@ static void parse_menu_separator(ObParseInst *i,
 {
     ObMenuParseState *state = data;
 
-    if (state->parent)
-        menu_add_separator(state->parent, -1);
+    if (state->parent) {
+        gchar *label;
+
+        if (!parse_attr_string("label", node, &label))
+            label = NULL;
+
+        menu_add_separator(state->parent, -1, label);
+        g_free(label);
+    }
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -243,7 +250,7 @@ parse_menu_fail:
     g_free(script);
 }
 
-ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
+ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data)
 {
     ObMenu *self;
 
@@ -291,7 +298,6 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
 {
     ObMenu *self;
     ObMenuFrame *frame;
-    guint i;
 
     if (!(self = menu_from_name(name))
         || keyboard_interactively_grabbed()) return;
@@ -307,21 +313,7 @@ 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) {
-        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))
+    if (!menu_frame_show_topmenu(frame, x, y))
         menu_frame_free(frame);
     else if (frame->entries) {
         ObMenuEntryFrame *e = frame->entries->data;
@@ -405,7 +397,7 @@ void menu_entry_remove(ObMenuEntry *self)
     menu_entry_free(self);
 }
 
-ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label,
+ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label,
                              GSList *actions)
 {
     ObMenuEntry *e;
@@ -418,7 +410,7 @@ ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label,
     return e;
 }
 
-ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu)
+ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu)
 {
     ObMenuEntry *e;
 
@@ -429,11 +421,12 @@ ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu)
     return e;
 }
 
-ObMenuEntry* menu_add_separator(ObMenu *self, gint id)
+ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
 {
     ObMenuEntry *e;
 
     e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
+    e->data.separator.label = g_strdup(label);
 
     self->entries = g_list_append(self->entries, e);
     return e;