From fcffaa58605e292ce076539bda04d49d3f720dc0 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 19 Jul 2011 19:22:20 +1000 Subject: [PATCH] Add checks for KEY_EXIT: same functionality as pressing CTRL-C --- src/exch.c | 6 ++++++ src/game.c | 2 ++ src/help.c | 1 + src/intf.c | 5 +++-- src/move.c | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/exch.c b/src/exch.c index 68e9dcb..aff35a7 100644 --- a/src/exch.c +++ b/src/exch.c @@ -188,6 +188,8 @@ void exchange_stock (void) case '4': case ' ': + case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): @@ -309,6 +311,8 @@ void visit_bank (void) case '2': case '3': case ' ': + case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): @@ -566,6 +570,8 @@ void trade_shares (int num, bool *bid_used) case '3': case '4': case ' ': + case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): diff --git a/src/game.c b/src/game.c index cc98f7b..22e258c 100644 --- a/src/game.c +++ b/src/game.c @@ -111,6 +111,7 @@ void init_game (void) switch (key) { case KEY_ESC: case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): @@ -159,6 +160,7 @@ void init_game (void) switch (key) { case KEY_ESC: case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): diff --git a/src/help.c b/src/help.c index aa9e615..e679e22 100644 --- a/src/help.c +++ b/src/help.c @@ -351,6 +351,7 @@ void show_help (void) case KEY_ESC: case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): diff --git a/src/intf.c b/src/intf.c index 222076a..7ffce6b 100644 --- a/src/intf.c +++ b/src/intf.c @@ -718,9 +718,10 @@ int gettxline (WINDOW *win, char *buf, int bufsize, bool multifield, break; case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('G'): - // case KEY_CTRL('C'): - // case KEY_CTRL('\\'): + case KEY_CTRL('C'): + case KEY_CTRL('\\'): // Cancel entering the string ret = ERR; done = true; diff --git a/src/move.c b/src/move.c index 3c7ae24..5392225 100644 --- a/src/move.c +++ b/src/move.c @@ -243,6 +243,7 @@ selection_t get_move (void) case KEY_ESC: case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): @@ -333,6 +334,7 @@ selection_t get_move (void) switch (key) { case KEY_ESC: case KEY_CANCEL: + case KEY_EXIT: case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'):