mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-27 20:58:52 +00:00
XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099)
This commit is contained in:
@@ -572,7 +572,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
|
||||
#endif
|
||||
const void *chr_data = NULL;
|
||||
int num_keycodes = NUM_KEYCODES;
|
||||
UInt32 keyboard_type = 0;
|
||||
UInt32 keyboard_type = LMGetKbdType();
|
||||
int i, j;
|
||||
OSStatus err;
|
||||
KeySym *k;
|
||||
@@ -580,7 +580,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
||||
TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
|
||||
keyboard_type = LMGetKbdType();
|
||||
|
||||
if (currentKeyLayoutRef) {
|
||||
currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
|
||||
|
||||
Reference in New Issue
Block a user