aboutsummaryrefslogtreecommitdiff
path: root/view.c
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-06-27 20:52:52 +0200
committerMarc André Tanner <mat@brain-dump.org>2017-06-27 20:52:52 +0200
commit431dea6871f88766e66ccaba5775303121a514ed (patch)
tree65caf7f1e32a7fd9dfb8f0627235b34779c4b1f4 /view.c
parentdfe9937786a5183952bb464901da9ba951e71652 (diff)
parentbfcf2210da1f83d4138425febf96d3afb60fdfac (diff)
downloadvis-431dea6871f88766e66ccaba5775303121a514ed.tar.gz
vis-431dea6871f88766e66ccaba5775303121a514ed.tar.xz
Merge branch 'show-eof' of https://github.com/p-e-w/vis
Conflicts: view.c view.h
Diffstat (limited to 'view.c')
-rw-r--r--view.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/view.c b/view.c
index b1b210a..2de4142 100644
--- a/view.c
+++ b/view.c
@@ -19,6 +19,7 @@ enum {
SYNTAX_SYMBOL_TAB,
SYNTAX_SYMBOL_TAB_FILL,
SYNTAX_SYMBOL_EOL,
+ SYNTAX_SYMBOL_EOF,
SYNTAX_SYMBOL_LAST,
};
@@ -86,6 +87,7 @@ static const SyntaxSymbol symbols_none[] = {
[SYNTAX_SYMBOL_TAB] = { " " },
[SYNTAX_SYMBOL_TAB_FILL] = { " " },
[SYNTAX_SYMBOL_EOL] = { " " },
+ [SYNTAX_SYMBOL_EOF] = { " " },
};
static const SyntaxSymbol symbols_default[] = {
@@ -93,6 +95,7 @@ static const SyntaxSymbol symbols_default[] = {
[SYNTAX_SYMBOL_TAB] = { "›" /* Single Right-Pointing Angle Quotation Mark U+203A */ },
[SYNTAX_SYMBOL_TAB_FILL] = { " " },
[SYNTAX_SYMBOL_EOL] = { "↵" /* Downwards Arrow with Corner Leftwards U+21B5 */ },
+ [SYNTAX_SYMBOL_EOF] = { "~" },
};
static Cell cell_unused;
@@ -507,7 +510,7 @@ View *view_new(Text *text) {
.data = " ",
};
view->tabwidth = 8;
- view_options_set(view, 0);
+ view_options_set(view, UI_OPTION_SYMBOL_EOF);
if (!view_resize(view, 1, 1)) {
view_free(view);
@@ -823,6 +826,7 @@ void view_options_set(View *view, enum UiOption options) {
[SYNTAX_SYMBOL_TAB] = UI_OPTION_SYMBOL_TAB,
[SYNTAX_SYMBOL_TAB_FILL] = UI_OPTION_SYMBOL_TAB_FILL,
[SYNTAX_SYMBOL_EOL] = UI_OPTION_SYMBOL_EOL,
+ [SYNTAX_SYMBOL_EOF] = UI_OPTION_SYMBOL_EOF,
};
for (int i = 0; i < LENGTH(mapping); i++) {
@@ -1328,6 +1332,10 @@ Text *view_text(View *view) {
return view->text;
}
+char *view_symbol_eof_get(View *view) {
+ return view->symbols[SYNTAX_SYMBOL_EOF]->symbol;
+}
+
bool view_style_define(View *view, enum UiStyle id, const char *style) {
return view->ui->style_define(view->ui, id, style);
}