sled

чување 3f88aba1b7cffab24431076ae230fafe255accba
родитељ 82d72c0d49787b5905b6dc2f02848f3513bb458b
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Wed,  5 Apr 2023 22:17:39 +0200

draw.c(format_mode): Give higher priority to command mode over overwrite; config.def.h: Add TB_MOD_CTRL to TB_KEY_TAB keys

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
config.def.h
 | 
10
++++++++--
M
draw.c
 | 
4
++--

измењених датотека: 2, додавања: 10(+), брисања: 4(-)
diff --git a/config.def.h b/config.def.h
@@ -224,7 +224,10 @@ static const struct Key input_dialog_keys[] = {
 	{ .ev = { .key = TB_KEY_HOME },	.callback = input_move_start },
 	{ .ev = { .key = TB_KEY_SPACE },
 					.callback = input_insert_space },
-	{ .ev = { .key = TB_KEY_TAB },	.callback = input_insert_tab }
+	/* Tab = C-I, hence the TB_MOD_CTRL; tb doesn't make a difference
+	 * between C-I and Tab... */
+	{ .ev = { .key = TB_KEY_TAB, .mod = TB_MOD_CTRL },
+					.callback = input_insert_tab }
 };
 
 /* Only when in insert mode */
@@ -239,7 +242,10 @@ static const struct Key insert_keys[] = {
 					.callback = toggle_overwrite },
 	{ .ev = { .key = TB_KEY_SPACE },
 					.callback = insert_space },
-	{ .ev = { .key = TB_KEY_TAB },	.callback = insert_tab }
+	/* Tab = C-I, hence the TB_MOD_CTRL; tb doesn't make a difference
+	 * between C-I and Tab... */
+	{ .ev = { .key = TB_KEY_TAB, .mod = TB_MOD_CTRL },
+					.callback = insert_tab }
 };
 
 /* Only when in command mode */
diff --git a/draw.c b/draw.c
@@ -187,10 +187,10 @@ format_mode(char* result, size_t result_size, const char* format,
 		mode_label = mode_labels[PROMPT_MODE];
 	else if (IN(state->mode, M_SELECTION))
 		mode_label = mode_labels[SELECTION_MODE];
-	else if (IN(state->mode, M_OVERWRITE))
-		mode_label = mode_labels[OVERWRITE_MODE];
 	else if (IN(state->mode, M_COMMAND))
 		mode_label = mode_labels[COMMAND_MODE];
+	else if (IN(state->mode, M_OVERWRITE))
+		mode_label = mode_labels[OVERWRITE_MODE];
 	else
 		mode_label = mode_labels[INSERT_MODE];