1.4.2-apple25
This commit is contained in:
parent
27b1a5eb34
commit
b876e0452e
|
@ -26,7 +26,7 @@ dnl
|
|||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([xorg-server], 1.4.2-apple24, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||
AC_INIT([xorg-server], 1.4.2-apple25, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
|
||||
AM_MAINTAINER_MODE
|
||||
|
|
|
@ -652,11 +652,17 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
|
|||
UniCharCount len;
|
||||
UInt32 dead_key_state = 0, extra_dead = 0;
|
||||
|
||||
if(((i+MIN_KEYCODE)==32 && j==0) || ((i+MIN_KEYCODE)==22 && j==2))
|
||||
fprintf(stderr, "%s i=%d (mods[j] >> 8) = %ul\n", (i+MIN_KEYCODE) == 22 ? "US" : "Czech", i, mods[j] >> 8);
|
||||
|
||||
err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
|
||||
mods[j] >> 8, keyboard_type, 0,
|
||||
&dead_key_state, 8, &len, s);
|
||||
if (err != noErr) continue;
|
||||
|
||||
if(((i+MIN_KEYCODE)==32 && j==0) || ((i+MIN_KEYCODE)==22 && j==2))
|
||||
fprintf(stderr, "dead_key_state = %d, len=%d s=%d %d %d %d %d %d %d %d\n", dead_key_state, len, s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7]);
|
||||
|
||||
if (len == 0 && dead_key_state != 0) {
|
||||
/* Found a dead key. Work out which one it is, but
|
||||
remembering that it's dead. */
|
||||
|
@ -664,12 +670,19 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
|
|||
mods[j] >> 8, keyboard_type,
|
||||
kUCKeyTranslateNoDeadKeysMask,
|
||||
&extra_dead, 8, &len, s);
|
||||
|
||||
if(((i+MIN_KEYCODE)==32 && j==0) || ((i+MIN_KEYCODE)==22 && j==2))
|
||||
fprintf(stderr, "found a dead key... post: extra_dead = %d, len=%d s=%d %d %d %d %d %d %d %d\n", extra_dead, len, s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7]);
|
||||
|
||||
if (err != noErr) continue;
|
||||
}
|
||||
|
||||
if (len > 0 && s[0] != 0x0010) {
|
||||
k[j] = ucs2keysym (s[0]);
|
||||
if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
|
||||
|
||||
if(((i+MIN_KEYCODE)==32 && j==0) || ((i+MIN_KEYCODE)==22 && j==2))
|
||||
fprintf(stderr, "k[j] = %d\n", k[j]);
|
||||
}
|
||||
#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
|
||||
} else { // kchr
|
||||
|
|
Loading…
Reference in New Issue
Block a user