From 4070a1811bb903fbbf1c0230d75879f43ca04c88 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Wed, 28 Jun 2017 13:48:18 -0400 Subject: [PATCH] Added configuration option to turn off syntax highlighting --- XResources | 13 +++++++------ inc/edit.h | 2 +- lib/colors.c | 3 ++- lib/config.c | 11 ++++++----- themes/acme | 1 + 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/XResources b/XResources index eb06f35..aadb689 100644 --- a/XResources +++ b/XResources @@ -6,12 +6,13 @@ tide.ui.line_spacing: 0 tide.ui.font: Liberation Mono:pixelsize=14:antialias=true:autohint=true tide.ui.line_spacing: 1 #endif -tide.ui.tags: 'Quit Save Undo Redo Cut Copy Paste | Find ' -tide.ui.width: 640 -tide.ui.height: 480 -tide.ui.line_numbers: true -tide.ui.ruler_column: 80 -tide.ui.timeout: 50 +tide.ui.tags: 'Quit Save Undo Redo Cut Copy Paste | Find ' +tide.ui.width: 640 +tide.ui.height: 480 +tide.ui.line_numbers: true +tide.ui.syntax_enabled: true +tide.ui.ruler_column: 80 +tide.ui.timeout: 50 ! Input and Behavior Settings tide.input.copy_indent: true diff --git a/inc/edit.h b/inc/edit.h index ead80d1..0a35965 100644 --- a/inc/edit.h +++ b/inc/edit.h @@ -225,7 +225,7 @@ char* cmdwriteread(char** cmd, char* text, char** err); enum { /* Configuration Variables */ FontString = 0, TagString, WinWidth, WinHeight, LineSpacing, LineNumbers, RulerColumn, EventTimeout, CopyIndent, TrimOnSave, ExpandTabs, TabWidth, - ScrollLines, DblClickTime, MaxScanDist, + ScrollLines, DblClickTime, MaxScanDist, SyntaxEnabled, Color00, Color01, Color02, Color03, Color04, Color05, Color06, Color07, Color08, Color09, Color10, Color11, Color12, Color13, Color14, Color15, BkgRuler, BkgGutter, BkgTags, BkgEdit, BkgScroll, BkgThumb, BkgBorder, diff --git a/lib/colors.c b/lib/colors.c index 3b8d703..3a9d7b1 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -15,7 +15,8 @@ static int read_byte(void); static int read_num(void); void colors_init(char* path) { - cmdspawn((char*[]){ "tide-hl.rb", path, NULL }, &ChildIn, &ChildOut); + if (config_get_bool(SyntaxEnabled)) + cmdspawn((char*[]){ "tide-hl.rb", path, NULL }, &ChildIn, &ChildOut); } SyntaxSpan* colors_scan(SyntaxSpan* spans, Buf* buf, size_t beg, size_t end) { diff --git a/lib/config.c b/lib/config.c index bf48b16..afea612 100644 --- a/lib/config.c +++ b/lib/config.c @@ -28,11 +28,12 @@ struct { #endif /* user interface related options */ - [WinWidth] = { "tide.ui.width", INTEGER, { .num = 640 } }, - [WinHeight] = { "tide.ui.height", INTEGER, { .num = 480 } }, - [LineNumbers] = { "tide.ui.line_numbers", BOOLEAN, { .opt = true } }, - [RulerColumn] = { "tide.ui.ruler_column", INTEGER, { .num = 80 } }, - [EventTimeout] = { "tide.ui.timeout", INTEGER, { .num = 50 } }, + [WinWidth] = { "tide.ui.width", INTEGER, { .num = 640 } }, + [WinHeight] = { "tide.ui.height", INTEGER, { .num = 480 } }, + [LineNumbers] = { "tide.ui.line_numbers", BOOLEAN, { .opt = true } }, + [SyntaxEnabled] = { "tide.ui.syntax_enabled", BOOLEAN, { .opt = true } }, + [RulerColumn] = { "tide.ui.ruler_column", INTEGER, { .num = 80 } }, + [EventTimeout] = { "tide.ui.timeout", INTEGER, { .num = 50 } }, /* input related options */ [CopyIndent] = { "tide.input.copy_indent", BOOLEAN, { .opt = true } }, diff --git a/themes/acme b/themes/acme index 07095a7..89537da 100644 --- a/themes/acme +++ b/themes/acme @@ -1,6 +1,7 @@ ! Acme Theme - based on the Acme text editor !------------------------------------------------------------------------------- ! Setting Tweaks +tide.ui.syntax_enabled: false tide.ui.line_numbers: false tide.ui.ruler_column: 80 -- 2.49.0