X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=f1fa5c525f9174365d25e3fe3581eb8cbe639a5c;hb=511c0afa8e95fb7dca7017db29b91ff37b72f4be;hp=4d5f4fb392f1cf31f3da789e3114430f0e2d05fc;hpb=1cf3ca527c99b74bf7616dcf74e3854b58d0d553;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index 4d5f4fb3..f1fa5c52 100644
--- a/keys.c
+++ b/keys.c
@@ -50,13 +50,13 @@ int			key_consoleactive;
 static int	key_count;					// incremented every key event
 static int	key_bmap, key_bmap2;
 
-char				*keybindings[8][256];
-static qboolean		consolekeys[256];	// if true, can't be rebound while in
+char				*keybindings[8][1024];
+static qboolean		consolekeys[1024];	// if true, can't be rebound while in
 										// console
-static qboolean		menubound[256];		// if true, can't be rebound while in
+static qboolean		menubound[1024];		// if true, can't be rebound while in
 										// menu
-static unsigned int	key_repeats[256];	// if > 1, it is autorepeating
-static qboolean		keydown[256];
+static unsigned int	key_repeats[1024];	// if > 1, it is autorepeating
+static qboolean		keydown[1024];
 
 typedef struct {
 	const char	*name;
@@ -154,10 +154,22 @@ static const keyname_t   keynames[] = {
 	{"KP_ENTER", K_KP_ENTER},
 	{"KP_EQUALS", K_KP_EQUALS},
 
-	{"JOY1", K_JOY1},
-	{"JOY2", K_JOY2},
-	{"JOY3", K_JOY3},
-	{"JOY4", K_JOY4},
+	{"JOY1",  K_JOY1},
+	{"JOY2",  K_JOY2},
+	{"JOY3",  K_JOY3},
+	{"JOY4",  K_JOY4},
+	{"JOY5",  K_JOY5},
+	{"JOY6",  K_JOY6},
+	{"JOY7",  K_JOY7},
+	{"JOY8",  K_JOY8},
+	{"JOY9",  K_JOY9},
+	{"JOY10", K_JOY10},
+	{"JOY11", K_JOY11},
+	{"JOY12", K_JOY12},
+	{"JOY13", K_JOY13},
+	{"JOY14", K_JOY14},
+	{"JOY15", K_JOY15},
+	{"JOY16", K_JOY16},
 
 	{"AUX1", K_AUX1},
 	{"AUX2", K_AUX2},
@@ -272,8 +284,6 @@ Key_Console (int key, char ascii)
 		break;
 	}
 
-	// LordHavoc: FIXME: implement this sometime
-	#if 0
 	if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
 	{
 		char *cbd;
@@ -294,7 +304,6 @@ Key_Console (int key, char ascii)
 		}
 		return;
 	}
-	#endif
 
 	if (key == 'l')
 	{
@@ -309,7 +318,7 @@ Key_Console (int key, char ascii)
 	{
 		Cbuf_AddText (key_lines[edit_line]+1);	// skip the ]
 		Cbuf_AddText ("\n");
-		Con_Printf ("%s\n",key_lines[edit_line]);
+		Con_Printf("%s\n",key_lines[edit_line]);
 		edit_line = (edit_line + 1) & 31;
 		history_line = edit_line;
 		key_lines[edit_line][0] = ']';
@@ -619,19 +628,19 @@ Key_In_Unbind_f (void)
 	int         b, m;
 
 	if (Cmd_Argc () != 3) {
-		Con_Printf ("in_unbind <bindmap> <key> : remove commands from a key\n");
+		Con_Print("in_unbind <bindmap> <key> : remove commands from a key\n");
 		return;
 	}
 
 	m = strtol(Cmd_Argv (1), NULL, 0);
 	if ((m < 0) || (m >= 8)) {
-		Con_Printf ("%d isn't a valid bindmap\n", m);
+		Con_Printf("%d isn't a valid bindmap\n", m);
 		return;
 	}
 
 	b = Key_StringToKeynum (Cmd_Argv (2));
 	if (b == -1) {
-		Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (2));
+		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
 		return;
 	}
 
@@ -647,27 +656,27 @@ Key_In_Bind_f (void)
 	c = Cmd_Argc ();
 
 	if (c != 3 && c != 4) {
-		Con_Printf ("in_bind <bindmap> <key> [command] : attach a command to a key\n");
+		Con_Print("in_bind <bindmap> <key> [command] : attach a command to a key\n");
 		return;
 	}
 
 	m = strtol(Cmd_Argv (1), NULL, 0);
 	if ((m < 0) || (m >= 8)) {
-		Con_Printf ("%d isn't a valid bindmap\n", m);
+		Con_Printf("%d isn't a valid bindmap\n", m);
 		return;
 	}
 
 	b = Key_StringToKeynum (Cmd_Argv (2));
 	if (b == -1) {
-		Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (2));
+		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
 		return;
 	}
 
 	if (c == 3) {
 		if (keybindings[m][b])
-			Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv (2), keybindings[m][b]);
+			Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (2), keybindings[m][b]);
 		else
-			Con_Printf ("\"%s\" is not bound\n", Cmd_Argv (2));
+			Con_Printf("\"%s\" is not bound\n", Cmd_Argv (2));
 		return;
 	}
 // copy the rest of the command line
@@ -689,19 +698,19 @@ Key_In_Bindmap_f (void)
 	c = Cmd_Argc ();
 
 	if (c != 3) {
-		Con_Printf ("in_bindmap <bindmap> <fallback>: set current bindmap and fallback\n");
+		Con_Print("in_bindmap <bindmap> <fallback>: set current bindmap and fallback\n");
 		return;
 	}
 
 	m1 = strtol(Cmd_Argv (1), NULL, 0);
 	if ((m1 < 0) || (m1 >= 8)) {
-		Con_Printf ("%d isn't a valid bindmap\n", m1);
+		Con_Printf("%d isn't a valid bindmap\n", m1);
 		return;
 	}
 
 	m2 = strtol(Cmd_Argv (2), NULL, 0);
 	if ((m2 < 0) || (m2 >= 8)) {
-		Con_Printf ("%d isn't a valid bindmap\n", m2);
+		Con_Printf("%d isn't a valid bindmap\n", m2);
 		return;
 	}
 
@@ -715,13 +724,13 @@ Key_Unbind_f (void)
 	int         b;
 
 	if (Cmd_Argc () != 2) {
-		Con_Printf ("unbind <key> : remove commands from a key\n");
+		Con_Print("unbind <key> : remove commands from a key\n");
 		return;
 	}
 
 	b = Key_StringToKeynum (Cmd_Argv (1));
 	if (b == -1) {
-		Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (1));
+		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
 		return;
 	}
 
@@ -734,7 +743,7 @@ Key_Unbindall_f (void)
 	int         i, j;
 
 	for (j = 0; j < 8; j++)
-		for (i = 0; i < 256; i++)
+		for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 			if (keybindings[j][i])
 				Key_SetBinding (i, j, "");
 }
@@ -749,20 +758,20 @@ Key_Bind_f (void)
 	c = Cmd_Argc ();
 
 	if (c != 2 && c != 3) {
-		Con_Printf ("bind <key> [command] : attach a command to a key\n");
+		Con_Print("bind <key> [command] : attach a command to a key\n");
 		return;
 	}
 	b = Key_StringToKeynum (Cmd_Argv (1));
 	if (b == -1) {
-		Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (1));
+		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
 		return;
 	}
 
 	if (c == 2) {
 		if (keybindings[0][b])
-			Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv (1), keybindings[0][b]);
+			Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (1), keybindings[0][b]);
 		else
-			Con_Printf ("\"%s\" is not bound\n", Cmd_Argv (1));
+			Con_Printf("\"%s\" is not bound\n", Cmd_Argv (1));
 		return;
 	}
 // copy the rest of the command line
@@ -786,14 +795,14 @@ Key_WriteBindings (qfile_t *f)
 {
 	int         i, j;
 
-	for (i = 0; i < 256; i++)
+	for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 		if (keybindings[0][i])
-			FS_Printf (f, "bind %s \"%s\"\n",
+			FS_Printf(f, "bind %s \"%s\"\n",
 					Key_KeynumToString (i), keybindings[0][i]);
 	for (j = 1; j < 8; j++)
-		for (i = 0; i < 256; i++)
+		for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 			if (keybindings[j][i])
-				FS_Printf (f, "in_bind %d %s \"%s\"\n",
+				FS_Printf(f, "in_bind %d %s \"%s\"\n",
 						j, Key_KeynumToString (i), keybindings[j][i]);
 }
 
@@ -822,6 +831,7 @@ Key_Init (void)
 	consolekeys[K_DOWNARROW] = true; consolekeys[K_KP_DOWNARROW] = true;
 	consolekeys[K_BACKSPACE] = true;
 	consolekeys[K_DEL] = true; consolekeys[K_KP_DEL] = true;
+	consolekeys[K_INS] = true; consolekeys[K_KP_INS] = true;
 	consolekeys[K_HOME] = true; consolekeys[K_KP_HOME] = true;
 	consolekeys[K_END] = true; consolekeys[K_KP_END] = true;
 	consolekeys[K_PGUP] = true; consolekeys[K_KP_PGUP] = true;
@@ -829,6 +839,10 @@ Key_Init (void)
 	consolekeys[K_SHIFT] = true;
 	consolekeys[K_MWHEELUP] = true;
 	consolekeys[K_MWHEELDOWN] = true;
+	consolekeys[K_KP_PLUS] = true;
+	consolekeys[K_KP_MINUS] = true;
+	consolekeys[K_KP_DIVIDE] = true;
+	consolekeys[K_KP_MULTIPLY] = true;
 	consolekeys['`'] = false;
 	consolekeys['~'] = false;
 
@@ -877,7 +891,7 @@ Key_Event (int key, char ascii, qboolean down)
 		key_repeats[key]++;
 		if (key_repeats[key] > 1) {
 			if ((key_consoleactive && !consolekeys[key]) ||
-					(key_dest == key_game &&
+					(!key_consoleactive && key_dest == key_game &&
 					 (cls.state == ca_connected && cls.signon == SIGNONS)))
 				return;						// ignore most autorepeats
 		}
@@ -1016,7 +1030,7 @@ Key_ClearStates (void)
 {
 	int i;
 
-	for (i = 0;i < 256;i++)
+	for (i = 0; i < (int)(sizeof(keydown)/sizeof(keydown[0])); i++)
 	{
 		keydown[i] = false;
 		key_repeats[i] = 0;