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

Xi: If the MD doesn't have a key/kbdfeed class, init the keyboard. 

This fixes crashes on mouse/keyboard combos where the mouse is both a keyboard
and a mouse. Upon copying the SD's key info into the VCP, the NULL xkbInfo of
the VCP would crash the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-01-28 20:52:45 +10:00 committed by Peter Hutterer
parent caade11b84
commit 32adf8d34f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xi/exevents.c
View File

@ -237,7 +237,14 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
{ {
classes = dixLookupPrivate(&to->devPrivates, classes = dixLookupPrivate(&to->devPrivates,
UnusedClassesPrivateKey); UnusedClassesPrivateKey);
to->kbdfeed = classes->kbdfeed; to->kbdfeed = classes->kbdfeed;
if (!to->kbdfeed)
{
XkbRMLVOSet rmlvo;
XkbGetRulesDflts(&rmlvo);
InitKeyboardDeviceStruct(to, &rmlvo, NULL, NULL);
}
} }
k = &to->kbdfeed; k = &to->kbdfeed;
@ -481,9 +488,9 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
to->key = classes->key; to->key = classes->key;
if (!to->key) if (!to->key)
{ {
to->key = xcalloc(1, sizeof(KeyClassRec)); XkbRMLVOSet rmlvo;
if (!to->key) XkbGetRulesDflts(&rmlvo);
FatalError("[Xi] no memory for class shift.\n"); InitKeyboardDeviceStruct(to, &rmlvo, NULL, NULL);
} else } else
classes->key = NULL; classes->key = NULL;
} }