frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: darwinPointer reports the actual pixel position now rather than a relative position 

(cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82)
This commit is contained in:
Jeremy Huddleston 2008-12-06 14:11:52 -08:00
parent 7ebd0c7e8d
commit ccd2c668c1
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/darwin.c
View File

@ -347,10 +347,10 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
InitPointerDeviceStruct((DevicePtr)pPointer, map, 7, InitPointerDeviceStruct((DevicePtr)pPointer, map, 7,
(PtrCtrlProcPtr)NoopDDA, (PtrCtrlProcPtr)NoopDDA,
GetMotionHistorySize(), 2); GetMotionHistorySize(), 2);
InitAbsoluteClassDeviceStruct(pPointer);
pPointer->valuator->mode = Absolute; // Relative pPointer->valuator->mode = Absolute; // Relative
InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1); InitAbsoluteClassDeviceStruct(pPointer);
InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1); // InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);
// InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);
break; break;
case DEVICE_ON: case DEVICE_ON:
pPointer->public.on = TRUE; pPointer->public.on = TRUE;

33
hw/xquartz/darwinEvents.c
View File

@ -370,7 +370,7 @@ static void DarwinPokeEQ(void) {
* Note: pointer_x and pointer_y are relative to the upper-left of primary * Note: pointer_x and pointer_y are relative to the upper-left of primary
* display. * display.
*/ */
static void DarwinPrepareValuators(int *valuators, ScreenPtr screen, static void DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
float pointer_x, float pointer_y, float pointer_x, float pointer_y,
float pressure, float tilt_x, float tilt_y) { float pressure, float tilt_x, float tilt_y) {
/* Fix offset between darwin and X screens */ /* Fix offset between darwin and X screens */
@ -383,13 +383,20 @@ static void DarwinPrepareValuators(int *valuators, ScreenPtr screen,
if(pointer_y < 0.0) if(pointer_y < 0.0)
pointer_y = 0.0; pointer_y = 0.0;
if(pDev == darwinPointer) {
valuators[0] = pointer_x;
valuators[1] = pointer_y;
valuators[2] = 0;
valuators[3] = 0;
valuators[4] = 0;
} else {
/* Setup our array of values */ /* Setup our array of values */
valuators[0] = pointer_x * XQUARTZ_VALUATOR_LIMIT / (float)screenInfo.screens[0]->width; valuators[0] = XQUARTZ_VALUATOR_LIMIT * (pointer_x / (float)screenInfo.screens[0]->width);
valuators[1] = pointer_y * XQUARTZ_VALUATOR_LIMIT / (float)screenInfo.screens[0]->height; valuators[1] = XQUARTZ_VALUATOR_LIMIT * (pointer_y / (float)screenInfo.screens[0]->height);
valuators[2] = pressure * XQUARTZ_VALUATOR_LIMIT; valuators[2] = XQUARTZ_VALUATOR_LIMIT * pressure;
valuators[3] = tilt_x * XQUARTZ_VALUATOR_LIMIT; valuators[3] = XQUARTZ_VALUATOR_LIMIT * tilt_x;
valuators[4] = tilt_y * XQUARTZ_VALUATOR_LIMIT; valuators[4] = XQUARTZ_VALUATOR_LIMIT * tilt_y;
}
//DEBUG_LOG("Pointer (%f, %f), Valuators: {%d,%d,%d,%d,%d}\n", pointer_x, pointer_y, //DEBUG_LOG("Pointer (%f, %f), Valuators: {%d,%d,%d,%d,%d}\n", pointer_x, pointer_y,
// valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]); // valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]);
} }
@ -446,7 +453,7 @@ void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, floa
darwinFakeMouseButtonDown = 0; darwinFakeMouseButtonDown = 0;
} }
DarwinPrepareValuators(valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y); DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
darwinEvents_lock(); { darwinEvents_lock(); {
num_events = GetPointerEvents(darwinEvents, pDev, ev_type, ev_button, num_events = GetPointerEvents(darwinEvents, pDev, ev_type, ev_button,
POINTER_ABSOLUTE, 0, pDev==darwinTabletCurrent?5:2, valuators); POINTER_ABSOLUTE, 0, pDev==darwinTabletCurrent?5:2, valuators);
@ -473,7 +480,7 @@ void DarwinSendKeyboardEvents(int ev_type, int keycode) {
void DarwinSendProximityEvents(int ev_type, float pointer_x, float pointer_y) { void DarwinSendProximityEvents(int ev_type, float pointer_x, float pointer_y) {
int i, num_events; int i, num_events;
ScreenPtr screen; ScreenPtr screen;
DeviceIntPtr dev = darwinTabletCurrent; DeviceIntPtr pDev = darwinTabletCurrent;
int valuators[5]; int valuators[5];
DEBUG_LOG("DarwinSendProximityEvents(%d, %f, %f)\n", ev_type, pointer_x, pointer_y); DEBUG_LOG("DarwinSendProximityEvents(%d, %f, %f)\n", ev_type, pointer_x, pointer_y);
@ -483,17 +490,17 @@ void DarwinSendProximityEvents(int ev_type, float pointer_x, float pointer_y) {
return; return;
} }
screen = miPointerGetScreen(dev); screen = miPointerGetScreen(pDev);
if(!screen) { if(!screen) {
DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n"); DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");
return; return;
} }
DarwinPrepareValuators(valuators, screen, pointer_x, pointer_y, 0.0f, 0.0f, 0.0f); DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, 0.0f, 0.0f, 0.0f);
darwinEvents_lock(); { darwinEvents_lock(); {
num_events = GetProximityEvents(darwinEvents, dev, ev_type, num_events = GetProximityEvents(darwinEvents, pDev, ev_type,
0, 5, valuators); 0, 5, valuators);
for(i=0; i<num_events; i++) mieqEnqueue (dev,darwinEvents[i].event); for(i=0; i<num_events; i++) mieqEnqueue (pDev,darwinEvents[i].event);
DarwinPokeEQ(); DarwinPokeEQ();
} darwinEvents_unlock(); } darwinEvents_unlock();
} }