X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=7ef45f1dedabeaeaae1063530e5830693afcf385;hb=7af96fa3f500f70e1869316d201cdc4d31fbb75f;hp=7a218b58039d0cb1f3deb7d4da0ed3d99e6dd7c5;hpb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index 7a218b58..7ef45f1d 100644
--- a/keys.c
+++ b/keys.c
@@ -21,7 +21,9 @@
 */
 
 #include "quakedef.h"
+#include "cl_video.h"
 
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","0", "allows toggleconsole binds to close the console as well"};
 
 /*
 key up events are sent even if in console mode
@@ -37,7 +39,7 @@ int			key_consoleactive;
 char		*keybindings[MAX_BINDMAPS][MAX_KEYS];
 
 static int	key_bmap, key_bmap2;
-static qbyte keydown[MAX_KEYS];	// 0 = up, 1 = down, 2 = repeating
+static unsigned char keydown[MAX_KEYS];	// 0 = up, 1 = down, 2 = repeating
 
 typedef struct keyname_s
 {
@@ -280,10 +282,10 @@ Key_Console (int key, char ascii)
 			if (i > 0)
 			{
 				cbd[i]=0;
-				strcat(key_lines[edit_line], cbd);
+				strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
 				key_linepos += i;
 			}
-			free(cbd);
+			Z_Free(cbd);
 		}
 		return;
 	}
@@ -302,6 +304,8 @@ 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]);
+		if(key_lines[edit_line][1] == 0) // empty line (just a ])?
+			return; // no, no, you can't submit empty lines to the history...
 		// LordHavoc: redesigned edit_line/history_line
 		edit_line = 31;
 		history_line = edit_line;
@@ -326,12 +330,29 @@ Key_Console (int key, char ascii)
 
 	// Advanced Console Editing by Radix radix@planetquake.com
 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+	// Enhanced by [515]
 
 	// left arrow will just move left one without erasing, backspace will
-	// actually erase charcter
+	// actually erase character
 	if (key == K_LEFTARROW || key == K_KP_LEFTARROW)
 	{
-		if (key_linepos > 1)
+		if (key_linepos < 2)
+			return;
+		if(keydown[K_CTRL])
+		{
+			int		pos;
+			char	k;
+			pos = key_linepos-1;
+			if(pos)
+				while(--pos)
+				{
+					k = key_lines[edit_line][pos];
+					if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+						break;
+				}
+			key_linepos = pos + 1;
+		}
+		else
 			key_linepos--;
 		return;
 	}
@@ -341,7 +362,7 @@ Key_Console (int key, char ascii)
 	{
 		if (key_linepos > 1)
 		{
-			strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos);
+			strlcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos, sizeof(key_lines[edit_line]) + 1 - key_linepos);
 			key_linepos--;
 		}
 		return;
@@ -350,8 +371,10 @@ Key_Console (int key, char ascii)
 	// delete char on cursor
 	if (key == K_DEL || key == K_KP_DEL)
 	{
-		if (key_linepos < (int)strlen(key_lines[edit_line]))
-			strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
+		size_t linelen;
+		linelen = strlen(key_lines[edit_line]);
+		if (key_linepos < (int)linelen)
+			memmove(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1, linelen - key_linepos);
 		return;
 	}
 
@@ -360,9 +383,24 @@ Key_Console (int key, char ascii)
 	// otherwise just go right one
 	if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
 	{
-		if (key_linepos < (int)strlen(key_lines[edit_line]))
+		if (key_linepos >= (int)strlen(key_lines[edit_line]))
+			return;
+		if(keydown[K_CTRL])
+		{
+			int		pos, len;
+			char	k;
+			len = (int)strlen(key_lines[edit_line]);
+			pos = key_linepos;
+			while(++pos < len)
+			{
+				k = key_lines[edit_line][pos];
+				if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+					break;
+			}
+			key_linepos = pos;
+		}
+		else
 			key_linepos++;
-
 		return;
 	}
 
@@ -378,9 +416,11 @@ Key_Console (int key, char ascii)
 	{
 		if (history_line > 0 && key_lines[history_line-1][1])
 		{
+			size_t linelen;
 			history_line--;
-			strcpy(key_lines[edit_line], key_lines[history_line]);
-			key_linepos = (int)strlen(key_lines[edit_line]);
+			linelen = strlen(key_lines[history_line]);
+			memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
+			key_linepos = (int)linelen;
 		}
 		return;
 	}
@@ -397,8 +437,10 @@ Key_Console (int key, char ascii)
 		}
 		else
 		{
-			strcpy(key_lines[edit_line], key_lines[history_line]);
-			key_linepos = (int)strlen(key_lines[edit_line]);
+			size_t linelen;
+			linelen = strlen(key_lines[history_line]);
+			memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
+			key_linepos = (int)linelen;
 		}
 		return;
 	}
@@ -421,13 +463,19 @@ Key_Console (int key, char ascii)
 
 	if (key == K_HOME || key == K_KP_HOME)
 	{
-		con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1;
+		if (keydown[K_CTRL])
+			con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1;
+		else
+			key_linepos = 1;
 		return;
 	}
 
 	if (key == K_END || key == K_KP_END)
 	{
-		con_backscroll = 0;
+		if (keydown[K_CTRL])
+			con_backscroll = 0;
+		else
+			key_linepos = (int)strlen(key_lines[edit_line]);
 		return;
 	}
 
@@ -558,7 +606,7 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
 	char *newbinding;
 	size_t l;
 
-	if (keynum == -1)
+	if (keynum == -1 || keynum >= MAX_KEYS)
 		return;
 
 // free old bindings
@@ -569,7 +617,7 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
 // allocate memory for new binding
 	l = strlen (binding);
 	newbinding = (char *)Z_Malloc (l + 1);
-	strcpy (newbinding, binding);
+	memcpy (newbinding, binding, l + 1);
 	newbinding[l] = 0;
 	keybindings[bindmap][keynum] = newbinding;
 }
@@ -603,7 +651,7 @@ static void
 Key_In_Bind_f (void)
 {
 	int         i, c, b, m;
-	char        cmd[1024];
+	char        cmd[MAX_INPUTLINE];
 
 	c = Cmd_Argc ();
 
@@ -619,7 +667,7 @@ Key_In_Bind_f (void)
 	}
 
 	b = Key_StringToKeynum (Cmd_Argv (2));
-	if (b == -1) {
+	if (b == -1 || b >= MAX_KEYS) {
 		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
 		return;
 	}
@@ -705,7 +753,7 @@ static void
 Key_Bind_f (void)
 {
 	int         i, c, b;
-	char        cmd[1024];
+	char        cmd[MAX_INPUTLINE];
 
 	c = Cmd_Argc ();
 
@@ -714,7 +762,7 @@ Key_Bind_f (void)
 		return;
 	}
 	b = Key_StringToKeynum (Cmd_Argv (1));
-	if (b == -1) {
+	if (b == -1 || b >= MAX_KEYS) {
 		Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
 		return;
 	}
@@ -773,15 +821,29 @@ Key_Init (void)
 //
 // register our functions
 //
-	Cmd_AddCommand ("in_bind", Key_In_Bind_f);
-	Cmd_AddCommand ("in_unbind", Key_In_Unbind_f);
-	Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f);
+	Cmd_AddCommand ("in_bind", Key_In_Bind_f, "binds a command to the specified key in the selected bindmap");
+	Cmd_AddCommand ("in_unbind", Key_In_Unbind_f, "removes command on the specified key in the selected bindmap");
+	Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f, "selects active foreground and background (used only if a key is not bound in the foreground) bindmaps for typing");
+
+	Cmd_AddCommand ("bind", Key_Bind_f, "binds a command to the specified key in bindmap 0");
+	Cmd_AddCommand ("unbind", Key_Unbind_f, "removes a command on the specified key in bindmap 0");
+	Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
 
-	Cmd_AddCommand ("bind", Key_Bind_f);
-	Cmd_AddCommand ("unbind", Key_Unbind_f);
-	Cmd_AddCommand ("unbindall", Key_Unbindall_f);
+	Cvar_RegisterVariable (&con_closeontoggleconsole);
 }
 
+const char *Key_GetBind (int key)
+{
+	const char *bind;
+	if (key < 0 || key >= MAX_KEYS)
+		return NULL;
+	bind = keybindings[key_bmap][key];
+	if (!bind)
+		bind = keybindings[key_bmap2][key];
+	return bind;
+}
+
+qboolean CL_VM_InputEvent (qboolean pressed, int key);
 
 /*
 ===================
@@ -793,13 +855,36 @@ void
 Key_Event (int key, char ascii, qboolean down)
 {
 	const char *bind;
+	qboolean q;
+
+	if (key < 0 || key >= MAX_KEYS)
+		return;
 
 	// get key binding
 	bind = keybindings[key_bmap][key];
 	if (!bind)
 		bind = keybindings[key_bmap2][key];
 
-	if (!down)
+	if(key_dest == key_game)
+	{
+		q = CL_VM_InputEvent(!down, key);
+		if(q)
+		{
+			if (down)
+				keydown[key] = min(keydown[key] + 1, 2);
+			else
+				keydown[key] = 0;
+			return;
+		}
+	}
+
+	if (down)
+	{
+		// increment key repeat count each time a down is received so that things
+		// which want to ignore key repeat can ignore it
+		keydown[key] = min(keydown[key] + 1, 2);
+	}
+	else
 	{
 		// clear repeat count now that the key is released
 		keydown[key] = 0;
@@ -810,15 +895,8 @@ Key_Event (int key, char ascii, qboolean down)
 		// downs can be matched with ups
 		if (bind && bind[0] == '+')
 			Cbuf_AddText(va("-%s %i\n", bind + 1, key));
-		return;
 	}
 
-	// from here on we know this is a down event
-
-	// increment key repeat count each time a down is received so that things
-	// which want to ignore key repeat can ignore it
-	keydown[key] = min(keydown[key] + 1, 2);
-
 	// key_consoleactive is a flag not a key_dest because the console is a
 	// high priority overlay ontop of the normal screen (designed as a safety
 	// feature so that developers and users can rescue themselves from a bad
@@ -841,7 +919,7 @@ Key_Event (int key, char ascii, qboolean down)
 		// key_menu - go to parent menu (or key_game)
 		// key_game - open menu
 		// in all modes shift-escape toggles console
-		if ((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT])
+		if (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down)
 		{
 			Con_ToggleConsole_f ();
 			return;
@@ -849,25 +927,24 @@ Key_Event (int key, char ascii, qboolean down)
 		switch (key_dest)
 		{
 			case key_message:
-				Key_Message (key, ascii);
+				if (down)
+					Key_Message (key, ascii);
 				break;
 			case key_menu:
-				MR_Keydown (key, ascii);
+				MR_KeyEvent (key, ascii, down);
 				break;
 			case key_game:
-				MR_ToggleMenu_f ();
+				if (down)
+					MR_ToggleMenu_f ();
 				break;
 			default:
-				if(UI_Callback_IsSlotUsed(key_dest - 3))
-					UI_Callback_KeyDown (key, ascii);
-				else
-					Con_Printf ("Key_Event: Bad key_dest");
+				Con_Printf ("Key_Event: Bad key_dest\n");
 		}
 		return;
 	}
 
 	// send function keydowns to interpreter no matter what mode is
-	if (key >= K_F1 && key <= K_F12)
+	if (key >= K_F1 && key <= K_F12 && down)
 	{
 		// ignore key repeats on F1-F12 binds
 		if (keydown[key] > 1)
@@ -886,31 +963,39 @@ Key_Event (int key, char ascii, qboolean down)
 		return;
 	}
 
-#if 1
+#if 0
 	// ignore binds (other than the above escape/F1-F12 keys) while in console
-	if (key_consoleactive)
+	if (key_consoleactive && down)
 #else
 	// respond to toggleconsole binds while in console unless the pressed key
 	// happens to be the color prefix character (such as on German keyboards)
-	if (key_consoleactive && (strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
+	if (key_consoleactive && down && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
 #endif
 	{
 		Key_Console (key, ascii);
 		return;
 	}
 
+	// ignore binds while a video is played, let the video system handle the key event
+	if (cl_videoplaying)
+	{
+		CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
+		return;
+	}
+
 	// anything else is a key press into the game, chat line, or menu
 	switch (key_dest)
 	{
 		case key_message:
-			Key_Message (key, ascii);
+			if (down)
+				Key_Message (key, ascii);
 			break;
 		case key_menu:
-			MR_Keydown (key, ascii);
+			MR_KeyEvent (key, ascii, down);
 			break;
 		case key_game:
 			// ignore key repeats on binds
-			if (bind && keydown[key] == 1)
+			if (bind && keydown[key] == 1 && down)
 			{
 				// button commands add keynum as a parm
 				if (bind[0] == '+')
@@ -923,10 +1008,7 @@ Key_Event (int key, char ascii, qboolean down)
 			}
 			break;
 		default:
-			if(UI_Callback_IsSlotUsed(key_dest - 3))
-				UI_Callback_KeyDown (key, ascii);
-			else
-				Con_Printf ("Key_Event: Bad key_dest");
+			Con_Printf ("Key_Event: Bad key_dest\n");
 	}
 }