static ObtXmlInst *menu_parse_inst;
static ObMenuParseState menu_parse_state;
static gboolean menu_can_hide = FALSE;
+static guint menu_timeout_id = 0;
static void menu_destroy_hash_value(ObMenu *self);
static void parse_menu_item(xmlNodePtr node, gpointer data);
gchar **strippedlabel, guint *position,
gboolean *always_show);
-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 */
- menu_frame_hide_all_client(client);
-}
-
void menu_startup(gboolean reconfig)
{
gboolean loaded = FALSE;
}
g_assert(menu_parse_state.parent == NULL);
-
- if (!reconfig)
- client_add_destroy_notify(client_dest, NULL);
}
void menu_shutdown(gboolean reconfig)
{
- if (!reconfig)
- client_remove_destroy_notify(client_dest);
-
obt_xml_instance_unref(menu_parse_inst);
menu_parse_inst = NULL;
ObActionsAct *action = actions_parse(c);
if (action)
acts = g_slist_append(acts, action);
- c = obt_xml_find_node(node->next, "action");
+ c = obt_xml_find_node(c->next, "action");
}
e = menu_add_normal(state->parent, -1, label, acts, TRUE);
if (config_menu_show_icons &&
obt_xml_attr_string(node, "icon", &icon))
{
- RrImage *ic;
-
- ic = RrImageCacheFindName(ob_rr_icons, icon);
- if (ic)
- RrImageRef(ic);
- else {
- ic = RrImageNew(ob_rr_icons);
- if (!RrImageAddPictureName(ic, icon)) {
- RrImageUnref(ic); /* no need to keep it around */
- ic = NULL;
- }
- }
- e->data.normal.icon = ic;
+ e->data.normal.icon = RrImageNewFromName(ob_rr_icons, icon);
if (e->data.normal.icon)
e->data.normal.icon_alpha = 0xff;
ObMenuParseState *state = data;
gchar *name = NULL, *title = NULL, *script = NULL;
ObMenu *menu;
+ ObMenuEntry *e;
+ gchar *icon;
if (!obt_xml_attr_string(node, "id", &name))
goto parse_menu_fail;
}
}
- if (state->parent)
- menu_add_submenu(state->parent, -1, name);
+ if (state->parent) {
+ e = menu_add_submenu(state->parent, -1, name);
+
+ if (config_menu_show_icons &&
+ obt_xml_attr_string(node, "icon", &icon))
+ {
+ e->data.submenu.icon = RrImageNewFromName(ob_rr_icons, icon);
+
+ if (e->data.submenu.icon)
+ e->data.submenu.icon_alpha = 0xff;
+
+ g_free(icon);
+ }
+ }
parse_menu_fail:
g_free(name);
{
ObMenu *self;
- self = g_new0(ObMenu, 1);
+ self = g_slice_new0(ObMenu);
self->name = g_strdup(name);
self->data = data;
more_menu->more_menu will always be NULL, since there is only 1 for
each menu. */
- self->more_menu = g_new0(ObMenu, 1);
+ self->more_menu = g_slice_new0(ObMenu);
self->more_menu->name = _("More...");
self->more_menu->title = _("More...");
self->more_menu->data = data;
g_free(self->name);
g_free(self->title);
g_free(self->execute);
- g_free(self->more_menu);
+ g_slice_free(ObMenu, self->more_menu);
- g_free(self);
+ g_slice_free(ObMenu, self);
}
void menu_free(ObMenu *menu)
static gboolean menu_hide_delay_func(gpointer data)
{
menu_can_hide = TRUE;
+ menu_timeout_id = 0;
return FALSE; /* no repeat */
}
menu_can_hide = TRUE;
else {
menu_can_hide = FALSE;
- obt_main_loop_timeout_add(ob_main_loop,
- config_menu_hide_delay * 1000,
- menu_hide_delay_func,
- NULL, g_direct_equal, NULL);
+ if (menu_timeout_id) g_source_remove(menu_timeout_id);
+ menu_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT,
+ config_menu_hide_delay,
+ menu_hide_delay_func,
+ NULL, NULL);
}
}
}
g_assert(menu);
- self = g_new0(ObMenuEntry, 1);
+ self = g_slice_new0(ObMenuEntry);
self->ref = 1;
self->type = type;
self->menu = menu;
}
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
+ RrImageUnref(self->data.submenu.icon);
g_free(self->data.submenu.name);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
break;
}
- g_free(self);
+ g_slice_free(ObMenuEntry, self);
}
}
self->more_menu->execute_func = func; /* keep it in sync */
}
+void menu_set_cleanup_func(ObMenu *self, ObMenuCleanupFunc func)
+{
+ self->cleanup_func = func;
+}
+
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
{
self->destroy_func = func;