X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=1f39395c9d839e1c96d896609ccf054e6f3d25ac;hb=61b081d64d4135698b56f63c931da60c64511e3c;hp=35245a194f6050fea2e59ef53688dcbf809126d1;hpb=0b3bcb6c7f1bb4a633896b8a9936e498570ef8e1;p=ncmpc.git

diff --git a/src/screen_file.c b/src/screen_file.c
index 35245a1..1f39395 100644
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -1,6 +1,4 @@
-/* 
- * $Id$
- *
+/*
  * (c) 2004 by Kalle Wallin <kaw@linux.se>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,248 +16,77 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
 #include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
 #include "options.h"
-#include "support.h"
+#include "charset.h"
 #include "mpdclient.h"
-#include "strfsong.h"
 #include "command.h"
 #include "screen.h"
 #include "screen_utils.h"
-#include "screen_browse.h"
+#include "screen_browser.h"
 #include "screen_play.h"
 
-#define USE_OLD_LAYOUT
-#undef  USE_OLD_ADD
-
-#define BUFSIZE 1024
-
-#define HIGHLIGHT  (0x01)
-
-
-static list_window_t *lw = NULL;
-static list_window_state_t *lw_state = NULL;
-static mpdclient_filelist_t *filelist = NULL;
-
-
-/* clear the highlight flag for all items in the filelist */
-void
-clear_highlights(mpdclient_filelist_t *filelist)
-{
-	GList *list = g_list_first(filelist->list);
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
 
-	while( list ) {
-		filelist_entry_t *entry = list->data;
+static struct screen_browser browser;
 
-		entry->flags &= ~HIGHLIGHT;
-		list = list->next;
-	}
-}
+static void
+browse_paint(void);
 
-/* change the highlight flag for a song */
-void
-set_highlight(mpdclient_filelist_t *filelist, mpd_Song *song, int highlight)
+static void
+file_repaint(void)
 {
-	GList *list = g_list_first(filelist->list);
-
-	if( !song )
-		return;
-
-	while( list ) {
-		filelist_entry_t *entry = list->data;
-		mpd_InfoEntity *entity  = entry->entity;
-
-		if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-			mpd_Song *song2 = entity->info.song;
-
-			if( strcmp(song->file, song2->file) == 0 ) {
-				if(highlight)
-					entry->flags |= HIGHLIGHT;
-				else
-					entry->flags &= ~HIGHLIGHT;
-			}
-		}
-		list = list->next;
-	}
+	browse_paint();
+	wrefresh(browser.lw->w);
 }
 
-/* sync highlight flags with playlist */
-void
-sync_highlights(mpdclient_t *c, mpdclient_filelist_t *filelist)
+static void
+file_repaint_if_active(void)
 {
-	GList *list = g_list_first(filelist->list);
-
-	while(list) {
-		filelist_entry_t *entry = list->data;
-		mpd_InfoEntity *entity = entry->entity;
-
-		if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-			mpd_Song *song = entity->info.song;
-
-			if( playlist_get_index_from_file(c, song->file) >= 0 )
-				entry->flags |= HIGHLIGHT;
-			else
-				entry->flags &= ~HIGHLIGHT;
-		}
-		list=list->next;
-	}
+	if (screen_is_visible(&screen_browse))
+		file_repaint();
 }
 
 /* the db have changed -> update the filelist */
 static void
-file_changed_callback(mpdclient_t *c, int event, gpointer data)
+file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event,
+		      G_GNUC_UNUSED gpointer data)
 {
-	D("screen_file.c> filelist_callback() [%d]\n", event);
-	filelist = mpdclient_filelist_update(c, filelist);
-	sync_highlights(c, filelist);
-	list_window_check_selected(lw, filelist->length);
+	browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+#ifndef NCMPC_MINI
+	sync_highlights(c, browser.filelist);
+#endif
+	list_window_check_selected(browser.lw, filelist_length(browser.filelist));
+
+	file_repaint_if_active();
 }
 
+#ifndef NCMPC_MINI
 /* the playlist have been updated -> fix highlights */
 static void
 playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
 {
-	D("screen_file.c> playlist_callback() [%d]\n", event);
-	switch(event) {
-	case PLAYLIST_EVENT_CLEAR:
-		clear_highlights(filelist);
-		break;
-	case PLAYLIST_EVENT_ADD:
-		set_highlight(filelist, (mpd_Song *) data, 1);
-		break;
-	case PLAYLIST_EVENT_DELETE:
-		set_highlight(filelist, (mpd_Song *) data, 0);
-		break;
-	case PLAYLIST_EVENT_MOVE:
-		break;
-	default:
-		sync_highlights(c, filelist);
-		break;
-	}
-}
-
-/* list_window callback */
-const char *
-browse_lw_callback(int index, int *highlight, void *data)
-{
-	static char buf[BUFSIZE];
-	mpdclient_filelist_t *filelist = (mpdclient_filelist_t *) data;
-	filelist_entry_t *entry;
-	mpd_InfoEntity *entity;
-
-	*highlight = 0;
-	if( (entry=(filelist_entry_t *)g_list_nth_data(filelist->list,index))==NULL )
-		return NULL;
-
-	entity = entry->entity;
-	*highlight = (entry->flags & HIGHLIGHT);
-
-	if( entity == NULL )
-		return "[..]";
-
-	if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
-		mpd_Directory *dir = entity->info.directory;
-		char *dirname = utf8_to_locale(basename(dir->path));
-
-		g_snprintf(buf, BUFSIZE, "[%s]", dirname);
-		g_free(dirname);
-		return buf;
-	} else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-		mpd_Song *song = entity->info.song;
-
-		strfsong(buf, BUFSIZE, LIST_FORMAT, song);
-		return buf;
-	} else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
-		mpd_PlaylistFile *plf = entity->info.playlistFile;
-		char *filename = utf8_to_locale(basename(plf->path));
-
-#ifdef USE_OLD_LAYOUT
-		g_snprintf(buf, BUFSIZE, "*%s*", filename);
-#else
-		g_snprintf(buf, BUFSIZE, "<Playlist> %s", filename);
-#endif
-		g_free(filename);
-		return buf;
-	}
-
-	return "Error: Unknown entry!";
-}
-
-/* chdir */
-static int
-change_directory(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry,
-		 const char *new_path)
-{
-	mpd_InfoEntity *entity = NULL;
-	gchar *path = NULL;
-
-	if( entry!=NULL )
-		entity = entry->entity;
-	else if( new_path==NULL )
-		return -1;
-
-	if( entity==NULL ) {
-		if( entry || 0==strcmp(new_path, "..") ) {
-			/* return to parent */
-			char *parent = g_path_get_dirname(filelist->path);
-			if( strcmp(parent, ".") == 0 )
-				parent[0] = '\0';
-			path = g_strdup(parent);
-			list_window_reset(lw);
-			/* restore previous list window state */
-			list_window_pop_state(lw_state,lw);
-		} else {
-			/* entry==NULL, then new_path ("" is root) */
-			path = g_strdup(new_path);
-			list_window_reset(lw);
-			/* restore first list window state (pop while returning true) */
-			while(list_window_pop_state(lw_state,lw));
-		}
-	} else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY) {
-		/* enter sub */
-		mpd_Directory *dir = entity->info.directory;
-		path = utf8_to_locale(dir->path);
-		/* save current list window state */
-		list_window_push_state(lw_state,lw);
-	} else
-		return -1;
-
-	filelist = mpdclient_filelist_free(filelist);
-	filelist = mpdclient_filelist_get(c, path);
-	sync_highlights(c, filelist);
-	list_window_check_selected(lw, filelist->length);
-	g_free(path);
-	return 0;
-}
-
-static int
-load_playlist(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry)
-{
-	mpd_InfoEntity *entity = entry->entity;
-	mpd_PlaylistFile *plf = entity->info.playlistFile;
-	char *filename = utf8_to_locale(plf->path);
+	browser_playlist_changed(&browser, c, event, data);
 
-	if( mpdclient_cmd_load_playlist_utf8(c, plf->path) == 0 )
-		screen_status_printf(_("Loading playlist %s..."), basename(filename));
-	g_free(filename);
-	return 0;
+	file_repaint_if_active();
 }
+#endif
 
 static int
-handle_save(screen_t *screen, mpdclient_t *c)
+handle_save(mpdclient_t *c)
 {
 	filelist_entry_t *entry;
 	char *defaultname = NULL;
+	int ret;
 
+	if (browser.lw->selected >= filelist_length(browser.filelist))
+		return -1;
 
-	entry=( filelist_entry_t *) g_list_nth_data(filelist->list,lw->selected);
+	entry = filelist_get(browser.filelist, browser.lw->selected);
 	if( entry && entry->entity ) {
 		mpd_InfoEntity *entity = entry->entity;
 		if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
@@ -268,11 +95,15 @@ handle_save(screen_t *screen, mpdclient_t *c)
 		}
 	}
 
-	return playlist_save(screen, c, NULL, defaultname);
+	defaultname = utf8_to_locale(defaultname);
+	ret = playlist_save(c, NULL, defaultname);
+	g_free(defaultname);
+
+	return ret;
 }
 
 static int
-handle_delete(screen_t *screen, mpdclient_t *c)
+handle_delete(mpdclient_t *c)
 {
 	filelist_entry_t *entry;
 	mpd_InfoEntity *entity;
@@ -280,489 +111,219 @@ handle_delete(screen_t *screen, mpdclient_t *c)
 	char *str, *buf;
 	int key;
 
-	entry=( filelist_entry_t *) g_list_nth_data(filelist->list,lw->selected);
+	if (browser.lw->selected >= filelist_length(browser.filelist))
+		return -1;
+
+	entry = filelist_get(browser.filelist, browser.lw->selected);
 	if( entry==NULL || entry->entity==NULL )
 		return -1;
 
 	entity = entry->entity;
 
 	if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
-		screen_status_printf(_("You can only delete playlists!"));
+		screen_status_printf(_("You can only delete playlists"));
 		screen_bell();
 		return -1;
 	}
 
 	plf = entity->info.playlistFile;
-	str = utf8_to_locale(basename(plf->path));
+	str = utf8_to_locale(g_basename(plf->path));
 	buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
 	g_free(str);
-	key = tolower(screen_getch(screen->status_window.w, buf));
+	key = tolower(screen_getch(screen.status_window.w, buf));
 	g_free(buf);
-	if( key==KEY_RESIZE )
-		screen_resize();
 	if( key != YES[0] ) {
-		screen_status_printf(_("Aborted!"));
+		screen_status_printf(_("Aborted"));
 		return 0;
 	}
 
-	if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) )
+	if( mpdclient_cmd_delete_playlist(c, plf->path) )
 		return -1;
 
-	screen_status_printf(_("Playlist deleted!"));
-	return 0;
-}
-
-static int
-enqueue_and_play(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry)
-{
-	int index;
-	mpd_InfoEntity *entity = entry->entity;
-	mpd_Song *song = entity->info.song;
-
-	if(!( entry->flags & HIGHLIGHT )) {
-		if( mpdclient_cmd_add(c, song) == 0 ) {
-			char buf[BUFSIZE];
-
-			entry->flags |= HIGHLIGHT;
-			strfsong(buf, BUFSIZE, LIST_FORMAT, song);
-			screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
-			mpdclient_update(c); /* get song id */
-		} else
-			return -1;
-	}
-
-	index = playlist_get_index_from_file(c, song->file);
-	mpdclient_cmd_play(c, index);
-	return 0;
-}
-
-int
-browse_handle_enter(screen_t *screen,
-		    mpdclient_t *c,
-		    list_window_t *lw,
-		    mpdclient_filelist_t *filelist)
-{
-	filelist_entry_t *entry;
-	mpd_InfoEntity *entity;
-
-	if ( filelist==NULL )
-		return -1;
-	entry = ( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected);
-	if( entry==NULL )
-		return -1;
-
-	entity = entry->entity;
-	if( entity==NULL || entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY )
-		return change_directory(screen, c, entry, NULL);
-	else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
-		return load_playlist(screen, c, entry);
-	else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG )
-		return enqueue_and_play(screen, c, entry);
-	return -1;
-}
-
-
-#ifdef USE_OLD_ADD
-/* NOTE - The add_directory functions should move to mpdclient.c */
-extern gint mpdclient_finish_command(mpdclient_t *c);
-
-static int
-add_directory(mpdclient_t *c, char *dir)
-{
-	mpd_InfoEntity *entity;
-	GList *subdir_list = NULL;
-	GList *list = NULL;
-	char *dirname;
-
-	dirname = utf8_to_locale(dir);
-	screen_status_printf(_("Adding directory %s...\n"), dirname);
-	doupdate();
-	g_free(dirname);
-	dirname = NULL;
-
-	mpd_sendLsInfoCommand(c->connection, dir);
-	mpd_sendCommandListBegin(c->connection);
-	while( (entity=mpd_getNextInfoEntity(c->connection)) ) {
-		if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-			mpd_Song *song = entity->info.song;
-			mpd_sendAddCommand(c->connection, song->file);
-			mpd_freeInfoEntity(entity);
-		} else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
-			subdir_list = g_list_append(subdir_list, (gpointer) entity);
-		} else
-			mpd_freeInfoEntity(entity);
-	}
-	mpd_sendCommandListEnd(c->connection);
-	mpdclient_finish_command(c);
-	c->need_update = TRUE;
-
-	list = g_list_first(subdir_list);
-	while( list!=NULL ) {
-		mpd_Directory *dir;
-
-		entity = list->data;
-		dir = entity->info.directory;
-		add_directory(c, dir->path);
-		mpd_freeInfoEntity(entity);
-		list->data=NULL;
-		list=list->next;
-	}
-	g_list_free(subdir_list);
-	return 0;
-}
-#endif
-
-int
-browse_handle_select(screen_t *screen,
-		     mpdclient_t *c,
-		     list_window_t *lw,
-		     mpdclient_filelist_t *filelist)
-{
-	filelist_entry_t *entry;
-
-	if ( filelist==NULL )
-		return -1;
-	entry=( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected);
-	if( entry==NULL || entry->entity==NULL)
-		return -1;
-
-	if( entry->entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
-		return load_playlist(screen, c, entry);
-
-	if( entry->entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
-		mpd_Directory *dir = entry->entity->info.directory;
-#ifdef USE_OLD_ADD
-		add_directory(c, tmp);
-#else
-		if( mpdclient_cmd_add_path_utf8(c, dir->path) == 0 ) {
-			char *tmp = utf8_to_locale(dir->path);
-
-			screen_status_printf(_("Adding \'%s\' to playlist\n"), tmp);
-			g_free(tmp);
-		}
-#endif
-		return 0;
-	}
-
-	if( entry->entity->type!=MPD_INFO_ENTITY_TYPE_SONG )
-		return -1;
-
-	if( entry->flags & HIGHLIGHT )
-		entry->flags &= ~HIGHLIGHT;
-	else
-		entry->flags |= HIGHLIGHT;
-
-	if( entry->flags & HIGHLIGHT ) {
-		if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-			mpd_Song *song = entry->entity->info.song;
-
-			if( mpdclient_cmd_add(c, song) == 0 ) {
-				char buf[BUFSIZE];
-
-				strfsong(buf, BUFSIZE, LIST_FORMAT, song);
-				screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
-			}
-		}
-	} else {
-		/* remove song from playlist */
-		if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-			mpd_Song *song = entry->entity->info.song;
-
-			if( song ) {
-				int index = playlist_get_index_from_file(c, song->file);
-
-				while( (index=playlist_get_index_from_file(c, song->file))>=0 )
-					mpdclient_cmd_delete(c, index);
-			}
-		}
-	}
-	return 0;
-}
-
-int
-browse_handle_select_all (screen_t *screen,
-			  mpdclient_t *c,
-			  list_window_t *lw,
-			  mpdclient_filelist_t *filelist)
-{
-	filelist_entry_t *entry;
-	GList *temp = filelist->list;
-
-	if ( filelist==NULL )
-		return -1;
-	for (filelist->list = g_list_first(filelist->list);
-	     filelist->list;
-	     filelist->list = g_list_next(filelist->list)) {
-		entry=( filelist_entry_t *) filelist->list->data;
-		if( entry==NULL || entry->entity==NULL)
-			return -1;
-
-		if( entry->entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
-			load_playlist(screen, c, entry);
-
-		if( entry->entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
-			mpd_Directory *dir = entry->entity->info.directory;
-#ifdef USE_OLD_ADD
-			add_directory(c, tmp);
-#else
-			if (mpdclient_cmd_add_path_utf8(c, dir->path) == 0) {
-				char *tmp = utf8_to_locale(dir->path);
-
-				screen_status_printf(_("Adding \'%s\' to playlist\n"), tmp);
-				g_free(tmp);
-			}
-#endif
-		}
-
-		if( entry->entity->type!=MPD_INFO_ENTITY_TYPE_SONG )
-			continue;
-
-		entry->flags |= HIGHLIGHT;
-
-		if( entry->flags & HIGHLIGHT ) {
-			if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-				mpd_Song *song = entry->entity->info.song;
-
-				if( mpdclient_cmd_add(c, song) == 0 ) {
-					char buf[BUFSIZE];
-
-					strfsong(buf, BUFSIZE, LIST_FORMAT, song);
-					screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
-				}
-			}
-		}
-		/*
-		else {
-			//remove song from playlist
-			if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
-				mpd_Song *song = entry->entity->info.song;
-
-				if( song ) {
-					int index = playlist_get_index_from_file(c, song->file);
-
-					while( (index=playlist_get_index_from_file(c, song->file))>=0 )
-						mpdclient_cmd_delete(c, index);
-				}
-			}
-		}
-		*/
-		return 0;
-	}
-
-	filelist->list = temp;
+	screen_status_printf(_("Playlist deleted"));
 	return 0;
 }
 
 static void
 browse_init(WINDOW *w, int cols, int rows)
 {
-	lw = list_window_init(w, cols, rows);
-	lw_state = list_window_init_state();
+	browser.lw = list_window_init(w, cols, rows);
 }
 
 static void
 browse_resize(int cols, int rows)
 {
-	lw->cols = cols;
-	lw->rows = rows;
+	browser.lw->cols = cols;
+	browser.lw->rows = rows;
 }
 
 static void
 browse_exit(void)
 {
-	if( filelist )
-		filelist = mpdclient_filelist_free(filelist);
-	lw = list_window_free(lw);
-	lw_state = list_window_free_state(lw_state);
+	if (browser.filelist)
+		filelist_free(browser.filelist);
+	list_window_free(browser.lw);
 }
 
 static void
-browse_open(screen_t *screen, mpdclient_t *c)
+browse_open(G_GNUC_UNUSED mpdclient_t *c)
 {
-	if( filelist == NULL ) {
-		filelist = mpdclient_filelist_get(c, "");
+	if (browser.filelist == NULL) {
+		browser.filelist = mpdclient_filelist_get(c, "");
+#ifndef NCMPC_MINI
 		mpdclient_install_playlist_callback(c, playlist_changed_callback);
+#endif
 		mpdclient_install_browse_callback(c, file_changed_callback);
 	}
 }
 
-static void
-browse_close(void)
-{
-}
-
 static const char *
 browse_title(char *str, size_t size)
 {
-	char *pathcopy;
-	char *parentdir;
+	const char *path = NULL, *prev = NULL, *slash = browser.filelist->path;
+	char *path_locale;
 
-	pathcopy = strdup(filelist->path);
-	parentdir = dirname(pathcopy);
-	parentdir = basename(parentdir);
-
-	if( parentdir[0] == '.' && strlen(parentdir) == 1 ) {
-		parentdir = NULL;
+	/* determine the last 2 parts of the path */
+	while ((slash = strchr(slash, '/')) != NULL) {
+		path = prev;
+		prev = ++slash;
 	}
 
-	g_snprintf(str, size, _("Browse: %s%s%s"),
-		   parentdir ? parentdir : "",
-		   parentdir ? "/" : "",
-		   basename(filelist->path));
-	free(pathcopy);
+	if (path == NULL)
+		/* fall back to full path */
+		path = browser.filelist->path;
+
+	path_locale = utf8_to_locale(path);
+	g_snprintf(str, size, _("Browse: %s"), path_locale);
+	g_free(path_locale);
 	return str;
 }
 
 static void
-browse_paint(screen_t *screen, mpdclient_t *c)
+browse_paint(void)
 {
-	lw->clear = 1;
-
-	list_window_paint(lw, browse_lw_callback, (void *) filelist);
-	wnoutrefresh(lw->w);
+	list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
 }
 
-static void
-browse_update(screen_t *screen, mpdclient_t *c)
+static bool
+browse_cmd(mpdclient_t *c, command_t cmd)
 {
-	if( filelist->updated ) {
-		browse_paint(screen, c);
-		filelist->updated = FALSE;
-		return;
+	switch(cmd) {
+	case CMD_GO_ROOT_DIRECTORY:
+		browser_change_directory(&browser, c, NULL, "");
+		file_repaint();
+		return true;
+	case CMD_GO_PARENT_DIRECTORY:
+		browser_change_directory(&browser, c, NULL, "..");
+		file_repaint();
+		return true;
+
+	case CMD_LOCATE:
+		/* don't let browser_cmd() evaluate the locate command
+		   - it's a no-op, and by the way, leads to a
+		   segmentation fault in the current implementation */
+		return false;
+
+	case CMD_DELETE:
+		handle_delete(c);
+		file_repaint();
+		break;
+	case CMD_SAVE_PLAYLIST:
+		handle_save(c);
+		break;
+	case CMD_SCREEN_UPDATE:
+		browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+#ifndef NCMPC_MINI
+		sync_highlights(c, browser.filelist);
+#endif
+		list_window_check_selected(browser.lw,
+					   filelist_length(browser.filelist));
+		file_repaint();
+		return false;
+
+	case CMD_DB_UPDATE:
+		if (c->status == NULL)
+			return true;
+
+		if (!c->status->updatingDb) {
+			if (mpdclient_cmd_db_update(c, browser.filelist->path) == 0) {
+				if (strcmp(browser.filelist->path, "")) {
+					char *path_locale =
+						utf8_to_locale(browser.filelist->path);
+					screen_status_printf(_("Database update of %s started"),
+							     path_locale);
+					g_free(path_locale);
+				} else
+					screen_status_printf(_("Database update started"));
+
+				/* set updatingDb to make shure the browse callback gets called
+				 * even if the updated has finished before status is updated */
+				c->status->updatingDb = 1;
+			}
+		} else
+			screen_status_printf(_("Database update running..."));
+		return true;
+
+	default:
+		break;
 	}
 
-	list_window_paint(lw, browse_lw_callback, (void *) filelist);
-	wnoutrefresh(lw->w);
-}
+	if (browser_cmd(&browser, c, cmd)) {
+		if (screen_is_visible(&screen_browse))
+			file_repaint();
+		return true;
+	}
 
+	return false;
+}
 
-#ifdef HAVE_GETMOUSE
-int
-browse_handle_mouse_event(screen_t *screen,
-			  mpdclient_t *c,
-			  list_window_t *lw,
-			  mpdclient_filelist_t *filelist)
+const struct screen_functions screen_browse = {
+	.init = browse_init,
+	.exit = browse_exit,
+	.open = browse_open,
+	.resize = browse_resize,
+	.paint = browse_paint,
+	.cmd = browse_cmd,
+	.get_title = browse_title,
+};
+
+bool
+screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song)
 {
-	int row;
-	int prev_selected = lw->selected;
-	unsigned long bstate;
-	int length;
+	const char *slash, *parent;
+	char *allocated = NULL;
+	bool ret;
+	int i;
 
-	if ( filelist )
-		length = filelist->length;
-	else
-		length = 0;
+	assert(song != NULL);
+	assert(song->file != NULL);
 
-	if( screen_get_mouse_event(c, lw, length, &bstate, &row) )
-		return 1;
+	if (strstr(song->file, "//") != NULL)
+		/* an URL? */
+		return false;
 
-	lw->selected = lw->start+row;
-	list_window_check_selected(lw, length);
+	/* determine the song's parent directory and go there */
 
-	if( bstate & BUTTON1_CLICKED ) {
-		if( prev_selected == lw->selected )
-			browse_handle_enter(screen, c, lw, filelist);
-	} else if( bstate & BUTTON3_CLICKED ) {
-		if( prev_selected == lw->selected )
-			browse_handle_select(screen, c, lw, filelist);
-	}
+	slash = strrchr(song->file, '/');
+	if (slash != NULL)
+		parent = allocated = g_strndup(song->file, slash - song->file);
+	else
+		parent = "";
 
-	return 1;
-}
-#endif
+	ret = browser_change_directory(&browser, c, NULL, parent);
+	g_free(allocated);
+	if (!ret)
+		return false;
 
-static int
-browse_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
-{
-	switch(cmd)
-		{
-		case CMD_PLAY:
-			browse_handle_enter(screen, c, lw, filelist);
-			return 1;
-		case CMD_GO_ROOT_DIRECTORY:
-			return change_directory(screen, c, NULL, "");
-			break;
-		case CMD_GO_PARENT_DIRECTORY:
-			return change_directory(screen, c, NULL, "..");
-			break;
-		case CMD_SELECT:
-			if( browse_handle_select(screen, c, lw, filelist) == 0 )
-				{
-					/* continue and select next item... */
-					cmd = CMD_LIST_NEXT;
-				}
-			break;
-		case CMD_DELETE:
-			handle_delete(screen, c);
-			break;
-		case CMD_SAVE_PLAYLIST:
-			handle_save(screen, c);
-			break;
-		case CMD_SCREEN_UPDATE:
-			screen->painted = 0;
-			lw->clear = 1;
-			lw->repaint = 1;
-			filelist = mpdclient_filelist_update(c, filelist);
-			list_window_check_selected(lw, filelist->length);
-			screen_status_printf(_("Screen updated!"));
-			return 1;
-		case CMD_DB_UPDATE:
-			if( !c->status->updatingDb )
-				{
-					if( mpdclient_cmd_db_update_utf8(c,filelist->path)==0 )
-						{
-							if(strcmp(filelist->path,"")) {
-								screen_status_printf(_("Database update of %s started!"),
-										     filelist->path);
-							} else {
-								screen_status_printf(_("Database update started!"));
-							}
-							/* set updatingDb to make shure the browse callback gets called
-							 * even if the updated has finished before status is updated */
-							c->status->updatingDb = 1;
-						}
-				}
-			else
-				screen_status_printf(_("Database update running..."));
-			return 1;
-		case CMD_LIST_FIND:
-		case CMD_LIST_RFIND:
-		case CMD_LIST_FIND_NEXT:
-		case CMD_LIST_RFIND_NEXT:
-			return screen_find(screen,
-					   lw, filelist->length,
-					   cmd, browse_lw_callback, (void *) filelist);
-		case CMD_MOUSE_EVENT:
-			return browse_handle_mouse_event(screen,c,lw,filelist);
-		default:
-			break;
-		}
-	return list_window_cmd(lw, filelist->length, cmd);
-}
+	/* select the specified song */
 
-list_window_t *
-get_filelist_window()
-{
-	return lw;
-}
+	i = filelist_find_song(browser.filelist, song);
+	if (i < 0)
+		i = 0;
 
-screen_functions_t *
-get_screen_browse(void)
-{
-	static screen_functions_t functions;
-
-	memset(&functions, 0, sizeof(screen_functions_t));
-	functions.init = browse_init;
-	functions.exit = browse_exit;
-	functions.open = browse_open;
-	functions.close = browse_close;
-	functions.resize = browse_resize;
-	functions.paint = browse_paint;
-	functions.update = browse_update;
-	functions.cmd = browse_cmd;
-	functions.get_lw = get_filelist_window;
-	functions.get_title = browse_title;
-
-	return &functions;
-}
+	list_window_set_selected(browser.lw, i);
 
+	/* finally, switch to the file screen */
+	screen_switch(&screen_browse, c);
+	return true;
+}