gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 19:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change NSEvent to CGFloat, NSUInteger and NSInteger.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36121 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2013-02-13 08:40:36 +00:00
parent f9ab80ec48
commit 9212e5bbeb
15 changed files with 166 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2013-02-13 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSEvent.h
* Source/NSEvent.m
* Source/GSDragView.m
* Source/GSTitleView.m
* Source/NSComboBoxCell.m
* Source/NSInputManager.m
* Source/NSMatrix.m
* Source/NSMenuView.m
* Source/NSRulerMarker.m
* Source/NSScroller.m
* Source/NSSlider.m
* Source/NSSliderCell.m
* Source/NSTableHeaderView.m
* Source/NSTableView.m:
Change NSEvent to CGFloat, NSUInteger and NSInteger.
2013-02-10 Fred Kiefer <FredKiefer@gmx.de> 2013-02-10 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSSplitView.h * Headers/AppKit/NSSplitView.h

132
Headers/AppKit/NSEvent.h
View file

@ -71,7 +71,7 @@
NSScrollWheel NSScrollWheel
</example> </example>
*/ */
typedef enum _NSEventType { enum _NSEventType {
// Note - order IS significant as ranges of values // Note - order IS significant as ranges of values
// are used for testing for valid event types. // are used for testing for valid event types.
NSLeftMouseDown = 1, NSLeftMouseDown = 1,
@ -99,7 +99,8 @@ typedef enum _NSEventType {
NSOtherMouseDown = 25, NSOtherMouseDown = 25,
NSOtherMouseUp, NSOtherMouseUp,
NSOtherMouseDragged NSOtherMouseDragged
} NSEventType; };
typedef NSUInteger NSEventType;
enum { enum {
NSLeftMouseDownMask = (1 << NSLeftMouseDown), NSLeftMouseDownMask = (1 << NSLeftMouseDown),
@ -161,8 +162,10 @@ enum {
* Convert an NSEvent Type to it's respective Event Mask * Convert an NSEvent Type to it's respective Event Mask
*/ */
// FIXME: Should we use the inline trick from NSGeometry.h here? // FIXME: Should we use the inline trick from NSGeometry.h here?
static inline static inline NSUInteger
unsigned int NSEventMaskFromType(NSEventType type);
static inline NSUInteger
NSEventMaskFromType(NSEventType type) NSEventMaskFromType(NSEventType type)
{ {
return (1 << type); return (1 << type);
@ -225,21 +228,21 @@ enum
{ {
NSEventType event_type; NSEventType event_type;
NSPoint location_point; NSPoint location_point;
unsigned int modifier_flags; NSUInteger modifier_flags;
NSTimeInterval event_time; NSTimeInterval event_time;
int window_num; NSInteger window_num;
NSGraphicsContext *event_context; NSGraphicsContext *event_context;
union _MB_event_data union _MB_event_data
{ {
struct struct
{ {
int event_num; NSInteger event_num;
short click; NSInteger click;
short button; NSInteger button;
float pressure; float pressure;
float deltaX; CGFloat deltaX;
float deltaY; CGFloat deltaY;
float deltaZ; CGFloat deltaZ;
} mouse; } mouse;
struct struct
{ {
@ -250,34 +253,34 @@ enum
} key; } key;
struct struct
{ {
int event_num; NSInteger event_num;
int tracking_num; NSInteger tracking_num;
void *user_data; void *user_data;
} tracking; } tracking;
struct struct
{ {
short sub_type; short sub_type;
int data1; NSInteger data1;
int data2; NSInteger data2;
} misc; } misc;
} event_data; } event_data;
} }
+ (NSEvent*) enterExitEventWithType: (NSEventType)type + (NSEvent*) enterExitEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
trackingNumber: (int)trackingNum trackingNumber: (NSInteger)trackingNum
userData: (void *)userData; userData: (void *)userData;
+ (NSEvent*) keyEventWithType: (NSEventType)type + (NSEvent*) keyEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
characters: (NSString *)keys characters: (NSString *)keys
charactersIgnoringModifiers: (NSString *)ukeys charactersIgnoringModifiers: (NSString *)ukeys
@ -286,41 +289,41 @@ enum
+ (NSEvent*) mouseEventWithType: (NSEventType)type + (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
clickCount: (int)clickNum clickCount: (NSInteger)clickNum
pressure: (float)pressureValue; pressure: (float)pressureValue;
#if OS_API_VERSION(GS_API_NONE, GS_API_NONE) #if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
+ (NSEvent*) mouseEventWithType: (NSEventType)type + (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
clickCount: (int)clickNum clickCount: (NSInteger)clickNum
pressure: (float)pressureValue pressure: (float)pressureValue
buttonNumber: (int)buttonNum buttonNumber: (NSInteger)buttonNum
deltaX: (float)deltaX deltaX: (CGFloat)deltaX
deltaY: (float)deltaY deltaY: (CGFloat)deltaY
deltaZ: (float)deltaZ; deltaZ: (CGFloat)deltaZ;
#endif #endif
+ (NSPoint)mouseLocation; + (NSPoint)mouseLocation;
+ (NSEvent*) otherEventWithType: (NSEventType)type + (NSEvent*) otherEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
subtype: (short)subType subtype: (short)subType
data1: (int)data1 data1: (NSInteger)data1
data2: (int)data2; data2: (NSInteger)data2;
+ (void) startPeriodicEventsAfterDelay: (NSTimeInterval)delaySeconds + (void) startPeriodicEventsAfterDelay: (NSTimeInterval)delaySeconds
withPeriod: (NSTimeInterval)periodSeconds; withPeriod: (NSTimeInterval)periodSeconds;
@ -328,53 +331,53 @@ enum
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (int) buttonNumber; - (NSInteger) buttonNumber;
#endif #endif
- (NSString *) characters; - (NSString *) characters;
- (NSString *) charactersIgnoringModifiers; - (NSString *) charactersIgnoringModifiers;
- (int) clickCount; - (NSInteger) clickCount;
- (NSGraphicsContext*) context; - (NSGraphicsContext*) context;
- (int) data1; - (NSInteger) data1;
- (int) data2; - (NSInteger) data2;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (float)deltaX; - (CGFloat)deltaX;
- (float)deltaY; - (CGFloat)deltaY;
- (float)deltaZ; - (CGFloat)deltaZ;
#endif #endif
- (int) eventNumber; - (NSInteger) eventNumber;
- (BOOL) isARepeat; - (BOOL) isARepeat;
- (unsigned short) keyCode; - (unsigned short) keyCode;
- (NSPoint) locationInWindow; - (NSPoint) locationInWindow;
- (unsigned int) modifierFlags; - (NSUInteger) modifierFlags;
- (float) pressure; - (float) pressure;
- (short) subtype; - (short) subtype;
- (NSTimeInterval) timestamp; - (NSTimeInterval) timestamp;
- (int) trackingNumber; - (NSInteger) trackingNumber;
- (NSEventType) type; - (NSEventType) type;
- (void *) userData; - (void *) userData;
- (NSWindow *) window; - (NSWindow *) window;
- (int) windowNumber; - (NSInteger) windowNumber;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (int) absoluteX; - (NSInteger) absoluteX;
- (int) absoluteY; - (NSInteger) absoluteY;
- (int) absoluteZ; - (NSInteger) absoluteZ;
- (unsigned int) buttonMask; - (NSUInteger) buttonMask;
- (unsigned int) capabilityMask; - (NSUInteger) capabilityMask;
- (unsigned int) deviceID; - (NSUInteger) deviceID;
- (BOOL) isEnteringProximity; - (BOOL) isEnteringProximity;
- (unsigned int) pointingDeviceID; - (NSUInteger) pointingDeviceID;
- (unsigned int) pointingDeviceSerialNumber; - (NSUInteger) pointingDeviceSerialNumber;
- (NSPointingDeviceType) pointingDeviceType; - (NSPointingDeviceType) pointingDeviceType;
- (float) rotation; - (float) rotation;
- (unsigned int) systemTabletID; - (NSUInteger) systemTabletID;
- (unsigned int) tabletID; - (NSUInteger) tabletID;
- (float) tangentialPressure; - (float) tangentialPressure;
- (NSPoint) tilt; - (NSPoint) tilt;
- (unsigned long long) uniqueID; - (unsigned long long) uniqueID;
- (id) vendorDefined; - (id) vendorDefined;
- (unsigned int) vendorID; - (NSUInteger) vendorID;
- (unsigned int) vendorPointingDeviceType; - (NSUInteger) vendorPointingDeviceType;
#endif #endif
@end @end
@ -454,11 +457,6 @@ enum {
NSModeSwitchFunctionKey = 0xF747 NSModeSwitchFunctionKey = 0xF747
}; };
/*
* Convert an Event Mask Type to a Mask
*/
unsigned int NSEventMaskFromType(NSEventType type);
#if OS_API_VERSION(GS_API_NONE, GS_API_NONE) #if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
typedef enum { typedef enum {
GSAppKitWindowMoved = 1, GSAppKitWindowMoved = 1,

10
Source/GSDragView.m
View file

@ -359,7 +359,7 @@ static GSDragView *sharedDragView = nil;
- (NSWindow*) windowAcceptingDnDunder: (NSPoint)mouseLocation - (NSWindow*) windowAcceptingDnDunder: (NSPoint)mouseLocation
windowRef: (int*)mouseWindowRef windowRef: (int*)mouseWindowRef
{ {
int win; NSInteger win;
*mouseWindowRef = 0; *mouseWindowRef = 0;
win = [GSServerForWindow(_window) findWindowAt: mouseLocation win = [GSServerForWindow(_window) findWindowAt: mouseLocation
@ -389,7 +389,7 @@ static GSDragView *sharedDragView = nil;
mousePosition: (NSPoint)mPoint mousePosition: (NSPoint)mPoint
imagePosition: (NSPoint)iPoint imagePosition: (NSPoint)iPoint
{ {
NSSize imageSize; NSSize imageSize;
if (anImage == nil) if (anImage == nil)
{ {
@ -433,7 +433,7 @@ static GSDragView *sharedDragView = nil;
*/ */
- (BOOL) _updateOperationMask: (NSEvent*) theEvent - (BOOL) _updateOperationMask: (NSEvent*) theEvent
{ {
unsigned int mod = [theEvent modifierFlags]; NSUInteger mod = [theEvent modifierFlags];
NSDragOperation oldOperationMask = operationMask; NSDragOperation oldOperationMask = operationMask;
if (operationMask == NSDragOperationIgnoresModifiers) if (operationMask == NSDragOperationIgnoresModifiers)
@ -580,7 +580,7 @@ static GSDragView *sharedDragView = nil;
NSEvent *e; NSEvent *e;
NSGraphicsContext *context = GSCurrentContext(); NSGraphicsContext *context = GSCurrentContext();
// FIXME: Should store this once // FIXME: Should store this once
int dragWindowRef = (int)(intptr_t)[GSServerForWindow(_window) windowDevice: [_window windowNumber]]; NSInteger dragWindowRef = (NSInteger)(intptr_t)[GSServerForWindow(_window) windowDevice: [_window windowNumber]];
eventLocation = [dWindow convertScreenToBase: eventLocation]; eventLocation = [dWindow convertScreenToBase: eventLocation];
e = [NSEvent otherEventWithType: NSAppKitDefined e = [NSEvent otherEventWithType: NSAppKitDefined
@ -623,7 +623,7 @@ static GSDragView *sharedDragView = nil;
// Use eWindow for coordination transformation // Use eWindow for coordination transformation
NSWindow *eWindow = [theEvent window]; NSWindow *eWindow = [theEvent window];
NSDate *theDistantFuture = [NSDate distantFuture]; NSDate *theDistantFuture = [NSDate distantFuture];
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSMouseMovedMask | NSLeftMouseDraggedMask | NSMouseMovedMask
| NSPeriodicMask | NSAppKitDefinedMask | NSFlagsChangedMask; | NSPeriodicMask | NSAppKitDefinedMask | NSFlagsChangedMask;
NSPoint startPoint; NSPoint startPoint;

2
Source/GSTitleView.m
View file

@ -284,7 +284,7 @@
{ {
NSPoint lastLocation; NSPoint lastLocation;
NSPoint location; NSPoint location;
unsigned eventMask = NSLeftMouseUpMask | NSPeriodicMask; NSUInteger eventMask = NSLeftMouseUpMask | NSPeriodicMask;
BOOL done = NO; BOOL done = NO;
BOOL moved = NO; BOOL moved = NO;
NSDate *theDistantFuture = [NSDate distantFuture]; NSDate *theDistantFuture = [NSDate distantFuture];

2
Source/NSComboBoxCell.m
View file

@ -1471,7 +1471,7 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
{ {
NSEvent *e = theEvent; NSEvent *e = theEvent;
BOOL isMouseUp = NO; BOOL isMouseUp = NO;
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSOtherMouseDraggedMask | NSMouseMovedMask | NSLeftMouseDraggedMask | NSOtherMouseDraggedMask
| NSRightMouseDraggedMask; | NSRightMouseDraggedMask;
NSPoint location; NSPoint location;

90
Source/NSEvent.m
View file

@ -85,12 +85,12 @@ static Class eventClass;
*/ */
+ (NSEvent*) enterExitEventWithType: (NSEventType)type + (NSEvent*) enterExitEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
trackingNumber: (int)trackingNum trackingNumber: (NSInteger)trackingNum
userData: (void *)userData userData: (void *)userData
{ {
NSEvent *e; NSEvent *e;
@ -121,9 +121,9 @@ static Class eventClass;
+ (NSEvent*) keyEventWithType: (NSEventType)type + (NSEvent*) keyEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext *)context context: (NSGraphicsContext *)context
characters: (NSString *)keys characters: (NSString *)keys
charactersIgnoringModifiers: (NSString *)ukeys charactersIgnoringModifiers: (NSString *)ukeys
@ -159,12 +159,12 @@ static Class eventClass;
+ (NSEvent*) mouseEventWithType: (NSEventType)type + (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
clickCount: (int)clickNum clickCount: (NSInteger)clickNum
pressure: (float)pressureValue pressure: (float)pressureValue
{ {
NSEvent *e; NSEvent *e;
@ -193,17 +193,17 @@ static Class eventClass;
+ (NSEvent*) mouseEventWithType: (NSEventType)type + (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
eventNumber: (int)eventNum eventNumber: (NSInteger)eventNum
clickCount: (int)clickNum clickCount: (NSInteger)clickNum
pressure: (float)pressureValue pressure: (float)pressureValue
buttonNumber: (int)buttonNum buttonNumber: (NSInteger)buttonNum
deltaX: (float)deltaX deltaX: (CGFloat)deltaX
deltaY: (float)deltaY deltaY: (CGFloat)deltaY
deltaZ: (float)deltaZ deltaZ: (CGFloat)deltaZ
{ {
NSEvent *e; NSEvent *e;
@ -243,13 +243,13 @@ static Class eventClass;
+ (NSEvent*) otherEventWithType: (NSEventType)type + (NSEvent*) otherEventWithType: (NSEventType)type
location: (NSPoint)location location: (NSPoint)location
modifierFlags: (unsigned int)flags modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context context: (NSGraphicsContext*)context
subtype: (short)subType subtype: (short)subType
data1: (int)data1 data1: (NSInteger)data1
data2: (int)data2 data2: (NSInteger)data2
{ {
NSEvent *e; NSEvent *e;
@ -381,7 +381,7 @@ static Class eventClass;
* more buttons, and you want to know which button an 'other' mouse * more buttons, and you want to know which button an 'other' mouse
* event refers to. * event refers to.
*/ */
- (int) buttonNumber - (NSInteger) buttonNumber
{ {
if (!(NSEventMaskFromType(event_type) & GSMouseEventMask)) if (!(NSEventMaskFromType(event_type) & GSMouseEventMask))
{ {
@ -430,7 +430,7 @@ static Class eventClass;
* <br />Raises an NSInternalInconsistencyException if applied to any * <br />Raises an NSInternalInconsistencyException if applied to any
* other type of event. * other type of event.
*/ */
- (int) clickCount - (NSInteger) clickCount
{ {
/* Make sure it is one of the right event types */ /* Make sure it is one of the right event types */
if (!(NSEventMaskFromType(event_type) & GSMouseEventMask)) if (!(NSEventMaskFromType(event_type) & GSMouseEventMask))
@ -473,7 +473,7 @@ static Class eventClass;
* of type NSAppKitDefined, NSSystemDefined, NSApplicationDefined, * of type NSAppKitDefined, NSSystemDefined, NSApplicationDefined,
* or NSPeriodic * or NSPeriodic
*/ */
- (int) data1 - (NSInteger) data1
{ {
if (event_type < NSAppKitDefined || event_type > NSPeriodic) if (event_type < NSAppKitDefined || event_type > NSPeriodic)
{ {
@ -489,7 +489,7 @@ static Class eventClass;
* of type NSAppKitDefined, NSSystemDefined, NSApplicationDefined, * of type NSAppKitDefined, NSSystemDefined, NSApplicationDefined,
* or NSPeriodic * or NSPeriodic
*/ */
- (int) data2 - (NSInteger) data2
{ {
if (event_type < NSAppKitDefined || event_type > NSPeriodic) if (event_type < NSAppKitDefined || event_type > NSPeriodic)
{ {
@ -522,7 +522,7 @@ static Class eventClass;
NSScrollWheel events, otherwise it will return 0. NSScrollWheel events, otherwise it will return 0.
</p> </p>
*/ */
- (float) deltaX - (CGFloat) deltaX
{ {
if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask)) if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask))
{ {
@ -540,7 +540,7 @@ static Class eventClass;
NSScrollWheel events, otherwise it will return 0. NSScrollWheel events, otherwise it will return 0.
</p> </p>
*/ */
- (float) deltaY - (CGFloat) deltaY
{ {
if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask)) if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask))
{ {
@ -561,7 +561,7 @@ static Class eventClass;
The value returned is 0.0 in most cases. The value returned is 0.0 in most cases.
</p> </p>
*/ */
- (float) deltaZ - (CGFloat) deltaZ
{ {
if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask)) if (!(NSEventMaskFromType(event_type) & GSMouseMovedEventMask))
{ {
@ -763,7 +763,7 @@ static const char *eventTypes[] = {
* <br />Raises an NSInternalInconsistencyException if applied to any * <br />Raises an NSInternalInconsistencyException if applied to any
* other type of event. * other type of event.
*/ */
- (int) eventNumber - (NSInteger) eventNumber
{ {
/* Make sure it is one of the right event types */ /* Make sure it is one of the right event types */
if (!(NSEventMaskFromType(event_type) & GSMouseEventMask) && if (!(NSEventMaskFromType(event_type) & GSMouseEventMask) &&
@ -922,7 +922,7 @@ static const char *eventTypes[] = {
/** /**
* Returns the modifier flag bits associated with the event. * Returns the modifier flag bits associated with the event.
*/ */
- (unsigned int) modifierFlags - (NSUInteger) modifierFlags
{ {
return modifier_flags; return modifier_flags;
} }
@ -987,7 +987,7 @@ static const char *eventTypes[] = {
* <br />Raises an NSInternalInconsistencyException if applied to any * <br />Raises an NSInternalInconsistencyException if applied to any
* other type of event than a mouse entered or exited event. * other type of event than a mouse entered or exited event.
*/ */
- (int) trackingNumber - (NSInteger) trackingNumber
{ {
if (event_type != NSMouseEntered && event_type != NSMouseExited if (event_type != NSMouseEntered && event_type != NSMouseExited
&& event_type != NSCursorUpdate) && event_type != NSCursorUpdate)
@ -1038,7 +1038,7 @@ static const char *eventTypes[] = {
* <br />Periodic events have no associated window, and you should not call * <br />Periodic events have no associated window, and you should not call
* this method for those events. * this method for those events.
*/ */
- (int) windowNumber - (NSInteger) windowNumber
{ {
return window_num; return window_num;
} }
@ -1046,37 +1046,37 @@ static const char *eventTypes[] = {
/* /*
* Methods for tablet events * Methods for tablet events
*/ */
- (int) absoluteX - (NSInteger) absoluteX
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (int) absoluteY - (NSInteger) absoluteY
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (int) absoluteZ - (NSInteger) absoluteZ
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) buttonMask - (NSUInteger) buttonMask
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) capabilityMask - (NSUInteger) capabilityMask
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) deviceID - (NSUInteger) deviceID
{ {
// FIXME // FIXME
return 0; return 0;
@ -1088,13 +1088,13 @@ static const char *eventTypes[] = {
return NO; return NO;
} }
- (unsigned int) pointingDeviceID - (NSUInteger) pointingDeviceID
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) pointingDeviceSerialNumber - (NSUInteger) pointingDeviceSerialNumber
{ {
// FIXME // FIXME
return 0; return 0;
@ -1112,13 +1112,13 @@ static const char *eventTypes[] = {
return 0.0; return 0.0;
} }
- (unsigned int) systemTabletID - (NSUInteger) systemTabletID
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) tabletID - (NSUInteger) tabletID
{ {
// FIXME // FIXME
return 0; return 0;
@ -1148,13 +1148,13 @@ static const char *eventTypes[] = {
return nil; return nil;
} }
- (unsigned int) vendorID - (NSUInteger) vendorID
{ {
// FIXME // FIXME
return 0; return 0;
} }
- (unsigned int) vendorPointingDeviceType - (NSUInteger) vendorPointingDeviceType
{ {
// FIXME // FIXME
return 0; return 0;

2
Source/NSInputManager.m
View file

@ -496,7 +496,7 @@ static NSInputManager *currentInputManager = nil;
NSString *characters = [theEvent characters]; NSString *characters = [theEvent characters];
NSString *unmodifiedCharacters = [theEvent charactersIgnoringModifiers]; NSString *unmodifiedCharacters = [theEvent charactersIgnoringModifiers];
unichar character = 0; unichar character = 0;
unsigned flags = [theEvent modifierFlags] & (NSShiftKeyMask NSUInteger flags = [theEvent modifierFlags] & (NSShiftKeyMask
| NSAlternateKeyMask | NSAlternateKeyMask
| NSControlKeyMask | NSControlKeyMask
| NSNumericPadKeyMask); | NSNumericPadKeyMask);

28
Source/NSMatrix.m
View file

@ -198,7 +198,7 @@ enum {
/* Class variables */ /* Class variables */
static Class defaultCellClass = nil; static Class defaultCellClass = nil;
static int mouseDownFlags = 0; static NSUInteger mouseDownFlags = 0;
static SEL copySel; static SEL copySel;
static SEL initSel; static SEL initSel;
static SEL allocSel; static SEL allocSel;
@ -2248,7 +2248,7 @@ static SEL getSel;
NSPoint mouseLocation; NSPoint mouseLocation;
NSRect mouseCellFrame; NSRect mouseCellFrame;
NSCell *originallySelectedCell = _selectedCell; NSCell *originallySelectedCell = _selectedCell;
unsigned eventMask = NSLeftMouseUpMask | NSLeftMouseDownMask NSUInteger eventMask = NSLeftMouseUpMask | NSLeftMouseDownMask
| NSMouseMovedMask | NSLeftMouseDraggedMask; | NSMouseMovedMask | NSLeftMouseDraggedMask;
while (!mouseUp) while (!mouseUp)
@ -2368,7 +2368,7 @@ static SEL getSel;
id mouseCell, previousCell = nil; id mouseCell, previousCell = nil;
BOOL onCell; BOOL onCell;
BOOL isSelecting = YES; BOOL isSelecting = YES;
unsigned eventMask = NSLeftMouseUpMask | NSLeftMouseDownMask NSUInteger eventMask = NSLeftMouseUpMask | NSLeftMouseDownMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSMouseMovedMask | NSLeftMouseDraggedMask
| NSPeriodicMask; | NSPeriodicMask;
@ -2592,10 +2592,10 @@ static SEL getSel;
*/ */
- (BOOL) performKeyEquivalent: (NSEvent*)theEvent - (BOOL) performKeyEquivalent: (NSEvent*)theEvent
{ {
NSString *keyEquivalent = [theEvent charactersIgnoringModifiers]; NSString *keyEquivalent = [theEvent charactersIgnoringModifiers];
unsigned int modifiers = [theEvent modifierFlags]; NSUInteger modifiers = [theEvent modifierFlags];
int i; int i;
unsigned int relevantModifiersMask = NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask; NSUInteger relevantModifiersMask = NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask;
/* Take shift key into account only for control keys and arrow and function keys */ /* Take shift key into account only for control keys and arrow and function keys */
if ((modifiers & NSFunctionKeyMask) if ((modifiers & NSFunctionKeyMask)
@ -2607,19 +2607,19 @@ static SEL getSel;
for (i = 0; i < _numRows; i++) for (i = 0; i < _numRows; i++)
{ {
int j; int j;
for (j = 0; j < _numCols; j++) for (j = 0; j < _numCols; j++)
{ {
NSCell *aCell = _cells[i][j]; NSCell *aCell = _cells[i][j];
unsigned int mask = 0; NSUInteger mask = 0;
if ([aCell respondsToSelector:@selector(keyEquivalentModifierMask)]) if ([aCell respondsToSelector:@selector(keyEquivalentModifierMask)])
mask = [(NSButtonCell *)aCell keyEquivalentModifierMask]; mask = [(NSButtonCell *)aCell keyEquivalentModifierMask];
if ([aCell isEnabled] if ([aCell isEnabled]
&& [[aCell keyEquivalent] isEqualToString: keyEquivalent] && [[aCell keyEquivalent] isEqualToString: keyEquivalent]
&& (mask & relevantModifiersMask) == (modifiers & relevantModifiersMask)) && (mask & relevantModifiersMask) == (modifiers & relevantModifiersMask))
{ {
NSCell *oldSelectedCell = _selectedCell; NSCell *oldSelectedCell = _selectedCell;
int oldSelectedRow = _selectedRow; int oldSelectedRow = _selectedRow;
@ -3685,7 +3685,7 @@ static SEL getSel;
- (void) keyDown: (NSEvent *)theEvent - (void) keyDown: (NSEvent *)theEvent
{ {
NSString *characters = [theEvent characters]; NSString *characters = [theEvent characters];
unsigned modifiers = [theEvent modifierFlags]; NSUInteger modifiers = [theEvent modifierFlags];
unichar character = 0; unichar character = 0;
if ([characters length] > 0) if ([characters length] > 0)

2
Source/NSMenuView.m
View file

@ -1445,7 +1445,7 @@ static NSMapTable *viewInfo = 0;
- (BOOL) _trackWithEvent: (NSEvent*)event - (BOOL) _trackWithEvent: (NSEvent*)event
startingMenuView: (NSMenuView*)mainWindowMenuView startingMenuView: (NSMenuView*)mainWindowMenuView
{ {
unsigned eventMask = NSPeriodicMask; NSUInteger eventMask = NSPeriodicMask;
NSDate *theDistantFuture = [NSDate distantFuture]; NSDate *theDistantFuture = [NSDate distantFuture];
NSPoint lastLocation = {0,0}; NSPoint lastLocation = {0,0};
BOOL justAttachedNewSubmenu = NO; BOOL justAttachedNewSubmenu = NO;

2
Source/NSRulerMarker.m
View file

@ -224,7 +224,7 @@
{ {
NSView *client = [_rulerView clientView]; NSView *client = [_rulerView clientView];
NSEvent *newEvent = nil; NSEvent *newEvent = nil;
int eventMask = NSLeftMouseDraggedMask | NSLeftMouseUpMask; NSUInteger eventMask = NSLeftMouseDraggedMask | NSLeftMouseUpMask;
BOOL isFar = NO; BOOL isFar = NO;
BOOL askedCanRemove = NO; BOOL askedCanRemove = NO;
BOOL canRemove = NO; BOOL canRemove = NO;

4
Source/NSScroller.m
View file

@ -849,7 +849,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
- (void) trackKnob: (NSEvent*)theEvent - (void) trackKnob: (NSEvent*)theEvent
{ {
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSFlagsChangedMask; | NSLeftMouseDraggedMask | NSFlagsChangedMask;
NSPoint point; NSPoint point;
float lastPosition; float lastPosition;
@ -860,7 +860,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
NSEvent *presentEvent = theEvent; NSEvent *presentEvent = theEvent;
NSEventType eventType = [theEvent type]; NSEventType eventType = [theEvent type];
NSRect knobRect; NSRect knobRect;
unsigned flags = [theEvent modifierFlags]; NSUInteger flags = [theEvent modifierFlags];
knobRect = [self rectForPart: NSScrollerKnob]; knobRect = [self rectForPart: NSScrollerKnob];

2
Source/NSSlider.m
View file

@ -271,7 +271,7 @@ static Class cellClass;
double min = [_cell minValue]; double min = [_cell minValue];
double max = [_cell maxValue]; double max = [_cell maxValue];
double altValue = [_cell altIncrementValue]; double altValue = [_cell altIncrementValue];
int alt_down = ([ev modifierFlags] & NSAlternateKeyMask); NSUInteger alt_down = ([ev modifierFlags] & NSAlternateKeyMask);
BOOL only_ticks = [_cell allowsTickMarkValuesOnly]; BOOL only_ticks = [_cell allowsTickMarkValuesOnly];
BOOL valueChanged = NO; BOOL valueChanged = NO;
double diff; double diff;

2
Source/NSSliderCell.m
View file

@ -811,7 +811,7 @@ float _floatValueForMousePoint (NSPoint point, NSRect knobRect,
float interval; float interval;
id target = [self target]; id target = [self target];
SEL action = [self action]; SEL action = [self action];
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSMouseMovedMask; | NSLeftMouseDraggedMask | NSMouseMovedMask;
NSEventType eventType = [theEvent type]; NSEventType eventType = [theEvent type];
BOOL isContinuous = [self isContinuous]; BOOL isContinuous = [self isContinuous];

12
Source/NSTableHeaderView.m
View file

@ -274,14 +274,14 @@
float p; float p;
NSEvent *e; NSEvent *e;
BOOL lit; BOOL lit;
unsigned int eventMask; NSUInteger eventMask;
BOOL liveResize; BOOL liveResize;
/* Width of the highlighted area. */ /* Width of the highlighted area. */
const float divWidth = 4; const float divWidth = 4;
/* Coordinates of visible part of table */ /* Coordinates of visible part of table */
float minVisCoord = NSMinX([self visibleRect]); CGFloat minVisCoord = NSMinX([self visibleRect]);
float maxVisCoord = NSMaxX([self visibleRect]); CGFloat maxVisCoord = NSMaxX([self visibleRect]);
NSPoint unconverted = [event locationInWindow]; NSPoint unconverted = [event locationInWindow];
NSArray *columns = [_tableView tableColumns]; NSArray *columns = [_tableView tableColumns];
@ -463,10 +463,10 @@
float *_cO; float *_cO;
float *_cO_minus1; float *_cO_minus1;
int numberOfColumns = [_tableView numberOfColumns]; int numberOfColumns = [_tableView numberOfColumns];
unsigned int eventMask = (NSLeftMouseUpMask NSUInteger eventMask = (NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSLeftMouseDraggedMask
| NSPeriodicMask); | NSPeriodicMask);
unsigned int modifiers = [event modifierFlags]; NSUInteger modifiers = [event modifierFlags];
NSEvent *e; NSEvent *e;
NSDate *distantFuture = [NSDate distantFuture]; NSDate *distantFuture = [NSDate distantFuture];
NSRect visibleRect = [self visibleRect]; NSRect visibleRect = [self visibleRect];
@ -719,7 +719,7 @@
{ {
NSRect cellFrame = [self headerRectOfColumn: columnIndex]; NSRect cellFrame = [self headerRectOfColumn: columnIndex];
NSApplication *theApp = [NSApplication sharedApplication]; NSApplication *theApp = [NSApplication sharedApplication];
unsigned int modifiers = [event modifierFlags]; NSUInteger modifiers = [event modifierFlags];
NSPoint location = [event locationInWindow]; NSPoint location = [event locationInWindow];
NSPoint point = [self convertPoint: location fromView: nil]; NSPoint point = [self convertPoint: location fromView: nil];

8
Source/NSTableView.m
View file

@ -3616,8 +3616,8 @@ if (currentRow >= 0 && currentRow < _numberOfRows) \
} while (0); } while (0);
// Selection // Selection
unsigned int modifiers = [theEvent modifierFlags]; NSUInteger modifiers = [theEvent modifierFlags];
unsigned int eventMask = (NSLeftMouseUpMask NSUInteger eventMask = (NSLeftMouseUpMask
| NSLeftMouseDownMask | NSLeftMouseDownMask
| NSLeftMouseDraggedMask | NSLeftMouseDraggedMask
| NSPeriodicMask); | NSPeriodicMask);
@ -3635,8 +3635,8 @@ if (currentRow >= 0 && currentRow < _numberOfRows) \
BOOL dragOperationPossible = [self _isDraggingSource]; BOOL dragOperationPossible = [self _isDraggingSource];
NSRect visibleRect = [self convertRect: [self visibleRect] NSRect visibleRect = [self convertRect: [self visibleRect]
toView: nil]; toView: nil];
float minYVisible = NSMinY (visibleRect); CGFloat minYVisible = NSMinY (visibleRect);
float maxYVisible = NSMaxY (visibleRect); CGFloat maxYVisible = NSMaxY (visibleRect);
float oldPeriod = 0; float oldPeriod = 0;
int originalRow = _clickedRow; int originalRow = _clickedRow;
int oldRow = -1; int oldRow = -1;