X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=keys.h;h=c2587aed1b3a0796f25535a1d359982386759c06;hb=1a606ca4c462e8a9a76cd5e7e085efbecbe90009;hp=c99011dca7505b678b15ed38931ae50a6d5d5981;hpb=58ecffb6f73f96936bf8c21853570d7da483d0f3;p=xonotic%2Fdarkplaces.git

diff --git a/keys.h b/keys.h
index c99011dc..c2587aed 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,