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

Don't clobber virtual core pointer touches array length 

The VCP has its own touches array, don't overwrite it when the class is
copied from the SD to the master.

Reported-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2012-02-13 16:00:47 -08:00
parent 03d32fe7a7
commit 8573b3519a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Xi/exevents.c
View File

@ -671,7 +671,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
if (from->touch) if (from->touch)
{ {
TouchPointInfoPtr tmp; TouchClassPtr t, f;
if (!to->touch) if (!to->touch)
{ {
classes = to->unused_classes; classes = to->unused_classes;
@ -692,10 +692,18 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
} else } else
classes->touch = NULL; classes->touch = NULL;
} }
tmp = to->touch->touches;
memcpy(to->touch, from->touch, sizeof(TouchClassRec));
to->touch->touches = tmp; t = to->touch;
to->touch->sourceid = from->id; f = from->touch;
t->sourceid = f->sourceid;
t->max_touches = f->max_touches;
t->mode = f->mode;
t->buttonsDown = f->buttonsDown;
t->state = f->state;
t->motionMask = f->motionMask;
/* to->touches and to->num_touches are separate on the master,
* don't copy */
} else if (to->touch) } else if (to->touch)
{ {
ClassesPtr classes; ClassesPtr classes;