diff options
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | ui-curses.c | 16 | ||||
| -rw-r--r-- | ui.h | 5 | ||||
| -rw-r--r-- | vis.c | 6 | ||||
| -rw-r--r-- | window.c | 4 | ||||
| -rw-r--r-- | window.h | 4 |
6 files changed, 33 insertions, 8 deletions
@@ -449,9 +449,11 @@ and their current support in vis. replicate spaces and tabs at the beginning of the line when starting a new line. - number (yes|no) + number (yes|no) + relativenumber (yes|no) - whether line numbers are printed alongside the file content + whether absolute or relative line numbers are printed alongside + the file content syntax name diff --git a/ui-curses.c b/ui-curses.c index 4b351e5..3cab014 100644 --- a/ui-curses.c +++ b/ui-curses.c @@ -197,10 +197,19 @@ static void ui_window_draw_sidebar(UiCursesWin *win, const Line *line) { } else { int i = 0; size_t prev_lineno = 0; + size_t cursor_lineno = window_cursor_getpos(win->view).line; werase(win->winside); for (const Line *l = line; l; l = l->next, i++) { - if (l->lineno != prev_lineno) - mvwprintw(win->winside, i, 0, "%*u", sidebar_width-1, l->lineno); + if (l->lineno != prev_lineno) { + if (win->options & UI_OPTION_LINE_NUMBERS_ABSOLUTE) { + mvwprintw(win->winside, i, 0, "%*u", sidebar_width-1, l->lineno); + } else if (win->options & UI_OPTION_LINE_NUMBERS_RELATIVE) { + size_t rel = l->lineno > cursor_lineno ? + l->lineno - cursor_lineno : + cursor_lineno - l->lineno; + mvwprintw(win->winside, i, 0, "%*u", sidebar_width-1, rel); + } + } prev_lineno = l->lineno; } mvwvline(win->winside, 0, sidebar_width-1, ACS_VLINE, win->height-1); @@ -338,6 +347,8 @@ static void ui_window_cursor_to(UiWin *w, int x, int y) { UiCursesWin *win = (UiCursesWin*)w; wmove(win->win, y, x); ui_window_draw_status(w); + if (win->options & UI_OPTION_LINE_NUMBERS_RELATIVE) + ui_window_draw_sidebar(win, window_lines_get(win->view)); } static void ui_window_draw_text(UiWin *w, const Line *line) { @@ -386,6 +397,7 @@ static void ui_window_options(UiWin *w, enum UiOption options) { } break; case UI_OPTION_LINE_NUMBERS_ABSOLUTE: + case UI_OPTION_LINE_NUMBERS_RELATIVE: if (!win->winside) win->winside = newwin(1, 1, 1, 1); break; @@ -10,8 +10,9 @@ enum UiLayout { }; enum UiOption { - UI_OPTION_LINE_NUMBERS_NONE, - UI_OPTION_LINE_NUMBERS_ABSOLUTE, + UI_OPTION_LINE_NUMBERS_NONE = 0, + UI_OPTION_LINE_NUMBERS_ABSOLUTE = 1 << 0, + UI_OPTION_LINE_NUMBERS_RELATIVE = 1 << 1, }; #include <stdbool.h> @@ -1377,6 +1377,7 @@ static bool cmd_set(Filerange *range, enum CmdOpt cmdopt, const char *argv[]) { OPTION_TABWIDTH, OPTION_SYNTAX, OPTION_NUMBER, + OPTION_NUMBER_RELATIVE, }; static OptionDef options[] = { @@ -1385,6 +1386,7 @@ static bool cmd_set(Filerange *range, enum CmdOpt cmdopt, const char *argv[]) { [OPTION_TABWIDTH] = { "^(tabwidth|tw)$", OPTION_TYPE_NUMBER }, [OPTION_SYNTAX] = { "^(syntax|syn?)$", OPTION_TYPE_STRING }, [OPTION_NUMBER] = { "^(numbers?|nu)$", OPTION_TYPE_BOOL }, + [OPTION_NUMBER_RELATIVE] = { "^(relativenumbers?|rnu)$", OPTION_TYPE_BOOL }, }; static bool init = false; @@ -1474,6 +1476,10 @@ static bool cmd_set(Filerange *range, enum CmdOpt cmdopt, const char *argv[]) { editor_window_options(vis->win, arg.b ? UI_OPTION_LINE_NUMBERS_ABSOLUTE : UI_OPTION_LINE_NUMBERS_NONE); break; + case OPTION_NUMBER_RELATIVE: + editor_window_options(vis->win, arg.b ? UI_OPTION_LINE_NUMBERS_RELATIVE : + UI_OPTION_LINE_NUMBERS_NONE); + break; } return true; @@ -820,6 +820,10 @@ size_t window_cursor_get(Win *win) { return win->cursor.pos; } +const Line *window_lines_get(Win *win) { + return win->topline; +} + void window_scroll_to(Win *win, size_t pos) { while (pos < win->start && window_viewport_up(win, 1)); while (pos > win->end && window_viewport_down(win, 1)); @@ -76,6 +76,8 @@ size_t window_screenline_goto(Win*, int n); /* get cursor position in bytes from start of the file */ size_t window_cursor_get(Win*); + +const Line *window_lines_get(Win*); /* get cursor position in terms of screen coordinates */ CursorPos window_cursor_getpos(Win*); /* moves window viewport in direction until pos is visible. should only be @@ -103,7 +105,5 @@ Filerange window_viewport_get(Win*); /* associate a set of syntax highlighting rules to this window. */ void window_syntax_set(Win*, Syntax*); Syntax *window_syntax_get(Win*); -/* register a user defined function which will be called whenever the cursor has moved */ -void window_cursor_watch(Win *win, void (*cursor_moved)(Win*, void*), void *data); #endif |