From 320aa2257f5b5f4ef516eccc3ab2bd49b79d0fdb Mon Sep 17 00:00:00 2001
From: Robin Jarry <robin@jarry.cc>
Date: Mon, 11 Sep 2023 17:52:47 +0200
Subject: config: add default values for empty stylesets

When adding new style objects it is impossible to give them a default
color nor attributes without modifying each existing user styleset.
Also, if the user has an incomplete styleset, some parts of aerc will
have no style at all. These quirks are not nice from a user experience
point of view.

Before parsing the user styleset, initialize aerc style with basic
defaults. Reuse the exact same content than the actual "default"
styleset provided in /usr/share/aerc/stylesets. Comment all of the
default styleset to make it obvious that these are default values.

This has some implications:

* To reset these defaults, the user styleset must now start with these
  two lines:

    *.default = true
    *.normal = true

  If these two lines are not present, the default style will be kept and
  only changed if the user styleset explicitly sets them.

* Empty stylesets no longer produce weird results.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Inwit <inwit@sindominio.net>
---
 stylesets/default | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'stylesets/default')

diff --git a/stylesets/default b/stylesets/default
index f3ea2733..c0d6f909 100644
--- a/stylesets/default
+++ b/stylesets/default
@@ -6,36 +6,39 @@
 # the aerc-stylesets(7) manpage. Please read the manual before
 # modifying or creating a styleset.
 
-*.default=true
-*.selected.reverse=toggle
+# Uncomment these two lines to reset all attributes and start from scratch.
+#*.default=true
+#*.normal=true
 
-title.reverse=true
-header.bold=true
+#*.selected.reverse=toggle
+#
+#title.reverse=true
+#header.bold=true
 
-*error.bold=true
-error.fg=red
-warning.fg=yellow
-success.fg=green
+#*error.bold=true
+#error.fg=red
+#warning.fg=yellow
+#success.fg=green
 
-statusline*.default=true
-statusline_default.reverse=true
-statusline_error.fg=red
-statusline_error.reverse=true
-statusline_warning.fg=yellow
-statusline_warning.reverse=true
+#statusline*.default=true
+#statusline_default.reverse=true
+#statusline_error.fg=red
+#statusline_error.reverse=true
+#statusline_warning.fg=yellow
+#statusline_warning.reverse=true
 
-msglist_unread.bold=true
-msglist_deleted.fg=gray
-msglist_result.fg=green
-msglist_pill.reverse=true
+#msglist_unread.bold=true
+#msglist_deleted.fg=gray
+#msglist_result.fg=green
+#msglist_pill.reverse=true
 
-completion_pill.reverse=true
+#completion_pill.reverse=true
 
-tab.reverse=true
-border.reverse = true
+#tab.reverse=true
+#border.reverse = true
 
-selector_focused.reverse=true
-selector_chooser.bold=true
+#selector_focused.reverse=true
+#selector_chooser.bold=true
 
 #[viewer]
 #url.underline=true
-- 
cgit