aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-10-08 23:30:31 -0400
committerChong Yidong2010-10-08 23:30:31 -0400
commit3625b3e2822aee88a47080bb356f6cb2a46bc478 (patch)
tree29c1c13922bd0b345191db1dec1e1986b3e22590
parent587faadd0c89d5baa58612bc011785a4b5fed8df (diff)
downloademacs-3625b3e2822aee88a47080bb356f6cb2a46bc478.tar.gz
emacs-3625b3e2822aee88a47080bb356f6cb2a46bc478.zip
* xterm.c (x_draw_relief_rect): Clear corner pixels.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xterm.c13
2 files changed, 14 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 151e0daa29d..3b3f20fb737 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-10-09 Chong Yidong <cyd@stupidchicken.com>
2
3 * xterm.c (x_draw_relief_rect): Clear corner pixels.
4
12010-10-08 Michael Albinus <michael.albinus@gmx.de> 52010-10-08 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * keyboard.c: Revert last change; it was not intended to be 7 * keyboard.c: Revert last change; it was not intended to be
diff --git a/src/xterm.c b/src/xterm.c
index 8b28b1afa27..d9d908d4396 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1967,6 +1967,9 @@ x_draw_relief_rect (struct frame *f,
1967 if (width == 1) 1967 if (width == 1)
1968 XDrawLine (dpy, window, gc, left_x, top_y + 1, left_x, bottom_y); 1968 XDrawLine (dpy, window, gc, left_x, top_y + 1, left_x, bottom_y);
1969 1969
1970 XClearArea (dpy, window, left_x, top_y, 1, 1, False);
1971 XClearArea (dpy, window, left_x, bottom_y, 1, 1, False);
1972
1970 for (i = (width > 1 ? 1 : 0); i < width; ++i) 1973 for (i = (width > 1 ? 1 : 0); i < width; ++i)
1971 XDrawLine (dpy, window, gc, 1974 XDrawLine (dpy, window, gc,
1972 left_x + i, top_y + i, left_x + i, bottom_y - i + 1); 1975 left_x + i, top_y + i, left_x + i, bottom_y - i + 1);
@@ -2006,9 +2009,13 @@ x_draw_relief_rect (struct frame *f,
2006 2009
2007 /* Right. */ 2010 /* Right. */
2008 if (right_p) 2011 if (right_p)
2009 for (i = 0; i < width; ++i) 2012 {
2010 XDrawLine (dpy, window, gc, 2013 XClearArea (dpy, window, right_x, top_y, 1, 1, False);
2011 right_x - i, top_y + i + 1, right_x - i, bottom_y - i); 2014 XClearArea (dpy, window, right_x, bottom_y, 1, 1, False);
2015 for (i = 0; i < width; ++i)
2016 XDrawLine (dpy, window, gc,
2017 right_x - i, top_y + i + 1, right_x - i, bottom_y - i);
2018 }
2012 2019
2013 XSetClipMask (dpy, gc, None); 2020 XSetClipMask (dpy, gc, None);
2014} 2021}