X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=keys.h;h=beb5df69734769c3e7012c3ff269fc136ef4c8fb;hb=e0dd663af275fb1ec46fd180cdab2547e499fe0f;hp=51d0691b24e41ce82e2e3e14fc78868dda5194ea;hpb=7a326060eaf7fee38b91dd9dfb6bf10bcad7e108;p=xonotic%2Fdarkplaces.git

diff --git a/keys.h b/keys.h
index 51d0691b..beb5df69 100644
--- a/keys.h
+++ b/keys.h
@@ -32,7 +32,7 @@
 //
 // these are the key numbers that should be passed to Key_Event
 //
-extern enum keynum_e
+typedef enum keynum_e
 {
 	K_TAB			= 9,
 	K_ENTER			= 13,
@@ -50,6 +50,7 @@ extern enum keynum_e
 	K_ALT,
 	K_CTRL,
 	K_SHIFT,
+
 	K_F1,
 	K_F2,
 	K_F3,
@@ -62,6 +63,7 @@ extern enum keynum_e
 	K_F10,
 	K_F11,
 	K_F12,
+
 	K_INS,
 	K_DEL,
 	K_PGDN,
@@ -107,6 +109,7 @@ extern enum keynum_e
 	// mouse buttons generate virtual keys
 
 	K_MOUSE1 = 512,
+	K_OTHERDEVICESBEGIN = K_MOUSE1,
 	K_MOUSE2,
 	K_MOUSE3,
 	K_MWHEELUP,
@@ -185,14 +188,11 @@ extern enum keynum_e
 }
 keynum_t;
 
-typedef enum keydest_e { key_game, key_message, key_menu } keydest_t;
+typedef enum keydest_e { key_game, key_message, key_menu, key_menu_grabbed, key_console, key_void } keydest_t;
 
-#define MAX_INPUTLINES 32
 #define MAX_BINDMAPS 8
 #define MAX_KEYS 1024
-extern	int			edit_line;
-extern	int			history_line;
-extern	char		key_lines[MAX_INPUTLINES][MAX_INPUTLINE];
+extern	char		key_line[MAX_INPUTLINE];
 extern	int			key_linepos;
 extern	qboolean	key_insert;	// insert key toggle (for editing)
 extern	keydest_t	key_dest;
@@ -205,14 +205,15 @@ extern	int			key_consoleactive;
 extern	char		*keybindings[MAX_BINDMAPS][MAX_KEYS];
 
 extern void Key_ClearEditLine(int edit_line);
-extern qboolean chat_team;
+extern int chat_mode; // 0 for say, 1 for say_team, -1 for command
 extern char chat_buffer[MAX_INPUTLINE];
 extern unsigned int chat_bufferlen;
 
 void Key_WriteBindings(qfile_t *f);
 void Key_Init(void);
+void Key_Shutdown(void);
 void Key_Init_Cvars(void);
-void Key_Event(int key, char ascii, qboolean down);
+void Key_Event(int key, int ascii, qboolean down);
 void Key_ClearStates (void);
 void Key_SetBinding (int keynum, int bindmap, const char *binding);