Alexandre Julliard : winex11.drv:
Added mapping for Unicode keysyms in ToUnicodeEx.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 8 06:41:59 CST 2006
Module: wine
Branch: master
Commit: 187d52bc2de4c2a230664a07d292fdc8d7c22ce8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=187d52bc2de4c2a230664a07d292fdc8d7c22ce8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Nov 7 17:27:35 2006 +0100
winex11.drv: Added mapping for Unicode keysyms in ToUnicodeEx.
---
dlls/winex11.drv/keyboard.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 5a6df8f..fdbf526 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -2444,10 +2444,19 @@ #endif
dead_char = KEYBOARD_MapDeadKeysym(keysym);
if (dead_char)
- {
+ {
MultiByteToWideChar(CP_UNIXCP, 0, &dead_char, 1, bufW, bufW_size);
ret = -1;
- }
+ goto found;
+ }
+
+ if (keysym >= 0x01000100 && keysym <= 0x0100ffff)
+ {
+ /* Unicode direct mapping */
+ bufW[0] = keysym & 0xffff;
+ ret = 1;
+ goto found;
+ }
else
{
const char *ksname;
More information about the wine-cvs
mailing list