gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge Source/NSEvent.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38725 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-30 22:01:18 +00:00
parent 94b64d8f6b
commit b70ec16e6c
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Source/NSEvent.m
View file

@ -289,7 +289,7 @@ static Class eventClass;
if ([dict objectForKey: timerKey])
[NSException raise: NSInternalInconsistencyException
format: @"Periodic events are already being generated for "
@"this thread %x", GSCurrentThread()];
@"this thread %p", GSCurrentThread()];
/*
* Register a timer that will fire in delaySeconds.
@ -609,25 +609,26 @@ static const char *eventTypes[] = {
case NSRightMouseDown:
case NSRightMouseUp:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d, dpsContext = %p,"
@" event number = %d, click = %d, pressure = %f",
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld, dpsContext = %p,"
@" event number = %ld, click = %ld, pressure = %f",
eventTypes[event_type], location_point.x, location_point.y,
modifier_flags, event_time, window_num, event_context,
event_data.mouse.event_num, event_data.mouse.click,
(unsigned long) modifier_flags, event_time, (long) window_num,
event_context, (long int) event_data.mouse.event_num,
(long int) event_data.mouse.click,
event_data.mouse.pressure];
break;
case NSMouseEntered:
case NSMouseExited:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d, dpsContext = %p, "
@" event number = %d, tracking number = %d, user data = %p",
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld, dpsContext = %p, "
@" event number = %ld, tracking number = %ld, user data = %p",
eventTypes[event_type], location_point.x, location_point.y,
modifier_flags, event_time, window_num, event_context,
event_data.tracking.event_num,
event_data.tracking.tracking_num,
(unsigned long) modifier_flags, event_time, (long) window_num, event_context,
(long) event_data.tracking.event_num,
(long) event_data.tracking.tracking_num,
event_data.tracking.user_data];
break;
@ -635,11 +636,11 @@ static const char *eventTypes[] = {
case NSKeyUp:
case NSFlagsChanged:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d, dpsContext = %p, "
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld, dpsContext = %p, "
@" repeat = %s, keys = %@, ukeys = %@, keyCode = 0x%x",
eventTypes[event_type], location_point.x, location_point.y,
modifier_flags, event_time, window_num, event_context,
(unsigned long) modifier_flags, event_time, (long) window_num, event_context,
(event_data.key.repeat ? "YES" : "NO"),
event_data.key.char_keys, event_data.key.unmodified_keys,
event_data.key.key_code];
@ -651,13 +652,13 @@ static const char *eventTypes[] = {
case NSSystemDefined:
case NSApplicationDefined:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d, dpsContext = %p, "
@" subtype = %d, data1 = %p, data2 = %p",
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld, dpsContext = %p, "
@" subtype = %d, data1 = %lx, data2 = %lx",
eventTypes[event_type], location_point.x, location_point.y,
modifier_flags, event_time, window_num, event_context,
event_data.misc.sub_type, event_data.misc.data1,
event_data.misc.data2];
(unsigned long) modifier_flags, event_time, (long) window_num, event_context,
event_data.misc.sub_type, (long) event_data.misc.data1,
(long) event_data.misc.data2];
break;
case NSScrollWheel:
@ -666,14 +667,14 @@ static const char *eventTypes[] = {
case NSOtherMouseDragged:
case NSRightMouseDragged:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d, dpsContext = %p,"
@" event number = %d, click = %d, pressure = %f"
@" button = %d, deltaX = %f, deltaY = %f, deltaZ = %f",
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld, dpsContext = %p,"
@" event number = %ld, click = %ld, pressure = %f"
@" button = %ld, deltaX = %f, deltaY = %f, deltaZ = %f",
eventTypes[event_type], location_point.x, location_point.y,
modifier_flags, event_time, window_num, event_context,
event_data.mouse.event_num, event_data.mouse.click,
event_data.mouse.pressure, event_data.mouse.button,
(unsigned long) modifier_flags, event_time, (long) window_num, event_context,
(long ) event_data.mouse.event_num, (long) event_data.mouse.click,
event_data.mouse.pressure, (long) event_data.mouse.button,
event_data.mouse.deltaX,
event_data.mouse.deltaY,
event_data.mouse.deltaZ];
@ -686,10 +687,10 @@ static const char *eventTypes[] = {
default:
return [NSString stringWithFormat:
@"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %u,"
@" time = %f, window = %d",
@"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %lu,"
@" time = %f, window = %ld",
location_point.x, location_point.y,
modifier_flags, event_time, window_num];
(unsigned long) modifier_flags, event_time, (long) window_num];
break;
}