X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=a65adba8f1154225aa6281b79d37f843324e6a39;hb=67575888bba048836755d18f644b8f93328924f5;hp=dd718225deb8a3d5f646b3efa2e134758656ed19;hpb=38dc528b36742bf91901a4a160954677cd762e0f;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index dd718225..a65adba8 100644
--- a/keys.c
+++ b/keys.c
@@ -53,6 +53,9 @@ static const keyname_t   keynames[] = {
 	{"ENTER", K_ENTER},
 	{"ESCAPE", K_ESCAPE},
 	{"SPACE", K_SPACE},
+
+	// spacer so it lines up with keys.h
+
 	{"BACKSPACE", K_BACKSPACE},
 	{"UPARROW", K_UPARROW},
 	{"DOWNARROW", K_DOWNARROW},
@@ -85,53 +88,32 @@ static const keyname_t   keynames[] = {
 
 	{"PAUSE", K_PAUSE},
 
-	{"MWHEELUP", K_MWHEELUP},
-	{"MWHEELDOWN", K_MWHEELDOWN},
-
-	{"MOUSE1", K_MOUSE1},
-	{"MOUSE2", K_MOUSE2},
-	{"MOUSE3", K_MOUSE3},
-	{"MOUSE4", K_MOUSE4},
-	{"MOUSE5", K_MOUSE5},
-	{"MOUSE6", K_MOUSE6},
-	{"MOUSE7", K_MOUSE7},
-	{"MOUSE8", K_MOUSE8},
-	{"MOUSE9", K_MOUSE9},
-	{"MOUSE10", K_MOUSE10},
-	{"MOUSE11", K_MOUSE11},
-	{"MOUSE12", K_MOUSE12},
-	{"MOUSE13", K_MOUSE13},
-	{"MOUSE14", K_MOUSE14},
-	{"MOUSE15", K_MOUSE15},
-	{"MOUSE16", K_MOUSE16},
-
 	{"NUMLOCK", K_NUMLOCK},
 	{"CAPSLOCK", K_CAPSLOCK},
 	{"SCROLLOCK", K_SCROLLOCK},
 
-	{"KP_HOME",			K_KP_HOME },
-	{"KP_UPARROW",		K_KP_UPARROW },
-	{"KP_PGUP",			K_KP_PGUP },
-	{"KP_LEFTARROW",	K_KP_LEFTARROW },
-	{"KP_RIGHTARROW",	K_KP_RIGHTARROW },
-	{"KP_END",			K_KP_END },
-	{"KP_DOWNARROW",	K_KP_DOWNARROW },
-	{"KP_PGDN",			K_KP_PGDN },
 	{"KP_INS",			K_KP_INS },
-	{"KP_DEL",			K_KP_DEL },
-	{"KP_SLASH",		K_KP_SLASH },
-
 	{"KP_0", K_KP_0},
+	{"KP_END",			K_KP_END },
 	{"KP_1", K_KP_1},
+	{"KP_DOWNARROW",	K_KP_DOWNARROW },
 	{"KP_2", K_KP_2},
+	{"KP_PGDN",			K_KP_PGDN },
 	{"KP_3", K_KP_3},
+	{"KP_LEFTARROW",	K_KP_LEFTARROW },
 	{"KP_4", K_KP_4},
 	{"KP_5", K_KP_5},
+	{"KP_RIGHTARROW",	K_KP_RIGHTARROW },
 	{"KP_6", K_KP_6},
+	{"KP_HOME",			K_KP_HOME },
 	{"KP_7", K_KP_7},
+	{"KP_UPARROW",		K_KP_UPARROW },
 	{"KP_8", K_KP_8},
+	{"KP_PGUP",			K_KP_PGUP },
 	{"KP_9", K_KP_9},
+	{"KP_DEL",			K_KP_DEL },
 	{"KP_PERIOD", K_KP_PERIOD},
+	{"KP_SLASH",		K_KP_SLASH },
 	{"KP_DIVIDE", K_KP_DIVIDE},
 	{"KP_MULTIPLY", K_KP_MULTIPLY},
 	{"KP_MINUS", K_KP_MINUS},
@@ -139,6 +121,31 @@ static const keyname_t   keynames[] = {
 	{"KP_ENTER", K_KP_ENTER},
 	{"KP_EQUALS", K_KP_EQUALS},
 
+
+
+	{"MOUSE1", K_MOUSE1},
+
+	{"MOUSE2", K_MOUSE2},
+	{"MOUSE3", K_MOUSE3},
+	{"MWHEELUP", K_MWHEELUP},
+	{"MWHEELDOWN", K_MWHEELDOWN},
+	{"MOUSE4", K_MOUSE4},
+	{"MOUSE5", K_MOUSE5},
+	{"MOUSE6", K_MOUSE6},
+	{"MOUSE7", K_MOUSE7},
+	{"MOUSE8", K_MOUSE8},
+	{"MOUSE9", K_MOUSE9},
+	{"MOUSE10", K_MOUSE10},
+	{"MOUSE11", K_MOUSE11},
+	{"MOUSE12", K_MOUSE12},
+	{"MOUSE13", K_MOUSE13},
+	{"MOUSE14", K_MOUSE14},
+	{"MOUSE15", K_MOUSE15},
+	{"MOUSE16", K_MOUSE16},
+
+
+
+
 	{"JOY1",  K_JOY1},
 	{"JOY2",  K_JOY2},
 	{"JOY3",  K_JOY3},
@@ -156,6 +163,11 @@ static const keyname_t   keynames[] = {
 	{"JOY15", K_JOY15},
 	{"JOY16", K_JOY16},
 
+
+
+
+
+
 	{"AUX1", K_AUX1},
 	{"AUX2", K_AUX2},
 	{"AUX3", K_AUX3},
@@ -272,11 +284,24 @@ Key_Console (int key, char ascii)
 
 	if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
 	{
-		char *cbd;
+		char *cbd, *p;
 		if ((cbd = Sys_GetClipboardData()) != 0)
 		{
 			int i;
+#if 1
+			p = cbd;
+			while (*p)
+			{
+				if (*p == '\n' || *p == '\r' || *p == '\b')
+				{
+					*p++ = 0;
+					break;
+				}
+				p++;
+			}
+#else
 			strtok(cbd, "\n\r\b");
+#endif
 			i = (int)strlen(cbd);
 			if (i + key_linepos >= MAX_INPUTLINE)
 				i= MAX_INPUTLINE - key_linepos;
@@ -863,7 +888,7 @@ const char *Key_GetBind (int key)
 	return bind;
 }
 
-qboolean CL_VM_InputEvent (qboolean down, int key);
+qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
 
 /*
 ===================
@@ -871,11 +896,15 @@ Called by the system between frames for both key up and key down events
 Should NOT be called during an interrupt!
 ===================
 */
+static char tbl_keyascii[MAX_KEYS];
+static keydest_t tbl_keydest[MAX_KEYS];
+
 void
 Key_Event (int key, char ascii, qboolean down)
 {
 	const char *bind;
 	qboolean q;
+	keydest_t keydest = key_dest;
 
 	if (key < 0 || key >= MAX_KEYS)
 		return;
@@ -888,33 +917,33 @@ Key_Event (int key, char ascii, qboolean down)
 	if (developer.integer >= 1000)
 		Con_Printf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii, down ? "down" : "up", keydown[key], bind ? bind : "");
 
-#if 0
-	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;
-		}
-	}
-#endif
-
+	if(key_consoleactive)
+		keydest = key_console;
+	
 	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);
+		if(keydown[key] == 1) {
+			tbl_keyascii[key] = ascii;
+			tbl_keydest[key] = keydest;
+		} else {
+			ascii = tbl_keyascii[key];
+			keydest = tbl_keydest[key];
+		}
 	}
 	else
 	{
 		// clear repeat count now that the key is released
 		keydown[key] = 0;
+		keydest = tbl_keydest[key];
+		ascii = tbl_keyascii[key];
 	}
 
+	if(keydest == key_void)
+		return;
+	
 	// 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
@@ -940,9 +969,11 @@ Key_Event (int key, char ascii, qboolean down)
 		if (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down)
 		{
 			Con_ToggleConsole_f ();
+			tbl_keydest[key] = key_void; // ignore the release
 			return;
 		}
-		switch (key_dest)
+#if 0
+		switch (keydest)
 		{
 			case key_message:
 				if (down)
@@ -954,7 +985,7 @@ Key_Event (int key, char ascii, qboolean down)
 				break;
 			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);
+				q = CL_VM_InputEvent(down, key, ascii);
 				if (!q && down)
 					MR_ToggleMenu_f ();
 				break;
@@ -962,10 +993,11 @@ Key_Event (int key, char ascii, qboolean down)
 				Con_Printf ("Key_Event: Bad key_dest\n");
 		}
 		return;
+#endif
 	}
 
 	// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
-	if (key_dest != key_menu_grabbed)
+	if (keydest != key_menu_grabbed)
 	if (key >= K_F1 && key <= K_F12 && down)
 	{
 		// ignore key repeats on F1-F12 binds
@@ -991,10 +1023,15 @@ Key_Event (int key, char ascii, qboolean 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 && down && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
+	if (keydest == key_console && key_consoleactive && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
 #endif
 	{
-		Key_Console (key, ascii);
+		if(down) {
+			if(key == K_ESCAPE)
+				MR_ToggleMenu_f();
+			else
+				Key_Console (key, ascii);
+		}
 		return;
 	}
 
@@ -1006,8 +1043,10 @@ Key_Event (int key, char ascii, qboolean down)
 	// keep the character from continuing an action started before a console
 	// switch.  Button commands include the kenum as a parameter, so multiple
 	// downs can be matched with ups
+	/*
 	if (!down && bind && bind[0] == '+')
 		Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+	*/
 
 	// ignore binds while a video is played, let the video system handle the key event
 	if (cl_videoplaying)
@@ -1017,7 +1056,7 @@ Key_Event (int key, char ascii, qboolean down)
 	}
 
 	// anything else is a key press into the game, chat line, or menu
-	switch (key_dest)
+	switch (keydest)
 	{
 		case key_message:
 			if (down)
@@ -1028,20 +1067,29 @@ Key_Event (int key, char ascii, qboolean down)
 			MR_KeyEvent (key, ascii, down);
 			break;
 		case key_game:
-			q = CL_VM_InputEvent(down, key);
+			q = CL_VM_InputEvent(down, key, ascii);
 			// ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
-			if (!q && bind && keydown[key] == 1 && down)
+			if (!q && bind)
 			{
-				// button commands add keynum as a parm
-				if (bind[0] == '+')
-					Cbuf_AddText (va("%s %i\n", bind, key));
-				else
+				if(keydown[key] == 1 && down)
 				{
-					Cbuf_AddText (bind);
-					Cbuf_AddText ("\n");
-				}
+					// button commands add keynum as a parm
+					if (bind[0] == '+')
+						Cbuf_AddText (va("%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));
 			}
 			break;
+		case key_console:
+			// This happens for example when pressing shift in the console
+			// closing the console, and then releasing shift.
+			// Con_Printf("Key_Event: Console key ignored\n");
+			break;
 		default:
 			Con_Printf ("Key_Event: Bad key_dest\n");
 	}