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

xfree86/input: re-add support for disabling drag events

This commit is contained in:
Daniel Stone 2006-11-27 22:39:56 +02:00 committed by Daniel Stone
parent f2903c12bb
commit 8884a73a3f
1 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,16 +90,6 @@
#include "mi.h" #include "mi.h"
/******************************************************************************
* debugging macro
*****************************************************************************/
#ifdef DEBUG
static int debug_level = 0;
#define DBG(lvl, f) {if ((lvl) <= debug_level) f;}
#else
#define DBG(lvl, f)
#endif
xEvent *xf86Events = NULL; xEvent *xf86Events = NULL;
static Bool static Bool
@ -140,33 +130,6 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
} }
} }
void
xf86AlwaysCoreControl(DeviceIntPtr pDev, IntegerCtrl *control)
{
}
/***********************************************************************
*
* xf86XinputFinalizeInit --
*
* Create and initialize an integer feedback to control the always
* core feature.
*
***********************************************************************
*/
void
xf86XinputFinalizeInit(DeviceIntPtr dev)
{
LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate;
if (InitIntegerFeedbackClassDeviceStruct(dev, xf86AlwaysCoreControl) == FALSE) {
ErrorF("Unable to init integer feedback for always core feature\n");
} else {
local->always_core_feedback = dev->intfeed;
dev->intfeed->ctrl.integer_displayed = (local->flags & XI86_ALWAYS_CORE) ? 1 : 0;
}
}
/*********************************************************************** /***********************************************************************
* *
* xf86ActivateDevice -- * xf86ActivateDevice --
@ -193,8 +156,6 @@ xf86ActivateDevice(LocalDevicePtr local)
dev->public.devicePrivate = (pointer) local; dev->public.devicePrivate = (pointer) local;
local->dev = dev; local->dev = dev;
xf86XinputFinalizeInit(dev);
dev->coreEvents = local->flags & XI86_ALWAYS_CORE; dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
RegisterOtherDevice(dev); RegisterOtherDevice(dev);
@ -435,9 +396,9 @@ xf86PostMotionEvent(DeviceIntPtr device,
va_list var; va_list var;
int i = 0, nevents = 0; int i = 0, nevents = 0;
Bool drag = xf86SendDragEvents(device); Bool drag = xf86SendDragEvents(device);
LocalDevicePtr local = (LocalDevicePtr) device->public.devicePrivate;
int *valuators = NULL; int *valuators = NULL;
int flags = 0; int flags = 0;
xEvent *xE = NULL;
if (is_absolute) if (is_absolute)
flags = POINTER_ABSOLUTE; flags = POINTER_ABSOLUTE;
@ -460,8 +421,14 @@ xf86PostMotionEvent(DeviceIntPtr device,
flags, first_valuator, num_valuators, flags, first_valuator, num_valuators,
valuators); valuators);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++) {
mieqEnqueue(device, xf86Events + i); xE = xf86Events + i;
/* Don't post core motion events for devices not registered to send
* drag events. */
if (xE->u.u.type != MotionNotify || drag) {
mieqEnqueue(device, xf86Events + i);
}
}
xfree(valuators); xfree(valuators);
} }