+
/*
* This file is part of DisOrder
* Copyright (C) 2006-2008 Richard Kettlewell
#define REPORT() ((void)0)
#endif
-WT(label);
-WT(event_box);
-WT(menu);
-WT(menu_item);
-WT(layout);
-WT(vbox);
-WT(arrow);
-WT(hbox);
-WT(button);
-WT(image);
-WT(entry);
-
/* Types */
struct choosenode;
void (*fill)(struct choosenode *));
static void fill_root_node(struct choosenode *cn);
static void fill_directory_node(struct choosenode *cn);
-static void got_files(void *v, int nvec, char **vec);
+static void got_files(void *v, const char *error, int nvec, char **vec);
static void got_resolved_file(void *v, const char *error, const char *track);
-static void got_dirs(void *v, int nvec, char **vec);
+static void got_dirs(void *v, const char *error, int nvec, char **vec);
static void expand_node(struct choosenode *cn, int contingent);
static void contract_node(struct choosenode *cn);
/** @brief Fill the root */
static void fill_root_node(struct choosenode *cn) {
- struct callbackdata *cbd;
-
D(("fill_root_node"));
clear_children(cn);
/* More de-duping possible here */
if(cn->flags & CN_GETTING_ANY)
return;
gtk_label_set_text(GTK_LABEL(report_label), "getting files");
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_dirs(client, got_dirs, "", 0, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, "", 0, cbd);
+ disorder_eclient_dirs(client, got_dirs, "", 0, cn);
+ disorder_eclient_files(client, got_files, "", 0, cn);
cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
gets_in_flight += 2;
}
/** @brief Delete all the widgets owned by @p cn */
static void delete_cn_widgets(struct choosenode *cn) {
if(cn->arrow) {
- DW(arrow);
gtk_widget_destroy(cn->arrow);
cn->arrow = 0;
}
if(cn->label) {
- DW(label);
gtk_widget_destroy(cn->label);
cn->label = 0;
}
if(cn->marker) {
- DW(image);
gtk_widget_destroy(cn->marker);
cn->marker = 0;
}
if(cn->hbox) {
- DW(hbox);
gtk_widget_destroy(cn->hbox);
cn->hbox = 0;
}
if(cn->container) {
- DW(event_box);
gtk_widget_destroy(cn->container);
cn->container = 0;
}
}
/** @brief Called with a list of files just below some node */
-static void got_files(void *v, int nvec, char **vec) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode;
+static void got_files(void *v, const char *error, int nvec, char **vec) {
+ struct choosenode *cn = v;
int n;
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
+
D(("got_files %d files for %s %s", nvec, cn->path, cnflags(cn)));
/* Complicated by the need to resolve aliases. */
cn->flags &= ~CN_GETTING_FILES;
}
/** @brief Called with a list of directories just below some node */
-static void got_dirs(void *v, int nvec, char **vec) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode;
+static void got_dirs(void *v, const char *error, int nvec, char **vec) {
+ struct choosenode *cn = v;
int n;
+
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
D(("got_dirs %d dirs for %s %s", nvec, cn->path, cnflags(cn)));
/* TODO this depends on local configuration for trackname_transform().
/** @brief Fill a child node */
static void fill_directory_node(struct choosenode *cn) {
- struct callbackdata *cbd;
-
D(("fill_directory_node %s", cn->path));
/* TODO: caching */
if(cn->flags & CN_GETTING_ANY)
assert(report_label != 0);
gtk_label_set_text(GTK_LABEL(report_label), "getting files");
clear_children(cn);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_dirs(client, got_dirs, cn->path, 0, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, cn->path, 0, cbd);
+ disorder_eclient_dirs(client, got_dirs, cn->path, 0, cn);
+ disorder_eclient_files(client, got_files, cn->path, 0, cn);
cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
gets_in_flight += 2;
}
* and also from initiate_seatch with an always empty list to indicate that
* we're not searching for anything in particular. */
static void search_completed(void attribute((unused)) *v,
+ const char *error,
int nvec, char **vec) {
int n;
char *s;
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
+
search_in_flight = 0;
/* Contract any choosenodes that were only expanded to show search
* results */
/* The search terms are bad! We treat this as if there were no search
* terms at all. Some kind of feedback would be handy. */
fprintf(stderr, "bad terms [%s]\n", terms); /* TODO */
- search_completed(0, 0, 0);
+ search_completed(0, 0, 0, 0);
} else {
search_in_flight = 1;
}
} else {
/* No search terms - we want to see all tracks */
- search_completed(0, 0, 0);
+ search_completed(0, 0, 0, 0);
}
}
static void clearsearch_clicked(GtkButton attribute((unused)) *button,
gpointer attribute((unused)) userdata) {
gtk_entry_set_text(GTK_ENTRY(searchentry), "");
+ /* Put the input focus back */
+ gtk_widget_grab_focus(searchentry);
}
/** @brief Called when the 'next search result' button is clicked */
files_selected = 0;
files_visible = 0;
/* Correct the layout and find out how much space it uses */
- MTAG_PUSH("display_tree");
searchnodes = nsearchresults ? xcalloc(nsearchresults,
sizeof (struct choosenode *)) : 0;
d = display_tree(root, 0, 0);
- MTAG_POP();
BEGIN(gtkbits);
/* We must set the total size or scrolling will not work (it wouldn't be hard
*/
if(!cn->container) {
BEGIN(new_widgets);
- MTAG_PUSH("make_widgets_1");
/* Widgets need to be created */
- NW(hbox);
cn->hbox = gtk_hbox_new(FALSE, 1);
if(cn->flags & CN_EXPANDABLE) {
- NW(arrow);
cn->arrow = gtk_arrow_new(cn->flags & CN_EXPANDED ? GTK_ARROW_DOWN
: GTK_ARROW_RIGHT,
GTK_SHADOW_NONE);
} else {
cn->arrow = 0;
if((pb = find_image("notes.png"))) {
- NW(image);
cn->marker = gtk_image_new_from_pixbuf(pb);
}
}
- MTAG_POP();
- MTAG_PUSH("make_widgets_2");
- NW(label);
cn->label = gtk_label_new(cn->display);
if(cn->arrow)
gtk_container_add(GTK_CONTAINER(cn->hbox), cn->arrow);
gtk_container_add(GTK_CONTAINER(cn->hbox), cn->label);
if(cn->marker)
gtk_container_add(GTK_CONTAINER(cn->hbox), cn->marker);
- MTAG_POP();
- MTAG_PUSH("make_widgets_3");
- NW(event_box);
cn->container = gtk_event_box_new();
gtk_container_add(GTK_CONTAINER(cn->container), cn->hbox);
g_signal_connect(cn->container, "button-release-event",
g_object_ref(cn->container);
/* Show everything by default */
gtk_widget_show_all(cn->container);
- MTAG_POP();
END(new_widgets);
}
assert(cn->container);
/* User actions ------------------------------------------------------------ */
+/** @brief Called when disorder_eclient_play completes */
+void play_completed(void attribute((unused)) *v,
+ const char *error) {
+ if(error)
+ popup_protocol_error(0, error);
+}
+
/** @brief Clicked on something
*
* This implements playing, all the modifiers for selection, etc.
clear_selection(root);
set_selection(cn, 1);
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
- disorder_eclient_play(client, cn->path, 0, 0);
+ disorder_eclient_play(client, cn->path, play_completed, 0);
last_click = 0;
}
} else if(event->type == GDK_BUTTON_PRESS
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
for(n = 0; tracks[n]; ++n)
- disorder_eclient_play(client, tracks[n], 0, 0);
+ disorder_eclient_play(client, tracks[n], play_completed, 0);
}
/** @brief Called when the menu's properties option is activated */
/** @brief Determine whether the menu's play option should be sensitive */
static gboolean sensitive_track_play(struct choosenode attribute((unused)) *cn) {
return (!!files_selected
- && (disorder_eclient_state(client) & DISORDER_CONNECTED));
+ && (disorder_eclient_state(client) & DISORDER_CONNECTED)
+ && (last_rights & RIGHT_PLAY));
}
/** @brief Determine whether the menu's properties option should be sensitive */
static gboolean sensitive_track_properties(struct choosenode attribute((unused)) *cn) {
- return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED);
+ return (!!files_selected
+ && (disorder_eclient_state(client) & DISORDER_CONNECTED)
+ && (last_rights & RIGHT_PREFS));
}
/* Directory menu items ---------------------------------------------------- */
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
for(n = 0; n < ntracks; ++n)
- disorder_eclient_play(client, tracks[n], 0, 0);
+ disorder_eclient_play(client, tracks[n], play_completed, 0);
}
static void properties_dir(struct choosenode *cn,
return TRUE;
}
-
-
/* Main menu plumbing ------------------------------------------------------ */
/** @brief Determine whether the edit menu's properties option should be sensitive */
-static int choose_properties_sensitive(GtkWidget attribute((unused)) *w) {
+static int choose_properties_sensitive(void attribute((unused)) *extra) {
return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED);
}
-/** @brief Determine whether the edit menu's select all option should be sensitive
- *
- * TODO not implemented, see also choose_selectall_activate()
- */
-static int choose_selectall_sensitive(GtkWidget attribute((unused)) *w) {
- return FALSE;
-}
-
-/** @brief Determine whether the edit menu's select none option should be sensitive
- *
- * TODO not implemented, see also choose_selectnone_activate()
- */
-static int choose_selectnone_sensitive(GtkWidget attribute((unused)) *w) {
- return FALSE;
-}
-
/** @brief Called when the edit menu's properties option is activated */
-static void choose_properties_activate(GtkWidget attribute((unused)) *w) {
+static void choose_properties_activate(void attribute((unused)) *extra) {
activate_track_properties(0, 0);
}
-/** @brief Called when the edit menu's select all option is activated
- *
- * TODO not implemented, see choose_selectall_sensitive() */
-static void choose_selectall_activate(GtkWidget attribute((unused)) *w) {
-}
-
-/** @brief Called when the edit menu's select none option is activated
- *
- * TODO not implemented, see choose_selectnone_sensitive() */
-static void choose_selectnone_activate(GtkWidget attribute((unused)) *w) {
+/** @brief Called when the choose tab is selected */
+static void choose_tab_selected(void) {
+ gtk_widget_grab_focus(searchentry);
}
/** @brief Main menu callbacks for Choose screen */
static const struct tabtype tabtype_choose = {
choose_properties_sensitive,
- choose_selectall_sensitive,
- choose_selectnone_sensitive,
+ NULL/*choose_selectall_sensitive*/,
+ NULL/*choose_selectnone_sensitive*/,
choose_properties_activate,
- choose_selectall_activate,
- choose_selectnone_activate,
+ NULL/*choose_selectall_activate*/,
+ NULL/*choose_selectnone_activate*/,
+ choose_tab_selected,
+ 0
};
/* Public entry points ----------------------------------------------------- */
-/** @brief Called to entirely reset the choose screen */
-static void choose_reset(void) {
+/** @brief Called when we have just logged in
+ *
+ * Entirely resets the choose tab.
+ */
+static void choose_logged_in(const char attribute((unused)) *event,
+ void attribute((unused)) *eventdata,
+ void attribute((unused)) *callbackdata) {
if(root)
undisplay_tree(root);
root = newnode(0/*parent*/, "<root>", "All files", "",
*/
/* Text entry box for search terms */
- NW(entry);
searchentry = gtk_entry_new();
gtk_widget_set_style(searchentry, tool_style);
g_signal_connect(searchentry, "changed", G_CALLBACK(searchentry_changed), 0);
gtk_tooltips_set_tip(tips, searchentry, "Enter search terms here; search is automatic", "");
/* Cancel button to clear the search */
- NW(button);
clearsearch = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_widget_set_style(clearsearch, tool_style);
g_signal_connect(G_OBJECT(clearsearch), "clicked",
gtk_widget_set_sensitive(nextsearch, 0);
/* hbox packs the search tools button together on a line */
- NW(hbox);
hbox = gtk_hbox_new(FALSE/*homogeneous*/, 1/*spacing*/);
gtk_box_pack_start(GTK_BOX(hbox), searchentry,
TRUE/*expand*/, TRUE/*fill*/, 0/*padding*/);
/* chooselayout contains the currently visible subset of the track
* namespace */
- NW(layout);
chooselayout = gtk_layout_new(0, 0);
gtk_widget_set_style(chooselayout, layout_style);
- choose_reset();
- register_reset(choose_reset);
+ choose_logged_in(0, 0, 0);
+ event_register("logged-in", choose_logged_in, 0);
/* Create the popup menus */
- NW(menu);
track_menu = gtk_menu_new();
g_signal_connect(track_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&track_menu);
for(n = 0; track_menuitems[n].name; ++n) {
- NW(menu_item);
track_menuitems[n].w =
gtk_menu_item_new_with_label(track_menuitems[n].name);
gtk_menu_attach(GTK_MENU(track_menu), track_menuitems[n].w,
0, 1, n, n + 1);
}
- NW(menu);
dir_menu = gtk_menu_new();
g_signal_connect(dir_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&dir_menu);
for(n = 0; dir_menuitems[n].name; ++n) {
- NW(menu_item);
dir_menuitems[n].w =
gtk_menu_item_new_with_label(dir_menuitems[n].name);
gtk_menu_attach(GTK_MENU(dir_menu), dir_menuitems[n].w,
vadjust = gtk_layout_get_vadjustment(GTK_LAYOUT(chooselayout));
/* The scrollable layout and the search hbox go together in a vbox */
- NW(vbox);
vbox = gtk_vbox_new(FALSE/*homogenous*/, 1/*spacing*/);
gtk_box_pack_start(GTK_BOX(vbox), hbox,
FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
~mdw / disorder / blobdiff