diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-01-16 21:39:14 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-01-16 21:40:07 +0800 |
| commit | 8f652465238aff062851a1f8bf1d76f5503ac1a9 (patch) | |
| tree | aebbb1b55c73692aa374824d67a21358cf49897c | |
| parent | 1220cf605b108751dae88e02aeadbef90bd83cc9 (diff) | |
| download | emacs-8f652465238aff062851a1f8bf1d76f5503ac1a9.tar.gz | |
Fix XI2 event filtering for very old versions of libXi
* src/xterm.c (handle_one_xevent): Handle cases where
xev->display is NULL.
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 4b5358ed658..3328e659301 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10711,7 +10711,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, if (f && xev->evtype == XI_ButtonPress && !popup_activated () - && !x_window_to_scroll_bar (xev->display, xev->event, 2) + && !x_window_to_scroll_bar (dpyinfo->display, xev->event, 2) && !FRAME_NO_ACCEPT_FOCUS (f)) { /* When clicking into a child frame or when clicking @@ -10884,7 +10884,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, xkey.type = KeyPress; xkey.serial = xev->serial; xkey.send_event = xev->send_event; - xkey.display = xev->display; + xkey.display = dpyinfo->display; xkey.window = xev->event; xkey.root = xev->root; xkey.subwindow = xev->child; @@ -11230,7 +11230,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, xkey.type = KeyRelease; xkey.serial = xev->serial; xkey.send_event = xev->send_event; - xkey.display = xev->display; + xkey.display = dpyinfo->display; xkey.window = xev->event; xkey.root = xev->root; xkey.subwindow = xev->child; |