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

Handle errors caused by ignoring errors with GDK's trap installed

Browse source 
* src/xterm.c (x_ignore_errors_for_next_request)
(x_stop_ignoring_errors): Also tell GDK to ignore errors from
the following requests.  (bug#56372)
This commit is contained in:
Po Lu 2022-07-04 14:02:42 +08:00
parent 1da6a6d327
commit c4e93b67c4
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/xterm.c
View file

@ -23144,6 +23144,19 @@ static void
x_ignore_errors_for_next_request (struct x_display_info *dpyinfo)
{
struct x_failable_request *request, *max;
#ifdef HAVE_GTK3
GdkDisplay *gdpy;
/* GTK 3 tends to override our own error handler inside certain
callbacks, which this can be called from. Instead of trying to
restore our own, add a trap for the following requests with
GDK as well. */
gdpy = gdk_x11_lookup_xdisplay (dpyinfo->display);
if (gdpy)
gdk_x11_display_error_trap_push (gdpy);
#endif
if ((dpyinfo->next_failable_request
!= dpyinfo->failable_requests)
@ -23182,6 +23195,9 @@ static void
x_stop_ignoring_errors (struct x_display_info *dpyinfo)
{
struct x_failable_request *range;
#ifdef HAVE_GTK3
GdkDisplay *gdpy;
#endif
range = dpyinfo->next_failable_request - 1;
range->end = XNextRequest (dpyinfo->display) - 1;
@ -23192,6 +23208,13 @@ x_stop_ignoring_errors (struct x_display_info *dpyinfo)
if (X_COMPARE_SERIALS (range->end, <,
range->start))
emacs_abort ();
#ifdef HAVE_GTK3
gdpy = gdk_x11_lookup_xdisplay (dpyinfo->display);
if (gdpy)
gdk_x11_display_error_trap_pop_ignored (gdpy);
#endif
}
/* Undo the last x_catch_errors call.