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

Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2010-03-29 11:44:07 -07:00
parent 579715f830 aa91508356
commit 4b3d67a764
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/udev.c
View File

@ -73,8 +73,11 @@ device_added(struct udev_device *udev_device)
goto unwind; goto unwind;
parent = udev_device_get_parent(udev_device); parent = udev_device_get_parent(udev_device);
if (parent) if (parent) {
name = udev_device_get_sysattr_value(parent, "name");
if (!name)
name = udev_device_get_property_value(parent, "NAME"); name = udev_device_get_property_value(parent, "NAME");
}
if (!name) if (!name)
name = "(unnamed)"; name = "(unnamed)";
else else

1
configure.ac
View File

@ -1135,6 +1135,7 @@ MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
# XINPUT extension is integral part of the server # XINPUT extension is integral part of the server
AC_DEFINE(XINPUT, 1, [Support X Input extension])
XI_LIB='$(top_builddir)/Xi/libXi.la' XI_LIB='$(top_builddir)/Xi/libXi.la'
XI_INC='-I$(top_srcdir)/Xi' XI_INC='-I$(top_srcdir)/Xi'

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

@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
"InputClass configuration"); "InputClass configuration");
return BadAlloc; return BadAlloc;
} }
mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver);
} }
idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts); idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts);

10
hw/xfree86/os-support/shared/posix_tty.c
View File

@ -137,19 +137,9 @@ xf86OpenSerial (pointer options)
if (!isatty (fd)) if (!isatty (fd))
{ {
#if 1
/* Allow non-tty devices to be opened. */ /* Allow non-tty devices to be opened. */
xfree(dev); xfree(dev);
return (fd); 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 */ /* set up default port parameters */

12
include/inputstr.h
View File

@ -386,8 +386,16 @@ typedef struct {
int spriteTraceSize; int spriteTraceSize;
int spriteTraceGood; int spriteTraceGood;
ScreenPtr pEnqueueScreen; /* screen events are being delivered to */ /* Due to delays between event generation and event processing, it is
ScreenPtr pDequeueScreen; /* screen events are being dispatched to */ * 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; } SpriteRec, *SpritePtr;

2
xkb/xkbUtils.c
View File

@ -753,7 +753,7 @@ XkbSrvLedInfoPtr sli;
if (cause!=NULL) { if (cause!=NULL) {
xkbControlsNotify cn; xkbControlsNotify cn;
cn.numGroups= ctrls->num_groups; cn.numGroups= ctrls->num_groups;
cn.changedControls|= XkbControlsEnabledMask; cn.changedControls= XkbControlsEnabledMask;
cn.enabledControls= ctrls->enabled_ctrls; cn.enabledControls= ctrls->enabled_ctrls;
cn.enabledControlChanges= (ctrls->enabled_ctrls^old); cn.enabledControlChanges= (ctrls->enabled_ctrls^old);
cn.keycode= cause->kc; cn.keycode= cause->kc;