use const char*'s when we should be

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index e4ac2f5751fc8811b72b54a2d38b459458f125ca..462b92fe75f36f996eaef39f6ff4311cb951d1d6 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menu.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -24,10 +25,12 @@
 #include "config.h"
 #include "screen.h"
 #include "menuframe.h"
+#include "keyboard.h"
 #include "geom.h"
 #include "misc.h"
 #include "client_menu.h"
 #include "client_list_menu.h"
+#include "client_list_combined_menu.h"
 #include "parser/parse.h"
 
 typedef struct _ObMenuParseState ObMenuParseState;
@@ -68,7 +71,8 @@ void menu_startup(gboolean reconfig)
     menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
                                       (GDestroyNotify)menu_destroy_hash_value);
 
-    client_list_menu_startup();
+    client_list_menu_startup(reconfig);
+    client_list_combined_menu_startup(reconfig);
     client_menu_startup();
 
     menu_parse_inst = parse_startup();
@@ -109,6 +113,9 @@ void menu_shutdown(gboolean reconfig)
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
+    client_list_menu_shutdown(reconfig);
+    client_list_combined_menu_shutdown(reconfig);
+
     menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
     menu_hash = NULL;
@@ -236,7 +243,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;
 
@@ -284,8 +291,10 @@ 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 (!(self = menu_from_name(name))
+        || keyboard_interactively_grabbed()) return;
 
     /* if the requested menu is already the top visible menu, then don't
        bother */
@@ -298,18 +307,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)) {
+                        x - ob_rr_theme->mbwidth, y - ob_rr_theme->mbwidth);
+    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);
     }
 }
 
@@ -376,7 +394,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);
     }
 }
@@ -387,7 +405,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;
@@ -400,7 +418,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;