Mercurial > emacs
changeset 25633:ddf2e1fef00b
(XTread_socket): In XSetInputFocus, use RevertToParent,
not RevertToPointerRoot.
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Fix the code to clear around the scroll bar.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 11 Sep 1999 01:15:25 +0000 |
| parents | 82ebdf9967da |
| children | 0d3bc0a437c4 |
| files | src/xterm.c |
| diffstat | 1 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Sat Sep 11 01:12:39 1999 +0000 +++ b/src/xterm.c Sat Sep 11 01:15:25 1999 +0000 @@ -8004,17 +8004,20 @@ #else /* not USE_TOOLKIT_SCROLL_BARS */ - /* Clear areas not covered by the scroll bar. This makes sure a - 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 - reserved for scroll bars - trim at both sides. */ - XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, - height, False); - XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM, - top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, - height, False); + if (VERTICAL_SCROLL_BAR_WIDTH_TRIM) + { + /* Clear areas not covered by the scroll bar. This makes sure a + 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 + reserved for scroll bars - trim at both sides. */ + XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), + left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, + height, False); + XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), + 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 @@ 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. */