X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=7fe55876c321b1d8795eb65f062c20f428df6f8f;hb=b9374ac617f41d806e06b04f7f3cecb14ea55fe4;hp=02dc4c4b3feefb390af21a49c3b4d96da72b468b;hpb=b268b9992faa303d6283c5a88ba460b5fd73cef6;p=ncmpc.git

diff --git a/src/screen_file.c b/src/screen_file.c
index 02dc4c4..7fe5587 100644
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -1,672 +1,436 @@
-/* 
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 #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 "filelist.h"
 #include "command.h"
 #include "screen.h"
 #include "screen_utils.h"
+#include "screen_browser.h"
+#include "screen_play.h"
+#include "screen_client.h"
 
+#include <mpd/client.h>
 
-#define USE_OLD_LAYOUT
-#undef  USE_OLD_ADD
-
-#define BUFSIZE 1024
-
-#define HIGHLIGHT  (0x01)
-
-
-static list_window_t *lw = NULL;
-static GList *lw_state_list = NULL;
-static mpdclient_filelist_t *filelist = NULL;
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
 
+static struct screen_browser browser;
+static char *current_path;
 
+static void
+browse_paint(void);
 
-/* clear the highlight flag for all items in the filelist */
 static void
-clear_highlights(mpdclient_filelist_t *filelist)
+file_repaint(void)
 {
-  GList *list = g_list_first(filelist->list);
-  
-  while( list )
-    {
-      filelist_entry_t *entry = list->data;
-
-      entry->flags &= ~HIGHLIGHT;
-      list = list->next;
-    }
+	browse_paint();
+	wrefresh(browser.lw->w);
 }
 
-/* change the highlight flag for a song */
 static void
-set_highlight(mpdclient_filelist_t *filelist, mpd_Song *song, int highlight)
+file_reload(struct mpdclient *c)
 {
-  GList *list = g_list_first(filelist->list);
-
-  if( !song )
-    return;
+	if (browser.filelist != NULL)
+		filelist_free(browser.filelist);
 
-  while( list )
-    {
-      filelist_entry_t *entry = list->data;
-      mpd_InfoEntity *entity  = entry->entity;
+	browser.filelist = mpdclient_filelist_get(c, current_path);
+	if (browser.filelist == NULL)
+		browser.filelist = filelist_new();
 
-      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;
-    }
+	if (*current_path != 0)
+		/* add a dummy entry for ./.. */
+		filelist_prepend(browser.filelist, NULL);
 }
 
-/* sync highlight flags with playlist */
-static void
-sync_highlights(mpdclient_t *c, mpdclient_filelist_t *filelist)
+/**
+ * Change to the specified absolute directory.
+ */
+static bool
+file_change_directory(struct mpdclient *c, const char *new_path)
 {
-  GList *list = g_list_first(filelist->list);
+	g_free(current_path);
+	current_path = g_strdup(new_path);
 
-  while(list)
-    {
-      filelist_entry_t *entry = list->data;
-      mpd_InfoEntity *entity = entry->entity;
+	file_reload(c);
 
-      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;
-    }
-}
+#ifndef NCMPC_MINI
+	sync_highlights(c, browser.filelist);
+#endif
 
-/* the db have changed -> update the filelist */
-static void 
-file_changed_callback(mpdclient_t *c, int event, 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);
-}
+	list_window_reset(browser.lw);
 
-/* 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;
-    }
+	return browser.filelist != NULL;
 }
 
-/* store current state when entering a subdirectory */
-static void
-push_lw_state(void)
+/**
+ * Change to the parent directory of the current directory.
+ */
+static bool
+file_change_to_parent(struct mpdclient *c)
 {
-  list_window_t *tmp = g_malloc(sizeof(list_window_t));
+	char *parent = g_path_get_dirname(current_path);
+	char *old_path;
+	int idx;
+	bool success;
+
+	if (strcmp(parent, ".") == 0)
+		parent[0] = '\0';
+
+	old_path = current_path;
+	current_path = NULL;
+
+	success = file_change_directory(c, parent);
+	g_free(parent);
+
+	idx = success
+		? filelist_find_directory(browser.filelist, old_path)
+		: -1;
+	g_free(old_path);
+
+	if (success && idx >= 0) {
+		/* set the cursor on the previous working directory */
+		list_window_set_selected(browser.lw, idx);
+		list_window_center(browser.lw,
+				   filelist_length(browser.filelist), idx);
+	}
 
-  memcpy(tmp, lw, sizeof(list_window_t));
-  lw_state_list = g_list_prepend(lw_state_list, (gpointer) tmp);
+	return success;
 }
 
-/* get previous state when leaving a directory */
-static void
-pop_lw_state(void)
+/**
+ * Change to the directory referred by the specified #filelist_entry
+ * object.
+ */
+static bool
+file_change_to_entry(struct mpdclient *c, const struct filelist_entry *entry)
 {
-  if( lw_state_list )
-    {
-      list_window_t *tmp = lw_state_list->data;
-
-      memcpy(lw, tmp, sizeof(list_window_t));
-      g_free(tmp);
-      lw_state_list->data = NULL;
-      lw_state_list = g_list_delete_link(lw_state_list, lw_state_list);
-    }
+	assert(entry != NULL);
+
+	if (entry->entity == NULL)
+		return file_change_to_parent(c);
+	else if (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_DIRECTORY)
+		return file_change_directory(c, mpd_directory_get_path(mpd_entity_get_directory(entry->entity)));
+	else
+		return false;
 }
 
-/* list_window callback */
-static char *
-list_callback(int index, int *highlight, void *data)
+static bool
+file_handle_enter(struct mpdclient *c)
 {
-  static char buf[BUFSIZE];
-  //mpdclient_t *c = (mpdclient_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));
-
-      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      
-      snprintf(buf, BUFSIZE, "*%s*", filename);
-#else 
-      snprintf(buf, BUFSIZE, "<Playlist> %s", filename);
-#endif
-      g_free(filename);
-      return buf;
-    }
-  return "Error: Unknow entry!";
-}
+	const struct filelist_entry *entry = browser_get_selected_entry(&browser);
 
-/* chdir */
-static int
-change_directory(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry)
-{
-  mpd_InfoEntity *entity = entry->entity;
-  gchar *path = NULL;
-
-  if( entity==NULL )
-    {
-      /* 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 */
-      pop_lw_state(); 
-    }
-  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 */
-	push_lw_state(); 
-	list_window_reset(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);
-
-  if( mpdclient_cmd_load_playlist_utf8(c, plf->path) == 0 )
-    screen_status_printf(_("Loading playlist %s..."), basename(filename));
-  g_free(filename);
-  return 0;
-}
+	if (entry == NULL)
+		return false;
 
-static int 
-handle_delete(screen_t *screen, mpdclient_t *c)
-{
-  filelist_entry_t *entry;
-  mpd_InfoEntity *entity;
-  mpd_PlaylistFile *plf;
-  char *str, buf[BUFSIZE];
-  int key;
-
-  entry=( filelist_entry_t *) g_list_nth_data(filelist->list,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_bell();
-      return -1;
-    }
-
-  plf = entity->info.playlistFile;
-  str = utf8_to_locale(basename(plf->path));
-  snprintf(buf, BUFSIZE, _("Delete playlist %s [%s/%s] ? "), str, YES, NO);
-  g_free(str);  
-  key = tolower(screen_getch(screen->status_window.w, buf));
-  if( key==KEY_RESIZE )
-    screen_resize();
-  if( key != YES[0] )
-    {
-      screen_status_printf(_("Aborted!"));
-      return 0;
-    }
-
-  if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) )
-    {
-      return -1;
-    }
-  screen_status_printf(_("Playlist deleted!"));
-  return 0;
+	return file_change_to_entry(c, entry);
 }
 
-
 static int
-handle_enter(screen_t *screen, mpdclient_t *c)
+handle_save(struct mpdclient *c)
 {
-  filelist_entry_t *entry;
-  mpd_InfoEntity *entity;
-  
-  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);
-  else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
-    return load_playlist(screen, c, entry);
-  return -1;
-}
-
+	struct filelist_entry *entry;
+	const char *defaultname = NULL;
+	char *defaultname_utf8 = NULL;
+	int ret;
+	unsigned selected;
 
-#ifdef USE_OLD_ADD
-/* NOTE - The add_directory functions should move to mpdclient.c */
-extern gint mpdclient_finish_command(mpdclient_t *c);
+	if (browser.lw->selected >= filelist_length(browser.filelist))
+		return -1;
 
-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 )
+	for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
 	{
-	  mpd_Song *song = entity->info.song;
-	  mpd_sendAddCommand(c->connection, song->file);
-	  mpd_freeInfoEntity(entity);
+		entry = filelist_get(browser.filelist, selected);
+		if( entry && entry->entity ) {
+			struct mpd_entity *entity = entry->entity;
+			if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST) {
+				const struct mpd_playlist *playlist =
+					mpd_entity_get_playlist(entity);
+				defaultname = mpd_playlist_get_path(playlist);
+			}
+		}
 	}
-      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;
+
+	if(defaultname)
+		defaultname_utf8 = utf8_to_locale(defaultname);
+	ret = playlist_save(c, NULL, defaultname_utf8);
+	g_free(defaultname_utf8);
+
+	return ret;
 }
-#endif
 
 static int
-handle_select(screen_t *screen, mpdclient_t *c)
+handle_delete(struct mpdclient *c)
 {
-  filelist_entry_t *entry;
-
-  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 )
+	struct filelist_entry *entry;
+	struct mpd_entity *entity;
+	const struct mpd_playlist *playlist;
+	char *str, *buf;
+	int key;
+	unsigned selected;
+
+	for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
 	{
-	  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);
-	    }
+		if (selected >= filelist_length(browser.filelist))
+			return -1;
+
+		entry = filelist_get(browser.filelist, selected);
+		if( entry==NULL || entry->entity==NULL )
+			continue;
+
+		entity = entry->entity;
+
+		if (mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) {
+			/* translators: the "delete" command is only possible
+			   for playlists; the user attempted to delete a song
+			   or a directory or something else */
+			screen_status_printf(_("Deleting this item is not possible"));
+			screen_bell();
+			continue;
+		}
+
+		playlist = mpd_entity_get_playlist(entity);
+		str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
+		buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
+		g_free(str);
+		key = tolower(screen_getch(buf));
+		g_free(buf);
+		if( key != YES[0] ) {
+			/* translators: a dialog was aborted by the user */
+			screen_status_printf(_("Aborted"));
+			return 0;
+		}
+
+		if (mpdclient_cmd_delete_playlist(c, mpd_playlist_get_path(playlist)))
+			continue;
+
+		/* translators: MPD deleted the playlist, as requested by the
+		   user */
+		screen_status_printf(_("Playlist deleted"));
 	}
-    }
-  return 0;
+	return 0;
 }
 
 static void
 browse_init(WINDOW *w, int cols, int rows)
 {
-  lw = list_window_init(w, cols, rows);
+	current_path = g_strdup("");
+
+	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( lw_state_list )
-    {
-      GList *list = lw_state_list;
-      while( list )
-	{
-	  g_free(list->data);
-	  list->data = NULL;
-	  list = list->next;
-	}
-      g_list_free(lw_state_list);
-      lw_state_list = NULL;
+	if (browser.filelist)
+		filelist_free(browser.filelist);
+	list_window_free(browser.lw);
 
-    }
-  if( filelist )
-    filelist = mpdclient_filelist_free(filelist);
-  list_window_free(lw);
-}
-
-static void 
-browse_open(screen_t *screen, mpdclient_t *c)
-{
-  if( filelist == NULL )
-    {
-      filelist = mpdclient_filelist_get(c, "");
-      mpdclient_install_playlist_callback(c, playlist_changed_callback);
-      mpdclient_install_browse_callback(c, file_changed_callback);
-    }
+	g_free(current_path);
 }
 
 static void
-browse_close(void)
+browse_open(struct mpdclient *c)
 {
+	file_reload(c);
 }
 
-static char *
+static const char *
 browse_title(char *str, size_t size)
 {
-  snprintf(str, size, _("Browse: %s"), basename(filelist->path));
-  return str;
+	const char *path = NULL, *prev = NULL, *slash = current_path;
+	char *path_locale;
+
+	/* determine the last 2 parts of the path */
+	while ((slash = strchr(slash, '/')) != NULL) {
+		path = prev;
+		prev = ++slash;
+	}
+
+	if (path == NULL)
+		/* fall back to full path */
+		path = current_path;
+
+	path_locale = utf8_to_locale(path);
+	g_snprintf(str, size, "%s: %s",
+		   /* translators: caption of the browser screen */
+		   _("Browse"), path_locale);
+	g_free(path_locale);
+	return str;
 }
 
-static void 
-browse_paint(screen_t *screen, mpdclient_t *c)
+static void
+browse_paint(void)
 {
-  lw->clear = 1;
-  
-  list_window_paint(lw, list_callback, (void *) c);
-  wnoutrefresh(lw->w);
+	list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
 }
 
-static void 
-browse_update(screen_t *screen, mpdclient_t *c)
+static void
+screen_file_update(struct mpdclient *c)
 {
-  if( filelist->updated )
-    {
-      browse_paint(screen, c);
-      filelist->updated = FALSE;
-      return;
-    }
-  list_window_paint(lw, list_callback, (void *) c);
-  wnoutrefresh(lw->w);
-}
+	if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) {
+		/* the db has changed -> update the filelist */
+		file_reload(c);
+		list_window_check_selected(browser.lw,
+					   filelist_length(browser.filelist));
+	}
 
+#ifndef NCMPC_MINI
+	if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST |
+			 MPD_IDLE_PLAYLIST))
+		sync_highlights(c, browser.filelist);
+#endif
 
-#ifdef HAVE_GETMOUSE
-static int
-handle_mouse_event(screen_t *screen, mpdclient_t *c)
-{
-  int row;
-  int prev_selected = lw->selected;
-  unsigned long bstate;
-
-  if( screen_get_mouse_event(c, lw, filelist->length, &bstate, &row) )
-    return 1;
-
-  lw->selected = lw->start+row;
-  list_window_check_selected(lw, filelist->length);
-
-  if( bstate & BUTTON1_CLICKED )
-    {
-      if( prev_selected == lw->selected )
-	handle_enter(screen, c);
-    }
-  else if( bstate & BUTTON3_CLICKED )
-    {
-      if( prev_selected == lw->selected )
-	handle_select(screen, c);
-    }
-
-  return 1;
-}
-#else
-#define handle_mouse_event(s,c) (0)
+	if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
+#ifndef NCMPC_MINI
+			 | MPD_IDLE_PLAYLIST
 #endif
+			 ))
+		file_repaint();
+}
 
-static int 
-browse_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+static bool
+browse_cmd(struct mpdclient *c, command_t cmd)
 {
-  switch(cmd)
-    {
-    case CMD_PLAY:
-      handle_enter(screen, c);
-      return 1;
-    case CMD_SELECT:
-      if( handle_select(screen, c) == 0 )
-	{
-	  /* continue and select next item... */
-	  cmd = CMD_LIST_NEXT;
+	switch(cmd) {
+	case CMD_PLAY:
+		if (file_handle_enter(c)) {
+			file_repaint();
+			return true;
+		}
+
+		break;
+
+	case CMD_GO_ROOT_DIRECTORY:
+		file_change_directory(c, "");
+		file_repaint();
+		return true;
+	case CMD_GO_PARENT_DIRECTORY:
+		file_change_to_parent(c);
+		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:
+		file_reload(c);
+#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;
+
+		screen_database_update(c, current_path);
+		return true;
+
+	default:
+		break;
 	}
-      break;
-    case CMD_DELETE:
-      handle_delete(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 )
-	    {
-	      screen_status_printf(_("Database update of %s started!"),
-				   filelist->path);
-	      /* set updatingDb to make shure the browse callback gets called
-	       * even if the updated has finished before status is updated */
-	      c->status->updatingDb = 1; 
-	    }
+
+	if (browser_cmd(&browser, c, cmd)) {
+		if (screen_is_visible(&screen_browse))
+			file_repaint();
+		return true;
 	}
-      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, c, 
-			 lw, filelist->length,
-			 cmd, list_callback);
-    case CMD_MOUSE_EVENT:
-      return handle_mouse_event(screen,c);
-    default:
-      break;
-    }
-  return list_window_cmd(lw, filelist->length, cmd);
-}
 
+	return false;
+}
 
-list_window_t *
-get_filelist_window()
+const struct screen_functions screen_browse = {
+	.init = browse_init,
+	.exit = browse_exit,
+	.open = browse_open,
+	.resize = browse_resize,
+	.paint = browse_paint,
+	.update = screen_file_update,
+	.cmd = browse_cmd,
+	.get_title = browse_title,
+};
+
+bool
+screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song)
 {
-  return lw;
-}
+	const char *uri, *slash, *parent;
+	char *allocated = NULL;
+	bool ret;
+	int i;
 
+	assert(song != NULL);
 
+	uri = mpd_song_get_uri(song);
 
+	if (strstr(uri, "//") != NULL)
+		/* an URL? */
+		return false;
 
-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;
-}
+	/* determine the song's parent directory and go there */
 
+	slash = strrchr(uri, '/');
+	if (slash != NULL)
+		parent = allocated = g_strndup(uri, slash - uri);
+	else
+		parent = "";
+
+	ret = file_change_directory(c, parent);
+	g_free(allocated);
+	if (!ret)
+		return false;
+
+	/* select the specified song */
+
+	i = filelist_find_song(browser.filelist, song);
+	if (i < 0)
+		i = 0;
+
+	list_window_set_selected(browser.lw, i);
+
+	/* finally, switch to the file screen */
+	screen_switch(&screen_browse, c);
+	return true;
+}