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

Don't transfer window attributes trying to find the XM drag window

Browse source 
* src/xterm.c (xm_get_drag_window): Select for impossible event
mask instead of asking for the window attributes.
This commit is contained in:
Po Lu 2022-04-22 19:43:42 +08:00
parent 381eb5d5a0
commit 05705454d5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xterm.c
View file

@ -1385,7 +1385,6 @@ xm_get_drag_window (struct x_display_info *dpyinfo)
unsigned char *tmp_data = NULL;
Window drag_window;
XSetWindowAttributes attrs;
XWindowAttributes wattrs;
Display *temp_display;
void *old_handler;
@ -1403,8 +1402,10 @@ xm_get_drag_window (struct x_display_info *dpyinfo)
{
drag_window = *(Window *) tmp_data;
x_catch_errors (dpyinfo->display);
XGetWindowAttributes (dpyinfo->display,
drag_window, &wattrs);
/* We use ButtonPressMask since it's one of the events an
input-only window can never get. */
XSelectInput (dpyinfo->display, drag_window,
ButtonPressMask);
rc = !x_had_errors_p (dpyinfo->display);
x_uncatch_errors_after_check ();
@ -1474,8 +1475,10 @@ xm_get_drag_window (struct x_display_info *dpyinfo)
current display, and the XOpenDisplay above didn't
accidentally connect to some other display. */
x_catch_errors (dpyinfo->display);
XGetWindowAttributes (dpyinfo->display,
drag_window, &wattrs);
/* We use ButtonPressMask since it's one of the events an
input-only window can never get. */
XSelectInput (dpyinfo->display, drag_window,
ButtonPressMask);
rc = !x_had_errors_p (dpyinfo->display);
x_uncatch_errors_after_check ();
unblock_input ();