src/command.c

@@ -38,7 +38,7 @@
 // protos.
 //========
 static boolean COM_Exists(const char *com_name);
-static void COM_ExecuteString(char *com_text);
+static void COM_ExecuteString(UINT8 *com_text);
 
 static void COM_Alias_f(void);
 static void COM_Echo_f(void);
@@ -58,8 +58,8 @@ static consvar_t *CV_FindVar(const char *name);
 static const char *CV_StringValue(const char *var_name);
 static consvar_t *consvar_vars; // list of registered console variables
 
-static char com_token[1024];
-static char *COM_Parse(char *data);
+static UINT8 com_token[1024];
+static UINT8 *COM_Parse(UINT8 *data);
 
 CV_PossibleValue_t CV_OnOff[] = {{0, "Off"}, {1, "On"}, {0, NULL}};
 CV_PossibleValue_t CV_YesNo[] = {{0, "No"}, {1, "Yes"}, {0, NULL}};
@@ -168,14 +168,14 @@ COM_BufTicker(void)
 void COM_BufExecute(void)
 {
 	size_t i;
-	char *ptext;
-	char line[1024] = "";
+	UINT8 *ptext;
+	UINT8 line[1024] = "";
 	INT32 quotes;
 
 	while (com_text.cursize)
 	{
 		// find a '\n' or; line break
-		ptext = (char *)com_text.data;
+		ptext = (UINT8 *)com_text.data;
 
 		quotes = 0;
 		for (i = 0; i < com_text.cursize; i++)
@@ -223,17 +223,17 @@ void COM_BufExecute(void)
 
 /** Executes a string immediately.  Used for skirting around WAIT commands.
   */
-void COM_ImmedExecute(const char *ptext)
+void COM_ImmedExecute(const char *itext)
 {
+	const UINT8 *ptext = (const UINT8 *)itext;
 	size_t i = 0, j = 0;
-	char line[1024] = "";
+	UINT8 line[1024] = "";
 	INT32 quotes;
 
-	while (i < strlen(ptext))
+	while (i < HU_StringLength(ptext))
 	{
-
 		quotes = 0;
-		for (j = 0; i < strlen(ptext); i++,j++)
+		for (j = 0; i < HU_StringLength(ptext); i++,j++)
 		{
 			if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
 				return;
@@ -384,7 +384,7 @@ size_t COM_FirstOption(void)
   * \param ptext A null-terminated string. Does not need to be
   *             newline-terminated.
   */
-static void COM_TokenizeString(char *ptext)
+static void COM_TokenizeString(UINT8 *ptext)
 {
 	size_t i;
 
@@ -407,13 +407,13 @@ static void COM_TokenizeString(char *ptext)
 			break;
 
 		if (com_argc == 1)
-			com_args = ptext;
+			com_args = (char *)ptext;
 
 		ptext = COM_Parse(ptext);
 		if (ptext == NULL)
 			break;
 
-		com_argv[com_argc] = Z_StrDup(com_token);
+		com_argv[com_argc] = (char *)HU_StringCopyAlloc(com_token);
 		com_argc++;
 	}
 }
@@ -541,7 +541,7 @@ const char *COM_CompleteCommand(const char *partial, INT32 skips)
   *
   * \param ptext A single line of text.
   */
-static void COM_ExecuteString(char *ptext)
+static void COM_ExecuteString(UINT8 *ptext)
 {
 	xcommand_t *cmd;
 	cmdalias_t *a;
@@ -2077,9 +2077,9 @@ void CV_SaveVariables(FILE *f)
   * \param data String to parse.
   * \return The data pointer after the token. NULL if no token found.
   */
-static char *COM_Parse(char *data)
+static UINT8 *COM_Parse(UINT8 *data)
 {
-	char c;
+	UINT8 c;
 	size_t len = 0;
 
 	com_token[0] = 0;

src/command.h

@@ -42,7 +42,7 @@ void COM_BufAddText(const char *btext);
 void COM_BufInsertText(const char *btext);
 
 // don't bother inserting, just do immediately
-void COM_ImmedExecute(const char *ptext);
+void COM_ImmedExecute(const char *itext);
 
 // Execute commands in buffer, flush them
 void COM_BufExecute(void);

src/console.c

@@ -139,7 +139,7 @@ static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, 		{1, "Black"},		{
 
 consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL};
 
-static void CON_Print(char *msg);
+static void CON_Print(UINT8 *msg);
 
 //
 //
@@ -399,7 +399,6 @@ void CON_Init(void)
 	con_destlines = vid.height;
 	con_curlines = vid.height;
 
-
 	if (!dedicated)
 	{
 		con_started = true;
@@ -518,7 +517,7 @@ static void CON_RecalcSize(void)
 					conw--;
 				string[conw+1] = '\n';
 				string[conw+2] = '\0';
-				CON_Print(string);
+				CON_Print((UINT8 *)string);
 			}
 		}
 	}
@@ -679,8 +678,8 @@ static void CON_InputClear(void)
 static void CON_InputSetString(const char *c)
 {
 	memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
-	strcpy(inputlines[inputline], c);
-	input_cur = input_sel = input_len = strlen(c);
+	HU_StringCopy((UINT8 *)inputlines[inputline], (const UINT8 *)c);
+	input_cur = input_sel = input_len = HU_StringLength((const UINT8 *)c);
 }
 
 static void CON_InputAddString(const char *c)
@@ -743,6 +742,11 @@ static void CON_InputDelChar(void)
 // ----
 //
 
+boolean CON_AcceptInput(void)
+{
+	return consoleready;
+}
+
 // Handles console key input
 //
 boolean CON_Responder(event_t *ev)
@@ -760,7 +764,7 @@ boolean CON_Responder(event_t *ev)
 		return false;
 
 	// let go keyup events, don't eat them
-	if (ev->type != ev_keydown && ev->type != ev_console)
+	if (ev->type != ev_keydown && ev->type != ev_textinput && ev->type != ev_console)
 	{
 		if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1])
 			consdown = false;
@@ -787,7 +791,7 @@ boolean CON_Responder(event_t *ev)
 		// check other keys only if console prompt is active
 		if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!!
 		{
-			if (bindtable[key])
+			if (bindtable[key] && ev->type == ev_keydown) // ev_textinput crashes the game. Why?
 			{
 				COM_BufAddText(bindtable[key]);
 				COM_BufAddText("\n");
@@ -1075,33 +1079,42 @@ boolean CON_Responder(event_t *ev)
 	}
 
 	// allow people to use keypad in console (good for typing IP addresses) - Calum
-	if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
+	if (!cv_textinput.value)
 	{
-		char keypad_translation[] = {'7','8','9','-',
-		                             '4','5','6','+',
-		                             '1','2','3',
-		                             '0','.'};
+		if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
+		{
+			char keypad_translation[] = {'7','8','9','-',
+										 '4','5','6','+',
+										 '1','2','3',
+										 '0','.'};
 
-		key = keypad_translation[key - KEY_KEYPAD7];
-	}
-	else if (key == KEY_KPADSLASH)
-		key = '/';
+			key = keypad_translation[key - KEY_KEYPAD7];
+		}
+		else if (key == KEY_KPADSLASH)
+			key = '/';
 
-	if (key >= 'a' && key <= 'z')
-	{
-		if (capslock ^ shiftdown)
+		if (key >= 'a' && key <= 'z')
+		{
+			if (capslock ^ shiftdown)
+				key = shiftxform[key];
+		}
+		else if (shiftdown)
 			key = shiftxform[key];
 	}
-	else if (shiftdown)
-		key = shiftxform[key];
+
+	// Lactozilla: Ignore caps lock key
+	// or else it turns into a printable character
+	if (ev->type != ev_textinput && key == KEY_CAPSLOCK)
+		return true;
 
 	// enter a char into the command prompt
-	if (key < 32 || key > 127)
+	if (key < 32 || key > 0xFF)
 		return true;
 
 	// add key to cmd line here
-	if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers
-		key = key + 'a' - 'A';
+	if (!cv_textinput.value)
+		if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers
+			key = key + 'a' - 'A';
 
 	if (input_sel != input_cur)
 		CON_InputDelSelection();
@@ -1128,7 +1141,7 @@ static void CON_Linefeed(void)
 }
 
 // Outputs text into the console text buffer
-static void CON_Print(char *msg)
+static void CON_Print(UINT8 *msg)
 {
 	size_t l;
 	INT32 controlchars = 0; // for color changing
@@ -1145,7 +1158,7 @@ static void CON_Print(char *msg)
 		S_StartSound(NULL, sfx_radio);
 	}
 
-	if (!(*msg & 0x80))
+	if (!(HU_IsColorCode(*msg)))
 	{
 		con_line[con_cx++] = '\x80';
 		controlchars = 1;
@@ -1156,7 +1169,7 @@ static void CON_Print(char *msg)
 		// skip non-printable characters and white spaces
 		while (*msg && *msg <= ' ')
 		{
-			if (*msg & 0x80)
+			if (HU_IsColorCode(*msg))
 			{
 				color = con_line[con_cx++] = *(msg++);
 				controlchars++;
@@ -1275,7 +1288,7 @@ void CONS_Printf(const char *fmt, ...)
 	}
 	else
 		// write message in con text buffer
-		CON_Print(txt);
+		CON_Print((UINT8 *)txt);
 
 #ifndef PC_DOS
 	CON_LogMessage(txt);
@@ -1385,7 +1398,7 @@ void CONS_Error(const char *msg)
 static void CON_DrawInput(void)
 {
 	INT32 charwidth = (INT32)con_scalefactor << 3;
-	const char *p = inputlines[inputline];
+	const UINT8 *p = (UINT8 *)inputlines[inputline];
 	size_t c, clen, cend;
 	UINT8 lellip = 0, rellip = 0;
 	INT32 x, y, i;
@@ -1440,32 +1453,32 @@ static void CON_DrawInput(void)
 		if (input_sel < c)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
-			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y, '.', cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 	}
 	else
-		V_DrawCharacter(x-charwidth, y, CON_PROMPTCHAR | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
+		V_DrawCharacter(x-charwidth, y, CON_PROMPTCHAR, cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 
 	for (cend = c + clen; c < cend; ++c, x += charwidth)
 	{
 		if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c))
 		{
 			V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 77 | V_NOSCALESTART);
-			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y, p[c], cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, true);
 		}
 		else
-			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y, p[c], cv_constextsize.value | V_NOSCALESTART, true);
 
 		if (c == input_cur && con_tick >= 4)
-			V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y + (con_scalefactor*2), '_', cv_constextsize.value | V_NOSCALESTART, true);
 	}
 	if (cend == input_cur && con_tick >= 4)
-		V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, true);
+		V_DrawCharacter(x, y + (con_scalefactor*2), '_', cv_constextsize.value | V_NOSCALESTART, true);
 	if (rellip)
 	{
 		if (input_sel > cend)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
-			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y, '.', cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, true);
 	}
 }
 
@@ -1501,7 +1514,7 @@ static void CON_DrawHudlines(void)
 
 		for (c = 0, x = 0; c < con_width; c++, x += charwidth, p++)
 		{
-			while (*p & 0x80) // Graue 06-19-2004
+			while (HU_IsColorCode(*p)) // Graue 06-19-2004
 			{
 				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
 				p++;
@@ -1511,11 +1524,11 @@ static void CON_DrawHudlines(void)
 			else
 			{
 				//charwidth = SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
-				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
+				V_DrawCharacter(x, y, *p, charflags | cv_constextsize.value | V_NOSCALESTART, true);
 			}
 		}
 
-		//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, true);
+		//V_DrawCharacter(x, y, (p[c]&0xff), cv_constextsize.value | V_NOSCALESTART, true);
 		y += charheight;
 	}
 
@@ -1581,12 +1594,12 @@ static void CON_DrawConsole(void)
 
 		for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
 		{
-			while (*p & 0x80)
+			while (HU_IsColorCode(*p))
 			{
 				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
 				p++;
 			}
-			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
+			V_DrawCharacter(x, y, (INT32)(*p), charflags | cv_constextsize.value | V_NOSCALESTART, true);
 		}
 	}
 

src/console.h

@@ -16,6 +16,7 @@
 void CON_Init(void);
 
 boolean CON_Responder(event_t *ev);
+boolean CON_AcceptInput(void);
 
 // set true when screen size has changed, to adapt console
 extern boolean con_recalc;

src/d_clisrv.c

@@ -1295,8 +1295,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 	netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
 	netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
 	netbuffer->u.serverinfo.isdedicated = (UINT8)dedicated;
-	strncpy(netbuffer->u.serverinfo.servername, cv_servername.string,
-		MAXSERVERNAME);
+	HU_StringCopyLen((UINT8 *)netbuffer->u.serverinfo.servername, (const UINT8 *)cv_servername.string, MAXSERVERNAME);
 	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), 7);
 
 	M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, 16);
@@ -1308,7 +1307,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 		char *read = mapheaderinfo[gamemap-1]->lvlttl, *writ = netbuffer->u.serverinfo.maptitle;
 		while (writ < (netbuffer->u.serverinfo.maptitle+32) && *read != '\0')
 		{
-			if (!(*read & 0x80))
+			if (!(HU_IsColorCode(*read)))
 			{
 				*writ = toupper(*read);
 				writ++;

src/d_event.h

@@ -27,6 +27,7 @@ typedef enum
 	ev_joystick,
 	ev_mouse2,
 	ev_joystick2,
+	ev_textinput,
 } evtype_t;
 
 // Event structure.

src/d_netcmd.c

@@ -916,8 +916,15 @@ boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 	// Also, anything over 0x80 is disallowed too, since compilers love to
 	// differ on whether they're printable characters or not.
 	for (ix = 0; name[ix] != '\0'; ix++)
-		if (!isprint(name[ix]) || name[ix] == ';' || (UINT8)(name[ix]) >= 0x80)
+	{
+		int printable = isprint(name[ix]);
+		// Lactozilla: Apparently Unicode isn't printable.
+		// Oh well.
+		if ((UINT8)name[ix] > 0x7F)
+			printable = 1;
+		if (!printable || name[ix] == ';' || HU_IsColorCode((UINT8)(name[ix])))
 			return false;
+	}
 
 	// Check if a player is currently using the name, case-insensitively.
 	for (ix = 0; ix < MAXPLAYERS; ix++)

src/f_finale.c

@@ -2246,7 +2246,7 @@ void F_EndingDrawer(void)
 		{
 			//colset(linkmap,  164, 165, 169); -- the ideal purple colour to represent a clicked in-game link, but not worth it just for a soundtest-controlled secret
 			V_DrawCenteredString(BASEVIDWIDTH/2, 8, V_ALLOWLOWERCASE|(trans<<V_ALPHASHIFT), str);
-			V_DrawCharacter(32, BASEVIDHEIGHT-16, '>'|(trans<<V_ALPHASHIFT), false);
+			V_DrawCharacter(32, BASEVIDHEIGHT-16, '>', (trans<<V_ALPHASHIFT), false);
 			V_DrawString(40, ((finalecount == STOPPINGPOINT-(20+TICRATE)) ? 1 : 0)+BASEVIDHEIGHT-16, ((timesBeaten || finalecount >= STOPPINGPOINT-TICRATE) ? V_PURPLEMAP : V_BLUEMAP)|(trans<<V_ALPHASHIFT), " [S] ===>");
 		}
 
@@ -2262,7 +2262,7 @@ void F_EndingDrawer(void)
 			else
 				trans2 += 2*trans;
 			if (trans2 < 10)
-				V_DrawCharacter(26, BASEVIDHEIGHT-33, '\x1C'|(trans2<<V_ALPHASHIFT), false);
+				V_DrawCharacter(26, BASEVIDHEIGHT-33, '\x1C', (trans2<<V_ALPHASHIFT), false);
 		}
 	}
 }

src/g_input.c

@@ -40,7 +40,7 @@ INT32 mouse2x, mouse2y, mlook2y;
 INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET];
 
 // current state of the keys: true if pushed
-UINT8 gamekeydown[NUMINPUTS];
+INT32 gamekeydown[NUMINPUTS];
 
 // two key codes (or virtual key) per game control
 INT32 gamecontrol[num_gamecontrols][2];
@@ -117,7 +117,7 @@ void G_MapEventsToControls(event_t *ev)
 	switch (ev->type)
 	{
 		case ev_keydown:
-			if (ev->data1 < NUMINPUTS)
+			if (ev->data1 < NUMINPUTS || (ev->data1 & KEY_XTMASK))
 				gamekeydown[ev->data1] = 1;
 #ifdef PARANOIA
 			else
@@ -129,7 +129,7 @@ void G_MapEventsToControls(event_t *ev)
 			break;
 
 		case ev_keyup:
-			if (ev->data1 < NUMINPUTS)
+			if (ev->data1 < NUMINPUTS || (ev->data1 & KEY_XTMASK))
 				gamekeydown[ev->data1] = 0;
 #ifdef PARANOIA
 			else
@@ -245,13 +245,14 @@ static keyname_t keynames[] =
 	{KEY_TAB, "TAB"},
 	{KEY_ESCAPE, "ESCAPE"},
 	{KEY_BACKSPACE, "BACKSPACE"},
+	{KEY_PRTSC, "PRINTSCREEN"},
 
 	{KEY_NUMLOCK, "NUMLOCK"},
 	{KEY_SCROLLLOCK, "SCROLLLOCK"},
 
 	// bill gates keys
-	{KEY_LEFTWIN, "LEFTWIN"},
-	{KEY_RIGHTWIN, "RIGHTWIN"},
+	{KEY_LEFTWIN, "LEFTGUI"},
+	{KEY_RIGHTWIN, "RIGHTGUI"},
 	{KEY_MENU, "MENU"},
 
 	{KEY_LSHIFT, "LSHIFT"},
@@ -306,7 +307,7 @@ static keyname_t keynames[] =
 	{KEY_F11, "F11"},
 	{KEY_F12, "F12"},
 
-	// KEY_CONSOLE has an exception in the keyname code
+	// I don't think that's a tilde
 	{'`', "TILDE"},
 	{KEY_PAUSE, "PAUSE/BREAK"},
 
@@ -637,9 +638,9 @@ const char *G_KeynumToString(INT32 keynum)
 	UINT32 j;
 
 	// return a string with the ascii char if displayable
-	if (keynum > ' ' && keynum <= 'z' && keynum != KEY_CONSOLE)
+	if (keynum > ' ' && keynum <= 0xFF && keynum != KEY_CONSOLE)
 	{
-		keynamestr[0] = (char)keynum;
+		keynamestr[0] = (UINT8)keynum;
 		keynamestr[1] = '\0';
 		return keynamestr;
 	}
@@ -656,10 +657,12 @@ const char *G_KeynumToString(INT32 keynum)
 
 INT32 G_KeyStringtoNum(const char *keystr)
 {
+	const UINT8 *keystr_u = (const UINT8 *)keystr;
 	UINT32 j;
 
-	if (!keystr[1] && keystr[0] > ' ' && keystr[0] <= 'z')
-		return keystr[0];
+	// You can put  as your strafe left key but the game won't recognize it
+	if (!keystr_u[1] && keystr_u[0] > ' ')
+		return (UINT8)keystr[0];
 
 	if (!strncmp(keystr, "KEY", 3) && keystr[3] >= '0' && keystr[3] <= '9')
 		return atoi(&keystr[3]);

src/g_input.h

@@ -20,7 +20,7 @@
 
 // number of total 'button' inputs, include keyboard keys, plus virtual
 // keys (mousebuttons and joybuttons becomes keys)
-#define NUMKEYS 256
+#define NUMKEYS 0x200 // Needs to be at least a single bit higher KEY_XTMASK!!!!
 
 #define MOUSEBUTTONS 8
 #define JOYBUTTONS   32 // 32 buttons
@@ -123,7 +123,7 @@ extern INT32 mouse2x, mouse2y, mlook2y;
 extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET];
 
 // current state of the keys: true if pushed
-extern UINT8 gamekeydown[NUMINPUTS];
+extern INT32 gamekeydown[NUMINPUTS];
 
 // two key codes (or virtual key) per game control
 extern INT32 gamecontrol[num_gamecontrols][2];

src/hu_stuff.h

@@ -22,7 +22,12 @@
 //           heads up font
 //------------------------------------
 #define HU_FONTSTART '\x16' // the first font character
-#define HU_FONTEND '~'
+#define HU_FONTEND 0xFF // 
+#define HU_FONTEXT 0xA1 // 
+
+#define HU_COLORSTART 0x80
+#define HU_COLOREND 0x8F
+#define HU_IsColorCode(char) ((UINT8)char >= HU_COLORSTART && (UINT8)char <= HU_COLOREND)
 
 #define HU_FONTSIZE (HU_FONTEND - HU_FONTSTART + 1)
 
@@ -75,8 +80,15 @@ typedef struct
 // some functions
 void HU_AddChatText(const char *text, boolean playsound);
 
+// Lactokaiju
+size_t HU_StringLength(const UINT8 *str);
+void HU_StringCopy(UINT8 *dest, const UINT8 *src);
+void HU_StringCopyLen(UINT8 *dest, const UINT8 *src, size_t len);
+UINT8 *HU_StringCopyAlloc(const UINT8 *src);
+
 // set true when entering a chat message
 extern boolean chat_on;
+boolean HU_ChatActive(void);
 
 extern patch_t *hu_font[HU_FONTSIZE], *tny_font[HU_FONTSIZE];
 extern patch_t *tallnum[10];

src/keys.h

@@ -13,9 +13,10 @@
 #ifndef __KEYS_H__
 #define __KEYS_H__
 
-// These are the key codes as posted by the keyboard handler,
-// ascii codes are 0->127,
-// scancodes are 0x80 + 0->127
+// Lactozilla: Well, this is embarrassing
+// Those key codes conflict with even Latin-1 Supplement
+// At least events are 32-bits, so I can use 0x100
+#define KEY_XTMASK (0x100)
 
 #define KEY_NULL      0 // null key, triggers nothing
 #define KEY_BACKSPACE 8
@@ -26,72 +27,67 @@
 #define KEY_MINUS    45
 #define KEY_EQUALS   61
 
-#define KEY_NUMLOCK    (0x80+69)
-#define KEY_SCROLLLOCK (0x80+70)
+// Num lock and scroll lock
+#define KEY_NUMLOCK    (KEY_XTMASK+1)
+#define KEY_SCROLLLOCK (KEY_XTMASK+2)
 
-//
-//  scancodes 71-83 (non-extended)
-//
-#define KEY_KEYPAD7  (0x80+71)
-#define KEY_KEYPAD8  (0x80+72)
-#define KEY_KEYPAD9  (0x80+73)
-#define KEY_MINUSPAD (0x80+74)
-#define KEY_KEYPAD4  (0x80+75)
-#define KEY_KEYPAD5  (0x80+76)
-#define KEY_KEYPAD6  (0x80+77)
-#define KEY_PLUSPAD  (0x80+78)
-#define KEY_KEYPAD1  (0x80+79)
-#define KEY_KEYPAD2  (0x80+80)
-#define KEY_KEYPAD3  (0x80+81)
-#define KEY_KEYPAD0  (0x80+82)
-#define KEY_KPADDEL  (0x80+83)
-
-// windows95 keys
-
-#define KEY_LEFTWIN  (0x80+91)
-#define KEY_RIGHTWIN (0x80+92)
-#define KEY_MENU     (0x80+93)
-
-// scancodes 71-83 EXTENDED are remapped to these by the keyboard handler (just add 30)
-#define KEY_KPADSLASH  (0x80+100) // extended scancode 53 '/' remapped
-#define KEY_HOME       (0x80+101)
-#define KEY_UPARROW    (0x80+102)
-#define KEY_PGUP       (0x80+103)
-#define KEY_LEFTARROW  (0x80+105)
-#define KEY_RIGHTARROW (0x80+107)
-#define KEY_END        (0x80+109)
-#define KEY_DOWNARROW  (0x80+110)
-#define KEY_PGDN       (0x80+111)
-#define KEY_INS        (0x80+112)
-#define KEY_DEL        (0x80+113)
+// Keypad
+#define KEY_KEYPAD7  (KEY_XTMASK+3)
+#define KEY_KEYPAD8  (KEY_XTMASK+4)
+#define KEY_KEYPAD9  (KEY_XTMASK+5)
+#define KEY_MINUSPAD (KEY_XTMASK+6)
+#define KEY_KEYPAD4  (KEY_XTMASK+7)
+#define KEY_KEYPAD5  (KEY_XTMASK+8)
+#define KEY_KEYPAD6  (KEY_XTMASK+9)
+#define KEY_PLUSPAD  (KEY_XTMASK+10)
+#define KEY_KEYPAD1  (KEY_XTMASK+11)
+#define KEY_KEYPAD2  (KEY_XTMASK+12)
+#define KEY_KEYPAD3  (KEY_XTMASK+13)
+#define KEY_KEYPAD0  (KEY_XTMASK+14)
+#define KEY_KPADDEL  (KEY_XTMASK+15)
 
-#define KEY_F1  (0x80+0x3b)
-#define KEY_F2  (0x80+0x3c)
-#define KEY_F3  (0x80+0x3d)
-#define KEY_F4  (0x80+0x3e)
-#define KEY_F5  (0x80+0x3f)
-#define KEY_F6  (0x80+0x40)
-#define KEY_F7  (0x80+0x41)
-#define KEY_F8  (0x80+0x42)
-#define KEY_F9  (0x80+0x43)
-#define KEY_F10 (0x80+0x44)
-#define KEY_F11 (0x80+0x57)
-#define KEY_F12 (0x80+0x58)
+// Bill Gates keys
+#define KEY_LEFTWIN  (KEY_XTMASK+16)
+#define KEY_RIGHTWIN (KEY_XTMASK+17)
+#define KEY_MENU     (KEY_XTMASK+18) // Context Menu
 
-#define KEY_PAUSE 255
+#define KEY_KPADSLASH  (KEY_XTMASK+19)
+#define KEY_HOME       (KEY_XTMASK+20)
+#define KEY_UPARROW    (KEY_XTMASK+21)
+#define KEY_PGUP       (KEY_XTMASK+22)
+#define KEY_LEFTARROW  (KEY_XTMASK+23)
+#define KEY_RIGHTARROW (KEY_XTMASK+24)
+#define KEY_END        (KEY_XTMASK+25)
+#define KEY_DOWNARROW  (KEY_XTMASK+26)
+#define KEY_PGDN       (KEY_XTMASK+27)
+#define KEY_INS        (KEY_XTMASK+28)
+#define KEY_DEL        (KEY_XTMASK+29)
 
-// these ones must be non-extended scancodes (rctrl, rshift, lalt)
-#define KEY_LSHIFT (0x80+54)
-#define KEY_RSHIFT (0x80+55)
-#define KEY_LCTRL  (0x80+29)
-#define KEY_RCTRL  (0x80+30)
-#define KEY_LALT   (0x80+56)
-#define KEY_RALT   (0x80+57)
+// Function keys
+#define KEY_F1  (KEY_XTMASK+30)
+#define KEY_F2  (KEY_XTMASK+31)
+#define KEY_F3  (KEY_XTMASK+32)
+#define KEY_F4  (KEY_XTMASK+33)
+#define KEY_F5  (KEY_XTMASK+34)
+#define KEY_F6  (KEY_XTMASK+35)
+#define KEY_F7  (KEY_XTMASK+36)
+#define KEY_F8  (KEY_XTMASK+37)
+#define KEY_F9  (KEY_XTMASK+38)
+#define KEY_F10 (KEY_XTMASK+39)
+#define KEY_F11 (KEY_XTMASK+40)
+#define KEY_F12 (KEY_XTMASK+41)
 
-#define KEY_CAPSLOCK (0x80+58)
-#define KEY_CONSOLE  '`'
+#define KEY_CAPSLOCK (KEY_XTMASK+42)
+#define KEY_CONSOLE '`' // This key is problematic, I'll put it back on tilde
+#define KEY_PAUSE (KEY_XTMASK+44)
+#define KEY_PRTSC (KEY_XTMASK+45)
 
-#define KEY_OPENBRACKETS
-#define KEY_CLOSEBRACKETS
+// Modifiers
+#define KEY_LSHIFT (KEY_XTMASK+46)
+#define KEY_RSHIFT (KEY_XTMASK+47)
+#define KEY_LCTRL  (KEY_XTMASK+48)
+#define KEY_RCTRL  (KEY_XTMASK+49)
+#define KEY_LALT   (KEY_XTMASK+50)
+#define KEY_RALT   (KEY_XTMASK+51)
 
 #endif

src/m_cheat.c

@@ -199,7 +199,8 @@ static UINT8 cht_CheckCheat(cheatseq_t *cht, char key)
 
 boolean cht_Responder(event_t *ev)
 {
-	UINT8 ret = 0, ch = 0;
+	UINT8 ret = 0;
+	UINT32 ch = 0;
 	if (ev->type != ev_keydown)
 		return false;
 

src/m_menu.c

@@ -92,6 +92,10 @@ int	snprintf(char *str, size_t n, const char *fmt, ...);
 #define SLIDER_WIDTH 78
 #define SERVERS_PER_PAGE 11
 
+// Lactozilla
+#define TEXTINPUTEVENT 0x80000000
+#define M_KeyboardTextInput(ch) (!cv_textinput.value) ? (true) : (ch & TEXTINPUTEVENT)
+
 typedef enum
 {
 	QUITMSG = 0,
@@ -2876,8 +2880,9 @@ static boolean M_ChangeStringCvar(INT32 choice)
 	char buf[MAXSTRINGLENGTH];
 	size_t len;
 
-	if (shiftdown && choice >= 32 && choice <= 127)
-		choice = shiftxform[choice];
+	if (!cv_textinput.value)
+		if (shiftdown && choice >= 32 && choice <= 127)
+			choice = shiftxform[choice];
 
 	switch (choice)
 	{
@@ -2891,17 +2896,21 @@ static boolean M_ChangeStringCvar(INT32 choice)
 			}
 			return true;
 		default:
-			if (choice >= 32 && choice <= 127)
+			if (M_KeyboardTextInput(choice) || (choice == 32)) // ev_textinput
 			{
-				len = strlen(cv->string);
-				if (len < MAXSTRINGLENGTH - 1)
+				choice &= ~TEXTINPUTEVENT;
+				if (choice >= 32 && choice <= 0xFF)
 				{
-					M_Memcpy(buf, cv->string, len);
-					buf[len++] = (char)choice;
-					buf[len] = 0;
-					CV_Set(cv, buf);
+					len = strlen(cv->string);
+					if (len < MAXSTRINGLENGTH - 1)
+					{
+						M_Memcpy(buf, cv->string, len);
+						buf[len++] = (char)choice;
+						buf[len] = 0;
+						CV_Set(cv, buf);
+					}
+					return true;
 				}
-				return true;
 			}
 			break;
 	}
@@ -2958,6 +2967,14 @@ static void Command_Manual_f(void)
 	itemOn = 0;
 }
 
+boolean M_TextInput(void)
+{
+	// Of course return false if the menus are down...
+	if (!menuactive)
+		return false;
+	return ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER);
+}
+
 //
 // M_Responder
 //
@@ -2987,7 +3004,12 @@ boolean M_Responder(event_t *ev)
 	}
 	else if (menuactive)
 	{
-		if (ev->type == ev_keydown)
+		if (ev->type == ev_textinput)
+		{
+			keydown++;
+			ch = ev->data1;
+		}
+		else if (ev->type == ev_keydown)
 		{
 			keydown++;
 			ch = ev->data1;
@@ -3023,7 +3045,7 @@ boolean M_Responder(event_t *ev)
 					break;
 			}
 		}
-		else if (ev->type == ev_joystick  && ev->data1 == 0 && joywait < I_GetTime())
+		else if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime())
 		{
 			const INT32 jdeadzone = JOYAXISRANGE/4;
 			if (ev->data3 != INT32_MAX)
@@ -3099,9 +3121,12 @@ boolean M_Responder(event_t *ev)
 		else if (ev->type == ev_keyup) // Preserve event for other responders
 			keydown = 0;
 	}
-	else if (ev->type == ev_keydown) // Preserve event for other responders
+	else if (ev->type == ev_keydown || ev->type == ev_textinput) // Preserve event for other responders
 		ch = ev->data1;
 
+	if (ev->type == ev_textinput)
+		goto textinputhandler;
+
 	if (ch == -1)
 		return false;
 	else if (ch == gamecontrol[gc_systemmenu][0] || ch == gamecontrol[gc_systemmenu][1]) // allow remappable ESC key
@@ -3180,17 +3205,25 @@ boolean M_Responder(event_t *ev)
 		return false;
 	}
 
+textinputhandler:
 	routine = currentMenu->menuitems[itemOn].itemaction;
 
 	// Handle menuitems which need a specific key handling
 	if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER)
 	{
-		if (shiftdown && ch >= 32 && ch <= 127)
-			ch = shiftxform[ch];
-		routine(ch);
+		INT32 chbits = ((ev->type == ev_textinput) ? TEXTINPUTEVENT : 0); // Of course
+		if (!cv_textinput.value)
+		{
+			if (shiftdown && ch >= 32 && ch <= 127)
+				ch = shiftxform[ch];
+		}
+		routine(ch | chbits);
 		return true;
 	}
 
+	if (ev->type == ev_textinput)
+		goto cvartextinputhandler;
+
 	if (currentMenu->menuitems[itemOn].status == IT_MSGHANDLER)
 	{
 		if (currentMenu->menuitems[itemOn].alphaKey != MM_EVENTHANDLER)
@@ -3221,19 +3254,24 @@ boolean M_Responder(event_t *ev)
 	}
 
 	// BP: one of the more big hack i have never made
+cvartextinputhandler:
 	if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR)
 	{
 		if ((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING)
 		{
-			if (M_ChangeStringCvar(ch))
+			INT32 chbits = ((ev->type == ev_textinput) ? TEXTINPUTEVENT : 0); // Of course
+			if (M_ChangeStringCvar(ch | chbits))
 				return true;
 			else
 				routine = NULL;
 		}
-		else
+		else if (ev->type != ev_textinput)
 			routine = M_ChangeCvar;
 	}
 
+	if (ev->type == ev_textinput)
+		return false;
+
 	// Keys usable within menu
 	switch (ch)
 	{
@@ -3781,9 +3819,9 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
 	if (ontop)
 	{
 		V_DrawCharacter(x - 6 - (skullAnimCounter/5), y,
-			'\x1C' | V_YELLOWMAP, false);
+			'\x1C', V_YELLOWMAP, false);
 		V_DrawCharacter(x+i*8 + 8 + (skullAnimCounter/5), y,
-			'\x1D' | V_YELLOWMAP, false);
+			'\x1D', V_YELLOWMAP, false);
 	}
 
 	p = W_CachePatchName("M_SLIDER", PU_CACHE);
@@ -4080,7 +4118,7 @@ static void M_DrawGenericMenu(void)
 								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
 								if (skullAnimCounter < 4 && i == itemOn)
 									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+										'_', 0x80, false);
 								y += 16;
 								break;
 							default:
@@ -4089,9 +4127,9 @@ static void M_DrawGenericMenu(void)
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-											'\x1C' | V_YELLOWMAP, false);
+											'\x1C', V_YELLOWMAP, false);
 									V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-											'\x1D' | V_YELLOWMAP, false);
+											'\x1D', V_YELLOWMAP, false);
 								}
 								break;
 						}
@@ -4241,14 +4279,14 @@ static void M_DrawGenericScrollMenu(void)
 								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
 								if (skullAnimCounter < 4 && i == itemOn)
 									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+										'_', 0x80, false);
 #else // cool new string type stuff, not ready for limelight
 								if (i == itemOn)
 								{
 									V_DrawFill(x-2, y-1, MAXSTRINGLENGTH*8 + 4, 8+3, 159);
 									V_DrawString(x, y, V_ALLOWLOWERCASE, cv->string);
 									if (skullAnimCounter < 4)
-										V_DrawCharacter(x + V_StringWidth(cv->string, 0), y, '_' | 0x80, false);
+										V_DrawCharacter(x + V_StringWidth(cv->string, 0), y, '_', 0x80, false);
 								}
 								else
 									V_DrawRightAlignedString(BASEVIDWIDTH - x, y,
@@ -4261,9 +4299,9 @@ static void M_DrawGenericScrollMenu(void)
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-											'\x1C' | V_YELLOWMAP, false);
+											'\x1C', V_YELLOWMAP, false);
 									V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-											'\x1D' | V_YELLOWMAP, false);
+											'\x1D', V_YELLOWMAP, false);
 								}
 								break;
 						}
@@ -4501,7 +4539,7 @@ static void M_DrawCenteredMenu(void)
 								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
 								if (skullAnimCounter < 4 && i == itemOn)
 									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+										'_', 0x80, false);
 								y += 16;
 								break;
 							default:
@@ -4510,9 +4548,9 @@ static void M_DrawCenteredMenu(void)
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-											'\x1C' | V_YELLOWMAP, false);
+											'\x1C', V_YELLOWMAP, false);
 									V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-											'\x1D' | V_YELLOWMAP, false);
+											'\x1D', V_YELLOWMAP, false);
 								}
 								break;
 						}
@@ -5263,9 +5301,9 @@ static void M_DrawLevelPlatterRow(UINT8 row, INT32 y)
 		if (!lsrow)
 		{
 			V_DrawCharacter(lsbasex - 10 - (skullAnimCounter/5), y+25,
-				'\x1C' | V_YELLOWMAP, false);
+				'\x1C', V_YELLOWMAP, false);
 			V_DrawCharacter(lsbasex+282 + 2 + (skullAnimCounter/5), y+25,
-				'\x1D' | V_YELLOWMAP, false);
+				'\x1D', V_YELLOWMAP, false);
 		}
 	}
 	else if (lswide(row))
@@ -6163,7 +6201,7 @@ static void M_DrawAddons(void)
 		V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Type to search...");
 	if (skullAnimCounter < 4)
 		V_DrawCharacter(x - 18 + V_StringWidth(menusearch+1, 0), y + 8,
-			'_' | 0x80, false);
+			'_', 0x80, false);
 
 	// draw search icon
 	x -= (21 + 5 + 16);
@@ -6189,7 +6227,7 @@ static void M_AddonExec(INT32 ch)
 #define len menusearch[0]
 static boolean M_ChangeStringAddons(INT32 choice)
 {
-	if (shiftdown && choice >= 32 && choice <= 127)
+	if (!cv_textinput.value)
 		choice = shiftxform[choice];
 
 	switch (choice)
@@ -6209,13 +6247,17 @@ static boolean M_ChangeStringAddons(INT32 choice)
 			}
 			break;
 		default:
-			if (choice >= 32 && choice <= 127)
+			if (M_KeyboardTextInput(choice) || (choice == 32)) // ev_textinput
 			{
-				if (len < MAXSTRINGLENGTH - 1)
+				choice &= ~TEXTINPUTEVENT;
+				if (choice >= 32 && choice <= 0xFF)
 				{
-					menusearch[1+len++] = (char)choice;
-					menusearch[1+len] = 0;
-					return true;
+					if (len < MAXSTRINGLENGTH - 1)
+					{
+						menusearch[1+len++] = (char)choice;
+						menusearch[1+len] = 0;
+						return true;
+					}
 				}
 			}
 			break;
@@ -7015,9 +7057,9 @@ static void M_DrawEmblemHints(void)
 	if (i == itemOn)
 	{
 		V_DrawCharacter(BASEVIDWIDTH - currentMenu->x - 10 - V_StringWidth(cv_soundtest.string, 0) - (skullAnimCounter/5), currentMenu->y + y,
-			'\x1C' | V_YELLOWMAP, false);
+			'\x1C', V_YELLOWMAP, false);
 		V_DrawCharacter(BASEVIDWIDTH - currentMenu->x + 2 + (skullAnimCounter/5), currentMenu->y + y,
-			'\x1D' | V_YELLOWMAP, false);
+			'\x1D', V_YELLOWMAP, false);
 	}
 	if (cv_soundtest.value)
 		V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + y + 8, V_YELLOWMAP, S_sfx[cv_soundtest.value].name);
@@ -7256,9 +7298,9 @@ static void M_DrawSoundTest(void)
 				if (t == st_sel)
 				{
 					V_DrawCharacter(x - 10 - (skullAnimCounter/5), y,
-						'\x1C' | V_YELLOWMAP, false);
+						'\x1C', V_YELLOWMAP, false);
 					V_DrawCharacter(x + 2 + V_StringWidth(sfxstr, 0) + (skullAnimCounter/5), y,
-						'\x1D' | V_YELLOWMAP, false);
+						'\x1D', V_YELLOWMAP, false);
 				}
 
 				if (curplaying == soundtestdefs[t])
@@ -7275,7 +7317,7 @@ static void M_DrawSoundTest(void)
 				if (curplaying == soundtestdefs[t])
 				{
 					V_DrawFill(165+140-9, y-4, 8, 16, 150);
-					//V_DrawCharacter(165+140-8, y, '\x19' | V_YELLOWMAP, false);
+					//V_DrawCharacter(165+140-8, y, '\x19', V_YELLOWMAP, false);
 					V_DrawFixedPatch((165+140-9)<<FRACBITS, (y<<FRACBITS)-(bounce*4), FRACUNIT, 0, hu_font['\x19'-HU_FONTSTART], V_GetStringColormap(V_YELLOWMAP));
 				}
 			}
@@ -7886,7 +7928,7 @@ skiplife:
 			V_DrawScaledPatch(tempx + 9, y + 2, 0, patch);
 			tempx += 16;
 			if (savegameinfo[savetodraw].lives == INFLIVES)
-				V_DrawCharacter(tempx, y + 1, '\x16', false);
+				V_DrawCharacter(tempx, y + 1, '\x16', 0, false);
 			else
 				V_DrawString(tempx, y, 0, va("%d", savegameinfo[savetodraw].lives));
 
@@ -9099,9 +9141,9 @@ void M_DrawTimeAttackMenu(void)
 			if (i == itemOn)
 			{
 				V_DrawCharacter(BASEVIDWIDTH - x - soffset - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-					'\x1C' | V_YELLOWMAP, false);
+					'\x1C', V_YELLOWMAP, false);
 				V_DrawCharacter(BASEVIDWIDTH - x - soffset + 2 + (skullAnimCounter/5), y,
-					'\x1D' | V_YELLOWMAP, false);
+					'\x1D', V_YELLOWMAP, false);
 			}
 		}
 	}
@@ -9162,9 +9204,9 @@ void M_DrawTimeAttackMenu(void)
 				/* Draw arrows !! */
 				y = y + 25 - 4;
 				V_DrawCharacter(216 - 10 - (skullAnimCounter/5), y,
-						'\x1C' | V_YELLOWMAP, false);
+						'\x1C', V_YELLOWMAP, false);
 				V_DrawCharacter(216 + 80 + 2 + (skullAnimCounter/5), y,
-						'\x1D' | V_YELLOWMAP, false);
+						'\x1D', V_YELLOWMAP, false);
 			}
 			// Draw press ESC to exit string on main record attack menu
 			V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
@@ -9375,9 +9417,9 @@ void M_DrawNightsAttackMenu(void)
 			if (i == itemOn)
 			{
 				V_DrawCharacter(BASEVIDWIDTH - x - soffset - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-					'\x1C' | V_YELLOWMAP, false);
+					'\x1C', V_YELLOWMAP, false);
 				V_DrawCharacter(BASEVIDWIDTH - x - soffset + 2 + (skullAnimCounter/5), y,
-					'\x1D' | V_YELLOWMAP, false);
+					'\x1D', V_YELLOWMAP, false);
 			}
 		}
 	}
@@ -9422,9 +9464,9 @@ void M_DrawNightsAttackMenu(void)
 				/* Draw arrows !! */
 				y = y + 25 - 4;
 				V_DrawCharacter(208 - 10 - (skullAnimCounter/5), y,
-						'\x1C' | V_YELLOWMAP, false);
+						'\x1C', V_YELLOWMAP, false);
 				V_DrawCharacter(208 + 80 + 2 + (skullAnimCounter/5), y,
-						'\x1D' | V_YELLOWMAP, false);
+						'\x1D', V_YELLOWMAP, false);
 			}
 			// Draw press ESC to exit string on main record attack menu
 			V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
@@ -10361,7 +10403,7 @@ static void M_DrawMPMainMenu(void)
 	// draw text cursor for name
 	if (itemOn == 2 //0
 	    && skullAnimCounter < 4)   //blink cursor
-		V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false);
+		V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',0,false);
 }
 
 // Tails 11-19-2002
@@ -10432,26 +10474,21 @@ static void M_HandleConnectIP(INT32 choice)
 			break;
 
 		default:
-			l = strlen(setupm_ip);
-			if (l >= 28-1)
-				break;
-
-			// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
-			if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
+			if (M_KeyboardTextInput(choice)) // ev_textinput
 			{
-				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] = (char)choice;
-				setupm_ip[l+1] = 0;
-			}
-			else if (choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too!
-			{
-				char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'};
-				choice = keypad_translation[choice - 199];
-				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] = (char)choice;
-				setupm_ip[l+1] = 0;
-			}
+				choice &= ~TEXTINPUTEVENT;
+				l = strlen(setupm_ip);
+				if (l >= 28-1)
+					break;
 
+				// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
+				if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
+				{
+					S_StartSound(NULL,sfx_menu1); // Tails
+					setupm_ip[l] = (char)choice;
+					setupm_ip[l+1] = 0;
+				}
+			}
 			break;
 	}
 
@@ -10514,7 +10551,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	V_DrawString(x + 8, y + 3, V_ALLOWLOWERCASE, setupm_name);
 	if (skullAnimCounter < 4 && itemOn == 0)
 		V_DrawCharacter(x + 8 + V_StringWidth(setupm_name, V_ALLOWLOWERCASE), y + 3,
-			'_' | 0x80, false);
+			'_', 0x80, false);
 
 	y += 20;
 
@@ -10530,9 +10567,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	if (itemOn == 1 && (MP_PlayerSetupMenu[1].status & IT_TYPE) != IT_SPACE)
 	{
 		V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(skins[setupm_fakeskin].realname, V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
-			'\x1C' | V_YELLOWMAP, false);
+			'\x1C', V_YELLOWMAP, false);
 		V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-			'\x1D' | V_YELLOWMAP, false);
+			'\x1D', V_YELLOWMAP, false);
 	}
 
 	x = BASEVIDWIDTH/2;
@@ -10607,9 +10644,9 @@ colordraw:
 	if (itemOn == 2 && (MP_PlayerSetupMenu[2].status & IT_TYPE) != IT_SPACE)
 	{
 		V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(Color_Names[setupm_fakecolor], V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
-			'\x1C' | V_YELLOWMAP, false);
+			'\x1C', V_YELLOWMAP, false);
 		V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-			'\x1D' | V_YELLOWMAP, false);
+			'\x1D', V_YELLOWMAP, false);
 	}
 
 	y += 11;
@@ -10761,14 +10798,18 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			break;
 
 		default:
-			if (itemOn != 0 || choice < 32 || choice > 127)
-				break;
-			S_StartSound(NULL,sfx_menu1); // Tails
-			l = strlen(setupm_name);
-			if (l < MAXPLAYERNAME)
+			if (M_KeyboardTextInput(choice) || (choice == 32)) // ev_textinput
 			{
-				setupm_name[l] = (char)choice;
-				setupm_name[l+1] = 0;
+				choice &= ~TEXTINPUTEVENT;
+				if (itemOn != 0 || choice < 32 || choice > 0xFF)
+					break;
+				S_StartSound(NULL,sfx_menu1); // Tails
+				l = strlen(setupm_name);
+				if (l < MAXPLAYERNAME)
+				{
+					setupm_name[l] = (char)choice;
+					setupm_name[l+1] = 0;
+				}
 			}
 			break;
 	}
@@ -11683,7 +11724,7 @@ static void M_DrawColorMenu(void)
 								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
 								if (skullAnimCounter < 4 && i == itemOn)
 									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+										'_', 0x80, false);
 								y += 16;
 								break;
 							default:
@@ -11692,9 +11733,9 @@ static void M_DrawColorMenu(void)
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
-											'\x1C' | V_YELLOWMAP, false);
+											'\x1C', V_YELLOWMAP, false);
 									V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-											'\x1D' | V_YELLOWMAP, false);
+											'\x1D', V_YELLOWMAP, false);
 								}
 								break;
 						}
@@ -11928,7 +11969,7 @@ static void M_OGL_DrawFogMenu(void)
 	// blink cursor on FOG_COLOR_ITEM if selected
 	if (itemOn == FOG_COLOR_ITEM && skullAnimCounter < 4)
 		V_DrawCharacter(BASEVIDWIDTH - mx,
-			my + currentMenu->menuitems[FOG_COLOR_ITEM].alphaKey, '_' | 0x80,false);
+			my + currentMenu->menuitems[FOG_COLOR_ITEM].alphaKey, '_', 0x80,false);
 }
 
 // =====================

src/m_menu.h

@@ -176,6 +176,7 @@ void M_SetMenuCurTitlePics(void);
 // this can resize the view and change game parameters.
 // Does all the real work of the menu interaction.
 boolean M_Responder(event_t *ev);
+boolean M_TextInput(void);
 
 // Called by main loop, only used for menu (skull cursor) animation.
 void M_Ticker(void);

src/m_misc.c

@@ -1579,7 +1579,7 @@ boolean M_ScreenshotResponder(event_t *ev)
 
 	ch = ev->data1;
 
-	if (ch >= KEY_MOUSE1 && menuactive) // If it's not a keyboard key, then don't allow it in the menus!
+	if (ch >= NUMKEYS && menuactive) // If it's not a keyboard key, then don't allow it in the menus!
 		return false;
 
 	if (ch == KEY_F8 || ch == gamecontrol[gc_screenshot][0] || ch == gamecontrol[gc_screenshot][1]) // remappable F8

src/screen.h

@@ -148,6 +148,11 @@ extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fu
 // wait for page flipping to end or not
 extern consvar_t cv_vidwait;
 
+// This is an annoying place to put these cvar on
+extern consvar_t cv_textinput;
+extern consvar_t cv_keyboardlocale;
+extern consvar_t cv_forceqwerty;
+
 // quick fix for tall/short skies, depending on bytesperpixel
 extern void (*walldrawerfunc)(void);
 

src/sdl/i_system.c

@@ -2549,7 +2549,7 @@ const char *I_ClipboardPaste(void)
 		}
 		else if (*i == '\t')
 			*i = ' '; // Tabs become spaces
-		else if (*i < 32 || (unsigned)*i > 127)
+		else if ((unsigned)*i < 32)
 			*i = '?'; // Nonprintable chars become question marks
 		++i;
 	}

src/sdl/i_video.c

@@ -66,6 +66,7 @@
 #include "../d_main.h"
 #include "../s_sound.h"
 #include "../i_joy.h"
+#include "../hu_stuff.h"
 #include "../st_stuff.h"
 #include "../g_game.h"
 #include "../i_video.h"
@@ -101,6 +102,11 @@ static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff
 
 UINT8 graphics_started = 0; // Is used in console.c and screen.c
 
+// Lactozilla: keyboard input
+consvar_t cv_textinput = {"textinput", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_keyboardlocale = {"keyboardlocale", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_forceqwerty = {"forceqwerty", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 // To disable fullscreen at startup; is set in VID_PrepareModeList
 boolean allow_fullscreen = false;
 static SDL_bool disable_fullscreen = SDL_FALSE;
@@ -264,92 +270,259 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 	}
 }
 
-static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
+static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code, Uint32 type)
 {
-	if (code >= SDL_SCANCODE_A && code <= SDL_SCANCODE_Z)
-	{
-		// get lowercase ASCII
-		return code - SDL_SCANCODE_A + 'a';
-	}
-	if (code >= SDL_SCANCODE_1 && code <= SDL_SCANCODE_9)
-	{
-		return code - SDL_SCANCODE_1 + '1';
-	}
-	else if (code == SDL_SCANCODE_0)
-	{
-		return '0';
-	}
-	if (code >= SDL_SCANCODE_F1 && code <= SDL_SCANCODE_F10)
-	{
-		return KEY_F1 + (code - SDL_SCANCODE_F1);
-	}
-	switch (code)
-	{
-		// F11 and F12 are separated from the rest of the function keys
-		case SDL_SCANCODE_F11: return KEY_F11;
-		case SDL_SCANCODE_F12: return KEY_F12;
-
-		case SDL_SCANCODE_KP_0: return KEY_KEYPAD0;
-		case SDL_SCANCODE_KP_1: return KEY_KEYPAD1;
-		case SDL_SCANCODE_KP_2: return KEY_KEYPAD2;
-		case SDL_SCANCODE_KP_3: return KEY_KEYPAD3;
-		case SDL_SCANCODE_KP_4: return KEY_KEYPAD4;
-		case SDL_SCANCODE_KP_5: return KEY_KEYPAD5;
-		case SDL_SCANCODE_KP_6: return KEY_KEYPAD6;
-		case SDL_SCANCODE_KP_7: return KEY_KEYPAD7;
-		case SDL_SCANCODE_KP_8: return KEY_KEYPAD8;
-		case SDL_SCANCODE_KP_9: return KEY_KEYPAD9;
-
-		case SDL_SCANCODE_RETURN:         return KEY_ENTER;
-		case SDL_SCANCODE_ESCAPE:         return KEY_ESCAPE;
-		case SDL_SCANCODE_BACKSPACE:      return KEY_BACKSPACE;
-		case SDL_SCANCODE_TAB:            return KEY_TAB;
-		case SDL_SCANCODE_SPACE:          return KEY_SPACE;
-		case SDL_SCANCODE_MINUS:          return KEY_MINUS;
-		case SDL_SCANCODE_EQUALS:         return KEY_EQUALS;
-		case SDL_SCANCODE_LEFTBRACKET:    return '[';
-		case SDL_SCANCODE_RIGHTBRACKET:   return ']';
-		case SDL_SCANCODE_BACKSLASH:      return '\\';
-		case SDL_SCANCODE_NONUSHASH:      return '#';
-		case SDL_SCANCODE_SEMICOLON:      return ';';
-		case SDL_SCANCODE_APOSTROPHE:     return '\'';
-		case SDL_SCANCODE_GRAVE:          return '`';
-		case SDL_SCANCODE_COMMA:          return ',';
-		case SDL_SCANCODE_PERIOD:         return '.';
-		case SDL_SCANCODE_SLASH:          return '/';
-		case SDL_SCANCODE_CAPSLOCK:       return KEY_CAPSLOCK;
-		case SDL_SCANCODE_PRINTSCREEN:    return 0; // undefined?
-		case SDL_SCANCODE_SCROLLLOCK:     return KEY_SCROLLLOCK;
-		case SDL_SCANCODE_PAUSE:          return KEY_PAUSE;
-		case SDL_SCANCODE_INSERT:         return KEY_INS;
-		case SDL_SCANCODE_HOME:           return KEY_HOME;
-		case SDL_SCANCODE_PAGEUP:         return KEY_PGUP;
-		case SDL_SCANCODE_DELETE:         return KEY_DEL;
-		case SDL_SCANCODE_END:            return KEY_END;
-		case SDL_SCANCODE_PAGEDOWN:       return KEY_PGDN;
-		case SDL_SCANCODE_RIGHT:          return KEY_RIGHTARROW;
-		case SDL_SCANCODE_LEFT:           return KEY_LEFTARROW;
-		case SDL_SCANCODE_DOWN:           return KEY_DOWNARROW;
-		case SDL_SCANCODE_UP:             return KEY_UPARROW;
-		case SDL_SCANCODE_NUMLOCKCLEAR:   return KEY_NUMLOCK;
-		case SDL_SCANCODE_KP_DIVIDE:      return KEY_KPADSLASH;
-		case SDL_SCANCODE_KP_MULTIPLY:    return '*'; // undefined?
-		case SDL_SCANCODE_KP_MINUS:       return KEY_MINUSPAD;
-		case SDL_SCANCODE_KP_PLUS:        return KEY_PLUSPAD;
-		case SDL_SCANCODE_KP_ENTER:       return KEY_ENTER;
-		case SDL_SCANCODE_KP_PERIOD:      return KEY_KPADDEL;
-		case SDL_SCANCODE_NONUSBACKSLASH: return '\\';
-
-		case SDL_SCANCODE_LSHIFT: return KEY_LSHIFT;
-		case SDL_SCANCODE_RSHIFT: return KEY_RSHIFT;
-		case SDL_SCANCODE_LCTRL:  return KEY_LCTRL;
-		case SDL_SCANCODE_RCTRL:  return KEY_RCTRL;
-		case SDL_SCANCODE_LALT:   return KEY_LALT;
-		case SDL_SCANCODE_RALT:   return KEY_RALT;
-		case SDL_SCANCODE_LGUI:   return KEY_LEFTWIN;
-		case SDL_SCANCODE_RGUI:   return KEY_RIGHTWIN;
-		default:                  break;
+	if (cv_keyboardlocale.value)
+	{
+		SDL_Keycode keycode = SDL_GetKeyFromScancode(code);
+
+		// Lactozilla
+		// Use keycodes instead of scancodes,
+		// so that non-US keyboards can work! Wow!
+		switch (keycode)
+		{
+			// F11 and F12 are separated from the rest of the function keys
+			case SDLK_F11: return KEY_F11;
+			case SDLK_F12: return KEY_F12;
+
+			case SDLK_KP_0: return KEY_KEYPAD0;
+			case SDLK_KP_1: return KEY_KEYPAD1;
+			case SDLK_KP_2: return KEY_KEYPAD2;
+			case SDLK_KP_3: return KEY_KEYPAD3;
+			case SDLK_KP_4: return KEY_KEYPAD4;
+			case SDLK_KP_5: return KEY_KEYPAD5;
+			case SDLK_KP_6: return KEY_KEYPAD6;
+			case SDLK_KP_7: return KEY_KEYPAD7;
+			case SDLK_KP_8: return KEY_KEYPAD8;
+			case SDLK_KP_9: return KEY_KEYPAD9;
+
+			case SDLK_RETURN:         return KEY_ENTER;
+			case SDLK_ESCAPE:         return KEY_ESCAPE;
+			case SDLK_BACKSPACE:      return KEY_BACKSPACE;
+			case SDLK_TAB:            return KEY_TAB;
+			case SDLK_SPACE:          return KEY_SPACE;
+			case SDLK_CAPSLOCK:       return KEY_CAPSLOCK;
+			case SDLK_PRINTSCREEN:    return KEY_PRTSC;
+			case SDLK_SCROLLLOCK:     return KEY_SCROLLLOCK;
+			case SDLK_APPLICATION:    return KEY_MENU;
+			case SDLK_PAUSE:          return KEY_PAUSE;
+			case SDLK_INSERT:         return KEY_INS;
+			case SDLK_HOME:           return KEY_HOME;
+			case SDLK_PAGEUP:         return KEY_PGUP;
+			case SDLK_DELETE:         return KEY_DEL;
+			case SDLK_END:            return KEY_END;
+			case SDLK_PAGEDOWN:       return KEY_PGDN;
+			case SDLK_RIGHT:          return KEY_RIGHTARROW;
+			case SDLK_LEFT:           return KEY_LEFTARROW;
+			case SDLK_DOWN:           return KEY_DOWNARROW;
+			case SDLK_UP:             return KEY_UPARROW;
+			case SDLK_NUMLOCKCLEAR:   return KEY_NUMLOCK;
+			case SDLK_KP_DIVIDE:      return KEY_KPADSLASH;
+			case SDLK_KP_MULTIPLY:    return '*'; // undefined?
+			case SDLK_KP_MINUS:       return KEY_MINUSPAD;
+			case SDLK_KP_PLUS:        return KEY_PLUSPAD;
+			case SDLK_KP_ENTER:       return KEY_ENTER;
+			case SDLK_KP_PERIOD:      return KEY_KPADDEL;
+
+			case SDLK_LSHIFT: return KEY_LSHIFT;
+			case SDLK_RSHIFT: return KEY_RSHIFT;
+			case SDLK_LCTRL:  return KEY_LCTRL;
+			case SDLK_RCTRL:  return KEY_RCTRL;
+			case SDLK_LALT:   return KEY_LALT;
+			case SDLK_RALT:   return KEY_RALT;
+			case SDLK_LGUI:   return KEY_LEFTWIN;
+			case SDLK_RGUI:   return KEY_RIGHTWIN;
+			default:          break;
+		}
+
+		if (keycode >= SDLK_F1 && keycode <= SDLK_F10)
+		{
+			return KEY_F1 + (keycode - SDLK_F1);
+		}
+
+		// Do send keyup events to avoid stuck movement keys
+		if (type != SDL_KEYUP && (!ctrldown))
+		{
+			if (cv_textinput.value)
+			{
+				// Lactozilla: console input
+				if (CON_AcceptInput())
+					return 0;
+				// menu text input
+				if (M_TextInput())
+					return 0;
+				// chat input
+				if (HU_ChatActive())
+					return 0;
+			}
+		}
+
+		switch (keycode)
+		{
+			case SDLK_MINUS:          return KEY_MINUS;
+			case SDLK_EQUALS:         return KEY_EQUALS;
+			case SDLK_LEFTBRACKET:    return '[';
+			case SDLK_RIGHTBRACKET:   return ']';
+			case SDLK_BACKSLASH:      return '\\';
+			case SDLK_SEMICOLON:      return ';';
+			case SDLK_QUOTE:          return '\'';
+			case SDLK_BACKQUOTE:      return '`';
+			case SDLK_COMMA:          return ',';
+			case SDLK_PERIOD:         return '.';
+			case SDLK_SLASH:          return '/';
+			case SDLK_AMPERSAND:      return '&';
+			case SDLK_ASTERISK:       return '*';
+			case SDLK_AT:             return '@';
+			case SDLK_CARET:          return '^';
+			case SDLK_COLON:          return ':';
+			case SDLK_DOLLAR:         return '$';
+			case SDLK_EXCLAIM:        return '!';
+			case SDLK_GREATER:        return '>';
+			case SDLK_HASH:           return '#';
+			case SDLK_LEFTPAREN:      return '(';
+			case SDLK_LESS:           return '<';
+			case SDLK_PERCENT:        return '%';
+			case SDLK_PLUS:           return '+';
+			case SDLK_QUESTION:       return '?';
+			case SDLK_QUOTEDBL:       return '"';
+			case SDLK_RIGHTPAREN:     return ')';
+			case SDLK_UNDERSCORE:     return '_';
+			default:          break;
+		}
+
+		// Tested by installing a French keymap
+		if (cv_forceqwerty.value)
+		{
+			if (code >= SDL_SCANCODE_A && code <= SDL_SCANCODE_Z)
+				return code - SDL_SCANCODE_A + 'a';
+			else if (code >= SDL_SCANCODE_1 && code <= SDL_SCANCODE_9)
+				return code - SDL_SCANCODE_1 + '1';
+			else if (code == SDL_SCANCODE_0)
+				return '0';
+		}
+		else
+		{
+			if (keycode >= SDLK_a && keycode <= SDLK_z)
+				return keycode - SDLK_a + 'a';
+			else if (keycode >= SDLK_1 && keycode <= SDLK_9)
+				return keycode - SDLK_1 + '1';
+			else if (keycode == SDLK_0)
+				return '0';
+		}
+	}
+	else
+	{
+		switch (code)
+		{
+			// F11 and F12 are separated from the rest of the function keys
+			case SDL_SCANCODE_F11: return KEY_F11;
+			case SDL_SCANCODE_F12: return KEY_F12;
+
+			case SDL_SCANCODE_KP_0: return KEY_KEYPAD0;
+			case SDL_SCANCODE_KP_1: return KEY_KEYPAD1;
+			case SDL_SCANCODE_KP_2: return KEY_KEYPAD2;
+			case SDL_SCANCODE_KP_3: return KEY_KEYPAD3;
+			case SDL_SCANCODE_KP_4: return KEY_KEYPAD4;
+			case SDL_SCANCODE_KP_5: return KEY_KEYPAD5;
+			case SDL_SCANCODE_KP_6: return KEY_KEYPAD6;
+			case SDL_SCANCODE_KP_7: return KEY_KEYPAD7;
+			case SDL_SCANCODE_KP_8: return KEY_KEYPAD8;
+			case SDL_SCANCODE_KP_9: return KEY_KEYPAD9;
+
+			case SDL_SCANCODE_RETURN:         return KEY_ENTER;
+			case SDL_SCANCODE_ESCAPE:         return KEY_ESCAPE;
+			case SDL_SCANCODE_BACKSPACE:      return KEY_BACKSPACE;
+			case SDL_SCANCODE_TAB:            return KEY_TAB;
+			case SDL_SCANCODE_SPACE:          return KEY_SPACE;
+			case SDL_SCANCODE_CAPSLOCK:       return KEY_CAPSLOCK;
+			case SDL_SCANCODE_PRINTSCREEN:    return 0; // undefined?
+			case SDL_SCANCODE_SCROLLLOCK:     return KEY_SCROLLLOCK;
+			case SDL_SCANCODE_PAUSE:          return KEY_PAUSE;
+			case SDL_SCANCODE_INSERT:         return KEY_INS;
+			case SDL_SCANCODE_HOME:           return KEY_HOME;
+			case SDL_SCANCODE_PAGEUP:         return KEY_PGUP;
+			case SDL_SCANCODE_DELETE:         return KEY_DEL;
+			case SDL_SCANCODE_END:            return KEY_END;
+			case SDL_SCANCODE_PAGEDOWN:       return KEY_PGDN;
+			case SDL_SCANCODE_RIGHT:          return KEY_RIGHTARROW;
+			case SDL_SCANCODE_LEFT:           return KEY_LEFTARROW;
+			case SDL_SCANCODE_DOWN:           return KEY_DOWNARROW;
+			case SDL_SCANCODE_UP:             return KEY_UPARROW;
+			case SDL_SCANCODE_NUMLOCKCLEAR:   return KEY_NUMLOCK;
+			case SDL_SCANCODE_KP_DIVIDE:      return KEY_KPADSLASH;
+			case SDL_SCANCODE_KP_MULTIPLY:    return '*'; // undefined?
+			case SDL_SCANCODE_KP_MINUS:       return KEY_MINUSPAD;
+			case SDL_SCANCODE_KP_PLUS:        return KEY_PLUSPAD;
+			case SDL_SCANCODE_KP_ENTER:       return KEY_ENTER;
+			case SDL_SCANCODE_KP_PERIOD:      return KEY_KPADDEL;
+			case SDL_SCANCODE_NONUSBACKSLASH: return '\\';
+
+			case SDL_SCANCODE_LSHIFT: return KEY_LSHIFT;
+			case SDL_SCANCODE_RSHIFT: return KEY_RSHIFT;
+			case SDL_SCANCODE_LCTRL:  return KEY_LCTRL;
+			case SDL_SCANCODE_RCTRL:  return KEY_RCTRL;
+			case SDL_SCANCODE_LALT:   return KEY_LALT;
+			case SDL_SCANCODE_RALT:   return KEY_RALT;
+			case SDL_SCANCODE_LGUI:   return KEY_LEFTWIN;
+			case SDL_SCANCODE_RGUI:   return KEY_RIGHTWIN;
+			default:                  break;
+		}
+
+		if (code >= SDL_SCANCODE_F1 && code <= SDL_SCANCODE_F10)
+		{
+			return KEY_F1 + (code - SDL_SCANCODE_F1);
+		}
+
+		// Do send keyup events to avoid stuck movement keys
+		if (type != SDL_KEYUP && (!ctrldown))
+		{
+			if (cv_textinput.value)
+			{
+				// Lactozilla: console input
+				if (CON_AcceptInput())
+					return 0;
+				// menu text input
+				if (M_TextInput())
+					return 0;
+				// chat input
+				if (HU_ChatActive())
+					return 0;
+			}
+		}
+
+		switch (code)
+		{
+			case SDL_SCANCODE_MINUS:          return KEY_MINUS;
+			case SDL_SCANCODE_EQUALS:         return KEY_EQUALS;
+			case SDL_SCANCODE_LEFTBRACKET:    return '[';
+			case SDL_SCANCODE_RIGHTBRACKET:   return ']';
+			case SDL_SCANCODE_BACKSLASH:      return '\\';
+			case SDL_SCANCODE_NONUSHASH:      return '#';
+			case SDL_SCANCODE_SEMICOLON:      return ';';
+			case SDL_SCANCODE_APOSTROPHE:     return '\'';
+			case SDL_SCANCODE_GRAVE:          return '`';
+			case SDL_SCANCODE_COMMA:          return ',';
+			case SDL_SCANCODE_PERIOD:         return '.';
+			case SDL_SCANCODE_SLASH:          return '/';
+			default:                  break;
+		}
+
+		// cv_forceqwerty assumed on
+		if (code >= SDL_SCANCODE_A && code <= SDL_SCANCODE_Z)
+		{
+			// get lowercase ASCII
+			return code - SDL_SCANCODE_A + 'a';
+		}
+		if (code >= SDL_SCANCODE_1 && code <= SDL_SCANCODE_9)
+		{
+			return code - SDL_SCANCODE_1 + '1';
+		}
+		else if (code == SDL_SCANCODE_0)
+		{
+			return '0';
+		}
 	}
+
 #ifdef HWRENDER
 	DBG_Printf("Unknown incoming scancode: %d, represented %c\n",
 				code,
@@ -630,10 +803,29 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 	{
 		return;
 	}
-	event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);
+	event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode, type);
 	if (event.data1) D_PostEvent(&event);
 }
 
+static void Impl_HandleTextInputEvent(char *text)
+{
+	event_t event;
+	UINT16 special;
+
+	if (!cv_textinput.value)
+		return;
+
+	special = (text[1]+256);
+	if (special == 256)
+		event.data1 = text[0];
+	else
+		event.data1 = special+64;
+
+	event.type = ev_textinput;
+	if (event.data1 >= 33 && event.data1 <= 0xFF)
+		D_PostEvent(&event);
+}
+
 static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 {
 	if (USE_MOUSEINPUT)
@@ -875,6 +1067,9 @@ void I_GetEvent(void)
 			case SDL_KEYDOWN:
 				Impl_HandleKeyboardEvent(evt.key, evt.type);
 				break;
+			case SDL_TEXTINPUT:
+				Impl_HandleTextInputEvent(evt.text.text);
+				break;
 			case SDL_MOUSEMOTION:
 				//if (!mouseMotionOnce)
 				Impl_HandleMouseMotionEvent(evt.motion);
@@ -1606,6 +1801,21 @@ void I_StartupGraphics(void)
 	disable_mouse = M_CheckParm("-nomouse");
 	disable_fullscreen = M_CheckParm("-win") ? 1 : 0;
 
+	// Lactozilla
+	// Small explanation from your local kaiju
+	// * cv_textinput allows "text input" events from SDL,
+	//   so that console and chat is guaranteed to use
+	//   your keyboard's locale reliably
+	// * When disabled, the game will fallback to using
+	//   keycode events, still following your locale somewhat
+	// * If cv_keyboardlocale is disabled, input will default
+	//   to using the US keyboard layout
+	// * cv_forceqwerty does what it says on the tin, but only
+	//   if text input events were disabled
+	CV_RegisterVar (&cv_textinput);
+	CV_RegisterVar (&cv_keyboardlocale);
+	CV_RegisterVar (&cv_forceqwerty);
+
 	keyboard_started = true;
 
 #if !defined(HAVE_TTF)