From 1a4f1c8177f7ee351cb0096e3456d055b97dc60a Mon Sep 17 00:00:00 2001 From: peter1138 Date: Thu, 16 Nov 2006 22:05:33 +0000 Subject: (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come. --- video/win32_v.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'video') diff --git a/video/win32_v.c b/video/win32_v.c index 1894e7a24..7511df597 100644 --- a/video/win32_v.c +++ b/video/win32_v.c @@ -349,14 +349,15 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP case WM_KEYDOWN: { // this is the rewritten ascii input function // it disables windows deadkey handling --> more linux like :D - WORD w = 0; + wchar_t w = 0; byte ks[256]; uint scancode; uint32 pressed_key; GetKeyboardState(ks); - if (ToAscii(wParam, 0, ks, &w, 0) == 0) { - w = 0; // no translation was possible + if (ToUnicode(wParam, 0, ks, &w, 1, 0) == 0) { + /* On win9x ToUnicode always fails, so fall back to ToAscii */ + if (ToAscii(wParam, 0, ks, &w, 0) == 0) w = 0; // no translation was possible } pressed_key = w | MapWindowsKey(wParam) << 16; -- cgit v1.2.3-70-g09d2