[Emacs-diffs] master ae88356: Don't call x_net_wm_state for scroll bar windows (Bug#24963, Bug#25887)

[Martin Rudalics]

branch: master
commit ae8835619655a0e28c4d84bbd8c46cc29aac6ad3
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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)
---
 src/xterm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 52bc8f9..c3af28e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8551,8 +8551,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
       if (f)
         {
-
-          x_net_wm_state (f, configureEvent.xconfigure.window);
+         /* Don't call x_net_wm_state for the scroll bar window.
+            (Bug#24963, Bug#25887)  */
+         if (configureEvent.xconfigure.window == FRAME_X_WINDOW (f))
+           x_net_wm_state (f, configureEvent.xconfigure.window);
 
 #ifdef USE_X_TOOLKIT
           /* Tip frames are pure X window, set size for them.  */