hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor

Browse source 
(cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
(cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
This commit is contained in:
Jeremy Huddleston 2008-09-03 09:11:25 -07:00
commit 46168b3b40
4 changed files with 83 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/xquartz/darwinEvents.c
View file

@ -70,7 +70,7 @@ in this Software without prior written authorization from The Open Group.
/* These values were chosen to match the output of xinput under Linux */
#define SCALEFACTOR_TILT 64.0
#define SCALEFACTOR_PRESSURE 1000.0
#define SCALEFACTOR_PRESSURE 1023.0
#define _APPLEWM_SERVER_
#include "applewmExt.h"
@ -416,7 +416,7 @@ void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int poin
if (pressure == 0 && tilt_x == 0 && tilt_y == 0)
dev = darwinPointer;
else
dev = darwinTablet;
dev = darwinTabletCurrent;
screen = miPointerGetScreen(dev);
if(!screen) {
@ -459,7 +459,7 @@ void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int poin
DarwinPrepareValuators(valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
darwinEvents_lock(); {
num_events = GetPointerEvents(darwinEvents, dev, ev_type, ev_button,
POINTER_ABSOLUTE, 0, dev==darwinTablet?5:2, valuators);
POINTER_ABSOLUTE, 0, dev==darwinTabletCurrent?5:2, valuators);
for(i=0; i<num_events; i++) mieqEnqueue (dev, &darwinEvents[i]);
DarwinPokeEQ();
} darwinEvents_unlock();
@ -496,7 +496,7 @@ void DarwinSendKeyboardEvents(int ev_type, int keycode) {
void DarwinSendProximityEvents(int ev_type, int pointer_x, int pointer_y) {
int i, num_events;
ScreenPtr screen;
DeviceIntPtr dev = darwinTablet;
DeviceIntPtr dev = darwinTabletCurrent;
int valuators[5];
DEBUG_LOG("DarwinSendProximityEvents(%d, %d, %d)\n", ev_type, pointer_x, pointer_y);