SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-12-26 01:57:52 +00:00
parent deeab190c1
commit 3c98303280
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
10 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xserver/dix/devices.c
View file

@ -2525,6 +2525,8 @@ RecalculateMasterButtons(DeviceIntPtr slave)
if (master->button && master->button->numButtons != maxbuttons) {
int i;
int last_num_buttons = master->button->numButtons;
DeviceChangedEvent event = {
.header = ET_Internal,
.type = ET_DeviceChanged,
@ -2535,6 +2537,15 @@ RecalculateMasterButtons(DeviceIntPtr slave)
};
master->button->numButtons = maxbuttons;
if (last_num_buttons < maxbuttons) {
master->button->xkb_acts = xnfreallocarray(master->button->xkb_acts,
maxbuttons,
sizeof(XkbAction));
memset(&master->button->xkb_acts[last_num_buttons],
0,
(maxbuttons - last_num_buttons) * sizeof(XkbAction));
}
memcpy(&event.buttons.names, master->button->labels, maxbuttons *
sizeof(Atom));