mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-01-08 07:10:18 +01:00
XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb34)
This commit is contained in:
parent
45c8bd0fe5
commit
ac57bb36d5
1 changed files with 1 additions and 2 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue