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

Merge remote-tracking branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2013-10-29 21:00:13 -07:00
parent 04ab07ca19 9f4afe7e83
commit 1470c0a132
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/exevents.c
View File

@ -1476,7 +1476,7 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
GrabPtr grab; GrabPtr grab;
XI2Mask *mask; 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) ti->listeners[0].type != LISTENER_POINTER_GRAB)
return; return;

3
configure.ac
View File

@ -2238,7 +2238,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
***********************************************]) ***********************************************])
fi fi
AC_OUTPUT([ AC_CONFIG_FILES([
Makefile Makefile
glx/Makefile glx/Makefile
include/Makefile include/Makefile
@ -2339,3 +2339,4 @@ test/xi2/Makefile
xserver.ent xserver.ent
xorg-server.pc xorg-server.pc
]) ])
AC_OUTPUT

3
hw/dmx/input/dmxevents.c
View File

@ -726,8 +726,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
case ButtonRelease: case ButtonRelease:
detail = dmxGetButtonMapping(dmxLocal, detail); detail = dmxGetButtonMapping(dmxLocal, detail);
valuator_mask_zero(&mask); valuator_mask_zero(&mask);
QueuePointerEvents(p, type, detail, QueuePointerEvents(p, type, detail, 0, &mask);
POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
return; return;
case MotionNotify: case MotionNotify:

11
hw/kdrive/src/kinput.c
View File

@ -308,20 +308,21 @@ KdEnableInput(void)
kdInputEnabled = TRUE; kdInputEnabled = TRUE;
ev.any.time = GetTimeInMillis();
for (ki = kdKeyboards; ki; ki = ki->next) { for (ki = kdKeyboards; ki; ki = ki->next) {
if (ki->driver && ki->driver->Enable) if (ki->driver && ki->driver->Enable)
(*ki->driver->Enable) (ki); (*ki->driver->Enable) (ki);
/* reset screen saver */
NoticeEventTime (&ev, ki->dixdev);
} }
for (pi = kdPointers; pi; pi = pi->next) { for (pi = kdPointers; pi; pi = pi->next) {
if (pi->driver && pi->driver->Enable) if (pi->driver && pi->driver->Enable)
(*pi->driver->Enable) (pi); (*pi->driver->Enable) (pi);
}
/* reset screen saver */ /* reset screen saver */
ev.any.time = GetTimeInMillis(); NoticeEventTime (&ev, pi->dixdev);
NoticeEventTime(&ev, pi->dixdev); }
NoticeEventTime(&ev, ki->dixdev);
OsReleaseSIGIO(); OsReleaseSIGIO();
} }