X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ee7552f86d9438d415cbe61fd897e5c768f4f1a4..ec7109f36e878732d30e592279c2b160b28e6955:/disobedience/menu.c diff --git a/disobedience/menu.c b/disobedience/menu.c index 8dcae3c..142857c 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -31,7 +31,7 @@ static GtkWidget *properties_widget; GtkItemFactory *mainmenufactory; static void about_popup_got_version(void *v, - const char *error, + const char *err, const char *value); /** @brief Called when the quit option is activated @@ -45,51 +45,24 @@ static void quit_program(gpointer attribute((unused)) callback_data, exit(0); } -/* TODO can we have a single parameterized callback for all these */ - -/** @brief Called when the select all option is activated - * - * Calls the per-tab select all function. - */ -static void select_all(gpointer attribute((unused)) callback_data, - guint attribute((unused)) callback_action, - GtkWidget attribute((unused)) *menu_item) { - GtkWidget *tab = gtk_notebook_get_nth_page - (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); - const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - - if(t->selectall_activate) - t->selectall_activate(t->extra); -} - -/** @brief Called when the select none option is activated - * - * Calls the per-tab select none function. - */ -static void select_none(gpointer attribute((unused)) callback_data, - guint attribute((unused)) callback_action, - GtkWidget attribute((unused)) *menu_item) { - GtkWidget *tab = gtk_notebook_get_nth_page - (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); - const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - - if(t->selectnone_activate) - t->selectnone_activate(t->extra); -} - -/** @brief Called when the track properties option is activated +/** @brief Called when an edit menu item is selected * - * Calls the per-tab properties function. + * Shared by several menu items; callback_action is expected to be the offset + * of the activate member of struct tabtype. */ -static void properties_item(gpointer attribute((unused)) callback_data, - guint attribute((unused)) callback_action, +static void menu_tab_action(gpointer attribute((unused)) callback_data, + guint callback_action, GtkWidget attribute((unused)) *menu_item) { GtkWidget *tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK(tabs), gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); - if(t->properties_activate) - t->properties_activate(t->extra); + void (**activatep)(GtkMenuItem *, gpointer) + = (void *)((const char *)t + callback_action); + void (*activate)(GtkMenuItem *, gpointer) = *activatep; + + if(activate) + activate(NULL, t->extra); } /** @brief Called when the login option is activated */ @@ -115,19 +88,18 @@ static void settings(gpointer attribute((unused)) callback_data, } #endif -/** @brief Update menu state +/** @brief Called when edit menu is shown * * Determines option sensitivity according to the current tab and adjusts the * widgets accordingly. Knows about @ref DISORDER_CONNECTED so the callbacks * need not. - * - * TODO: base this on menu popup instead? */ -void menu_update(int page) { +static void edit_menu_show(GtkWidget attribute((unused)) *widget, + gpointer attribute((unused)) user_data) { if(tabs) { GtkWidget *tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK(tabs), - page < 0 ? gtk_notebook_current_page(GTK_NOTEBOOK(tabs)) : page); + gtk_notebook_current_page(GTK_NOTEBOOK(tabs))); const struct tabtype *t = g_object_get_data(G_OBJECT(tab), "type"); assert(t != 0); @@ -166,7 +138,7 @@ static void manual_popup(gpointer attribute((unused)) callback_data, /** @brief Called when version arrives, displays about... popup */ static void about_popup_got_version(void attribute((unused)) *v, - const char attribute((unused)) *error, + const char attribute((unused)) *err, const char *value) { GtkWidget *w; char *server_version_string; @@ -301,25 +273,25 @@ GtkWidget *menubar(GtkWidget *w) { }, { (char *)"/Edit/Select all tracks", /* path */ - (char *)"A", /* accelerator */ - select_all, /* callback */ - 0, /* callback_action */ + 0, /* accelerator */ + menu_tab_action, /* callback */ + offsetof(struct tabtype, selectall_activate), /* callback_action */ 0, /* item_type */ 0 /* extra_data */ }, { (char *)"/Edit/Deselect all tracks", /* path */ - (char *)"A", /* accelerator */ - select_none, /* callback */ - 0, /* callback_action */ + 0, /* accelerator */ + menu_tab_action, /* callback */ + offsetof(struct tabtype, selectnone_activate), /* callback_action */ 0, /* item_type */ 0 /* extra_data */ }, { (char *)"/Edit/Track properties", /* path */ 0, /* accelerator */ - properties_item, /* callback */ - 0, /* callback_action */ + menu_tab_action, /* callback */ + offsetof(struct tabtype, properties_activate), /* callback_action */ 0, /* item_type */ 0 /* extra_data */ }, @@ -411,6 +383,12 @@ GtkWidget *menubar(GtkWidget *w) { assert(selectall_widget != 0); assert(selectnone_widget != 0); assert(properties_widget != 0); + + + GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory, + "/Edit"); + g_signal_connect(edit_widget, "show", G_CALLBACK(edit_menu_show), 0); + event_register("rights-changed", menu_rights_changed, 0); users_set_sensitive(0); m = gtk_item_factory_get_widget(mainmenufactory,