X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=d182291c1958b8abdacb0ac12afbb57f4757d156;hp=e0177edbb5fd7f051f2afaa52c09563102868379;hb=e2ca60e84ef1525d1b097548534e6ab1c96885b2;hpb=3559def9670c20b910bc9a09b1a76532581dd462

diff --git a/keys.c b/keys.c
index e0177edb..d182291c 100644
--- a/keys.c
+++ b/keys.c
@@ -36,8 +36,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 +110,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;
+}
+
+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 +129,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 +154,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 +171,143 @@ 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;
+	size_t digits = strlen(va("%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("*%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;
+	size_t digits = strlen(va("%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("*%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;
+	size_t digits = strlen(va("%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("*%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;
+	size_t digits = strlen(va("%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
 
@@ -712,8 +870,8 @@ Key_Console (int key, int unicode)
 		else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
 		{
 			int		pos;
-			size_t          inchar;
-			pos = u8_prevbyte(key_line, key_linepos);
+			size_t          inchar = 0;
+			pos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
 			while (pos)
 				if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
 					pos-=2;
@@ -733,7 +891,7 @@ Key_Console (int key, int unicode)
 		}
 		else
 		{
-			key_linepos = u8_prevbyte(key_line, key_linepos);
+			key_linepos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
 		}
 		return;
 	}
@@ -743,7 +901,7 @@ Key_Console (int key, int unicode)
 	{
 		if (key_linepos > 1)
 		{
-			int newpos = u8_prevbyte(key_line, key_linepos);
+			int newpos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
 			strlcpy(key_line + newpos, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
 			key_linepos = newpos;
 		}
@@ -850,6 +1008,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])
@@ -1011,6 +1202,10 @@ Key_Message (int key, int ascii)
 		return;
 	}
 
+	// ctrl+key generates an ascii value < 32 and shows a char from the charmap
+	if (ascii < 32 && utf8_enable.integer)
+		ascii = 0xE000 + ascii;
+
 	if (chat_bufferlen == sizeof (chat_buffer) - 1)
 		return;							// all full
 
@@ -1085,14 +1280,16 @@ Key_KeynumToString (int keynum)
 }
 
 
-void
+qboolean
 Key_SetBinding (int keynum, int bindmap, const char *binding)
 {
 	char *newbinding;
 	size_t l;
 
 	if (keynum == -1 || keynum >= MAX_KEYS)
-		return;
+		return false;
+	if ((bindmap < 0) || (bindmap >= MAX_BINDMAPS))
+		return false;
 
 // free old bindings
 	if (keybindings[bindmap][keynum]) {
@@ -1100,13 +1297,35 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
 		keybindings[bindmap][keynum] = NULL;
 	}
 	if(!binding[0]) // make "" binds be removed --blub
-		return;
+		return true;
 // allocate memory for new binding
 	l = strlen (binding);
 	newbinding = (char *)Z_Malloc (l + 1);
 	memcpy (newbinding, binding, l + 1);
 	newbinding[l] = 0;
 	keybindings[bindmap][keynum] = newbinding;
+	return true;
+}
+
+void Key_GetBindMap(int *fg, int *bg)
+{
+	if(fg)
+		*fg = key_bmap;
+	if(bg)
+		*bg = key_bmap2;
+}
+
+qboolean Key_SetBindMap(int fg, int bg)
+{
+	if(fg >= MAX_BINDMAPS)
+		return false;
+	if(bg >= MAX_BINDMAPS)
+		return false;
+	if(fg >= 0)
+		key_bmap = fg;
+	if(bg >= 0)
+		key_bmap2 = bg;
+	return true;
 }
 
 static void
@@ -1121,7 +1340,7 @@ Key_In_Unbind_f (void)
 	}
 
 	m = strtol(Cmd_Argv (1), &errchar, 0);
-	if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+	if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
 		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
@@ -1132,7 +1351,8 @@ Key_In_Unbind_f (void)
 		return;
 	}
 
-	Key_SetBinding (b, m, "");
+	if(!Key_SetBinding (b, m, ""))
+		Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
@@ -1150,7 +1370,7 @@ Key_In_Bind_f (void)
 	}
 
 	m = strtol(Cmd_Argv (1), &errchar, 0);
-	if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+	if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
 		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
@@ -1176,7 +1396,8 @@ Key_In_Bind_f (void)
 			strlcat (cmd, " ", sizeof (cmd));
 	}
 
-	Key_SetBinding (b, m, cmd);
+	if(!Key_SetBinding (b, m, cmd))
+		Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
@@ -1193,13 +1414,13 @@ Key_In_Bindmap_f (void)
 	}
 
 	m1 = strtol(Cmd_Argv (1), &errchar, 0);
-	if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+	if ((m1 < 0) || (m1 >= MAX_BINDMAPS) || (errchar && *errchar)) {
 		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
 
 	m2 = strtol(Cmd_Argv (2), &errchar, 0);
-	if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+	if ((m2 < 0) || (m2 >= MAX_BINDMAPS) || (errchar && *errchar)) {
 		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
 		return;
 	}
@@ -1224,7 +1445,8 @@ Key_Unbind_f (void)
 		return;
 	}
 
-	Key_SetBinding (b, 0, "");
+	if(!Key_SetBinding (b, 0, ""))
+		Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
@@ -1232,7 +1454,7 @@ Key_Unbindall_f (void)
 {
 	int         i, j;
 
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < MAX_BINDMAPS; j++)
 		for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 			if (keybindings[j][i])
 				Key_SetBinding (i, j, "");
@@ -1268,7 +1490,7 @@ Key_In_BindList_f (void)
 	if(Cmd_Argc() >= 2)
 	{
 		m = strtol(Cmd_Argv(1), &errchar, 0);
-		if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+		if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
 			Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 			return;
 		}
@@ -1320,7 +1542,8 @@ Key_Bind_f (void)
 			strlcat (cmd, " ", sizeof (cmd));
 	}
 
-	Key_SetBinding (b, 0, cmd);
+	if(!Key_SetBinding (b, 0, cmd))
+		Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 /*
@@ -1374,6 +1597,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);
 }
 
@@ -1383,17 +1608,54 @@ Key_Shutdown (void)
 	Key_History_Shutdown();
 }
 
-const char *Key_GetBind (int key)
+const char *Key_GetBind (int key, int bindmap)
 {
 	const char *bind;
 	if (key < 0 || key >= MAX_KEYS)
 		return NULL;
-	bind = keybindings[key_bmap][key];
-	if (!bind)
-		bind = keybindings[key_bmap2][key];
+	if(bindmap >= MAX_BINDMAPS)
+		return NULL;
+	if(bindmap >= 0)
+	{
+		bind = keybindings[bindmap][key];
+	}
+	else
+	{
+		bind = keybindings[key_bmap][key];
+		if (!bind)
+			bind = keybindings[key_bmap2][key];
+	}
 	return bind;
 }
 
+void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bindmap)
+{
+	int		count;
+	int		j;
+	const char	*b;
+
+	for (j = 0;j < numkeys;j++)
+		keys[j] = -1;
+
+	if(bindmap >= MAX_BINDMAPS)
+		return;
+
+	count = 0;
+
+	for (j = 0; j < MAX_KEYS; ++j)
+	{
+		b = Key_GetBind(j, bindmap);
+		if (!b)
+			continue;
+		if (!strcmp (b, command) )
+		{
+			keys[count++] = j;
+			if (count == numkeys)
+				break;
+		}
+	}
+}
+
 qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
 
 /*
@@ -1405,6 +1667,44 @@ Should NOT be called during an interrupt!
 static char tbl_keyascii[MAX_KEYS];
 static keydest_t tbl_keydest[MAX_KEYS];
 
+typedef struct eventqueueitem_s
+{
+	int key;
+	int ascii;
+	qboolean down;
+}
+eventqueueitem_t;
+static int events_blocked = 0;
+static eventqueueitem_t eventqueue[32];
+static unsigned eventqueue_idx = 0;
+
+static void Key_EventQueue_Add(int key, int ascii, qboolean down)
+{
+	if(eventqueue_idx < sizeof(eventqueue) / sizeof(*eventqueue))
+	{
+		eventqueue[eventqueue_idx].key = key;
+		eventqueue[eventqueue_idx].ascii = ascii;
+		eventqueue[eventqueue_idx].down = down;
+		++eventqueue_idx;
+	}
+}
+
+void Key_EventQueue_Block(void)
+{
+	// block key events until call to Unblock
+	events_blocked = true;
+}
+
+void Key_EventQueue_Unblock(void)
+{
+	// unblocks key events again
+	unsigned i;
+	events_blocked = false;
+	for(i = 0; i < eventqueue_idx; ++i)
+		Key_Event(eventqueue[i].key, eventqueue[i].ascii, eventqueue[i].down);
+	eventqueue_idx = 0;
+}
+
 void
 Key_Event (int key, int ascii, qboolean down)
 {
@@ -1415,6 +1715,17 @@ Key_Event (int key, int ascii, qboolean down)
 	if (key < 0 || key >= MAX_KEYS)
 		return;
 
+	if(events_blocked)
+	{
+		Key_EventQueue_Add(key, ascii, 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)
@@ -1492,7 +1803,7 @@ Key_Event (int key, int ascii, qboolean down)
 					if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
 					{
 						key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
-						MR_ToggleMenu_f ();
+						MR_ToggleMenu(1);
 					}
 					else
 						Con_ToggleConsole_f();
@@ -1513,7 +1824,7 @@ Key_Event (int key, int ascii, qboolean down)
 				// 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);
 				if (!q && down)
-					MR_ToggleMenu_f ();
+					MR_ToggleMenu(1);
 				break;
 
 			default:
@@ -1523,8 +1834,9 @@ Key_Event (int key, int ascii, qboolean down)
 	}
 
 	// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
+	// VorteX: Omnicide does bind F* keys
 	if (keydest != key_menu_grabbed)
-	if (key >= K_F1 && key <= K_F12)
+	if (key >= K_F1 && key <= K_F12 && gamemode != GAME_BLOODOMNICIDE)
 	{
 		if (bind)
 		{