From: Martin Rudalics <rudalics@gmx.at>
Date: Thu, 2 Mar 2017 10:31:20 +0000 (+0100)
Subject: Don't call x_net_wm_state for scroll bar windows (Bug#24963, Bug#25887)
X-Git-Tag: emacs-26.0.90~670
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae8835619655a0e28c4d84bbd8c46cc29aac6ad3;p=emacs.git

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)
---

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,
 #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.  */