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;
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->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_unref(ObMenu *menu)
+void menu_free(ObMenu *menu)
{
if (menu)
g_hash_table_remove(menu_hash, menu->name);
frame = menu_frame_new(self, 0, client);
if (!menu_frame_show_topmenu(frame, x, y, button))
menu_frame_free(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);
+ else if (!button) {
+ /* select the first entry if it's not a submenu and we opened
+ * the menu with the keyboard, and skip all headers */
+ GList *it = frame->entries;
+ while (it) {
+ ObMenuEntryFrame *e = it->data;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+ menu_frame_select(frame, e, FALSE);
+ break;
+ } else if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
+ it = g_list_next(it);
+ else
+ break;
+ }
}
}
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)