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;
}
ObMenu* menu_new(const gchar *name, const gchar *title,
- gboolean allow_shortcut, gpointer data)
+ gboolean allow_shortcut_selection, gpointer data)
{
ObMenu *self;
self->name = g_strdup(name);
self->data = data;
- self->shortcut = parse_shortcut(title, allow_shortcut, &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;
}
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, gint button, ObClient *client)
menu_frame_hide_all();
- frame = menu_frame_new(self, client);
+ frame = menu_frame_new(self, 0, client);
if (!menu_frame_show_topmenu(frame, x, y, button))
menu_frame_free(frame);
else if (frame->entries) {
g_assert(menu);
self = g_new0(ObMenuEntry, 1);
+ self->ref = 1;
self->type = type;
self->menu = menu;
self->id = id;
return self;
}
-void menu_entry_free(ObMenuEntry *self)
+void menu_entry_ref(ObMenuEntry *self)
+{
+ ++self->ref;
+}
+
+void menu_entry_unref(ObMenuEntry *self)
{
- if (self) {
+ if (self && --self->ref == 0) {
switch (self->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
g_free(self->data.normal.label);
#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,
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;
}
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;
}
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)
{
- self->place_func = func;
+ do {
+ self->place_func = func;
+ self = self->more_menu;
+ } while (self);
}
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)