frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: More Tiger ifdefs 

(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
This commit is contained in:
Jeremy Huddleston 2008-11-21 10:53:39 -08:00
parent 5107444443
commit b262788401
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xquartz/X11Controller.m
View File

@ -28,6 +28,7 @@
prior written authorization. */ prior written authorization. */
#include "sanitizedCarbon.h" #include "sanitizedCarbon.h"
#include <AvailabilityMacros.h>
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
@ -152,8 +153,11 @@
item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
(item_selected:) keyEquivalent:shortcut]; (item_selected:) keyEquivalent:shortcut];
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask]; [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
#else
[item setKeyEquivalentModifierMask:windowItemModMask];
#endif
[item setTarget:self]; [item setTarget:self];
[item setTag:i]; [item setTag:i];
[item setEnabled:YES]; [item setEnabled:YES];
@ -162,8 +166,11 @@
action:@selector action:@selector
(item_selected:) keyEquivalent:shortcut (item_selected:) keyEquivalent:shortcut
atIndex:i]; atIndex:i];
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask]; [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
#else
[item setKeyEquivalentModifierMask:windowItemModMask];
#endif
[item setTarget:self]; [item setTarget:self];
[item setTag:i]; [item setTag:i];
[item setEnabled:YES]; [item setEnabled:YES];

4
hw/xquartz/darwin.c
View File

@ -114,10 +114,10 @@ int darwinFakeMouse3Mask = NX_COMMANDMASK;
#endif #endif
// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu // Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
int darwinAppKitModMask = 0; // Any of these bits unsigned int darwinAppKitModMask = 0; // Any of these bits
// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled) // Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
int windowItemModMask = NX_COMMANDMASK; unsigned int windowItemModMask = NX_COMMANDMASK;
// devices // devices
DeviceIntPtr darwinKeyboard = NULL; DeviceIntPtr darwinKeyboard = NULL;

4
hw/xquartz/darwin.h
View File

@ -82,8 +82,8 @@ extern int darwinMouseAccelChange;
extern int darwinFakeButtons; extern int darwinFakeButtons;
extern int darwinFakeMouse2Mask; extern int darwinFakeMouse2Mask;
extern int darwinFakeMouse3Mask; extern int darwinFakeMouse3Mask;
extern int darwinAppKitModMask; extern unsigned int darwinAppKitModMask;
extern int windowItemModMask; extern unsigned int windowItemModMask;
extern int darwinSyncKeymap; extern int darwinSyncKeymap;
extern unsigned int darwinDesiredWidth, darwinDesiredHeight; extern unsigned int darwinDesiredWidth, darwinDesiredHeight;
extern int darwinDesiredDepth; extern int darwinDesiredDepth;

8
hw/xquartz/quartzKeyboard.c
View File

@ -753,6 +753,11 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
} }
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
if(currentKeyLayoutRef)
CFRelease(currentKeyLayoutRef);
#endif
if (chr_data == NULL) { if (chr_data == NULL) {
ErrorF ( "Couldn't get uchr or kchr resource\n"); ErrorF ( "Couldn't get uchr or kchr resource\n");
return FALSE; return FALSE;
@ -856,7 +861,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k[0] = known_numeric_keys[i].keypad; k[0] = known_numeric_keys[i].keypad;
} }
} }
if(currentKeyLayoutRef) CFRelease(currentKeyLayoutRef);
return TRUE; return TRUE;
} }