/* -*- 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
#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 "gettext.h"
#include "parser/parse.h"
typedef struct _ObMenuParseState ObMenuParseState;
gpointer data);
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
gpointer data);
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+ gchar **strippedlabel, guint *position);
+
static void client_dest(ObClient *client, gpointer data)
{
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();
loaded = TRUE;
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
- }
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ (const gchar*)it->data);
}
if (!loaded) {
if (parse_load_menu("menu.xml", &doc, &node)) {
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
- }
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ "menu.xml");
}
g_assert(menu_parse_state.parent == NULL);
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;
return;
if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) {
- g_warning("Failed to execute command for pipe-menu: %s", err->message);
+ g_message(_("Failed to execute command for pipe-menu '%s': %s"),
+ self->execute, err->message);
g_error_free(err);
return;
}
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
} else {
- g_warning("Invalid output from pipe-menu: %s", self->execute);
+ g_message(_("Invalid output from pipe-menu '%s'"), self->execute);
}
g_free(output);
g_assert(name != NULL);
if (!(self = g_hash_table_lookup(menu_hash, name)))
- g_warning("Attempted to access menu '%s' but it does not exist.",
+ g_message(_("Attempted to access menu '%s' but it does not exist"),
name);
return self;
}
+#define VALID_SHORTCUT(c) (((c) >= '0' && (c) <= '9') || \
+ ((c) >= 'A' && (c) <= 'Z') || \
+ ((c) >= 'a' && (c) <= 'z'))
+
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+ gchar **strippedlabel, guint *position)
+{
+ gunichar shortcut = 0;
+
+ *position = 0;
+
+ g_assert(strippedlabel != NULL);
+
+ if (label == NULL) {
+ *strippedlabel = NULL;
+ } else {
+ gchar *i;
+
+ *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 (allow_shortcut && i != NULL) {
+ /* there is an ampersand in the string */
+
+ /* you have to use a printable ascii character for shortcuts
+ don't allow space either, so you can have like "a & b"
+ */
+ if (VALID_SHORTCUT(*(i+1))) {
+ shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
+ *position = i - *strippedlabel;
+
+ /* remove the & from the string */
+ for (; *i != '\0'; ++i)
+ *i = *(i+1);
+ }
+ } else {
+ /* there is no ampersand, so find the first valid character to use
+ instead */
+
+ for (i = *strippedlabel; *i != '\0'; ++i)
+ if (VALID_SHORTCUT(*i)) {
+ *position = i - *strippedlabel;
+ shortcut = g_unichar_tolower(g_utf8_get_char(i));
+ break;
+ }
+ }
+ }
+ return shortcut;
+}
+
static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
gpointer data)
{
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);
}
}
{
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,
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);
g_free(script);
}
-ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
+ObMenu* menu_new(const gchar *name, const gchar *title,
+ gboolean allow_shortcut, gpointer data)
{
ObMenu *self;
self = g_new0(ObMenu, 1);
self->name = g_strdup(name);
- self->title = g_strdup(title);
self->data = data;
+ self->shortcut = parse_shortcut(title, allow_shortcut, &self->title,
+ &self->shortcut_position);
+
g_hash_table_replace(menu_hash, self->name, self);
return self;
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;
- 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 */
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
- menu_frame_move(frame,
- x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
- if (!menu_frame_show(frame, NULL)) {
+ if (!menu_frame_show_topmenu(frame, x, y, button))
menu_frame_free(frame);
- } else {
- if (frame->entries)
- menu_frame_select_next(frame);
+ else if (frame->entries) {
+ /* select the first entry if it's not a submenu */
+ ObMenuEntryFrame *e = frame->entries->data;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL)
+ menu_frame_select(frame, e, FALSE);
}
}
#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);
}
}
menu_entry_free(self);
}
-ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label,
- GSList *actions)
+ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label,
+ GSList *actions, gboolean allow_shortcut)
{
ObMenuEntry *e;
e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
- e->data.normal.label = g_strdup(label);
e->data.normal.actions = actions;
+ menu_entry_set_label(e, label, allow_shortcut);
+
self->entries = g_list_append(self->entries, e);
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;
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);
+ menu_entry_set_label(e, label, FALSE);
+
self->entries = g_list_append(self->entries, e);
return e;
}
self->destroy_func = func;
}
+void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
+{
+ self->place_func = func;
+}
+
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
{
ObMenuEntry *ret = NULL;
e->data.submenu.submenu = menu_from_name(e->data.submenu.name);
}
}
+
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label,
+ gboolean allow_shortcut)
+{
+ switch (self->type) {
+ case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ g_free(self->data.separator.label);
+ self->data.separator.label = g_strdup(label);
+ break;
+ case OB_MENU_ENTRY_TYPE_NORMAL:
+ g_free(self->data.normal.label);
+ self->data.normal.shortcut =
+ parse_shortcut(label, allow_shortcut, &self->data.normal.label,
+ &self->data.normal.shortcut_position);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+void menu_show_all_shortcuts(ObMenu *self, gboolean show)
+{
+ self->show_all_shortcuts = show;
+}
projects / chaz / openbox / blobdiff