X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/7a3eb8eb516c8cdb35eaf2e41030e802b623e713..HEAD:/disobedience/playlists.c diff --git a/disobedience/playlists.c b/disobedience/playlists.c index 37bb0ea..c5273ae 100644 --- a/disobedience/playlists.c +++ b/disobedience/playlists.c @@ -40,8 +40,6 @@ #include "popup.h" #include "validity.h" -#if PLAYLISTS - static void playlist_list_received_playlists(void *v, const char *err, int nvec, char **vec); @@ -101,6 +99,38 @@ static void playlist_drop_modify(struct playlist_modify_data *mod, int nvec, char **vec); static void playlist_remove_modify(struct playlist_modify_data *mod, int nvec, char **vec); +static gboolean playlist_new_keypress(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); +static gboolean playlist_picker_keypress(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); +static void playlist_editor_button_toggled(GtkToggleButton *tb, + gpointer userdata); +static void playlist_editor_set_buttons(const char *event, + void *eventdata, + void *callbackdata); +static void playlist_editor_got_share(void *v, + const char *err, + const char *value); +static void playlist_editor_share_set(void *v, const char *err); +static void playlist_picker_update_section(const char *title, const char *key, + int start, int end); +static gboolean playlist_picker_find(GtkTreeIter *parent, + const char *title, const char *key, + GtkTreeIter iter[1], + gboolean create); +static void playlist_picker_delete_obsolete(GtkTreeIter parent[1], + char **exists, + int nexists); +static gboolean playlist_picker_button(GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static gboolean playlist_editor_keypress(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); +static void playlist_editor_ok(GtkButton *button, gpointer userdata); +static void playlist_editor_help(GtkButton *button, gpointer userdata); /** @brief Playlist editing window */ static GtkWidget *playlist_window; @@ -110,7 +140,6 @@ static const struct queue_column playlist_columns[] = { { "Artist", column_namepart, "artist", COL_EXPAND|COL_ELLIPSIZE }, { "Album", column_namepart, "album", COL_EXPAND|COL_ELLIPSIZE }, { "Title", column_namepart, "title", COL_EXPAND|COL_ELLIPSIZE }, - { "Length", column_length, 0, COL_RIGHT } }; /** @brief Pop-up menu for playlist editor @@ -122,12 +151,28 @@ static const struct queue_column playlist_columns[] = { * - select/deselect all work */ static struct menuitem playlist_menuitems[] = { - { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 }, - { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 }, - { "Play playlist", playlist_playall_activate, playlist_playall_sensitive, 0, 0 }, - { "Remove track from queue", playlist_remove_activate, playlist_remove_sensitive, 0, 0 }, - { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 }, - { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 }, + { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 }, + { "Play track", GTK_STOCK_MEDIA_PLAY, ql_play_activate, ql_play_sensitive, 0, 0 }, + { "Play playlist", NULL, playlist_playall_activate, playlist_playall_sensitive, 0, 0 }, + { "Remove track from playlist", GTK_STOCK_DELETE, playlist_remove_activate, playlist_remove_sensitive, 0, 0 }, + { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 }, + { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 }, +}; + +static const GtkTargetEntry playlist_targets[] = { + { + PLAYLIST_TRACKS, /* drag type */ + GTK_TARGET_SAME_WIDGET, /* rearrangement within a widget */ + PLAYLIST_TRACKS_ID /* ID value */ + }, + { + PLAYABLE_TRACKS, /* drag type */ + GTK_TARGET_SAME_APP|GTK_TARGET_OTHER_WIDGET, /* copying between widgets */ + PLAYABLE_TRACKS_ID, /* ID value */ + }, + { + .target = NULL + } }; /** @brief Queuelike for editing a playlist */ @@ -137,7 +182,11 @@ static struct queuelike ql_playlist = { .ncolumns = sizeof playlist_columns / sizeof *playlist_columns, .menuitems = playlist_menuitems, .nmenuitems = sizeof playlist_menuitems / sizeof *playlist_menuitems, - .drop = playlist_drop + .drop = playlist_drop, + .drag_source_targets = playlist_targets, + .drag_source_actions = GDK_ACTION_MOVE|GDK_ACTION_COPY, + .drag_dest_targets = playlist_targets, + .drag_dest_actions = GDK_ACTION_MOVE|GDK_ACTION_COPY, }; /* Maintaining the list of playlists ---------------------------------------- */ @@ -204,9 +253,10 @@ static int playlistcmp(const void *ap, const void *bp) { /* Playlists menu ----------------------------------------------------------- */ static void playlist_menu_playing(void attribute((unused)) *v, - const char *err) { + const char *err, + const char attribute((unused)) *id) { if(err) - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); } /** @brief Play received playlist contents @@ -217,11 +267,11 @@ static void playlist_menu_received_content(void attribute((unused)) *v, const char *err, int nvec, char **vec) { if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); return; } for(int n = 0; n < nvec; ++n) - disorder_eclient_play(client, vec[n], playlist_menu_playing, NULL); + disorder_eclient_play(client, playlist_menu_playing, vec[n], NULL); } /** @brief Called to activate a playlist @@ -359,15 +409,36 @@ static void playlist_new_playlist(void) { /* Set initial state of OK button */ playlist_new_changed(0,0,0); - /* TODO: return should = OK, escape should = cancel */ + g_signal_connect(playlist_new_window, "key-press-event", + G_CALLBACK(playlist_new_keypress), 0); /* Display the window */ gtk_widget_show_all(playlist_new_window); } +/** @brief Keypress handler */ +static gboolean playlist_new_keypress(GtkWidget attribute((unused)) *widget, + GdkEventKey *event, + gpointer attribute((unused)) user_data) { + if(event->state) + return FALSE; + switch(event->keyval) { + case GDK_Return: + playlist_new_ok(NULL, NULL); + return TRUE; + case GDK_Escape: + gtk_widget_destroy(playlist_new_window); + return TRUE; + default: + return FALSE; + } +} + /** @brief Called when 'ok' is clicked in new-playlist popup */ static void playlist_new_ok(GtkButton attribute((unused)) *button, gpointer attribute((unused)) userdata) { + if(playlist_new_valid()) + return; gboolean shared, public, private; char *name, *fullname; playlist_new_details(&name, &fullname, &shared, &public, &private); @@ -389,7 +460,7 @@ static void playlist_new_ok(GtkButton attribute((unused)) *button, static void playlist_new_locked(void *v, const char *err) { char *fullname = v; if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); return; } disorder_eclient_playlist_get(client, playlist_new_retrieved, @@ -408,7 +479,7 @@ static void playlist_new_retrieved(void *v, const char *err, /* A rare case but not in principle impossible */ err = "A playlist with that name already exists."; if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); disorder_eclient_playlist_unlock(client, playlist_new_unlocked, fullname); return; } @@ -424,7 +495,7 @@ static void playlist_new_retrieved(void *v, const char *err, /** @brief Called when the new playlist has been created */ static void playlist_new_created(void attribute((unused)) *v, const char *err) { if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); return; } disorder_eclient_playlist_unlock(client, playlist_new_unlocked, NULL); @@ -434,7 +505,7 @@ static void playlist_new_created(void attribute((unused)) *v, const char *err) { /** @brief Called when the newly created playlist has unlocked */ static void playlist_new_unlocked(void attribute((unused)) *v, const char *err) { if(err) - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); /* Pop down the creation window */ gtk_widget_destroy(playlist_new_window); } @@ -509,7 +580,7 @@ static const char *playlist_new_valid(void) { /** @brief Get entered new-playlist details * @param namep Where to store entered name (or NULL) * @param fullnamep Where to store computed full name (or NULL) - * @param sharep Where to store 'shared' flag (or NULL) + * @param sharedp Where to store 'shared' flag (or NULL) * @param publicp Where to store 'public' flag (or NULL) * @param privatep Where to store 'private' flag (or NULL) */ @@ -531,7 +602,7 @@ static void playlist_new_details(char **namep, if(privatep) *privatep = private; if(namep) *namep = name; if(fullnamep) { - if(*sharedp) *fullnamep = *namep; + if(shared) *fullnamep = name; else byte_xasprintf(fullnamep, "%s.%s", config->username, name); } } @@ -541,8 +612,13 @@ static void playlist_new_details(char **namep, /** @brief Delete button */ static GtkWidget *playlist_picker_delete_button; -/** @brief Tree model for list of playlists */ -static GtkListStore *playlist_picker_list; +/** @brief Tree model for list of playlists + * + * This has two columns: + * - column 0 will be the display name + * - column 1 will be the sort key/playlist name (and will not be displayed) + */ +static GtkTreeStore *playlist_picker_list; /** @brief Selection for list of playlists */ static GtkTreeSelection *playlist_picker_selection; @@ -554,25 +630,169 @@ static const char *playlist_picker_selected; static void playlist_picker_fill(const char attribute((unused)) *event, void attribute((unused)) *eventdata, void attribute((unused)) *callbackdata) { - GtkTreeIter iter[1]; - if(!playlist_window) return; if(!playlist_picker_list) - playlist_picker_list = gtk_list_store_new(1, G_TYPE_STRING); - const char *was_selected = playlist_picker_selected; - gtk_list_store_clear(playlist_picker_list); /* clears playlists_selected */ - for(int n = 0; n < nplaylists; ++n) { - gtk_list_store_insert_with_values(playlist_picker_list, iter, - n /*position*/, - 0, playlists[n], /* column 0 */ - -1); /* no more cols */ - /* Reselect the selected playlist */ - if(was_selected && !strcmp(was_selected, playlists[n])) - gtk_tree_selection_select_iter(playlist_picker_selection, iter); + playlist_picker_list = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING); + /* We will accumulate a list of all the sections that exist */ + char **sections = xcalloc(nplaylists, sizeof (char *)); + int nsections = 0; + /* Make sure shared playlists are there */ + int start = 0, end; + for(end = start; end < nplaylists && !strchr(playlists[end], '.'); ++end) + ; + if(start != end) { + playlist_picker_update_section("Shared playlists", "", + start, end); + sections[nsections++] = (char *)""; + } + /* Make sure owned playlists are there */ + while((start = end) < nplaylists) { + const int nl = strchr(playlists[start], '.') - playlists[start]; + char *name = xstrndup(playlists[start], nl); + for(end = start; + end < nplaylists + && playlists[end][nl] == '.' + && !strncmp(playlists[start], playlists[end], nl); + ++end) + ; + playlist_picker_update_section(name, name, start, end); + sections[nsections++] = name; + } + /* Delete obsolete sections */ + playlist_picker_delete_obsolete(NULL, sections, nsections); +} + +/** @brief Update a section in the picker tree model + * @param title Display name of section + * @param key Key to search for + * @param start First entry in @ref playlists + * @param end Past last entry in @ref playlists + */ +static void playlist_picker_update_section(const char *title, const char *key, + int start, int end) { + /* Find the section, creating it if necessary */ + GtkTreeIter section_iter[1]; + playlist_picker_find(NULL, title, key, section_iter, TRUE); + /* Add missing rows */ + for(int n = start; n < end; ++n) { + GtkTreeIter child[1]; + char *name; + if((name = strchr(playlists[n], '.'))) + ++name; + else + name = playlists[n]; + playlist_picker_find(section_iter, + name, playlists[n], + child, + TRUE); + } + /* Delete anything that shouldn't exist. */ + playlist_picker_delete_obsolete(section_iter, playlists + start, end - start); +} + +/** @brief Find and maybe create a row in the picker tree model + * @param parent Parent iterator (or NULL for top level) + * @param title Display name of section + * @param key Key to search for + * @param iter Iterator to point at key + * @param create Whether to create the row + * @return TRUE if key exists else FALSE + * + * If the @p key exists then @p iter will point to it and TRUE will be + * returned. + * + * If the @p key does not exist and @p create is TRUE then it will be created. + * @p iter wil point to it and TRUE will be returned. + * + * If the @p key does not exist and @p create is FALSE then FALSE will be + * returned. + */ +static gboolean playlist_picker_find(GtkTreeIter *parent, + const char *title, + const char *key, + GtkTreeIter iter[1], + gboolean create) { + gchar *candidate; + GtkTreeIter next[1]; + gboolean it; + int row = 0; + + it = gtk_tree_model_iter_children(GTK_TREE_MODEL(playlist_picker_list), + next, + parent); + while(it) { + /* Find the value at row 'next' */ + gtk_tree_model_get(GTK_TREE_MODEL(playlist_picker_list), + next, + 1, &candidate, + -1); + /* See how it compares with @p key */ + int c = strcmp(key, candidate); + g_free(candidate); + if(!c) { + *iter = *next; + return TRUE; /* we found our key */ + } + if(c < 0) { + /* @p key belongs before row 'next' */ + if(create) { + gtk_tree_store_insert_with_values(playlist_picker_list, + iter, + parent, + row, /* insert here */ + 0, title, 1, key, -1); + return TRUE; + } else + return FALSE; + ++row; + } + it = gtk_tree_model_iter_next(GTK_TREE_MODEL(playlist_picker_list), next); + } + /* We have reached the end and not found a row that should be later than @p + * key. */ + if(create) { + gtk_tree_store_insert_with_values(playlist_picker_list, + iter, + parent, + INT_MAX, /* insert at end */ + 0, title, 1, key, -1); + return TRUE; + } else + return FALSE; +} + +/** @brief Delete obsolete rows + * @param parent Parent or NULL + * @param exists List of rows that should exist (by key) + * @param nexists Length of @p exists + */ +static void playlist_picker_delete_obsolete(GtkTreeIter parent[1], + char **exists, + int nexists) { + /* Delete anything that shouldn't exist. */ + GtkTreeIter iter[1]; + gboolean it = gtk_tree_model_iter_children(GTK_TREE_MODEL(playlist_picker_list), + iter, + parent); + while(it) { + /* Find the value at row 'next' */ + gchar *candidate; + gtk_tree_model_get(GTK_TREE_MODEL(playlist_picker_list), + iter, + 1, &candidate, + -1); + gboolean found = FALSE; + for(int n = 0; n < nexists; ++n) + if((found = !strcmp(candidate, exists[n]))) + break; + if(!found) + it = gtk_tree_store_remove(playlist_picker_list, iter); + else + it = gtk_tree_model_iter_next(GTK_TREE_MODEL(playlist_picker_list), + iter); + g_free(candidate); } - /* TODO deselecting then reselecting the current playlist resets the playlist - * editor, which trashes the user's selection. */ } /** @brief Called when the selection might have changed */ @@ -582,18 +802,24 @@ static void playlist_picker_selection_changed(GtkTreeSelection attribute((unused char *gselected, *selected; /* Identify the current selection */ - if(gtk_tree_selection_get_selected(playlist_picker_selection, 0, &iter)) { + if(gtk_tree_selection_get_selected(playlist_picker_selection, 0, &iter) + && gtk_tree_store_iter_depth(playlist_picker_list, &iter) > 0) { gtk_tree_model_get(GTK_TREE_MODEL(playlist_picker_list), &iter, - 0, &gselected, -1); + 1, &gselected, -1); selected = xstrdup(gselected); g_free(gselected); } else selected = 0; /* Set button sensitivity according to the new state */ - if(selected) - gtk_widget_set_sensitive(playlist_picker_delete_button, 1); - else - gtk_widget_set_sensitive(playlist_picker_delete_button, 0); + int deletable = FALSE; + if(selected) { + if(strchr(selected, '.')) { + if(!strncmp(selected, config->username, strlen(config->username))) + deletable = TRUE; + } else + deletable = TRUE; + } + gtk_widget_set_sensitive(playlist_picker_delete_button, deletable); /* Eliminate no-change cases */ if(!selected && !playlist_picker_selected) return; @@ -605,7 +831,8 @@ static void playlist_picker_selection_changed(GtkTreeSelection attribute((unused playlist_picker_selected = selected; /* Re-initalize the queue */ ql_new_queue(&ql_playlist, NULL); - playlist_editor_fill(NULL, (void *)playlist_picker_selected, NULL); + /* Synthesize a playlist-modified to re-initialize the editor etc */ + event_raise("playlist-modified", (void *)playlist_picker_selected); } /** @brief Called when the 'add' button is pressed */ @@ -620,7 +847,7 @@ static void playlist_picker_add(GtkButton attribute((unused)) *button, static void playlists_picker_delete_completed(void attribute((unused)) *v, const char *err) { if(err) - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); } /** @brief Called when the 'Delete' button is pressed */ @@ -630,7 +857,7 @@ static void playlist_picker_delete(GtkButton attribute((unused)) *button, int res; if(!playlist_picker_selected) - return; /* shouldn't happen */ + return; yesno = gtk_message_dialog_new(GTK_WINDOW(playlist_window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, @@ -654,13 +881,15 @@ static struct button playlist_picker_buttons[] = { GTK_STOCK_ADD, playlist_picker_add, "Create a new playlist", - 0 + 0, + NULL, }, { GTK_STOCK_REMOVE, playlist_picker_delete, "Delete a playlist", - 0 + 0, + NULL, }, }; #define NPLAYLIST_PICKER_BUTTONS (sizeof playlist_picker_buttons / sizeof *playlist_picker_buttons) @@ -699,16 +928,274 @@ static GtkWidget *playlist_picker_create(void) { gtk_box_pack_start(GTK_BOX(vbox), scroll_widget(tree), TRUE/*expand*/, TRUE/*fill*/, 0); gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE/*expand*/, FALSE, 0); + g_signal_connect(tree, "key-press-event", + G_CALLBACK(playlist_picker_keypress), 0); + g_signal_connect(tree, "button-press-event", + G_CALLBACK(playlist_picker_button), 0); + return vbox; } +static gboolean playlist_picker_keypress(GtkWidget attribute((unused)) *widget, + GdkEventKey *event, + gpointer attribute((unused)) user_data) { + if(event->state) + return FALSE; + switch(event->keyval) { + case GDK_BackSpace: + case GDK_Delete: + playlist_picker_delete(NULL, NULL); + return TRUE; + default: + return FALSE; + } +} + +static void playlist_picker_select_activate(GtkMenuItem attribute((unused)) *item, + gpointer attribute((unused)) userdata) { + /* nothing */ +} + +static int playlist_picker_select_sensitive(void *extra) { + GtkTreeIter *iter = extra; + return gtk_tree_store_iter_depth(playlist_picker_list, iter) > 0; +} + +static void playlist_picker_play_activate(GtkMenuItem attribute((unused)) *item, + gpointer attribute((unused)) userdata) { + /* Re-use the menu-based activation callback */ + disorder_eclient_playlist_get(client, playlist_menu_received_content, + playlist_picker_selected, NULL); +} + +static int playlist_picker_play_sensitive(void *extra) { + GtkTreeIter *iter = extra; + return gtk_tree_store_iter_depth(playlist_picker_list, iter) > 0; +} + +static void playlist_picker_remove_activate(GtkMenuItem attribute((unused)) *item, + gpointer attribute((unused)) userdata) { + /* Re-use the 'Remove' button' */ + playlist_picker_delete(NULL, NULL); +} + +static int playlist_picker_remove_sensitive(void *extra) { + GtkTreeIter *iter = extra; + if(gtk_tree_store_iter_depth(playlist_picker_list, iter) > 0) { + if(strchr(playlist_picker_selected, '.')) { + if(!strncmp(playlist_picker_selected, config->username, + strlen(config->username))) + return TRUE; + } else + return TRUE; + } + return FALSE; +} + +/** @brief Pop-up menu for picker */ +static struct menuitem playlist_picker_menuitems[] = { + { + "Select playlist", + NULL, + playlist_picker_select_activate, + playlist_picker_select_sensitive, + 0, + 0 + }, + { + "Play playlist", + GTK_STOCK_MEDIA_PLAY, + playlist_picker_play_activate, + playlist_picker_play_sensitive, + 0, + 0 + }, + { + "Remove playlist", + GTK_STOCK_DELETE, + playlist_picker_remove_activate, + playlist_picker_remove_sensitive, + 0, + 0 + }, +}; + +static gboolean playlist_picker_button(GtkWidget *widget, + GdkEventButton *event, + gpointer attribute((unused)) user_data) { + if(event->type == GDK_BUTTON_PRESS && event->button == 3) { + static GtkWidget *playlist_picker_menu; + + /* Right click press pops up a menu */ + ensure_selected(GTK_TREE_VIEW(widget), event); + /* Find the selected row */ + GtkTreeIter iter[1]; + if(!gtk_tree_selection_get_selected(playlist_picker_selection, 0, iter)) + return TRUE; + popup(&playlist_picker_menu, event, + playlist_picker_menuitems, + sizeof playlist_picker_menuitems / sizeof *playlist_picker_menuitems, + iter); + return TRUE; + } + return FALSE; +} + +static void playlist_picker_destroy(void) { + playlist_picker_delete_button = NULL; + g_object_unref(playlist_picker_list); + playlist_picker_list = NULL; + playlist_picker_selection = NULL; + playlist_picker_selected = NULL; +} + /* Playlist editor ---------------------------------------------------------- */ +static GtkWidget *playlist_editor_shared; +static GtkWidget *playlist_editor_public; +static GtkWidget *playlist_editor_private; +static int playlist_editor_setting_buttons; + +/** @brief Buttons for the playlist window */ +static struct button playlist_editor_buttons[] = { + { + GTK_STOCK_OK, + playlist_editor_ok, + "Close window", + 0, + gtk_box_pack_end, + }, + { + GTK_STOCK_HELP, + playlist_editor_help, + "Go to manual", + 0, + gtk_box_pack_end, + }, +}; + +#define NPLAYLIST_EDITOR_BUTTONS (int)(sizeof playlist_editor_buttons / sizeof *playlist_editor_buttons) + static GtkWidget *playlists_editor_create(void) { assert(ql_playlist.view == NULL); /* better not be set up already */ - GtkWidget *w = init_queuelike(&ql_playlist); - /* Initially empty */ - return w; + + GtkWidget *hbox = gtk_hbox_new(FALSE, 0); + playlist_editor_shared = gtk_radio_button_new_with_label(NULL, "shared"); + playlist_editor_public + = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(playlist_editor_shared), + "public"); + playlist_editor_private + = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(playlist_editor_shared), + "private"); + g_signal_connect(playlist_editor_public, "toggled", + G_CALLBACK(playlist_editor_button_toggled), + (void *)"public"); + g_signal_connect(playlist_editor_private, "toggled", + G_CALLBACK(playlist_editor_button_toggled), + (void *)"private"); + gtk_box_pack_start(GTK_BOX(hbox), playlist_editor_shared, + FALSE/*expand*/, FALSE/*fill*/, 0); + gtk_box_pack_start(GTK_BOX(hbox), playlist_editor_public, + FALSE/*expand*/, FALSE/*fill*/, 0); + gtk_box_pack_start(GTK_BOX(hbox), playlist_editor_private, + FALSE/*expand*/, FALSE/*fill*/, 0); + playlist_editor_set_buttons(0,0,0); + create_buttons_box(playlist_editor_buttons, + NPLAYLIST_EDITOR_BUTTONS, + hbox); + + GtkWidget *vbox = gtk_vbox_new(FALSE, 0); + GtkWidget *view = init_queuelike(&ql_playlist); + gtk_box_pack_start(GTK_BOX(vbox), view, + TRUE/*expand*/, TRUE/*fill*/, 0); + gtk_box_pack_start(GTK_BOX(vbox), hbox, + FALSE/*expand*/, FALSE/*fill*/, 0); + g_signal_connect(view, "key-press-event", + G_CALLBACK(playlist_editor_keypress), 0); + return vbox; +} + +static gboolean playlist_editor_keypress(GtkWidget attribute((unused)) *widget, + GdkEventKey *event, + gpointer attribute((unused)) user_data) { + if(event->state) + return FALSE; + switch(event->keyval) { + case GDK_BackSpace: + case GDK_Delete: + playlist_remove_activate(NULL, NULL); + return TRUE; + default: + return FALSE; + } +} + +/** @brief Called when the public/private buttons are set */ +static void playlist_editor_button_toggled(GtkToggleButton *tb, + gpointer userdata) { + const char *state = userdata; + if(!gtk_toggle_button_get_active(tb) + || !playlist_picker_selected + || playlist_editor_setting_buttons) + return; + disorder_eclient_playlist_set_share(client, playlist_editor_share_set, + playlist_picker_selected, state, NULL); +} + +static void playlist_editor_share_set(void attribute((unused)) *v, + const attribute((unused)) char *err) { + if(err) + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); +} + +/** @brief Set the editor button state and sensitivity */ +static void playlist_editor_set_buttons(const char attribute((unused)) *event, + void *eventdata, + void attribute((unused)) *callbackdata) { + /* If this event is for a non-selected playlist do nothing */ + if(eventdata + && playlist_picker_selected + && strcmp(eventdata, playlist_picker_selected)) + return; + if(playlist_picker_selected) { + if(strchr(playlist_picker_selected, '.')) + disorder_eclient_playlist_get_share(client, + playlist_editor_got_share, + playlist_picker_selected, + (void *)playlist_picker_selected); + else + playlist_editor_got_share((void *)playlist_picker_selected, NULL, + "shared"); + } else + playlist_editor_got_share(NULL, NULL, NULL); +} + +/** @brief Called with playlist sharing details */ +static void playlist_editor_got_share(void *v, + const char *err, + const char *value) { + const char *playlist = v; + if(err) { + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); + value = NULL; + } + /* Set the currently active button */ + ++playlist_editor_setting_buttons; + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(playlist_editor_shared), + value && !strcmp(value, "shared")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(playlist_editor_public), + value && !strcmp(value, "public")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(playlist_editor_private), + value && !strcmp(value, "private")); + /* Set button sensitivity */ + gtk_widget_set_sensitive(playlist_editor_shared, FALSE); + int sensitive = (playlist + && strchr(playlist, '.') + && !strncmp(playlist, config->username, + strlen(config->username))); + gtk_widget_set_sensitive(playlist_editor_public, sensitive); + gtk_widget_set_sensitive(playlist_editor_private, sensitive); + --playlist_editor_setting_buttons; } /** @brief (Re-)populate the playlist tree model */ @@ -732,7 +1219,7 @@ static void playlists_editor_received_tracks(void *v, int nvec, char **vec) { const char *playlist = v; if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); return; } if(!playlist_picker_selected @@ -746,27 +1233,49 @@ static void playlists_editor_received_tracks(void *v, /* No such playlist, presumably we'll get a deleted event shortly */ return; /* Translate the list of tracks into queue entries */ - struct queue_entry *newq, **qq = &newq; + struct queue_entry *newq, **qq = &newq, *qprev = NULL; hash *h = hash_new(sizeof(int)); for(int n = 0; n < nvec; ++n) { struct queue_entry *q = xmalloc(sizeof *q); + q->prev = qprev; q->track = vec[n]; /* Synthesize a unique ID so that the selection survives updates. Tracks * can appear more than once in the queue so we can't use raw track names, * so we add a serial number to the start. */ int *serialp = hash_find(h, vec[n]), serial = serialp ? *serialp : 0; byte_xasprintf((char **)&q->id, "%d-%s", serial++, vec[n]); - hash_add(h, vec[0], &serial, HASH_INSERT_OR_REPLACE); + hash_add(h, vec[n], &serial, HASH_INSERT_OR_REPLACE); *qq = q; qq = &q->next; + qprev = q; } *qq = NULL; ql_new_queue(&ql_playlist, newq); } +static void playlist_editor_ok(GtkButton attribute((unused)) *button, + gpointer attribute((unused)) userdata) { + gtk_widget_destroy(playlist_window); +} + +static void playlist_editor_help(GtkButton attribute((unused)) *button, + gpointer attribute((unused)) userdata) { + popup_help("playlists.html"); +} + /* Playlist mutation -------------------------------------------------------- */ /** @brief State structure for guarded playlist modification + * + * To safely move, insert or delete rows we must: + * - take a lock + * - fetch the playlist + * - verify it's not changed + * - update the playlist contents + * - store the playlist + * - release the lock + * + * The playlist_modify_ functions do just that. * * To kick things off create one of these and disorder_eclient_playlist_lock() * with playlist_modify_locked() as its callback. @c modify will be called; it @@ -802,7 +1311,7 @@ struct playlist_modify_data { static void playlist_modify_locked(void *v, const char *err) { struct playlist_modify_data *mod = v; if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); return; } disorder_eclient_playlist_get(client, playlist_modify_retrieved, @@ -817,7 +1326,7 @@ void playlist_modify_retrieved(void *v, const char *err, char **vec) { struct playlist_modify_data *mod = v; if(err) { - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); disorder_eclient_playlist_unlock(client, playlist_modify_unlocked, NULL); return; } @@ -845,7 +1354,7 @@ void playlist_modify_retrieved(void *v, const char *err, static void playlist_modify_updated(void attribute((unused)) *v, const char *err) { if(err) - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); disorder_eclient_playlist_unlock(client, playlist_modify_unlocked, NULL); } @@ -853,7 +1362,7 @@ static void playlist_modify_updated(void attribute((unused)) *v, static void playlist_modify_unlocked(void attribute((unused)) *v, const char *err) { if(err) - popup_protocol_error(0, err); + popup_submsg(playlist_window, GTK_MESSAGE_ERROR, err); } /* Drop tracks into a playlist ---------------------------------------------- */ @@ -870,47 +1379,96 @@ static void playlist_drop(struct queuelike attribute((unused)) *ql, mod->tracks = tracks; mod->ids = ids; mod->after_me = after_me; - /* To safely move or insert rows we must: - * - take a lock - * - fetch the playlist - * - verify it's not changed - * - update the playlist contents - * - store the playlist - * - release the lock - * - */ disorder_eclient_playlist_lock(client, playlist_modify_locked, mod->playlist, mod); } +/** @brief Return true if track @p i is in the moved set */ +static int playlist_drop_is_moved(struct playlist_modify_data *mod, + int i) { + struct queue_entry *q; + + /* Find the q corresponding to i, so we can get the ID */ + for(q = ql_playlist.q; i; q = q->next, --i) + ; + /* See if track i matches any of the moved set by ID */ + for(int n = 0; n < mod->ntracks; ++n) + if(!strcmp(q->id, mod->ids[n])) + return 1; + return 0; +} + static void playlist_drop_modify(struct playlist_modify_data *mod, int nvec, char **vec) { char **newvec; int nnewvec; + + //fprintf(stderr, "\nplaylist_drop_modify\n"); + /* after_me is the queue_entry to insert after, or NULL to insert at the + * beginning (including the case when the playlist is empty) */ + //fprintf(stderr, "after_me = %s\n", + // mod->after_me ? mod->after_me->track : "NULL"); + struct queue_entry *q = ql_playlist.q; + int ins = 0; + if(mod->after_me) { + ++ins; + while(q && q != mod->after_me) { + q = q->next; + ++ins; + } + } + /* Now ins is the index to insert at; equivalently, the row to insert before, + * and so equal to nvec to append. */ +#if 0 + fprintf(stderr, "ins = %d = %s\n", + ins, ins < nvec ? vec[ins] : "NULL"); + for(int n = 0; n < nvec; ++n) + fprintf(stderr, "%d: %s %s\n", n, n == ins ? "->" : " ", vec[n]); + fprintf(stderr, "nvec = %d\n", nvec); +#endif if(mod->ids) { /* This is a rearrangement */ - /* TODO what if it's a drag from the queue? */ - abort(); - } else { - /* This is an insertion */ - struct queue_entry *q = ql_playlist.q; - int ins = 0; - if(mod->after_me) { - ++ins; - while(q && q != mod->after_me) { - q = q->next; - ++ins; + /* We have: + * - vec[], the current layout + * - ins, pointing into vec + * - mod->tracks[], a subset of vec[] which is to be moved + * + * ins is the insertion point BUT it is in terms of the whole + * array, i.e. before mod->tracks[] have been removed. The first + * step then is to remove everything in mod->tracks[] and adjust + * ins downwards as necessary. + */ + /* First zero out anything that's moved */ + int before_ins = 0; + for(int n = 0; n < nvec; ++n) { + if(playlist_drop_is_moved(mod, n)) { + vec[n] = NULL; + if(n < ins) + ++before_ins; } } - nnewvec = nvec + mod->ntracks; - newvec = xcalloc(nnewvec, sizeof (char *)); - memcpy(newvec, vec, - ins * sizeof (char *)); - memcpy(newvec + ins, mod->tracks, - mod->ntracks * sizeof (char *)); - memcpy(newvec + ins + mod->ntracks, vec + ins, - (nvec - ins) * sizeof (char *)); + /* Now collapse down the array */ + int i = 0; + for(int n = 0; n < nvec; ++n) { + if(vec[n]) + vec[i++] = vec[n]; + } + assert(i + mod->ntracks == nvec); + nvec = i; + /* Adjust the insertion point to take account of things moved from before + * it */ + ins -= before_ins; + /* The effect is now the same as an insertion */ } + /* This is (now) an insertion */ + nnewvec = nvec + mod->ntracks; + newvec = xcalloc(nnewvec, sizeof (char *)); + memcpy(newvec, vec, + ins * sizeof (char *)); + memcpy(newvec + ins, mod->tracks, + mod->ntracks * sizeof (char *)); + memcpy(newvec + ins + mod->ntracks, vec + ins, + (nvec - ins) * sizeof (char *)); disorder_eclient_playlist_set(client, playlist_modify_updated, mod->playlist, newvec, nnewvec, mod); } @@ -951,23 +1509,11 @@ static int playlist_remove_sensitive(void attribute((unused)) *extra) { return TRUE; } -/** @brief Called to play the selected playlist */ +/** @brief Called to remove the selected playlist */ static void playlist_remove_activate(GtkMenuItem attribute((unused)) *menuitem, gpointer attribute((unused)) user_data) { if(!playlist_picker_selected) return; - /* To safely remove rows we must: - * - take a lock - * - fetch the playlist - * - verify it's not changed - * - delete the selected rows from the retrieved version - * - store the playlist - * - release the lock - * - * In addition we careful check that the selected playlist hasn't changed - * underfoot, and avoid leaving the playlist locked if we bail out at any - * point. - */ struct playlist_modify_data *mod = xmalloc(sizeof *mod); mod->playlist = playlist_picker_selected; @@ -1019,7 +1565,7 @@ void playlist_window_create(gpointer attribute((unused)) callback_data, g_signal_connect(playlist_window, "key-press-event", G_CALLBACK(playlist_window_keypress), 0); /* default size is too small */ - gtk_window_set_default_size(GTK_WINDOW(playlist_window), 512, 240); + gtk_window_set_default_size(GTK_WINDOW(playlist_window), 640, 320); GtkWidget *hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), playlist_picker_create(), @@ -1052,6 +1598,7 @@ static gboolean playlist_window_keypress(GtkWidget attribute((unused)) *widget, static void playlist_window_destroyed(GtkWidget attribute((unused)) *widget, GtkWidget **widget_pointer) { destroy_queuelike(&ql_playlist); + playlist_picker_destroy(); *widget_pointer = NULL; } @@ -1075,10 +1622,10 @@ void playlists_init(void) { event_register("playlists-updated", playlist_picker_fill, 0); /* Update the displayed playlist when it is modified */ event_register("playlist-modified", playlist_editor_fill, 0); + /* Update the shared/public/etc buttons when a playlist is modified */ + event_register("playlist-modified", playlist_editor_set_buttons, 0); } -#endif - /* Local Variables: c-basic-offset:2