globally rename model_t to dp_model_t for OpenSolaris. Sorry, guys who now have svn...

[xonotic/darkplaces.git] / keys.h

diff --git a/keys.h b/keys.h
index eacbffac544ae4318ad599cefe50650c9c1a29a5..7b13635dbd503d75e96d1b1588b1816526cede24 100644 (file)
--- a/keys.h
+++ b/keys.h
@@ -32,7 +32,8 @@
 //
 // these are the key numbers that should be passed to Key_Event
 //
-extern enum {
+typedef enum keynum_e
+{
        K_TAB                   = 9,
        K_ENTER                 = 13,
        K_ESCAPE                = 27,
@@ -49,6 +50,7 @@ extern enum {
        K_ALT,
        K_CTRL,
        K_SHIFT,
+
        K_F1,
        K_F2,
        K_F3,
@@ -61,6 +63,7 @@ extern enum {
        K_F10,
        K_F11,
        K_F12,
+
        K_INS,
        K_DEL,
        K_PGDN,
@@ -106,12 +109,13 @@ extern enum {
        // mouse buttons generate virtual keys
 
        K_MOUSE1 = 512,
+       K_OTHERDEVICESBEGIN = K_MOUSE1,
        K_MOUSE2,
        K_MOUSE3,
+       K_MWHEELUP,
+       K_MWHEELDOWN,
        K_MOUSE4,
-       K_MWHEELUP              = K_MOUSE4,
        K_MOUSE5,
-       K_MWHEELDOWN    = K_MOUSE5,
        K_MOUSE6,
        K_MOUSE7,
        K_MOUSE8,
@@ -181,12 +185,12 @@ extern enum {
        K_AUX31,
        K_AUX32,
 
-} keynum_t;
+}
+keynum_t;
 
-typedef enum { key_game, key_message, key_menu } keydest_t;
+typedef enum keydest_e { key_game, key_message, key_menu, key_menu_grabbed } keydest_t;
 
 #define MAX_INPUTLINES 32
-#define MAX_INPUTLINE 256
 #define MAX_BINDMAPS 8
 #define MAX_KEYS 1024
 extern int                     edit_line;
@@ -205,7 +209,7 @@ extern      char            *keybindings[MAX_BINDMAPS][MAX_KEYS];
 
 extern void Key_ClearEditLine(int edit_line);
 extern qboolean chat_team;
-extern char chat_buffer[256];
+extern char chat_buffer[MAX_INPUTLINE];
 extern unsigned int chat_bufferlen;
 
 void Key_WriteBindings(qfile_t *f);