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
{
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,
{
ObMenu *self;
ObMenuFrame *frame;
- guint i;
if (!(self = menu_from_name(name))
|| keyboard_interactively_grabbed()) return;
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->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))
+ if (!menu_frame_show_topmenu(frame, x, y))
menu_frame_free(frame);
else if (frame->entries) {
ObMenuEntryFrame *e = frame->entries->data;
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;