From c079c2f61005f9a546bab5295305c908e8fe67d0 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Wed, 16 Nov 2016 19:13:10 -0500 Subject: [PATCH] Fixed highlighting of selection for lines that contain tab characters --- libx/x11.c | 3 ++- xedit | Bin 57612 -> 57612 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libx/x11.c b/libx/x11.c index af194e6..385f898 100644 --- a/libx/x11.c +++ b/libx/x11.c @@ -366,7 +366,8 @@ void x11_draw_glyphs(int fg, int bg, XGlyphSpec* specs, size_t nspecs) { int w = extent.xOff; int h = (font->height - font->descent); xftcolor(&bgc, Config->palette[bg]); - x11_draw_rect(bg, specs[0].x, specs[0].y - h, nspecs * w, font->height); + size_t width = specs[nspecs-1].x - specs[0].x + w; + x11_draw_rect(bg, specs[0].x, specs[0].y - h, width, font->height); XftColorFree(X.display, X.visual, X.colormap, &bgc); } xftcolor(&fgc, Config->palette[fg]); diff --git a/xedit b/xedit index e660043f2f6b923bb845f830daa46802c0ee1dc6..e298f02102728ffb2405147563b43142811c32fe 100755 GIT binary patch delta 10493 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 J_B?u68UV;80R#X5 delta 10631 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 F1^~qMA6WnZ -- 2.52.0