X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=71eb0591bc211b2e46cb6bcb071f63290a95d5f7;hb=0c8c23e8fdef2936d2ca425dcbf35e4eb7dd7edf;hp=1f335c787dac724b26bc3b0a97c3f964b4cf861d;hpb=5d5be2ba2a6e0b3886e0076475ed9d7a2d4ac9ab;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 1f335c78..71eb0591 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -54,8 +54,8 @@ static void parse_menu_separator(ObParseInst *i,
                                  gpointer data);
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data);
-static gunichar parse_shortcut(const gchar *label, gchar **strippedlabel,
-                               guint *position);
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+                               gchar **strippedlabel, guint *position);
 
 
 static void client_dest(ObClient *client, gpointer data)
@@ -110,13 +110,13 @@ void menu_startup(gboolean reconfig)
     g_assert(menu_parse_state.parent == NULL);
 
     if (!reconfig)
-        client_add_destructor(client_dest, NULL);
+        client_add_destroy_notify(client_dest, NULL);
 }
 
 void menu_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(client_dest);
+        client_remove_destroy_notify(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
@@ -185,8 +185,8 @@ static ObMenu* menu_from_name(gchar *name)
                            ((c) >= 'A' && (c) <= 'Z') || \
                            ((c) >= 'a' && (c) <= 'z'))
 
-static gunichar parse_shortcut(const gchar *label, gchar **strippedlabel,
-                               guint *position)
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+                               gchar **strippedlabel, guint *position)
 {
     gunichar shortcut = 0;
     
@@ -201,8 +201,12 @@ static gunichar parse_shortcut(const gchar *label, gchar **strippedlabel,
 
         *strippedlabel = g_strdup(label);
 
+        /* if allow_shortcut is false, then you can't use the &, instead you
+           have to just use the first valid character
+        */
+
         i = strchr(*strippedlabel, '&');
-        if (i != NULL) {
+        if (allow_shortcut && i != NULL) {
             /* there is an ampersand in the string */
 
             /* you have to use a printable ascii character for shortcuts
@@ -248,7 +252,7 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                     if (a)
                         acts = g_slist_append(acts, a);
                 }
-            menu_add_normal(state->parent, -1, label, acts);
+            menu_add_normal(state->parent, -1, label, acts, FALSE);
             g_free(label);
         }
     }
@@ -285,7 +289,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         if (!parse_attr_string("label", node, &title))
             goto parse_menu_fail;
 
-        if ((menu = menu_new(name, title, NULL))) {
+        if ((menu = menu_new(name, title, FALSE, NULL))) {
             menu->pipe_creator = state->pipe_creator;
             if (parse_attr_string("execute", node, &script)) {
                 menu->execute = parse_expand_tilde(script);
@@ -309,7 +313,8 @@ parse_menu_fail:
     g_free(script);
 }
 
-ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data)
+ObMenu* menu_new(const gchar *name, const gchar *title,
+                 gboolean allow_shortcut_selection, gpointer data)
 {
     ObMenu *self;
 
@@ -317,11 +322,24 @@ ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data)
     self->name = g_strdup(name);
     self->data = data;
 
-    self->shortcut = parse_shortcut(title, &self->title,
-                                    &self->shortcut_position);
+    self->shortcut = parse_shortcut(title, allow_shortcut_selection,
+                                    &self->title, &self->shortcut_position);
 
     g_hash_table_replace(menu_hash, self->name, self);
 
+    self->more_menu = g_new0(ObMenu, 1);
+    self->more_menu->name = _("More...");
+    self->more_menu->title = _("More...");
+    self->more_menu->data = data;
+    self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M"));
+
+    self->more_menu->show_func = self->show_func;
+    self->more_menu->hide_func = self->hide_func;
+    self->more_menu->update_func = self->update_func;
+    self->more_menu->execute_func = self->execute_func;
+    self->more_menu->destroy_func = self->destroy_func;
+    self->more_menu->place_func = self->place_func;
+
     return self;
 }
 
@@ -346,16 +364,18 @@ static void menu_destroy_hash_value(ObMenu *self)
     g_free(self->name);
     g_free(self->title);
     g_free(self->execute);
+    g_free(self->more_menu);
 
     g_free(self);
 }
 
 void menu_free(ObMenu *menu)
 {
-    g_hash_table_remove(menu_hash, menu->name);
+    if (menu)
+        g_hash_table_remove(menu_hash, menu->name);
 }
 
-void menu_show(gchar *name, gint x, gint y, ObClient *client)
+void menu_show(gchar *name, gint x, gint y, gint button, ObClient *client)
 {
     ObMenu *self;
     ObMenuFrame *frame;
@@ -373,14 +393,23 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
 
     menu_frame_hide_all();
 
-    frame = menu_frame_new(self, client);
-    if (!menu_frame_show_topmenu(frame, x, y))
+    frame = menu_frame_new(self, 0, client);
+    if (!menu_frame_show_topmenu(frame, x, y, button))
         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)
+    else if (!button) {
+        /* select the first entry if it's not a submenu and we opened
+         * the menu with the keyboard, and skip all headers */
+        GList *it = frame->entries;
+        while (it) {
+            ObMenuEntryFrame *e = it->data;
+            if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
                 menu_frame_select(frame, e, FALSE);
+                break;
+            } else if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
+                it = g_list_next(it);
+            else
+                break;
+        }
     }
 }
 
@@ -391,6 +420,7 @@ static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
     g_assert(menu);
 
     self = g_new0(ObMenuEntry, 1);
+    self->ref = 1;
     self->type = type;
     self->menu = menu;
     self->id = id;
@@ -407,9 +437,14 @@ static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
     return self;
 }
 
-void menu_entry_free(ObMenuEntry *self)
+void menu_entry_ref(ObMenuEntry *self)
 {
-    if (self) {
+    ++self->ref;
+}
+
+void menu_entry_unref(ObMenuEntry *self)
+{
+    if (self && --self->ref == 0) {
         switch (self->type) {
         case OB_MENU_ENTRY_TYPE_NORMAL:
             g_free(self->data.normal.label);
@@ -447,28 +482,41 @@ void menu_clear_entries(ObMenu *self)
 #endif
 
     while (self->entries) {
-        menu_entry_free(self->entries->data);
+        menu_entry_unref(self->entries->data);
         self->entries = g_list_delete_link(self->entries, self->entries);
     }
+    self->more_menu->entries = self->entries; /* keep it in sync */
 }
 
 void menu_entry_remove(ObMenuEntry *self)
 {
     self->menu->entries = g_list_remove(self->menu->entries, self);
-    menu_entry_free(self);
+    menu_entry_unref(self);
 }
 
 ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label,
-                             GSList *actions)
+                             GSList *actions, gboolean allow_shortcut)
 {
     ObMenuEntry *e;
 
     e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
     e->data.normal.actions = actions;
 
-    menu_entry_set_label(e, label);
+    menu_entry_set_label(e, label, allow_shortcut);
 
     self->entries = g_list_append(self->entries, e);
+    self->more_menu->entries = self->entries; /* keep it in sync */
+    return e;
+}
+
+ObMenuEntry* menu_get_more(ObMenu *self, guint show_from)
+{
+    ObMenuEntry *e;
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, -1);
+    /* points to itself */
+    e->data.submenu.name = g_strdup(self->name);
+    e->data.submenu.submenu = self;
+    e->data.submenu.show_from = show_from;
     return e;
 }
 
@@ -480,6 +528,7 @@ ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu)
     e->data.submenu.name = g_strdup(submenu);
 
     self->entries = g_list_append(self->entries, e);
+    self->more_menu->entries = self->entries; /* keep it in sync */
     return e;
 }
 
@@ -489,25 +538,59 @@ ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
 
     e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
 
-    menu_entry_set_label(e, label);
+    menu_entry_set_label(e, label, FALSE);
 
     self->entries = g_list_append(self->entries, e);
+    self->more_menu->entries = self->entries; /* keep it in sync */
     return e;
 }
 
+void menu_set_show_func(ObMenu *self, ObMenuShowFunc func)
+{
+    do {
+        self->show_func = func;
+        self = self->more_menu;
+    } while (self);
+}
+
+void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func)
+{
+    do {
+        self->hide_func = func;
+        self = self->more_menu;
+    } while (self);
+}
+
 void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
 {
-    self->update_func = func;
+    do {
+        self->update_func = func;
+        self = self->more_menu;
+    } while (self);
 }
 
 void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
 {
-    self->execute_func = func;
+    do {
+        self->execute_func = func;
+        self = self->more_menu;
+    } while (self);
 }
 
 void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
 {
-    self->destroy_func = func;
+    do {
+        self->destroy_func = func;
+        self = self->more_menu;
+    } while (self);
+}
+
+void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
+{
+    do {
+        self->place_func = func;
+        self = self->more_menu;
+    } while (self);
 }
 
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
@@ -538,7 +621,8 @@ void menu_find_submenus(ObMenu *self)
     }
 }
 
-void menu_entry_set_label(ObMenuEntry *self, const gchar *label)
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label,
+                          gboolean allow_shortcut)
 {
     switch (self->type) {
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
@@ -548,7 +632,7 @@ void menu_entry_set_label(ObMenuEntry *self, const gchar *label)
     case OB_MENU_ENTRY_TYPE_NORMAL:
         g_free(self->data.normal.label);
         self->data.normal.shortcut =
-            parse_shortcut(label, &self->data.normal.label,
+            parse_shortcut(label, allow_shortcut, &self->data.normal.label,
                            &self->data.normal.shortcut_position);
         break;
     default: