X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=e2436810791b717e3221a71a6840ca6efe194c07;hb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;hp=3a0cb12a9ce3da394e782150e4a53ba68dc08bfd;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index 3a0cb12a..e2436810 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,7 +1,8 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- menu.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + 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 @@ -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; @@ -51,7 +54,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 */ @@ -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(); @@ -98,7 +102,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) @@ -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; @@ -176,10 +183,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); } @@ -192,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, @@ -234,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; @@ -283,15 +299,28 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client) ObMenu *self; ObMenuFrame *frame; - 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 */ + 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 (!menu_frame_show_topmenu(frame, x, y)) + 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); } } @@ -368,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; @@ -381,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; @@ -392,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;