Commit Diff

Commit:
28cfdf8ff8b69c0baf35b300d8c4c88f1c0d9007
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
add fringe prefix and allow to override offset for fringes alone
Actions:
Patch | Tree
commit - 0bffd56d41ce3f26974c254c4f9688b28dff5581
commit + 28cfdf8ff8b69c0baf35b300d8c4c88f1c0d9007
blob - 605bcc2a5b658a91ad2bc6feaf3eb77d3638f65c
blob + 53f86455c9a1b226e83065891972dc3bbf27238e
--- defaults.c
+++ defaults.c
@@ -34,6 +34,7 @@ int dont_wrap_pre = 0;
 int emojify_link = 1;
 int enable_colors = 1;
 int fill_column = 120;
+int fringe_ignore_offset = 0;
 int hide_pre_blocks = 0;
 int hide_pre_closing_line = 0;
 int hide_pre_context = 0;
@@ -208,7 +209,7 @@ struct line_face line_faces[] = {
 
 	/* misc ui */
 	[LINE_FRINGE] = {
-		.prfx_pair = PFRINGE,
+		.prfx_pair = PFRINGE_PRFX,
 		.pair = PFRINGE,
 		.trail_pair = PFRINGE_TRAIL,
 	}
@@ -567,6 +568,8 @@ config_setvari(const char *var, int val)
 	} else if (!strcmp(var, "max-killed-tabs")) {
 		if (val >= 0)
 			max_killed_tabs = MIN(val, 128);
+	} else if (!strcmp(var, "fringe-ignore-offset")) {
+		fringe_ignore_offset = !!val;
 	} else {
 		return 0;
 	}
blob - 8c8b3a8b7db06d3abba3a4cfb0d159db40c990cc
blob + adc2a2c9a0fc0506cb9b3aab32c4f063334118ad
--- defaults.h
+++ defaults.h
@@ -25,6 +25,7 @@ extern int	 dont_wrap_pre;
 extern int	 emojify_link;
 extern int	 enable_colors;
 extern int	 fill_column;
+extern int	 fringe_ignore_offset;
 extern int	 hide_pre_blocks;
 extern int	 hide_pre_closing_line;
 extern int	 hide_pre_context;
blob - a4803f9231ebca27a7e363810dc46e96ce477d45
blob + 887489980981c8fc75c260a681e3013f5e9ef439
--- ui.c
+++ ui.c
@@ -481,6 +481,9 @@ print_vline(int off, int width, WINDOW *window, struct
 	/* unused, set by getyx */
 	(void)y;
 
+	if (vl->parent->type == LINE_FRINGE && fringe_ignore_offset)
+		off = 0;
+
 	line_prefix_and_text(vl, emojibuf, sizeof(emojibuf), &prfx, &text);
 
 	wattr_on(window, body_face.left, NULL);
@@ -706,7 +709,7 @@ again:
 	buffer->force_redraw = 0;
 end:
 	for (; show_fringe && l < height; l++)
-		print_vline(0, width, win, &fringe);
+		print_vline(off, width, win, &fringe);
 
 	wmove(win, buffer->curs_y, buffer->curs_x);
 }
blob - 00fe68291a346562f2e358b9eaef4fad166db13d
blob + afad9aee56199c4eaf9fd0699492dfed7f1a7c28
--- ui.h
+++ ui.h
@@ -119,6 +119,7 @@ enum pairs {
 
 	PMINIBUF,
 
+	PFRINGE_PRFX,
 	PFRINGE,
 	PFRINGE_TRAIL,
 };