Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
							
								
								
									
										4
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								st.c
									
									
									
									
									
								
							| @@ -3298,8 +3298,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { | |||||||
| 		XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1, | 		XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1, | ||||||
| 				width, 1); | 				width, 1); | ||||||
| 	} | 	} | ||||||
| 	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, winx, winy, width, |  | ||||||
| 			CEIL((font->ascent + font->descent) * chscale), winx, winy); |  | ||||||
|  |  | ||||||
| 	/* Reset clip to none. */ | 	/* Reset clip to none. */ | ||||||
| 	XftDrawSetClip(xw.draw, 0); | 	XftDrawSetClip(xw.draw, 0); | ||||||
| @@ -3398,6 +3396,8 @@ redraw(int timeout) { | |||||||
| void | void | ||||||
| draw(void) { | draw(void) { | ||||||
| 	drawregion(0, 0, term.col, term.row); | 	drawregion(0, 0, term.col, term.row); | ||||||
|  | 	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w, | ||||||
|  | 			xw.h, 0, 0); | ||||||
| 	XSetForeground(xw.dpy, dc.gc, | 	XSetForeground(xw.dpy, dc.gc, | ||||||
| 			dc.col[IS_SET(MODE_REVERSE)? | 			dc.col[IS_SET(MODE_REVERSE)? | ||||||
| 				defaultfg : defaultbg].pixel); | 				defaultfg : defaultbg].pixel); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user