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

xfree86: purge SendDragEvents support. 

From the documentation:
"This is mainly to allow a touch screen to be used with netscape and other
browsers which do strange things if the mouse moves between button down and
button up."

CLOSED - NOTOURBUG

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2010-07-22 10:24:02 +10:00
parent 7defd282be
commit 11ed32b62c
4 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xfree86/common/xf86Xinput.c
View File

@ -272,17 +272,6 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
} }
} }
static Bool
xf86SendDragEvents(DeviceIntPtr device)
{
LocalDevicePtr local = (LocalDevicePtr) device->public.devicePrivate;
if (device->button && device->button->buttonsDown > 0)
return local->flags & XI86_SEND_DRAG_EVENTS;
else
return TRUE;
}
/*********************************************************************** /***********************************************************************
* *
* xf86ProcessCommonOptions -- * xf86ProcessCommonOptions --
@ -305,12 +294,6 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name); xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name);
} }
if (xf86SetBoolOption(list, "SendDragEvents", 1)) {
local->flags |= XI86_SEND_DRAG_EVENTS;
} else {
xf86Msg(X_CONFIG, "%s: doesn't report drag events\n", local->name);
}
/* Backwards compatibility. */ /* Backwards compatibility. */
local->history_size = GetMotionHistorySize(); local->history_size = GetMotionHistorySize();
} }
@ -994,7 +977,6 @@ xf86PostMotionEventP(DeviceIntPtr device,
int *valuators) int *valuators)
{ {
int i = 0, nevents = 0; int i = 0, nevents = 0;
Bool drag = xf86SendDragEvents(device);
DeviceEvent *event; DeviceEvent *event;
int flags = 0; int flags = 0;
@ -1041,12 +1023,7 @@ xf86PostMotionEventP(DeviceIntPtr device,
for (i = 0; i < nevents; i++) { for (i = 0; i < nevents; i++) {
event = (DeviceEvent*)((xf86Events + i)->event); event = (DeviceEvent*)((xf86Events + i)->event);
/* Don't post core motion events for devices not registered to send mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
* drag events. */
if (event->header == ET_Internal &&
(event->type != ET_Motion || drag)) {
mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
} }
} }

8
hw/xfree86/common/xf86Xinput.h
View File

@ -62,14 +62,6 @@
#define XI86_ALWAYS_CORE 0x04 /* device always controls the pointer */ #define XI86_ALWAYS_CORE 0x04 /* device always controls the pointer */
/* the device sends Xinput and core pointer events */ /* the device sends Xinput and core pointer events */
#define XI86_SEND_CORE_EVENTS XI86_ALWAYS_CORE #define XI86_SEND_CORE_EVENTS XI86_ALWAYS_CORE
/* if the device is the core pointer or is sending core events, and
* SEND_DRAG_EVENTS is false, and a buttons is done, then no motion events
* (mouse drag action) are sent. This is mainly to allow a touch screen to be
* used with netscape and other browsers which do strange things if the mouse
* moves between button down and button up. With a touch screen, this motion
* is common due to the user's finger moving slightly.
*/
#define XI86_SEND_DRAG_EVENTS 0x08
#define XI_PRIVATE(dev) \ #define XI_PRIVATE(dev) \
(((LocalDevicePtr)((dev)->public.devicePrivate))->private) (((LocalDevicePtr)((dev)->public.devicePrivate))->private)

1
hw/xfree86/doc/devel/Registry
View File

@ -253,7 +253,6 @@ ReportDelay I I ??
ReportingMode S I may be "raw" or "scaled" ReportingMode S I may be "raw" or "scaled"
ScreenNumber I I Screen number (for touch screen) ScreenNumber I I Screen number (for touch screen)
SendCoreEvents B I Send core events SendCoreEvents B I Send core events
SendDragEvents B I Send drag events
StopBits I I Serial port stop bits StopBits I I Serial port stop bits
SwapXY B I Swap the X and Y axes SwapXY B I Swap the X and Y axes
UntouchDelay I I ?? UntouchDelay I I ??

3
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -944,9 +944,6 @@ default. Devices with
disabled will be \*qfloating\*q and only accessible by clients employing the disabled will be \*qfloating\*q and only accessible by clients employing the
X Input extension. This option controls the startup behavior only, a device X Input extension. This option controls the startup behavior only, a device
may be reattached or set floating at runtime. may be reattached or set floating at runtime.
.TP 7
.BI "Option \*qSendDragEvents\*q \*q" boolean \*q
Send core events while dragging. Enabled by default.
.PP .PP
For pointing devices, the following options control how the pointer For pointing devices, the following options control how the pointer
is accelerated or decelerated with respect to physical device motion. Most of is accelerated or decelerated with respect to physical device motion. Most of