use mpdclient_finish_command at the obvious places

[ncmpc.git] / src / command.c

diff --git a/src/command.c b/src/command.c
index f323b12c457e189f5f6f99dad5ed85ab467a3a2f..68b8d1e09dcea819d9c27a2619672eb501d37a1e 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -40,35 +40,38 @@
 #define DK(x)
 #endif
 
-#define BS KEY_BACKSPACE
-#define DEL KEY_DC
-#define UP KEY_UP
-#define DWN KEY_DOWN
+#define KEY_CTL(x) ((x) & 0x1f) /* KEY_CTL(A) == ^A == \1 */
+
+#define BS   KEY_BACKSPACE
+#define DEL  KEY_DC
+#define UP   KEY_UP
+#define DWN  KEY_DOWN
 #define LEFT KEY_LEFT
 #define RGHT KEY_RIGHT
 #define HOME KEY_HOME
-#define END KEY_END
+#define END  KEY_END
 #define PGDN KEY_NPAGE
 #define PGUP KEY_PPAGE
-#define TAB 0x09
+#define TAB  0x09
 #define STAB 0x161
-#define ESC 0x1B
-#define F1 KEY_F(1)
-#define F2 KEY_F(2)
-#define F3 KEY_F(3)
-#define F4 KEY_F(4)
-#define F5 KEY_F(5)
-#define F6 KEY_F(6)
-#define F7 KEY_F(7)
-#define F8 KEY_F(8)
-
+#define ESC  0x1B
+#define RET  '\r'
+#define F1   KEY_F(1)
+#define F2   KEY_F(2)
+#define F3   KEY_F(3)
+#define F4   KEY_F(4)
+#define F5   KEY_F(5)
+#define F6   KEY_F(6)
+#define F7   KEY_F(7)
+#define F8   KEY_F(8)
+#define C(x) KEY_CTL(x)
 
 static command_definition_t cmds[] = {
 #ifdef ENABLE_KEYDEF_SCREEN
        { {'K', 0, 0 }, 0, CMD_SCREEN_KEYDEF, "screen-keyedit",
          N_("Key configuration screen") },
 #endif
-       { { 'q', 'Q', 3 }, 0, CMD_QUIT, "quit",
+       { { 'q', 'Q', C('C') }, 0, CMD_QUIT, "quit",
          N_("Quit") },
 
        /* movement */
@@ -82,9 +85,9 @@ static command_definition_t cmds[] = {
          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",
+       { { HOME, C('A'), 0 }, 0, CMD_LIST_FIRST, "home",
          N_("Move cursor to the top of the list") },
-       { { END, 0x05, 0 }, 0, CMD_LIST_LAST, "end",
+       { { END, C('E'), 0 }, 0, CMD_LIST_LAST, "end",
          N_("Move cursor to the bottom of the list") },
        { { PGUP, 0, 0 }, 0, CMD_LIST_PREVIOUS_PAGE, "pgup",
          N_("Page up") },
@@ -92,9 +95,9 @@ static command_definition_t cmds[] = {
          N_("Page down") },
        { { '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",
+       { { C('N'),  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",
+       { { C('B'),  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") },
@@ -114,7 +117,7 @@ static command_definition_t cmds[] = {
 
 
        /* player commands */
-       { { 13, 0, 0 }, 0, CMD_PLAY, "play",
+       { { RET, 0, 0 }, 0, CMD_PLAY, "play",
          N_("Play/Enter directory") },
        { { 'P', 0, 0 }, 0, CMD_PAUSE,"pause",
          N_("Pause") },
@@ -154,7 +157,7 @@ static command_definition_t cmds[] = {
          N_("Toggle consume mode") },
        { { 'x', 0, 0 }, 0, CMD_CROSSFADE, "crossfade",
          N_("Toggle crossfade mode") },
-       { { 21, 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
+       { { C('U'), 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
          N_("Start a music database update") },
        { { 'S', 0, 0 }, 0, CMD_SAVE_PLAYLIST, "save",
          N_("Save playlist") },
@@ -170,11 +173,11 @@ static command_definition_t cmds[] = {
          N_("Locate song in browser") },
 
        /* lists */
-       { { 11, 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
+       { { C('K'), 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
          N_("Move item up") },
-       { { 10, 0, 0 }, 0, CMD_LIST_MOVE_DOWN, "move-down",
+       { { C('J'), 0, 0 }, 0, CMD_LIST_MOVE_DOWN, "move-down",
          N_("Move item down") },
-       { { 12, 0, 0 }, 0, CMD_SCREEN_UPDATE, "update",
+       { { C('L'), 0, 0 }, 0, CMD_SCREEN_UPDATE, "update",
          N_("Refresh screen") },
 
 
@@ -269,7 +272,7 @@ key2str(int key)
                return _("Undefined");
        case ' ':
                return _("Space");
-       case 13:
+       case RET:
                return _("Enter");
        case BS:
                return _("Backspace");