diff options
author | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2014-02-04 11:46:45 +0100 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2014-02-04 11:46:45 +0100 |
commit | 315b7ee9ce13603339104cab0402d7d6c10e92b8 (patch) | |
tree | bf2bbace5905d979aab58c3bc6f5f8d57983a29c | |
parent | 6521b5dc32d9bdc4d8826324cb7b2877910cc633 (diff) | |
parent | c2026a495097a7e3bcfe4b58e1b9e393433cf150 (diff) | |
download | st-patched-315b7ee9ce13603339104cab0402d7d6c10e92b8.tar.bz2 st-patched-315b7ee9ce13603339104cab0402d7d6c10e92b8.tar.xz st-patched-315b7ee9ce13603339104cab0402d7d6c10e92b8.zip |
Merge remote-tracking branch 'origin/master'
-rw-r--r-- | st.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3298,8 +3298,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { | |||
3298 | XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1, | 3298 | XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1, |
3299 | width, 1); | 3299 | width, 1); |
3300 | } | 3300 | } |
3301 | XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, winx, winy, width, | ||
3302 | CEIL((font->ascent + font->descent) * chscale), winx, winy); | ||
3303 | 3301 | ||
3304 | /* Reset clip to none. */ | 3302 | /* Reset clip to none. */ |
3305 | XftDrawSetClip(xw.draw, 0); | 3303 | XftDrawSetClip(xw.draw, 0); |
@@ -3398,6 +3396,8 @@ redraw(int timeout) { | |||
3398 | void | 3396 | void |
3399 | draw(void) { | 3397 | draw(void) { |
3400 | drawregion(0, 0, term.col, term.row); | 3398 | drawregion(0, 0, term.col, term.row); |
3399 | XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w, | ||
3400 | xw.h, 0, 0); | ||
3401 | XSetForeground(xw.dpy, dc.gc, | 3401 | XSetForeground(xw.dpy, dc.gc, |
3402 | dc.col[IS_SET(MODE_REVERSE)? | 3402 | dc.col[IS_SET(MODE_REVERSE)? |
3403 | defaultfg : defaultbg].pixel); | 3403 | defaultfg : defaultbg].pixel); |