list_window: remove list_window_state_t

[ncmpc.git] / src / screen_browser.c

diff --git a/src/screen_browser.c b/src/screen_browser.c
index 694987fae926d88914245862018aee327a25f654..4457e7e5954628dc03d15588b7f32a75a30cc71e 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -18,22 +18,23 @@
  */
 
 #include "screen_browser.h"
-#include "ncmpc.h"
+#include "i18n.h"
 #include "options.h"
-#include "support.h"
+#include "charset.h"
 #include "strfsong.h"
 #include "screen_utils.h"
 #include "gcc.h"
 
 #include <string.h>
 
-#define USE_OLD_LAYOUT
 #undef  USE_OLD_ADD
 
 #define BUFSIZE 1024
 
 #define HIGHLIGHT  (0x01)
 
+static const char playlist_format[] = "*%s*";
+
 /* clear the highlight flag for all items in the filelist */
 static void
 clear_highlights(mpdclient_filelist_t *fl)
@@ -93,7 +94,6 @@ browser_playlist_changed(struct screen_browser *browser, mpdclient_t *c,
        if (browser->filelist == NULL)
                return;
 
-       D("screen_file.c> playlist_callback() [%d]\n", event);
        switch(event) {
        case PLAYLIST_EVENT_CLEAR:
                clear_highlights(browser->filelist);
@@ -135,7 +135,7 @@ browser_lw_callback(unsigned idx, int *highlight, void *data)
 
        if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
                mpd_Directory *dir = entity->info.directory;
-               char *directory = utf8_to_locale(basename(dir->path));
+               char *directory = utf8_to_locale(g_basename(dir->path));
 
                g_snprintf(buf, BUFSIZE, "[%s]", directory);
                g_free(directory);
@@ -143,17 +143,13 @@ browser_lw_callback(unsigned idx, int *highlight, void *data)
        } else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
                mpd_Song *song = entity->info.song;
 
-               strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+               strfsong(buf, BUFSIZE, options.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));
+               char *filename = utf8_to_locale(g_basename(plf->path));
 
-#ifdef USE_OLD_LAYOUT
-               g_snprintf(buf, BUFSIZE, "*%s*", filename);
-#else
-               g_snprintf(buf, BUFSIZE, "<Playlist> %s", filename);
-#endif
+               g_snprintf(buf, BUFSIZE, playlist_format, filename);
                g_free(filename);
                return buf;
        }
@@ -168,6 +164,8 @@ browser_change_directory(struct screen_browser *browser, mpdclient_t *c,
 {
        mpd_InfoEntity *entity = NULL;
        gchar *path = NULL;
+       char *old_path;
+       int idx;
 
        if( entry!=NULL )
                entity = entry->entity;
@@ -181,29 +179,33 @@ browser_change_directory(struct screen_browser *browser, mpdclient_t *c,
                        if( strcmp(parent, ".") == 0 )
                                parent[0] = '\0';
                        path = g_strdup(parent);
-                       list_window_reset(browser->lw);
-                       /* restore previous list window state */
-                       list_window_pop_state(browser->lw_state, browser->lw);
                } else {
                        /* entry==NULL, then new_path ("" is root) */
                        path = g_strdup(new_path);
-                       list_window_reset(browser->lw);
-                       /* restore first list window state (pop while returning true) */
-                       while(list_window_pop_state(browser->lw_state, browser->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(browser->lw_state, browser->lw);
        } else
                return -1;
 
+       old_path = g_strdup(browser->filelist->path);
+
        filelist_free(browser->filelist);
        browser->filelist = mpdclient_filelist_get(c, path);
        sync_highlights(c, browser->filelist);
-       list_window_check_selected(browser->lw, filelist_length(browser->filelist));
+
+       idx = filelist_find_directory(browser->filelist, old_path);
+       g_free(old_path);
+
+       list_window_reset(browser->lw);
+       if (idx >= 0) {
+               list_window_set_selected(browser->lw, idx);
+               list_window_center(browser->lw,
+                                  filelist_length(browser->filelist), idx);
+       }
+
        g_free(path);
        return 0;
 }
@@ -216,7 +218,8 @@ load_playlist(mpdclient_t *c, filelist_entry_t *entry)
        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));
+               screen_status_printf(_("Loading playlist %s..."),
+                                    g_basename(filename));
        g_free(filename);
        return 0;
 }
@@ -233,7 +236,7 @@ enqueue_and_play(mpdclient_t *c, filelist_entry_t *entry)
                        char buf[BUFSIZE];
 
                        entry->flags |= HIGHLIGHT;
-                       strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+                       strfsong(buf, BUFSIZE, options.list_format, song);
                        screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
                        mpdclient_update(c); /* get song id */
                } else
@@ -255,7 +258,7 @@ browser_get_selected(const struct screen_browser *browser)
        return filelist_get(browser->filelist, browser->lw->selected);
 }
 
-int
+static int
 browser_handle_enter(struct screen_browser *browser, mpdclient_t *c)
 {
        struct filelist_entry *entry = browser_get_selected(browser);
@@ -363,7 +366,7 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
                if (mpdclient_cmd_add(c, song) == 0) {
                        char buf[BUFSIZE];
 
-                       strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+                       strfsong(buf, BUFSIZE, options.list_format, song);
                        screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
                }
        } else {
@@ -380,7 +383,7 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
        return 0;
 }
 
-int
+static int
 browser_handle_select(struct screen_browser *browser, mpdclient_t *c)
 {
        struct filelist_entry *entry = browser_get_selected(browser);
@@ -391,7 +394,7 @@ browser_handle_select(struct screen_browser *browser, mpdclient_t *c)
        return browser_select_entry(c, entry, TRUE);
 }
 
-int
+static int
 browser_handle_add(struct screen_browser *browser, mpdclient_t *c)
 {
        struct filelist_entry *entry = browser_get_selected(browser);
@@ -402,7 +405,7 @@ browser_handle_add(struct screen_browser *browser, mpdclient_t *c)
        return browser_select_entry(c, entry, FALSE);
 }
 
-void
+static void
 browser_handle_select_all(struct screen_browser *browser, mpdclient_t *c)
 {
        guint i;
@@ -419,7 +422,7 @@ browser_handle_select_all(struct screen_browser *browser, mpdclient_t *c)
 }
 
 #ifdef HAVE_GETMOUSE
-int
+static int
 browser_handle_mouse_event(struct screen_browser *browser, mpdclient_t *c)
 {
        int row;
@@ -492,9 +495,11 @@ browser_cmd(struct screen_browser *browser, struct screen *screen,
                            browser->filelist);
                return true;
 
+#ifdef HAVE_GETMOUSE
        case CMD_MOUSE_EVENT:
                browser_handle_mouse_event(browser, c);
                return true;
+#endif
 
 #ifdef ENABLE_LYRICS_SCREEN
        case CMD_SCREEN_LYRICS: