1 files changed, 17 insertions, 12 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 727bbdcdcf7..793e0098879 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8004,17 +8004,20 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 #else /* not USE_TOOLKIT_SCROLL_BARS */
  
-      /* Clear areas not covered by the scroll bar.  This makes sure a
+      if (VERTICAL_SCROLL_BAR_WIDTH_TRIM)
-         previous mode line display is cleared after C-x 2 C-x 1, for
+        {
-         example.  Non-toolkit scroll bars are as wide as the area
+          /* Clear areas not covered by the scroll bar.  This makes sure a
-         reserved for scroll bars - trim at both sides.  */
+             previous mode line display is cleared after C-x 2 C-x 1, for
-      XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+             example.  Non-toolkit scroll bars are as wide as the area
-                  left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+             reserved for scroll bars - trim at both sides.  */
-                  height, False);
+          XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-      XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                      left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-                  left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                      height, False);
-                  top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+          XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                  height, False);
+                      left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                      top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                      height, False);
+        }
      
      /* Move/size the scroll bar window.  */
      if (mask)
@@ -8736,7 +8739,9 @@ XTread_socket (sd, bufp, numchars, expected)
                               iconified by a window manager such as GWM.  */
                            int count = x_catch_errors (d);
                            XSetInputFocus (d, event.xclient.window,
-                                            RevertToPointerRoot,
+                                            /* The ICCCM says this is
+                                               the only valid choice.  */
+                                            RevertToParent,
                                            event.xclient.data.l[1]);
                            /* This is needed to detect the error
                               if there is an error.  */

diff --git a/src/xterm.c b/src/xterm.c index 727bbdcdcf7..793e0098879 100644 --- a/src/xterm.c +++ b/src/xterm.c
@@ -8004,17 +8004,20 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
8004		8004
8005	#else /* not USE_TOOLKIT_SCROLL_BARS */	8005	#else /* not USE_TOOLKIT_SCROLL_BARS */
8006		8006
8007	/* Clear areas not covered by the scroll bar. This makes sure a	8007	if (VERTICAL_SCROLL_BAR_WIDTH_TRIM)
8008	previous mode line display is cleared after C-x 2 C-x 1, for	8008	{
8009	example. Non-toolkit scroll bars are as wide as the area	8009	/* Clear areas not covered by the scroll bar. This makes sure a
8010	reserved for scroll bars - trim at both sides. */	8010	previous mode line display is cleared after C-x 2 C-x 1, for
8011	XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),	8011	example. Non-toolkit scroll bars are as wide as the area
8012	left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,	8012	reserved for scroll bars - trim at both sides. */
8013	height, False);	8013	XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
8014	XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),	8014	left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
8015	left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,	8015	height, False);
8016	top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,	8016	XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
8017	height, False);	8017	left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
		8018	top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
		8019	height, False);
		8020	}
8018		8021
8019	/* Move/size the scroll bar window. */	8022	/* Move/size the scroll bar window. */
8020	if (mask)	8023	if (mask)
@@ -8736,7 +8739,9 @@ XTread_socket (sd, bufp, numchars, expected)
8736	iconified by a window manager such as GWM. */	8739	iconified by a window manager such as GWM. */
8737	int count = x_catch_errors (d);	8740	int count = x_catch_errors (d);
8738	XSetInputFocus (d, event.xclient.window,	8741	XSetInputFocus (d, event.xclient.window,
8739	RevertToPointerRoot,	8742	/* The ICCCM says this is
		8743	the only valid choice. */
		8744	RevertToParent,
8740	event.xclient.data.l[1]);	8745	event.xclient.data.l[1]);
8741	/* This is needed to detect the error	8746	/* This is needed to detect the error
8742	if there is an error. */	8747	if there is an error. */