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

Merge remote branch 'whot/for-keith'

Browse source
This commit is contained in:
Keith Packard 2010-12-14 15:04:12 -08:00
commit f1542f1d71
3 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/common/xf86Option.c
View file

@ -130,7 +130,7 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
if (defaultOpts) {
XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);
if (pInfo->options)
pInfo->options = xf86optionListMerge(pInfo->options, tmp);
pInfo->options = xf86optionListMerge(tmp, pInfo->options);
else
pInfo->options = tmp;
}

23
hw/xfree86/common/xf86Xinput.c
View file

@ -684,6 +684,7 @@ xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)
pInfo->next = NULL;
xf86CollectInputOptions(pInfo, (const char**)drv->default_options);
xf86OptionListReport(pInfo->options);
xf86ProcessCommonOptions(pInfo, pInfo->options);
}
@ -1015,10 +1016,13 @@ xf86PostMotionEventM(DeviceIntPtr device,
int dx = 0, dy = 0;
#endif
if (is_absolute)
flags = POINTER_ABSOLUTE;
else
flags = POINTER_RELATIVE | POINTER_ACCELERATE;
if (valuator_mask_num_valuators(mask) > 0)
{
if (is_absolute)
flags = POINTER_ABSOLUTE;
else
flags = POINTER_RELATIVE | POINTER_ACCELERATE;
}
#if XFreeXDGA
/* The evdev driver may not always send all axes across. */
@ -1160,10 +1164,13 @@ xf86PostButtonEventM(DeviceIntPtr device,
int index;
#endif
if (is_absolute)
flags = POINTER_ABSOLUTE;
else
flags = POINTER_RELATIVE | POINTER_ACCELERATE;
if (valuator_mask_num_valuators(mask) > 0)
{
if (is_absolute)
flags = POINTER_ABSOLUTE;
else
flags = POINTER_RELATIVE | POINTER_ACCELERATE;
}
#if XFreeXDGA
if (miPointerGetScreen(device)) {