procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work around rare crash when turning scroll wheel

Browse source 
* src/xterm.c (handle_one_xevent): Don't allow devices to be
added twice handling hierarcy events.
This commit is contained in:
Po Lu 2022-09-22 17:06:36 +08:00
parent 101f3cf5b9
commit 9369e4242f
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/xterm.c
View file

@ -23000,24 +23000,36 @@ handle_one_xevent (struct x_display_info *dpyinfo,
any_changed = true;
}
x_catch_errors (dpyinfo->display);
info = XIQueryDevice (dpyinfo->display, hev->info[i].deviceid,
&ndevices);
x_uncatch_errors ();
/* Under unknown circumstances, multiple
XIDeviceEnabled events are sent at once,
causing the device to be duplicated. Check
that the device doesn't exist before adding
it. */
if (info && info->enabled)
if (!xi_device_from_id (dpyinfo,
hev->info[i].deviceid))
{
dpyinfo->devices
= xrealloc (dpyinfo->devices, (sizeof *dpyinfo->devices
* ++dpyinfo->num_devices));
memset (dpyinfo->devices + dpyinfo->num_devices - 1,
0, sizeof *dpyinfo->devices);
device = &dpyinfo->devices[dpyinfo->num_devices - 1];
xi_populate_device_from_info (device, info);
}
x_catch_errors (dpyinfo->display);
info = XIQueryDevice (dpyinfo->display,
hev->info[i].deviceid,
&ndevices);
x_uncatch_errors ();
if (info)
XIFreeDeviceInfo (info);
if (info && info->enabled)
{
dpyinfo->devices
= xrealloc (dpyinfo->devices,
(sizeof *dpyinfo->devices
* ++dpyinfo->num_devices));
memset (dpyinfo->devices + dpyinfo->num_devices - 1,
0, sizeof *dpyinfo->devices);
device = &dpyinfo->devices[dpyinfo->num_devices - 1];
xi_populate_device_from_info (device, info);
}
if (info)
XIFreeDeviceInfo (info);
}
}
else if (hev->info[i].flags & XIDeviceDisabled)
disabled[n_disabled++] = hev->info[i].deviceid;