let Ctrl-C exit Y/N and menu prompts

rolandwalker · Jul 4, 2017 · 23c2fde · 23c2fde
1 parent 76700c8
commit 23c2fde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/include/tig/keys.h b/include/tig/keys.h
@@ -56,6 +56,14 @@ key_to_unicode(const struct key *key)
 		: 0;
 }
 
+static inline char
+key_to_control(const struct key *key)
+{
+	return (key->modifiers.control && key->modifiers.multibytes && strlen(key->data.bytes) == 1)
+		? key->data.bytes[0]
+		: 0;
+}
+
 struct keymap *get_keymap(const char *name, size_t namelen);
 
 const char *get_key_name(const struct key key[], size_t keys, bool quote_comma);

diff --git a/src/prompt.c b/src/prompt.c
@@ -126,7 +126,7 @@ prompt_yesno_handler(struct input *input, struct key *key)
 
 	if (c == 'y' || c == 'Y')
 		return INPUT_STOP;
-	if (c == 'n' || c == 'N')
+	if (c == 'n' || c == 'N' || key_to_control(key) == 'C')
 		return INPUT_CANCEL;
 	return prompt_default_handler(input, key);
 }
@@ -574,6 +574,11 @@ prompt_menu(const char *prompt, const struct menu_item *items, int *selected)
 			break;
 
 		default:
+			if (key_to_control(&key) == 'C') {
+				status = INPUT_CANCEL;
+				break;
+			}
+
 			for (i = 0; items[i].text; i++)
 				if (items[i].hotkey == key.data.bytes[0]) {
 					*selected = i;