From 600721070f2970b3386393ca93cb8dc53aedc240 Mon Sep 17 00:00:00 2001 From: pommicket Date: Sun, 5 Mar 2023 10:01:42 -0500 Subject: rename styles -> themes --- Makefile | 3 +- control | 2 +- main.c | 2 +- styles/classic-light.ted.cfg | 50 ------------------------------ styles/classic.ted.cfg | 73 -------------------------------------------- styles/extradark.ted.cfg | 49 ----------------------------- ted.cfg | 2 +- ted.h | 2 +- themes/classic-light.ted.cfg | 50 ++++++++++++++++++++++++++++++ themes/classic.ted.cfg | 73 ++++++++++++++++++++++++++++++++++++++++++++ themes/extradark.ted.cfg | 49 +++++++++++++++++++++++++++++ 11 files changed, 178 insertions(+), 177 deletions(-) delete mode 100644 styles/classic-light.ted.cfg delete mode 100644 styles/classic.ted.cfg delete mode 100644 styles/extradark.ted.cfg create mode 100644 themes/classic-light.ted.cfg create mode 100644 themes/classic.ted.cfg create mode 100644 themes/extradark.ted.cfg diff --git a/Makefile b/Makefile index 718760d..62087b1 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ install: release mkdir -p $(GLOBAL_DATA_DIR) $(LOCAL_DATA_DIR) chown `logname`:`logname` $(LOCAL_DATA_DIR) cp -r assets $(GLOBAL_DATA_DIR) + cp -r themes $(GLOBAL_DATA_DIR) install -m 644 ted.cfg $(GLOBAL_DATA_DIR) install ted $(INSTALL_BIN_DIR) libpcre2-32.a: pcre2 @@ -53,7 +54,7 @@ ted.deb: release mkdir -p /tmp/ted/usr/share/applications cp ted.desktop /tmp/ted/usr/share/applications cp ted /tmp/ted$(INSTALL_BIN_DIR)/ - cp -r assets ted.cfg /tmp/ted$(GLOBAL_DATA_DIR)/ + cp -r assets themes ted.cfg /tmp/ted$(GLOBAL_DATA_DIR)/ cp control /tmp/ted/DEBIAN dpkg-deb --build /tmp/ted mv /tmp/ted.deb ./ diff --git a/control b/control index 210c472..235a8ec 100644 --- a/control +++ b/control @@ -1,5 +1,5 @@ Package: ted -Version: 2.0 +Version: 2.1 Section: text Priority: optional Architecture: amd64 diff --git a/main.c b/main.c index 3a594e1..d3cdbed 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,6 @@ /* FUTURE FEATURES: - better undo chaining (dechain on backspace?) -- manual.md - font setting & support for multiple fonts to cover more characters - support for variable-width fonts - robust find (results shouldn't move around when you type things) @@ -20,6 +19,7 @@ FUTURE FEATURES: - keyboard macros - ctrl+9/0 to inc/dec number would be useful here - with macros we can really test performance of buffer_insert_text_at_pos, etc. (which should ideally be fast) +- manual.md - auto-reload config even for %included files - LSP request timeout BUG REPORTS IM TO LAZY TO FILE (RIGHT NOW) diff --git a/styles/classic-light.ted.cfg b/styles/classic-light.ted.cfg deleted file mode 100644 index c154020..0000000 --- a/styles/classic-light.ted.cfg +++ /dev/null @@ -1,50 +0,0 @@ -[colors] -# for information about what these colors mean, see classic.ted.cfg -border = #844 -active-tab-hl = #a779 -selected-tab-hl = #0002 -cursor-line-bg = #00000015 -cursor = #088 -cursor-error = #a00 -matching-bracket-hl = #8703 -selection-bg = #36a5 -view-only-cursor = #080 -view-only-selection-bg = #0a05 -text = #000 -text-folder = #029 -text-other = #060 -bg = #ddd -menu-backdrop = #0004 -menu-bg = #ccc -menu-hl = #0a04 -error-border = #f00 -error-bg = #faa -warning-border = #ff0 -warning-bg = #ffa -info-border = #00f -info-bg = #aaf -find-hl = #0002 -yes = #070 -no = #800 -cancel = #880 -autocomplete-bg = #eee -autocomplete-border = #999 -autocomplete-hl = #f6a3 -hover-bg = #fffc -hover-border = #fff -hover-text = #000 -hover-hl = #0002 -hl-write = #f002 -autocomplete-variable = #061 -autocomplete-function = #039 -autocomplete-type = #939 -keyword = #062 -preprocessor = #11a -string = #b33 -character = #960 -builtin = #70a -comment = #555 -constant = #077 -line-numbers = #557 -cursor-line-number = #002 -line-numbers-separator = #0005 diff --git a/styles/classic.ted.cfg b/styles/classic.ted.cfg deleted file mode 100644 index b7a9025..0000000 --- a/styles/classic.ted.cfg +++ /dev/null @@ -1,73 +0,0 @@ -[colors] -# below, bg is short for background and hl is short for highlight - -border = #a77 -active-tab-hl = #a77a -# this color is used for tabs which are selected, but not active (because you are on the other side of a split, perhaps) -selected-tab-hl = #7777 -cursor-line-bg = #fff2 -cursor = #3ff -# used as cursor color when you do autocomplete and there are no suggestions -cursor-error = #f00 -# color to highlight matching brackets with -matching-bracket-hl = #fda8 -selection-bg = #36aa -view-only-cursor = #0d0 -view-only-selection-bg = #0a05 -text = #fff -# For example, in the open menu it is nice to have a visual distinction between folders and files. -# This is the color used for folders. -text-folder = #88f -# Used for things that are neither files nor folders. -text-other = #8f8 -bg = #001 -# The entire screen gets filled with this color when a menu (e.g. the "open" menu) is shown. -# By making it transparent, we can dim everything else while the menu is open. -menu-backdrop = #0004 -menu-bg = #222 -menu-hl = #afa2 -# error box colors -error-border = #f00 -error-bg = #800 -# warning box colors -warning-border = #ff0 -warning-bg = #660 -# info box colors -info-border = #00f -info-bg = #004 -# color to highlight search results with -find-hl = #fff4 -yes = #afa -no = #faa -cancel = #ffa - -# autocomplete -autocomplete-bg = #000 -autocomplete-border = #999 -autocomplete-hl = #f6a3 -# hover (press F1 while hovering over an identifier with an LSP server running) -hover-bg = #000a -hover-border = #fffa -hover-text = #fff -hover-hl = #fff4 -# highlight color for F2 key (LSP "document highlights") for write accesses to a variable -# (hover-hl is used for read accesses) -hl-write = #fca4 -# these control the text color for various kinds of completions -autocomplete-variable = #bfb -autocomplete-function = #fec -autocomplete-type = #faf - - -# Syntax highlighting -keyword = #0c0 -preprocessor = #77f -string = #f77 -character = #fa7 -builtin = #a7f -comment = #999 -constant = #8ff - -line-numbers = #779 -cursor-line-number = #ddf -line-numbers-separator = #fff3 diff --git a/styles/extradark.ted.cfg b/styles/extradark.ted.cfg deleted file mode 100644 index 0b3603e..0000000 --- a/styles/extradark.ted.cfg +++ /dev/null @@ -1,49 +0,0 @@ -[colors] -border = #9a7 -active-tab-hl = #9a7a -selected-tab-hl = #fff2 -cursor-line-bg = #fef2 -cursor = #faf -cursor-error = #f55 -matching-bracket-hl = #afc8 -selection-bg = #a6aa -view-only-cursor = #80a -view-only-selection-bg = #80a6 -text = #fff -text-folder = #66f -text-other = #6f6 -bg = #000 -menu-backdrop = #0004 -menu-bg = #000 -menu-hl = #cfa3 -error-border = #f00 -error-bg = #f005 -warning-border = #ff0 -warning-bg = #ff05 -info-border = #00f -info-bg = #00f5 -find-hl = #afa4 -yes = #6f6 -no = #f66 -cancel = #ff6 -autocomplete-bg = #000 -autocomplete-border = #444 -autocomplete-hl = #f6c3 -hover-bg = #000a -hover-border = #fffc -hover-text = #fff -hover-hl = #fff4 -hl-write = #fca4 -autocomplete-variable = #7f7 -autocomplete-function = #fa7 -autocomplete-type = #f7f -keyword = #0f0 -preprocessor = #24f -string = #f40 -character = #fa0 -builtin = #c0f -comment = #999 -constant = #0ff -line-numbers = #8a8 -cursor-line-number = #dfd -line-numbers-separator = #dfd7 diff --git a/ted.cfg b/ted.cfg index cf6fda8..f2d63f0 100644 --- a/ted.cfg +++ b/ted.cfg @@ -385,5 +385,5 @@ CSS = .css # [/path/to/special/project//Javascript.keyboard] # Ctrl+J = "function() {" :insert-text -%include styles/classic.ted.cfg +%include themes/classic.ted.cfg diff --git a/ted.h b/ted.h index 3470c5b..59bdf65 100644 --- a/ted.h +++ b/ted.h @@ -28,7 +28,7 @@ extern "C" { #include "sdl-inc.h" /// Version number -#define TED_VERSION "2.0" +#define TED_VERSION "2.1" /// Version string #define TED_VERSION_FULL "ted v. " TED_VERSION /// Maximum path size ted handles. diff --git a/themes/classic-light.ted.cfg b/themes/classic-light.ted.cfg new file mode 100644 index 0000000..c154020 --- /dev/null +++ b/themes/classic-light.ted.cfg @@ -0,0 +1,50 @@ +[colors] +# for information about what these colors mean, see classic.ted.cfg +border = #844 +active-tab-hl = #a779 +selected-tab-hl = #0002 +cursor-line-bg = #00000015 +cursor = #088 +cursor-error = #a00 +matching-bracket-hl = #8703 +selection-bg = #36a5 +view-only-cursor = #080 +view-only-selection-bg = #0a05 +text = #000 +text-folder = #029 +text-other = #060 +bg = #ddd +menu-backdrop = #0004 +menu-bg = #ccc +menu-hl = #0a04 +error-border = #f00 +error-bg = #faa +warning-border = #ff0 +warning-bg = #ffa +info-border = #00f +info-bg = #aaf +find-hl = #0002 +yes = #070 +no = #800 +cancel = #880 +autocomplete-bg = #eee +autocomplete-border = #999 +autocomplete-hl = #f6a3 +hover-bg = #fffc +hover-border = #fff +hover-text = #000 +hover-hl = #0002 +hl-write = #f002 +autocomplete-variable = #061 +autocomplete-function = #039 +autocomplete-type = #939 +keyword = #062 +preprocessor = #11a +string = #b33 +character = #960 +builtin = #70a +comment = #555 +constant = #077 +line-numbers = #557 +cursor-line-number = #002 +line-numbers-separator = #0005 diff --git a/themes/classic.ted.cfg b/themes/classic.ted.cfg new file mode 100644 index 0000000..b7a9025 --- /dev/null +++ b/themes/classic.ted.cfg @@ -0,0 +1,73 @@ +[colors] +# below, bg is short for background and hl is short for highlight + +border = #a77 +active-tab-hl = #a77a +# this color is used for tabs which are selected, but not active (because you are on the other side of a split, perhaps) +selected-tab-hl = #7777 +cursor-line-bg = #fff2 +cursor = #3ff +# used as cursor color when you do autocomplete and there are no suggestions +cursor-error = #f00 +# color to highlight matching brackets with +matching-bracket-hl = #fda8 +selection-bg = #36aa +view-only-cursor = #0d0 +view-only-selection-bg = #0a05 +text = #fff +# For example, in the open menu it is nice to have a visual distinction between folders and files. +# This is the color used for folders. +text-folder = #88f +# Used for things that are neither files nor folders. +text-other = #8f8 +bg = #001 +# The entire screen gets filled with this color when a menu (e.g. the "open" menu) is shown. +# By making it transparent, we can dim everything else while the menu is open. +menu-backdrop = #0004 +menu-bg = #222 +menu-hl = #afa2 +# error box colors +error-border = #f00 +error-bg = #800 +# warning box colors +warning-border = #ff0 +warning-bg = #660 +# info box colors +info-border = #00f +info-bg = #004 +# color to highlight search results with +find-hl = #fff4 +yes = #afa +no = #faa +cancel = #ffa + +# autocomplete +autocomplete-bg = #000 +autocomplete-border = #999 +autocomplete-hl = #f6a3 +# hover (press F1 while hovering over an identifier with an LSP server running) +hover-bg = #000a +hover-border = #fffa +hover-text = #fff +hover-hl = #fff4 +# highlight color for F2 key (LSP "document highlights") for write accesses to a variable +# (hover-hl is used for read accesses) +hl-write = #fca4 +# these control the text color for various kinds of completions +autocomplete-variable = #bfb +autocomplete-function = #fec +autocomplete-type = #faf + + +# Syntax highlighting +keyword = #0c0 +preprocessor = #77f +string = #f77 +character = #fa7 +builtin = #a7f +comment = #999 +constant = #8ff + +line-numbers = #779 +cursor-line-number = #ddf +line-numbers-separator = #fff3 diff --git a/themes/extradark.ted.cfg b/themes/extradark.ted.cfg new file mode 100644 index 0000000..0b3603e --- /dev/null +++ b/themes/extradark.ted.cfg @@ -0,0 +1,49 @@ +[colors] +border = #9a7 +active-tab-hl = #9a7a +selected-tab-hl = #fff2 +cursor-line-bg = #fef2 +cursor = #faf +cursor-error = #f55 +matching-bracket-hl = #afc8 +selection-bg = #a6aa +view-only-cursor = #80a +view-only-selection-bg = #80a6 +text = #fff +text-folder = #66f +text-other = #6f6 +bg = #000 +menu-backdrop = #0004 +menu-bg = #000 +menu-hl = #cfa3 +error-border = #f00 +error-bg = #f005 +warning-border = #ff0 +warning-bg = #ff05 +info-border = #00f +info-bg = #00f5 +find-hl = #afa4 +yes = #6f6 +no = #f66 +cancel = #ff6 +autocomplete-bg = #000 +autocomplete-border = #444 +autocomplete-hl = #f6c3 +hover-bg = #000a +hover-border = #fffc +hover-text = #fff +hover-hl = #fff4 +hl-write = #fca4 +autocomplete-variable = #7f7 +autocomplete-function = #fa7 +autocomplete-type = #f7f +keyword = #0f0 +preprocessor = #24f +string = #f40 +character = #fa0 +builtin = #c0f +comment = #999 +constant = #0ff +line-numbers = #8a8 +cursor-line-number = #dfd +line-numbers-separator = #dfd7 -- cgit v1.2.3