diff options
| author | Martin Rudalics | 2017-03-02 11:31:20 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2017-03-02 11:31:20 +0100 |
| commit | ae8835619655a0e28c4d84bbd8c46cc29aac6ad3 (patch) | |
| tree | 8ee611ee058792c367675fa8d15da75757fc697c /src | |
| parent | 4da7aaa3a8dafe39df95eef1e3a0b5ea8942a431 (diff) | |
| download | emacs-ae8835619655a0e28c4d84bbd8c46cc29aac6ad3.tar.gz emacs-ae8835619655a0e28c4d84bbd8c46cc29aac6ad3.zip | |
Don't call x_net_wm_state for scroll bar windows (Bug#24963, Bug#25887)
* src/xterm.c (handle_one_xevent): For ConfigureNotify events
don't call x_net_wm_state when the window is a scroll bar window.
(Bug#24963, Bug#25887)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 52bc8f9eca2..c3af28e571d 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8551,8 +8551,10 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 8551 | #endif | 8551 | #endif |
| 8552 | if (f) | 8552 | if (f) |
| 8553 | { | 8553 | { |
| 8554 | 8554 | /* Don't call x_net_wm_state for the scroll bar window. | |
| 8555 | x_net_wm_state (f, configureEvent.xconfigure.window); | 8555 | (Bug#24963, Bug#25887) */ |
| 8556 | if (configureEvent.xconfigure.window == FRAME_X_WINDOW (f)) | ||
| 8557 | x_net_wm_state (f, configureEvent.xconfigure.window); | ||
| 8556 | 8558 | ||
| 8557 | #ifdef USE_X_TOOLKIT | 8559 | #ifdef USE_X_TOOLKIT |
| 8558 | /* Tip frames are pure X window, set size for them. */ | 8560 | /* Tip frames are pure X window, set size for them. */ |