fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-04 23:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Fixed proximity logic errors for tablets.

Browse source
This commit is contained in:
Jeremy Huddleston 2008-09-04 08:55:22 -07:00
parent 4904e04ce6
commit d942849f24
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hw/xquartz/X11Application.m
View file

@ -906,7 +906,7 @@ extern int darwin_modifier_flags; // darwinEvents.c
tilt_y = [e tilt].y;
}
if([e subtype] != NSTabletProximityEventSubtype) {
if([e subtype] == NSTabletProximityEventSubtype) {
switch([e pointingDeviceType]) {
case NSEraserPointingDevice:
darwinTabletCurrent=darwinTabletEraser;
@ -931,21 +931,19 @@ extern int darwin_modifier_flags; // darwinEvents.c
break;
case NSTabletProximity:
if([e subtype] != NSTabletProximityEventSubtype) {
switch([e pointingDeviceType]) {
case NSEraserPointingDevice:
darwinTabletCurrent=darwinTabletEraser;
break;
case NSPenPointingDevice:
darwinTabletCurrent=darwinTabletStylus;
break;
case NSCursorPointingDevice:
case NSUnknownPointingDevice:
default:
darwinTabletCurrent=darwinTabletCursor;
break;
}
}
switch([e pointingDeviceType]) {
case NSEraserPointingDevice:
darwinTabletCurrent=darwinTabletEraser;
break;
case NSPenPointingDevice:
darwinTabletCurrent=darwinTabletStylus;
break;
case NSCursorPointingDevice:
case NSUnknownPointingDevice:
default:
darwinTabletCurrent=darwinTabletCursor;
break;
}
DarwinSendProximityEvents([e isEnteringProximity]?ProximityIn:ProximityOut,
pointer_x, pointer_y);