Fix up input so it's always in the current codepage

src/conio/sdl_con.c

@@ -718,6 +718,14 @@ static void sdl_add_key(unsigned int keyval, struct video_stats *vs)
 	}
 }
 
+static void
+sdl_add_key_uc(unsigned int keyval, struct video_stats *vs)
+{
+	if (keyval < 128)
+		keyval = cpchar_from_unicode_cpoint(getcodepage(), keyval, keyval);
+	sdl_add_key(keyval, vs);
+}
+
 /* Called from event thread only */
 static unsigned int sdl_get_char_code(unsigned int keysym, unsigned int mod)
 {
@@ -942,11 +950,11 @@ void sdl_video_event_thread(void *data)
 					    || ev.key.keysym.sym == SDLK_KP_PLUS
 					    || ev.key.keysym.sym == SDLK_KP_PERIOD))
 						break;
-					sdl_add_key(sdl_get_char_code(ev.key.keysym.sym, ev.key.keysym.mod), &cvstat);
+					sdl_add_key_uc(sdl_get_char_code(ev.key.keysym.sym, ev.key.keysym.mod), &cvstat);
 				}
 				else if (!isprint(ev.key.keysym.sym)) {
 					if (ev.key.keysym.sym < 128)
-						sdl_add_key(ev.key.keysym.sym, &cvstat);
+						sdl_add_key_uc(ev.key.keysym.sym, &cvstat);
 				}
 				break;
 			case SDL_TEXTINPUT:
@@ -954,7 +962,7 @@ void sdl_video_event_thread(void *data)
 					unsigned int charcode = sdl_get_char_code(last_sym, last_mod & ~(KMOD_ALT));
 					// If the key is exactly what we would expect, use sdl_get_char_code()
 					if (*(uint8_t *)ev.text.text == charcode)
-						sdl_add_key(sdl_get_char_code(last_sym, last_mod), &cvstat);
+						sdl_add_key_uc(sdl_get_char_code(last_sym, last_mod), &cvstat);
 					else
 						sdl_add_keys((uint8_t *)ev.text.text, &cvstat);
 				}

src/conio/x_events.c

@@ -976,8 +976,8 @@ static int x11_event(XEvent *ev)
 					case XLookupChars:
 						if (lus == XLookupChars || ((ev->xkey.state & (Mod1Mask | ControlMask)) == 0)) {
 							for (i = 0; i < cnt; i++) {
-								if (wbuf[i] < 127)
-									ch = wbuf[i];
+								if (wbuf[i] < 128)
+									ch = cpchar_from_unicode_cpoint(getcodepage(), wbuf[i], wbuf[i]);
 								else
 									ch = cpchar_from_unicode_cpoint(getcodepage(), wbuf[i], 0);
 								if (ch) {
@@ -1164,6 +1164,8 @@ static int x11_event(XEvent *ev)
 						}
 						if (scan != 0xffff) {
 							uint16_t key=scan;
+							if (key < 128)
+								key = cpchar_from_unicode_cpoint(getcodepage(), key, key);
 							write(key_pipe[1], &key, (scan&0xff)?1:2);
 						}
 						break;

src/syncterm/term.c

@@ -4244,8 +4244,6 @@ doterm(struct bbslist *bbs)
 					case 96: /* No backtick */
 						break;
 					default:
-						if (key < 128)
-							key = cpchar_from_unicode_cpoint(getcodepage(), key, key);
 						if (key < 256) {
                                                         /* ASCII Translation */
 							if (key < 123) {
@@ -4330,8 +4328,6 @@ doterm(struct bbslist *bbs)
 						conn_send(ch, 1, 0);
 						break;
 					default:
-						if (key < 128)
-							key = cpchar_from_unicode_cpoint(getcodepage(), key, key);
 						if (key < 256) {
 							ch[0] = key;
 							conn_send(ch, 1, 0);
@@ -4535,8 +4531,6 @@ doterm(struct bbslist *bbs)
 
                                         /* FALLTHROUGH to default */
 					default:
-						if (key < 128)
-							key = cpchar_from_unicode_cpoint(getcodepage(), key, key);
 						if ((key < 256) && (key >= 0)) {
 							ch[0] = key;
 							conn_send(ch, 1, 0);