gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert X event millisecond timestamp to NSEvent second timestamp.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@26634 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-06-12 19:55:09 +00:00
parent 250ebdfad0
commit 4e04ca9ea8
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerEvent.m,
* Source/x11/XGDragView.m: Convert X event millisecond timestamp
to NSEvent second timestamp.
2008-05-25 Adam Fedor <fedor@gnu.org>
* Revert library license version to 2 until applications

6
Source/x11/XGDragView.m
View file

@ -271,13 +271,13 @@ static XGDragView *sharedDragView = nil;
{
// FIXME There is an xdnd extension for root drop
}
xdnd_send_drop(&dnd, dWindowNumber, dragWindev->ident, CurrentTime);
xdnd_send_drop(&dnd, dWindowNumber, dragWindev->ident, time * 1000);
break;
case GSAppKitDraggingUpdate:
xdnd_send_position(&dnd, dWindowNumber, dragWindev->ident,
GSActionForDragOperation(dragMask & operationMask),
XX(newPosition), XY(newPosition), CurrentTime);
XX(newPosition), XY(newPosition), time * 1000);
break;
case GSAppKitDraggingEnter:
@ -289,7 +289,7 @@ static XGDragView *sharedDragView = nil;
xdnd_send_enter(&dnd, dWindowNumber, dragWindev->ident, typelist);
xdnd_send_position(&dnd, dWindowNumber, dragWindev->ident,
GSActionForDragOperation (dragMask & operationMask),
XX(dragPosition), XY(dragPosition), CurrentTime);
XX(dragPosition), XY(dragPosition), time * 1000);
break;
case GSAppKitDraggingExit:

26
Source/x11/XGServerEvent.m
View file

@ -451,7 +451,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent mouseEventWithType: eventType
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)generic.lastClick
timestamp: (NSTimeInterval)generic.lastClick / 1000.0
windowNumber: cWin->number
context: gcontext
eventNumber: xEvent.xbutton.serial
@ -496,7 +496,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent mouseEventWithType: eventType
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)generic.lastTime
timestamp: (NSTimeInterval)generic.lastTime / 1000.0
windowNumber: cWin->number
context: gcontext
eventNumber: xEvent.xbutton.serial
@ -640,7 +640,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent otherEventWithType: NSAppKitDefined
location: eventLocation
modifierFlags: 0
timestamp: time
timestamp: time / 1000.0
windowNumber: cWin->number
context: gcontext
subtype: GSAppKitDraggingUpdate
@ -715,7 +715,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent otherEventWithType: NSAppKitDefined
location: eventLocation
modifierFlags: 0
timestamp: time
timestamp: time / 1000.0
windowNumber: cWin->number
context: gcontext
subtype: GSAppKitDraggingDrop
@ -835,7 +835,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent otherEventWithType: NSAppKitDefined
location: n.origin
modifierFlags: eventFlags
timestamp: ts
timestamp: ts / 1000.0
windowNumber: cWin->number
context: gcontext
subtype: GSAppKitWindowResized
@ -851,7 +851,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent otherEventWithType: NSAppKitDefined
location: eventLocation
modifierFlags: eventFlags
timestamp: ts
timestamp: ts / 1000.0
windowNumber: cWin->number
context: gcontext
subtype: GSAppKitWindowMoved
@ -960,7 +960,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent otherEventWithType: NSAppKitDefined
location: rect.origin
modifierFlags: eventFlags
timestamp: ts
timestamp: ts / 1000.0
windowNumber: cWin->number
context: gcontext
subtype: GSAppKitRegionExposed
@ -1285,7 +1285,7 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
e = [NSEvent mouseEventWithType: eventType
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)generic.lastTime
timestamp: (NSTimeInterval)generic.lastTime / 1000.0
windowNumber: cWin->number
context: gcontext
eventNumber: xEvent.xbutton.serial
@ -1946,7 +1946,7 @@ process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType,
event = [NSEvent keyEventWithType: NSKeyDown
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)xEvent->xkey.time
timestamp: (NSTimeInterval)xEvent->xkey.time / 1000.0
windowNumber: window->number
context: GSCurrentContext()
characters: keys
@ -1957,7 +1957,7 @@ process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType,
event = [NSEvent keyEventWithType: NSFlagsChanged
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)xEvent->xkey.time
timestamp: (NSTimeInterval)xEvent->xkey.time / 1000.0
windowNumber: window->number
context: GSCurrentContext()
characters: keys
@ -1971,7 +1971,7 @@ process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType,
event = [NSEvent keyEventWithType: NSFlagsChanged
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)xEvent->xkey.time
timestamp: (NSTimeInterval)xEvent->xkey.time / 1000.0
windowNumber: window->number
context: GSCurrentContext()
characters: keys
@ -1982,7 +1982,7 @@ process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType,
event = [NSEvent keyEventWithType: NSKeyUp
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)xEvent->xkey.time
timestamp: (NSTimeInterval)xEvent->xkey.time / 1000.0
windowNumber: window->number
context: GSCurrentContext()
characters: keys
@ -2020,7 +2020,7 @@ process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType,
event = [NSEvent keyEventWithType: eventType
location: eventLocation
modifierFlags: eventFlags
timestamp: (NSTimeInterval)xEvent->xkey.time
timestamp: (NSTimeInterval)xEvent->xkey.time / 1000.0
windowNumber: window->number
context: GSCurrentContext()
characters: keys