Merge remote branch 'whot/for-keith'
This commit is contained in:
commit
4b3d67a764
|
@ -73,8 +73,11 @@ device_added(struct udev_device *udev_device)
|
|||
goto unwind;
|
||||
|
||||
parent = udev_device_get_parent(udev_device);
|
||||
if (parent)
|
||||
name = udev_device_get_property_value(parent, "NAME");
|
||||
if (parent) {
|
||||
name = udev_device_get_sysattr_value(parent, "name");
|
||||
if (!name)
|
||||
name = udev_device_get_property_value(parent, "NAME");
|
||||
}
|
||||
if (!name)
|
||||
name = "(unnamed)";
|
||||
else
|
||||
|
|
|
@ -1135,6 +1135,7 @@ MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
|
|||
MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
|
||||
|
||||
# XINPUT extension is integral part of the server
|
||||
AC_DEFINE(XINPUT, 1, [Support X Input extension])
|
||||
XI_LIB='$(top_builddir)/Xi/libXi.la'
|
||||
XI_INC='-I$(top_srcdir)/Xi'
|
||||
|
||||
|
|
|
@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
|
|||
"InputClass configuration");
|
||||
return BadAlloc;
|
||||
}
|
||||
mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver);
|
||||
}
|
||||
idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts);
|
||||
|
||||
|
|
|
@ -137,19 +137,9 @@ xf86OpenSerial (pointer options)
|
|||
|
||||
if (!isatty (fd))
|
||||
{
|
||||
#if 1
|
||||
/* Allow non-tty devices to be opened. */
|
||||
xfree(dev);
|
||||
return (fd);
|
||||
#else
|
||||
xf86Msg (X_WARNING,
|
||||
"xf86OpenSerial: Specified device %s is not a tty\n",
|
||||
dev);
|
||||
SYSCALL (close (fd));
|
||||
errno = EINVAL;
|
||||
xfree(dev);
|
||||
return (-1);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* set up default port parameters */
|
||||
|
|
|
@ -386,8 +386,16 @@ typedef struct {
|
|||
int spriteTraceSize;
|
||||
int spriteTraceGood;
|
||||
|
||||
ScreenPtr pEnqueueScreen; /* screen events are being delivered to */
|
||||
ScreenPtr pDequeueScreen; /* screen events are being dispatched to */
|
||||
/* Due to delays between event generation and event processing, it is
|
||||
* possible that the pointer has crossed screen boundaries between the
|
||||
* time in which it begins generating events and the time when
|
||||
* those events are processed.
|
||||
*
|
||||
* pEnqueueScreen: screen the pointer was on when the event was generated
|
||||
* pDequeueScreen: screen the pointer was on when the event is processed
|
||||
*/
|
||||
ScreenPtr pEnqueueScreen;
|
||||
ScreenPtr pDequeueScreen;
|
||||
|
||||
} SpriteRec, *SpritePtr;
|
||||
|
||||
|
|
|
@ -753,7 +753,7 @@ XkbSrvLedInfoPtr sli;
|
|||
if (cause!=NULL) {
|
||||
xkbControlsNotify cn;
|
||||
cn.numGroups= ctrls->num_groups;
|
||||
cn.changedControls|= XkbControlsEnabledMask;
|
||||
cn.changedControls= XkbControlsEnabledMask;
|
||||
cn.enabledControls= ctrls->enabled_ctrls;
|
||||
cn.enabledControlChanges= (ctrls->enabled_ctrls^old);
|
||||
cn.keycode= cause->kc;
|
||||
|
|
Loading…
Reference in New Issue
Block a user