X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=keys.h;h=7841e9d007df0354807ad4664fb96ca807907e8e;hb=83bdd42709b43836745d7ec9f0a3f61c356756c9;hp=c99011dca7505b678b15ed38931ae50a6d5d5981;hpb=aaf9f6370485140d942e02266635f5e4398d6be3;p=xonotic%2Fdarkplaces.git

diff --git a/keys.h b/keys.h
index c99011dc..7841e9d0 100644
--- a/keys.h
+++ b/keys.h
@@ -34,6 +34,7 @@
 //
 typedef enum keynum_e
 {
+	K_TEXT			= 1, // used only for unicode character input
 	K_TAB			= 9,
 	K_ENTER			= 13,
 	K_ESCAPE		= 27,
@@ -187,6 +188,38 @@ typedef enum keynum_e
 	K_AUX31,
 	K_AUX32,
 
+	// Microsoft Xbox 360 Controller For Windows
+	K_X360_DPAD_UP,
+	K_X360_DPAD_DOWN,
+	K_X360_DPAD_LEFT,
+	K_X360_DPAD_RIGHT,
+	K_X360_START,
+	K_X360_BACK,
+	K_X360_LEFT_THUMB,
+	K_X360_RIGHT_THUMB,
+	K_X360_LEFT_SHOULDER,
+	K_X360_RIGHT_SHOULDER,
+	K_X360_A,
+	K_X360_B,
+	K_X360_X,
+	K_X360_Y,
+	K_X360_LEFT_TRIGGER,
+	K_X360_RIGHT_TRIGGER,
+	K_X360_LEFT_THUMB_UP,
+	K_X360_LEFT_THUMB_DOWN,
+	K_X360_LEFT_THUMB_LEFT,
+	K_X360_LEFT_THUMB_RIGHT,
+	K_X360_RIGHT_THUMB_UP,
+	K_X360_RIGHT_THUMB_DOWN,
+	K_X360_RIGHT_THUMB_LEFT,
+	K_X360_RIGHT_THUMB_RIGHT,
+
+	// generic joystick emulation for menu
+	K_JOY_UP,
+	K_JOY_DOWN,
+	K_JOY_LEFT,
+	K_JOY_RIGHT,
+
 	K_MIDINOTE0 = 896, // to this, the note number is added
 	K_MIDINOTE1,
 	K_MIDINOTE2,
@@ -334,17 +367,17 @@ extern	keydest_t	key_dest;
 extern	int			key_consoleactive;
 extern	char		*keybindings[MAX_BINDMAPS][MAX_KEYS];
 
-extern void Key_ClearEditLine(int edit_line);
 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_ClearEditLine(int edit_line);
 void Key_WriteBindings(qfile_t *f);
 void Key_Init(void);
 void Key_Shutdown(void);
 void Key_Init_Cvars(void);
 void Key_Event(int key, int ascii, qboolean down);
-void Key_ClearStates (void);
+void Key_ReleaseAll (void);
 void Key_EventQueue_Block(void);
 void Key_EventQueue_Unblock(void);