Merge remote-tracking branch 'whot/for-keith'
This commit is contained in:
commit
1470c0a132
|
@ -1476,7 +1476,7 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
|
|||
GrabPtr grab;
|
||||
XI2Mask *mask;
|
||||
|
||||
if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
|
||||
if (ti->listeners[0].type != LISTENER_POINTER_REGULAR &&
|
||||
ti->listeners[0].type != LISTENER_POINTER_GRAB)
|
||||
return;
|
||||
|
||||
|
|
|
@ -2238,7 +2238,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
|
|||
***********************************************])
|
||||
fi
|
||||
|
||||
AC_OUTPUT([
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
glx/Makefile
|
||||
include/Makefile
|
||||
|
@ -2339,3 +2339,4 @@ test/xi2/Makefile
|
|||
xserver.ent
|
||||
xorg-server.pc
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -726,8 +726,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
|
|||
case ButtonRelease:
|
||||
detail = dmxGetButtonMapping(dmxLocal, detail);
|
||||
valuator_mask_zero(&mask);
|
||||
QueuePointerEvents(p, type, detail,
|
||||
POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
|
||||
QueuePointerEvents(p, type, detail, 0, &mask);
|
||||
return;
|
||||
|
||||
case MotionNotify:
|
||||
|
|
|
@ -308,21 +308,22 @@ KdEnableInput(void)
|
|||
|
||||
kdInputEnabled = TRUE;
|
||||
|
||||
ev.any.time = GetTimeInMillis();
|
||||
|
||||
for (ki = kdKeyboards; ki; ki = ki->next) {
|
||||
if (ki->driver && ki->driver->Enable)
|
||||
(*ki->driver->Enable) (ki);
|
||||
/* reset screen saver */
|
||||
NoticeEventTime (&ev, ki->dixdev);
|
||||
}
|
||||
|
||||
for (pi = kdPointers; pi; pi = pi->next) {
|
||||
if (pi->driver && pi->driver->Enable)
|
||||
(*pi->driver->Enable) (pi);
|
||||
/* reset screen saver */
|
||||
NoticeEventTime (&ev, pi->dixdev);
|
||||
}
|
||||
|
||||
/* reset screen saver */
|
||||
ev.any.time = GetTimeInMillis();
|
||||
NoticeEventTime(&ev, pi->dixdev);
|
||||
NoticeEventTime(&ev, ki->dixdev);
|
||||
|
||||
OsReleaseSIGIO();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user