mpdclient: fall back to simple "deleteid" if range is 1

[ncmpc.git] / src / command.c

diff --git a/src/command.c b/src/command.c
index ad8b8d49322e15ba25b77539450e580a41e8ee0b..3fe825c39fc6be6b0d79f2b4b6c55863949573b3 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -71,21 +71,37 @@ static command_definition_t cmds[] = {
        { { 'q', 'Q', 3 }, 0, CMD_QUIT, "quit",
          N_("Quit") },
 
-       /* movment */
+       /* movement */
        { { UP, 'k', 0 }, 0, CMD_LIST_PREVIOUS, "up",
          N_("Move cursor up") },
        { { DWN, 'j', 0 }, 0, CMD_LIST_NEXT, "down",
          N_("Move cursor down") },
+       { { 'H', 0, 0 }, 0, CMD_LIST_TOP, "top",
+         N_("Move cursor to the top of screen") },
+       { { 'M', 0, 0 }, 0, CMD_LIST_MIDDLE, "middle",
+         N_("Move cursor to the middle of screen") },
+       { { 'L', 0, 0 }, 0, CMD_LIST_BOTTOM, "bottom",
+         N_("Move cursor to the bottom of screen") },
        { { HOME, 0x01, 0 }, 0, CMD_LIST_FIRST, "home",
-         N_("Home") },
+         N_("Move cursor to the top of the list") },
        { { END, 0x05, 0 }, 0, CMD_LIST_LAST, "end",
-         N_("End") },
+         N_("Move cursor to the bottom of the list") },
        { { PGUP, 0, 0 }, 0, CMD_LIST_PREVIOUS_PAGE, "pgup",
          N_("Page up") },
        { { PGDN, 0, 0 }, 0, CMD_LIST_NEXT_PAGE, "pgdn",
          N_("Page down") },
-       { { 'v',  0, 0 }, 0, CMD_LIST_VISUAL_SELECT, "visual-select",
-         N_("Visual selection") },
+       { { 'v',  0, 0 }, 0, CMD_LIST_RANGE_SELECT, "range-select",
+         N_("Range selection") },
+       { { 14,  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_LINE, "scroll-down-line",
+         N_("Scroll up one line") },
+       { { 2,  0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line",
+         N_("Scroll down one line") },
+       { { 'N',  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_HALF, "scroll-down-half",
+         N_("Scroll up half a screen") },
+       { { 'B',  0, 0 }, 0, CMD_LIST_SCROLL_UP_HALF, "scroll-up-half",
+         N_("Scroll down half a screen") },
+       { { 'l', 0, 0 }, 0, CMD_SELECT_PLAYING, "select-playing",
+         N_("Select currently playing song") },
 
 
        /* basic screens */
@@ -132,6 +148,10 @@ static command_definition_t cmds[] = {
          N_("Toggle repeat mode") },
        { { 'z', 0, 0 }, 0, CMD_RANDOM, "random",
          N_("Toggle random mode") },
+       { { 'y', 0, 0 }, 0, CMD_SINGLE, "single",
+         N_("Toggle single mode") },
+       { { 'C', 0, 0 }, 0, CMD_CONSUME, "consume",
+         N_("Toggle consume mode") },
        { { 'x', 0, 0 }, 0, CMD_CROSSFADE, "crossfade",
          N_("Toggle crossfade mode") },
        { { 21, 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
@@ -146,11 +166,6 @@ static command_definition_t cmds[] = {
        { { '"', 0, 0 }, 0, CMD_GO_PARENT_DIRECTORY, "go-parent-directory",
          N_("Go to parent directory") },
 
-#ifdef ENABLE_SONG_SCREEN
-       { { 'i', 0, 0 }, 0, CMD_VIEW, "view",
-         N_("View the song") },
-#endif
-
        { { 'G', 0, 0 }, 0, CMD_LOCATE, "locate",
          N_("Locate song in browser") },
 
@@ -179,6 +194,8 @@ static command_definition_t cmds[] = {
          N_("Next screen") },
        { { STAB, 0, 0 }, 0, CMD_SCREEN_PREVIOUS, "screen-prev",
          N_("Previous screen") },
+    { { '`', 0, 0 }, 0, CMD_SCREEN_SWAP, "screen-swap",
+         N_("Swap to most recent screen") },
 
 
        /* find */
@@ -208,7 +225,10 @@ static command_definition_t cmds[] = {
        { {'m', 0, 0 }, 0, CMD_SEARCH_MODE, "search-mode",
          N_("Change search mode") },
 #endif
-
+#ifdef ENABLE_SONG_SCREEN
+       { { 'i', 0, 0 }, 0, CMD_SCREEN_SONG, "view",
+         N_("View the selected and the currently playing song") },
+#endif
 #ifdef ENABLE_LYRICS_SCREEN
        { {'7', F7, 0 }, 0, CMD_SCREEN_LYRICS, "screen-lyrics",
          N_("Lyrics screen") },