Update to tk 8.5.19
This commit is contained in:
Zachary Ware
@@ -26,7 +26,7 @@ typedef struct {
|
||||
|
||||
static int GenerateButtonEvent(MouseEventData *medPtr);
|
||||
static unsigned int ButtonModifiers2State(UInt32 buttonState,
|
||||
UInt32 keyModifiers);
|
||||
UInt32 keyModifiers);
|
||||
|
||||
#pragma mark TKApplication(TKMouseEvent)
|
||||
|
||||
@@ -34,37 +34,50 @@ enum {
|
||||
NSWindowWillMoveEventType = 20
|
||||
};
|
||||
|
||||
/*
|
||||
* In OS X 10.6 an NSEvent of type NSMouseMoved would always have a non-Nil
|
||||
* window attribute pointing to the active window. As of 10.8 this behavior
|
||||
* had changed. The new behavior was that if the mouse were ever moved outside
|
||||
* of a window, all subsequent NSMouseMoved NSEvents would have a Nil window
|
||||
* attribute. To work around this the TKApplication remembers the last non-Nil
|
||||
* window that it received in a mouse event. If it receives an NSEvent with a
|
||||
* Nil window attribute then the saved window is used.
|
||||
*/
|
||||
|
||||
@implementation TKApplication(TKMouseEvent)
|
||||
- (NSEvent *)tkProcessMouseEvent:(NSEvent *)theEvent {
|
||||
#ifdef TK_MAC_DEBUG_EVENTS
|
||||
TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
|
||||
#endif
|
||||
id win;
|
||||
NSEventType type = [theEvent type];
|
||||
NSWindow* eventWindow = [theEvent window];
|
||||
NSEventType eventType = [theEvent type];
|
||||
#if 0
|
||||
NSTrackingArea *trackingArea = nil;
|
||||
NSInteger eventNumber, clickCount, buttonNumber;
|
||||
#endif
|
||||
|
||||
switch (type) {
|
||||
switch (eventType) {
|
||||
case NSMouseEntered:
|
||||
/* Remember which window has the mouse. */
|
||||
if (_windowWithMouse) {
|
||||
[_windowWithMouse release];
|
||||
}
|
||||
_windowWithMouse = [theEvent window];
|
||||
if (_windowWithMouse) {
|
||||
[_windowWithMouse retain];
|
||||
}
|
||||
break;
|
||||
case NSMouseExited:
|
||||
case NSCursorUpdate:
|
||||
#if 0
|
||||
trackingArea = [theEvent trackingArea];
|
||||
#endif
|
||||
/* fall through */
|
||||
case NSLeftMouseDown:
|
||||
case NSLeftMouseUp:
|
||||
case NSRightMouseDown:
|
||||
case NSRightMouseUp:
|
||||
case NSOtherMouseDown:
|
||||
case NSOtherMouseUp:
|
||||
|
||||
case NSLeftMouseDragged:
|
||||
case NSRightMouseDragged:
|
||||
case NSOtherMouseDragged:
|
||||
|
||||
case NSMouseMoved:
|
||||
#if 0
|
||||
eventNumber = [theEvent eventNumber];
|
||||
@@ -73,45 +86,52 @@ enum {
|
||||
buttonNumber = [theEvent buttonNumber];
|
||||
}
|
||||
#endif
|
||||
|
||||
case NSTabletPoint:
|
||||
case NSTabletProximity:
|
||||
|
||||
case NSScrollWheel:
|
||||
win = [self windowWithWindowNumber:[theEvent windowNumber]];
|
||||
break;
|
||||
|
||||
default:
|
||||
default: /* Unrecognized mouse event. */
|
||||
return theEvent;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Remember the window in case we need it next time. */
|
||||
if (eventWindow && eventWindow != _windowWithMouse) {
|
||||
if (_windowWithMouse) {
|
||||
[_windowWithMouse release];
|
||||
}
|
||||
_windowWithMouse = eventWindow;
|
||||
[_windowWithMouse retain];
|
||||
}
|
||||
|
||||
/* Create an Xevent to add to the Tk queue. */
|
||||
NSPoint global, local = [theEvent locationInWindow];
|
||||
if (win) {
|
||||
global = [win convertBaseToScreen:local];
|
||||
local.y = [win frame].size.height - local.y;
|
||||
if (eventWindow) { /* local will be in window coordinates. */
|
||||
global = [eventWindow convertPointToScreen: local];
|
||||
local.y = [eventWindow frame].size.height - local.y;
|
||||
global.y = tkMacOSXZeroScreenHeight - global.y;
|
||||
} else {
|
||||
local.y = tkMacOSXZeroScreenHeight - local.y;
|
||||
global = local;
|
||||
} else { /* local will be in screen coordinates. */
|
||||
if (_windowWithMouse ) {
|
||||
eventWindow = _windowWithMouse;
|
||||
global = local;
|
||||
local = [eventWindow convertPointFromScreen: local];
|
||||
local.y = [eventWindow frame].size.height - local.y;
|
||||
global.y = tkMacOSXZeroScreenHeight - global.y;
|
||||
} else { /* We have no window. Use the screen???*/
|
||||
local.y = tkMacOSXZeroScreenHeight - local.y;
|
||||
global = local;
|
||||
}
|
||||
}
|
||||
|
||||
Window window = TkMacOSXGetXWindow(win);
|
||||
Window window = TkMacOSXGetXWindow(eventWindow);
|
||||
Tk_Window tkwin = window ? Tk_IdToWindow(TkGetDisplayList()->display,
|
||||
window) : NULL;
|
||||
if (!tkwin) {
|
||||
tkwin = TkMacOSXGetCapture();
|
||||
}
|
||||
if (!tkwin) {
|
||||
return theEvent;
|
||||
return theEvent; /* Give up. No window for this event. */
|
||||
}
|
||||
|
||||
/*
|
||||
MacDrawable *macWin = (MacDrawable *) window;
|
||||
NSView *view = TkMacOSXDrawableView(macWin);
|
||||
local = [view convertPoint:local fromView:nil];
|
||||
local.y = NSHeight([view bounds]) - local.y;
|
||||
*/
|
||||
TkWindow *winPtr = (TkWindow *) tkwin;
|
||||
local.x -= winPtr->wmInfoPtr->xInParent;
|
||||
local.y -= winPtr->wmInfoPtr->yInParent;
|
||||
@@ -130,7 +150,7 @@ enum {
|
||||
state |= (buttons & ((1<<5) - 1)) << 8;
|
||||
} else {
|
||||
if (button < 5) {
|
||||
switch (type) {
|
||||
switch (eventType) {
|
||||
case NSLeftMouseDown:
|
||||
case NSRightMouseDown:
|
||||
case NSLeftMouseDragged:
|
||||
@@ -167,12 +187,12 @@ enum {
|
||||
state |= Mod4Mask;
|
||||
}
|
||||
|
||||
if (type != NSScrollWheel) {
|
||||
if (eventType != NSScrollWheel) {
|
||||
#ifdef TK_MAC_DEBUG_EVENTS
|
||||
TKLog(@"UpdatePointer %p x %f.0 y %f.0 %d", tkwin, global.x, global.y, state);
|
||||
#endif
|
||||
Tk_UpdatePointer(tkwin, global.x, global.y, state);
|
||||
} else {
|
||||
} else { /* handle scroll wheel event */
|
||||
CGFloat delta;
|
||||
int coarseDelta;
|
||||
XEvent xEvent;
|
||||
@@ -188,7 +208,8 @@ enum {
|
||||
|
||||
delta = [theEvent deltaY];
|
||||
if (delta != 0.0) {
|
||||
coarseDelta = (delta > -1.0 && delta < 1.0) ? (signbit(delta) ? -1 : 1) : lround(delta);
|
||||
coarseDelta = (delta > -1.0 && delta < 1.0) ?
|
||||
(signbit(delta) ? -1 : 1) : lround(delta);
|
||||
xEvent.xbutton.state = state;
|
||||
xEvent.xkey.keycode = coarseDelta;
|
||||
xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
|
||||
@@ -196,14 +217,14 @@ enum {
|
||||
}
|
||||
delta = [theEvent deltaX];
|
||||
if (delta != 0.0) {
|
||||
coarseDelta = (delta > -1.0 && delta < 1.0) ? (signbit(delta) ? -1 : 1) : lround(delta);
|
||||
coarseDelta = (delta > -1.0 && delta < 1.0) ?
|
||||
(signbit(delta) ? -1 : 1) : lround(delta);
|
||||
xEvent.xbutton.state = state | ShiftMask;
|
||||
xEvent.xkey.keycode = coarseDelta;
|
||||
xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
|
||||
Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
|
||||
}
|
||||
}
|
||||
|
||||
return theEvent;
|
||||
}
|
||||
@end
|
||||
@@ -368,7 +389,7 @@ XQueryPointer(
|
||||
if (win) {
|
||||
NSPoint local;
|
||||
|
||||
local = [win convertScreenToBase:global];
|
||||
local = [win convertPointFromScreen:global];
|
||||
local.y = [win frame].size.height - local.y;
|
||||
if (macWin->winPtr && macWin->winPtr->wmInfoPtr) {
|
||||
local.x -= macWin->winPtr->wmInfoPtr->xInParent;
|
||||
@@ -466,7 +487,7 @@ TkGenerateButtonEvent(
|
||||
if (win) {
|
||||
NSPoint local = NSMakePoint(x, tkMacOSXZeroScreenHeight - y);
|
||||
|
||||
local = [win convertScreenToBase:local];
|
||||
local = [win convertPointFromScreen:local];
|
||||
local.y = [win frame].size.height - local.y;
|
||||
if (macWin->winPtr && macWin->winPtr->wmInfoPtr) {
|
||||
local.x -= macWin->winPtr->wmInfoPtr->xInParent;
|
||||
|
||||
Reference in New Issue
Block a user