COMMS: Allow 'c' to trigger channel button

Signed-off-by: Stephen M. Cameron <[email protected]>
smcameron · Oct 21, 2023 · 37b9667 · 37b9667
1 parent 96ffd59
commit 37b9667
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/snis_client.c b/snis_client.c
@@ -4674,6 +4674,7 @@ static void nav_lights_button_pressed(__attribute__((unused)) void *cookie);
 static void standard_orbit_button_pressed(__attribute__((unused)) void *cookie);
 static void nav_starmap_button_pressed(__attribute__((unused)) void *cookie);
 static void comms_hail_button_pressed(__attribute__((unused)) void *x);
+static void comms_channel_button_pressed(__attribute__((unused)) void *x);
 
 static int key_press_cb(SDL_Window *window, SDL_Keysym *keysym, int key_repeat)
 {
@@ -4773,6 +4774,12 @@ static int key_press_cb(SDL_Window *window, SDL_Keysym *keysym, int key_repeat)
 			snis_text_input_box_set_focus(comms_ui.comms_input, 1);
 		}
 		break;
+	case key_comms_channel:
+		if (!snis_text_input_box_has_focus(comms_ui.comms_input)) {
+			comms_channel_button_pressed(NULL);
+			snis_text_input_box_set_focus(comms_ui.comms_input, 1);
+		}
+		break;
 	case keytorpedo:
 		fire_torpedo_button_pressed(NULL);
 		break;

diff --git a/snis_keyboard.c b/snis_keyboard.c
@@ -200,6 +200,7 @@ char *keyactionstring[] = {
 	"key_weap_wavlen_nudge_up",
 	"key_weap_wavlen_nudge_down",
 	"key_comms_hail",
+	"key_comms_channel",
 };
 
 #ifdef DEBUG_KEYMAP
@@ -419,6 +420,7 @@ void init_keymap(void)
 	mapkey(nav, SDLK_t, key_starmap);
 
 	mapkey(comms, SDLK_h, key_comms_hail);
+	mapkey(comms, SDLK_c, key_comms_channel);
 
 #ifdef DEBUG_KEYMAP
 	print_keymap("keymap", keymap);

diff --git a/snis_keyboard.h b/snis_keyboard.h
@@ -93,7 +93,8 @@ enum keyaction {
 		key_weap_wavelen_nudge_up = 86,
 		key_weap_wavelen_nudge_down = 87,
 		key_comms_hail = 88,
-#define NKEYSTATES 89
+		key_comms_channel = 89,
+#define NKEYSTATES 90
 };
 
 struct keyboard_state {