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

Xi: copy the XkbSrvLedInfo too when copying device classes.

This commit is contained in:
Peter Hutterer 2008-04-13 08:28:07 +09:30
parent 4219e94c2f
commit bf6679cba4
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

@ -263,7 +263,11 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
(*k)->BellProc = it->BellProc; (*k)->BellProc = it->BellProc;
(*k)->CtrlProc = it->CtrlProc; (*k)->CtrlProc = it->CtrlProc;
(*k)->ctrl = it->ctrl; (*k)->ctrl = it->ctrl;
/* XXX: xkb_sli needs to be copied */ #ifdef XKB
if ((*k)->xkb_sli)
XkbFreeSrvLedInfo((*k)->xkb_sli);
(*k)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, *k, NULL);
#endif
k = &(*k)->next; k = &(*k)->next;
} }
@ -289,7 +293,6 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
} }
(*p)->CtrlProc = it->CtrlProc; (*p)->CtrlProc = it->CtrlProc;
(*p)->ctrl = it->ctrl; (*p)->ctrl = it->ctrl;
/* XXX: xkb_sli needs to be copied */
p = &(*p)->next; p = &(*p)->next;
} }
@ -391,7 +394,11 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
} }
(*l)->CtrlProc = it->CtrlProc; (*l)->CtrlProc = it->CtrlProc;
(*l)->ctrl = it->ctrl; (*l)->ctrl = it->ctrl;
/* XXX: xkb_sli needs to be copied */ #ifdef XKB
if ((*l)->xkb_sli)
XkbFreeSrvLedInfo((*l)->xkb_sli);
(*l)->xkb_sli = XkbCopySrvLedInfo(from, it->xkb_sli, NULL, *l);
#endif
l = &(*l)->next; l = &(*l)->next;
} }