X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=18b7a8446ed91e485485dce36603236ef4da46a0;hb=cfee52a1ec9db338098789cae89ae5cf1f7a6fbf;hp=cb99dcad7c9938165754858cf24c4e2cc4bfe917;hpb=442772ff530cb93073f2ea7207de762ec74d34ce;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index cb99dcad..18b7a844 100644
--- a/keys.c
+++ b/keys.c
@@ -23,8 +23,9 @@
 #include "quakedef.h"
 #include "cl_video.h"
 #include "utf8lib.h"
+#include "csprogs.h"
 
-cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"};
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
 
 /*
 key up events are sent even if in console mode
@@ -36,8 +37,11 @@ qboolean	key_insert = true;	// insert key toggle (for editing)
 keydest_t	key_dest;
 int			key_consoleactive;
 char		*keybindings[MAX_BINDMAPS][MAX_KEYS];
-int         history_line;
+
+int			history_line;
 char		history_savedline[MAX_INPUTLINE];
+char		history_searchstring[MAX_INPUTLINE];
+qboolean	history_matchfound = false;
 conbuffer_t history;
 
 extern cvar_t	con_textsize;
@@ -107,6 +111,18 @@ static void Key_History_Push(void)
 		ConBuffer_AddLine(&history, key_line + 1, strlen(key_line) - 1, 0);
 	Con_Printf("%s\n", key_line); // don't mark empty lines as history
 	history_line = -1;
+	if (history_matchfound)
+		history_matchfound = false;
+}
+
+static qboolean Key_History_Get_foundCommand(void)
+{
+	if (!history_matchfound)
+		return false;
+	strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+	key_linepos = strlen(key_line);
+	history_matchfound = false;
+	return true;
 }
 
 static void Key_History_Up(void)
@@ -114,6 +130,9 @@ static void Key_History_Up(void)
 	if(history_line == -1) // editing the "new" line
 		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
 
+	if (Key_History_Get_foundCommand())
+		return;
+
 	if(history_line == -1)
 	{
 		history_line = CONBUFFER_LINES_COUNT(&history) - 1;
@@ -136,6 +155,9 @@ static void Key_History_Down(void)
 	if(history_line == -1) // editing the "new" line
 		return;
 
+	if (Key_History_Get_foundCommand())
+		return;
+
 	if(history_line < CONBUFFER_LINES_COUNT(&history) - 1)
 	{
 		++history_line;
@@ -150,6 +172,147 @@ static void Key_History_Down(void)
 	key_linepos = strlen(key_line);
 }
 
+static void Key_History_First(void)
+{
+	if(history_line == -1) // editing the "new" line
+		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+	if (CONBUFFER_LINES_COUNT(&history) > 0)
+	{
+		history_line = 0;
+		strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+		key_linepos = strlen(key_line);
+	}
+}
+
+static void Key_History_Last(void)
+{
+	if(history_line == -1) // editing the "new" line
+		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+	if (CONBUFFER_LINES_COUNT(&history) > 0)
+	{
+		history_line = CONBUFFER_LINES_COUNT(&history) - 1;
+		strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+		key_linepos = strlen(key_line);
+	}
+}
+
+static void Key_History_Find_Backwards(void)
+{
+	int i;
+	const char *partial = key_line + 1;
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+	if (history_line == -1) // editing the "new" line
+		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+	if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+	{
+		strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+		i = CONBUFFER_LINES_COUNT(&history) - 1;
+	}
+	else if (history_line == -1)
+		i = CONBUFFER_LINES_COUNT(&history) - 1;
+	else
+		i = history_line - 1;
+
+	if (!*partial)
+		partial = "*";
+	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+	for ( ; i >= 0; i--)
+		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+		{
+			Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+			history_line = i;
+			history_matchfound = true;
+			return;
+		}
+}
+
+static void Key_History_Find_Forwards(void)
+{
+	int i;
+	const char *partial = key_line + 1;
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+	if (history_line == -1) // editing the "new" line
+		return;
+
+	if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+	{
+		strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+		i = 0;
+	}
+	else i = history_line + 1;
+
+	if (!*partial)
+		partial = "*";
+	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+	for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
+		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+		{
+			Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+			history_line = i;
+			history_matchfound = true;
+			return;
+		}
+}
+
+static void Key_History_Find_All(void)
+{
+	const char *partial = key_line + 1;
+	int i, count = 0;
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+	Con_Printf("History commands containing \"%s\":\n", key_line + 1);
+
+	if (!*partial)
+		partial = "*";
+	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+	for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
+		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+		{
+			Con_Printf("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+			count++;
+		}
+	Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
+}
+
+static void Key_History_f(void)
+{
+	char *errchar = NULL;
+	int i = 0;
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+	if (Cmd_Argc () > 1)
+	{
+		if (!strcmp(Cmd_Argv (1), "-c"))
+		{
+			ConBuffer_Clear(&history);
+			return;
+		}
+		i = strtol(Cmd_Argv (1), &errchar, 0);
+		if ((i < 0) || (i > CONBUFFER_LINES_COUNT(&history)) || (errchar && *errchar))
+			i = 0;
+		else
+			i = CONBUFFER_LINES_COUNT(&history) - i;
+	}
+
+	for ( ; i<CONBUFFER_LINES_COUNT(&history); i++)
+		Con_Printf("^3%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+	Con_Printf("\n");
+}
+
 static int	key_bmap, key_bmap2;
 static unsigned char keydown[MAX_KEYS];	// 0 = up, 1 = down, 2 = repeating
 
@@ -315,6 +478,36 @@ static const keyname_t   keynames[] = {
 	{"AUX31", K_AUX31},
 	{"AUX32", K_AUX32},
 
+	{"X360_DPAD_UP", K_X360_DPAD_UP},
+	{"X360_DPAD_DOWN", K_X360_DPAD_DOWN},
+	{"X360_DPAD_LEFT", K_X360_DPAD_LEFT},
+	{"X360_DPAD_RIGHT", K_X360_DPAD_RIGHT},
+	{"X360_START", K_X360_START},
+	{"X360_BACK", K_X360_BACK},
+	{"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
+	{"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
+	{"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
+	{"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
+	{"X360_A", K_X360_A},
+	{"X360_B", K_X360_B},
+	{"X360_X", K_X360_X},
+	{"X360_Y", K_X360_Y},
+	{"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
+	{"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
+	{"X360_LEFT_THUMB_UP", K_X360_LEFT_THUMB_UP},
+	{"X360_LEFT_THUMB_DOWN", K_X360_LEFT_THUMB_DOWN},
+	{"X360_LEFT_THUMB_LEFT", K_X360_LEFT_THUMB_LEFT},
+	{"X360_LEFT_THUMB_RIGHT", K_X360_LEFT_THUMB_RIGHT},
+	{"X360_RIGHT_THUMB_UP", K_X360_RIGHT_THUMB_UP},
+	{"X360_RIGHT_THUMB_DOWN", K_X360_RIGHT_THUMB_DOWN},
+	{"X360_RIGHT_THUMB_LEFT", K_X360_RIGHT_THUMB_LEFT},
+	{"X360_RIGHT_THUMB_RIGHT", K_X360_RIGHT_THUMB_RIGHT},
+
+	{"JOY_UP", K_JOY_UP},
+	{"JOY_DOWN", K_JOY_DOWN},
+	{"JOY_LEFT", K_JOY_LEFT},
+	{"JOY_RIGHT", K_JOY_RIGHT},
+
 	{"SEMICOLON", ';'},			// because a raw semicolon separates commands
 	{"TILDE", '~'},
 	{"BACKQUOTE", '`'},
@@ -850,6 +1043,39 @@ Key_Console (int key, int unicode)
 		return;
 	}
 	// ~1.0795 = 82/76  using con_textsize 64 76 is height of the char, 6 is the distance between 2 lines
+
+	if (keydown[K_CTRL])
+	{
+		// prints all the matching commands
+		if (key == 'f')
+		{
+			Key_History_Find_All();
+			return;
+		}
+		// Search forwards/backwards, pointing the history's index to the
+		// matching command but without fetching it to let one continue the search.
+		// To fetch it, it suffices to just press UP or DOWN.
+		if (key == 'r')
+		{
+			if (keydown[K_SHIFT])
+				Key_History_Find_Forwards();
+			else
+				Key_History_Find_Backwards();
+			return;
+		}
+		// go to the last/first command of the history
+		if (key == ',')
+		{
+			Key_History_First();
+			return;
+		}
+		if (key == '.')
+		{
+			Key_History_Last();
+			return;
+		}
+	}
+
 	if (key == K_PGUP || key == K_KP_PGUP)
 	{
 		if(keydown[K_CTRL])
@@ -971,17 +1197,16 @@ int chat_mode;
 char		chat_buffer[MAX_INPUTLINE];
 unsigned int	chat_bufferlen = 0;
 
-extern int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
-
 static void
 Key_Message (int key, int ascii)
 {
+	char vabuf[1024];
 	if (key == K_ENTER || ascii == 10 || ascii == 13)
 	{
 		if(chat_mode < 0)
-			Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+			Cmd_ExecuteString(chat_buffer, src_command, true); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
 		else
-			Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
+			Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
 
 		key_dest = key_game;
 		chat_bufferlen = 0;
@@ -1012,7 +1237,7 @@ Key_Message (int key, int ascii)
 	}
 
 	// ctrl+key generates an ascii value < 32 and shows a char from the charmap
-	if (ascii < 32 && utf8_enable.integer)
+	if (ascii > 0 && ascii < 32 && utf8_enable.integer)
 		ascii = 0xE000 + ascii;
 
 	if (chat_bufferlen == sizeof (chat_buffer) - 1)
@@ -1062,10 +1287,9 @@ FIXME: handle quote special (general escape sequence?)
 ===================
 */
 const char *
-Key_KeynumToString (int keynum)
+Key_KeynumToString (int keynum, char *tinystr, size_t tinystrlength)
 {
 	const keyname_t  *kn;
-	static char tinystr[2];
 
 	// -1 is an invalid code
 	if (keynum < 0)
@@ -1079,8 +1303,11 @@ Key_KeynumToString (int keynum)
 	// if it is printable, output it as a single character
 	if (keynum > 32 && keynum < 256)
 	{
-		tinystr[0] = keynum;
-		tinystr[1] = 0;
+		if (tinystrlength >= 2)
+		{
+			tinystr[0] = keynum;
+			tinystr[1] = 0;
+		}
 		return tinystr;
 	}
 
@@ -1273,6 +1500,7 @@ static void
 Key_PrintBindList(int j)
 {
 	char bindbuf[MAX_INPUTLINE];
+	char tinystr[2];
 	const char *p;
 	int i;
 
@@ -1281,11 +1509,11 @@ Key_PrintBindList(int j)
 		p = keybindings[j][i];
 		if (p)
 		{
-			Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+			Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false);
 			if (j == 0)
-				Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+				Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 			else
-				Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+				Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 		}
 	}
 }
@@ -1365,6 +1593,7 @@ Key_WriteBindings (qfile_t *f)
 {
 	int         i, j;
 	char bindbuf[MAX_INPUTLINE];
+	char tinystr[2];
 	const char *p;
 
 	for (j = 0; j < MAX_BINDMAPS; j++)
@@ -1374,11 +1603,11 @@ Key_WriteBindings (qfile_t *f)
 			p = keybindings[j][i];
 			if (p)
 			{
-				Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\"); // don't need to escape $ because cvars are not expanded inside bind
+				Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false); // don't need to escape $ because cvars are not expanded inside bind
 				if (j == 0)
-					FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
+					FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 				else
-					FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+					FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 			}
 		}
 	}
@@ -1406,6 +1635,8 @@ Key_Init (void)
 	Cmd_AddCommand ("bindlist", Key_BindList_f, "bindlist: displays bound keys for bindmap 0 bindmaps");
 	Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
 
+	Cmd_AddCommand ("history", Key_History_f, "prints the history of executed commands (history X prints the last X entries, history -c clears the whole history)");
+
 	Cvar_RegisterVariable (&con_closeontoggleconsole);
 }
 
@@ -1463,8 +1694,6 @@ void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bi
 	}
 }
 
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
-
 /*
 ===================
 Called by the system between frames for both key up and key down events
@@ -1518,6 +1747,7 @@ Key_Event (int key, int ascii, qboolean down)
 	const char *bind;
 	qboolean q;
 	keydest_t keydest = key_dest;
+	char vabuf[1024];
 
 	if (key < 0 || key >= MAX_KEYS)
 		return;
@@ -1528,6 +1758,11 @@ Key_Event (int key, int ascii, qboolean down)
 		return;
 	}
 
+	if (ascii == 0x80 && utf8_enable.integer) // pressing AltGr-5 (or AltGr-e) and for some reason we get windows-1252 encoding?
+		ascii = 0x20AC; // we want the Euro currency sign
+		// TODO find out which vid_ drivers do it and fix it there
+		// but catching U+0080 here is no loss as that char is not useful anyway
+
 	// get key binding
 	bind = keybindings[key_bmap][key];
 	if (!bind)
@@ -1624,7 +1859,7 @@ Key_Event (int key, int ascii, qboolean down)
 
 			case key_game:
 				// csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
-				q = CL_VM_InputEvent(down, key, ascii);
+				q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
 				if (!q && down)
 					MR_ToggleMenu(1);
 				break;
@@ -1646,14 +1881,14 @@ Key_Event (int key, int ascii, qboolean down)
 			{
 				// button commands add keynum as a parm
 				if (bind[0] == '+')
-					Cbuf_AddText (va("%s %i\n", bind, key));
+					Cbuf_AddText (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
 				else
 				{
 					Cbuf_AddText (bind);
 					Cbuf_AddText ("\n");
 				}
 			} else if(bind[0] == '+' && !down && keydown[key] == 0)
-				Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+				Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
 		}
 		return;
 	}
@@ -1666,11 +1901,15 @@ Key_Event (int key, int ascii, qboolean down)
 		// con_closeontoggleconsole enables toggleconsole keys to close the
 		// console, as long as they are not the color prefix character
 		// (special exemption for german keyboard layouts)
-		if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
+		if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1))
 		{
 			Con_ToggleConsole_f ();
 			return;
 		}
+
+		if (COM_CheckParm ("-noconsole"))
+			return; // only allow the key bind to turn off console
+
 		Key_Console (key, ascii);
 		return;
 	}
@@ -1689,7 +1928,10 @@ Key_Event (int key, int ascii, qboolean down)
 	// 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);
+		if (gamemode == GAME_BLOODOMNICIDE) // menu controls key events
+			MR_KeyEvent(key, ascii, down);
+		else
+			CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
 		return;
 	}
 
@@ -1705,7 +1947,7 @@ Key_Event (int key, int ascii, qboolean down)
 			MR_KeyEvent (key, ascii, down);
 			break;
 		case key_game:
-			q = CL_VM_InputEvent(down, key, ascii);
+			q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
 			// ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
 			if (!q && bind)
 			{
@@ -1713,14 +1955,14 @@ Key_Event (int key, int ascii, qboolean down)
 				{
 					// button commands add keynum as a parm
 					if (bind[0] == '+')
-						Cbuf_AddText (va("%s %i\n", bind, key));
+						Cbuf_AddText (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
 					else
 					{
 						Cbuf_AddText (bind);
 						Cbuf_AddText ("\n");
 					}
 				} else if(bind[0] == '+' && !down && keydown[key] == 0)
-					Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+					Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
 			}
 			break;
 		default:
@@ -1728,6 +1970,21 @@ Key_Event (int key, int ascii, qboolean down)
 	}
 }
 
+// a helper to simulate release of ALL keys
+void
+Key_ReleaseAll (void)
+{
+	int key;
+	// clear the event queue first
+	eventqueue_idx = 0;
+	// then send all down events (possibly into the event queue)
+	for(key = 0; key < MAX_KEYS; ++key)
+		if(keydown[key])
+			Key_Event(key, 0, false);
+	// now all keys are guaranteed down (once the event queue is unblocked)
+	// and only future events count
+}
+
 /*
 ===================
 Key_ClearStates