From ac28eb407daaee8a92fb9efb28ac2426c4edb97b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 10 Jun 2009 19:03:08 +0000
Subject: Add key bindings for pause, message refresh.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1586
---
 setup/configfile.c |  2 ++
 setup/keyboard.c   | 11 ++++++++++-
 setup/keyboard.h   |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'setup')

diff --git a/setup/configfile.c b/setup/configfile.c
index 3714a35f..3b6007f5 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -287,6 +287,7 @@ static default_t extra_defaults_list[] =
     {"mouseb_backward",             &mousebbackward, DEFAULT_INT, 0, 0},
     {"use_libsamplerate",           &use_libsamplerate, DEFAULT_INT, 0, 0},
 
+    {"key_pause",                   &key_pause, DEFAULT_KEY, 0, 0},
     {"key_menu_activate",           &key_menu_activate, DEFAULT_KEY, 0, 0},
     {"key_menu_up",                 &key_menu_up, DEFAULT_KEY, 0, 0},
     {"key_menu_down",               &key_menu_down, DEFAULT_KEY, 0, 0},
@@ -330,6 +331,7 @@ static default_t extra_defaults_list[] =
     {"key_weapon6",                 &key_weapon6, DEFAULT_KEY, 0, 0},
     {"key_weapon7",                 &key_weapon7, DEFAULT_KEY, 0, 0},
     {"key_weapon8",                 &key_weapon8, DEFAULT_KEY, 0, 0},
+    {"key_message_refresh",         &key_message_refresh, DEFAULT_KEY, 0, 0},
 };
 
 static default_collection_t extra_defaults =
diff --git a/setup/keyboard.c b/setup/keyboard.c
index 27ade663..79cb90e7 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -39,6 +39,8 @@ int key_use = ' ';
 int key_strafe = KEY_RALT;
 int key_speed = KEY_RSHIFT;
 
+int key_pause = KEY_PAUSE;
+
 // Menu keys:
 
 int key_menu_activate  = KEY_ESCAPE;
@@ -88,6 +90,8 @@ int key_weapon6        = '6';
 int key_weapon7        = '7';
 int key_weapon8        = '8';
 
+int key_message_refresh = KEY_ENTER;
+
 int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
@@ -97,6 +101,7 @@ static int always_run = 0;
 static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
                            &key_strafeleft, &key_straferight, &key_fire,
                            &key_use, &key_strafe, &key_speed, 
+                           &key_pause,
                            &key_weapon1, &key_weapon2, &key_weapon3,
                            &key_weapon4, &key_weapon5, &key_weapon6,
                            &key_weapon7, &key_weapon8, NULL };
@@ -109,7 +114,8 @@ static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
                             &key_menu_volume, &key_menu_detail, &key_menu_qsave,
                             &key_menu_endgame, &key_menu_messages,
                             &key_menu_qload, &key_menu_quit, &key_menu_gamma,
-                            &key_menu_incscreen, &key_menu_decscreen, NULL };
+                            &key_menu_incscreen, &key_menu_decscreen, 
+                            &key_message_refresh, NULL };
 
 static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,
                            &key_map_west, &key_map_zoomin, &key_map_zoomout,
@@ -250,6 +256,7 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
                           TXT_NewStrut(0, 0),
                           NULL);
 
+    AddKeyControl(table, "Pause game",            &key_pause);
     AddKeyControl(table, "Help screen",           &key_menu_help);
     AddKeyControl(table, "Save game",             &key_menu_save);
     AddKeyControl(table, "Load game",             &key_menu_load);
@@ -265,6 +272,8 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
     AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
     AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
 
+    AddKeyControl(table, "Display last message",  &key_message_refresh);
+
     TXT_AddWidgets(table, TXT_NewStrut(0, 1),
                           TXT_NewStrut(0, 1),
                           TXT_NewLabel(" - Map - "),
diff --git a/setup/keyboard.h b/setup/keyboard.h
index 29ff2a1a..fa3c0db3 100644
--- a/setup/keyboard.h
+++ b/setup/keyboard.h
@@ -35,6 +35,8 @@ extern int key_speed;
 extern int joybspeed;
 extern int vanilla_keyboard_mapping;
 
+extern int key_pause;
+
 // Menu keys:
 
 extern int key_menu_activate;
@@ -88,6 +90,8 @@ extern int key_weapon6;
 extern int key_weapon7;
 extern int key_weapon8;
 
+extern int key_message_refresh;
+
 void ConfigKeyboard(void);
 
 #endif /* #ifndef SETUP_KEYBOARD_H */
-- 
cgit v1.2.3