diff --git a/Makefile.am b/Makefile.am index af9d113..56bc8be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ CONF_PATH_FILE_IN_IN = src/config.lisp.in.in BUILT_SOURCES = $(CONF_PATH_FILE) EXTRA_DIST = config.rpath m4/ChangeLog tinmop.asd README.org src \ -LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/gui.conf \ +LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/shared-gui.conf \ etc/init.lisp compare_version.awk SUBDIRS = po @@ -40,7 +40,7 @@ doc/tinmop.org doc/send-toot.lisp NEWS.org ChangeLog AUTHORS confdir = $(sysconfdir)/$(PACKAGE) -dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/gui.conf +dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/shared-gui.conf nobase_dist_pkgdata_DATA = data/error-pages/51 \ data/error-pages/header-51.png \ diff --git a/Makefile.in b/Makefile.in index f35288b..36ffceb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -398,7 +398,7 @@ CONF_PATH_FILE_IN = src/config.lisp.in CONF_PATH_FILE_IN_IN = src/config.lisp.in.in BUILT_SOURCES = $(CONF_PATH_FILE) EXTRA_DIST = config.rpath m4/ChangeLog tinmop.asd README.org src \ -LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/gui.conf \ +LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/shared-gui.conf \ etc/init.lisp compare_version.awk SUBDIRS = po @@ -406,7 +406,7 @@ dist_doc_DATA = README.org LICENSES.org CONTRIBUTING.org \ doc/tinmop.org doc/send-toot.lisp NEWS.org ChangeLog AUTHORS confdir = $(sysconfdir)/$(PACKAGE) -dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/gui.conf +dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/shared-gui.conf nobase_dist_pkgdata_DATA = data/error-pages/51 \ data/error-pages/header-51.png \ data/icons/fmw_arrow-down.png \ diff --git a/etc/gui.conf b/etc/shared-gui.conf similarity index 98% rename from etc/gui.conf rename to etc/shared-gui.conf index 7fa4995..59587dd 100644 --- a/etc/gui.conf +++ b/etc/shared-gui.conf @@ -167,7 +167,7 @@ gemini.preformatted.justification = left # width in chars -toc.show = no +toc.show = yes toc.maximum.width = 40 @@ -187,7 +187,7 @@ toc.autoresize = yes # stream frame -stream-frame.show = no +stream-frame.show = yes # Keybinding diff --git a/src/gui/client/client-configuration.lisp b/src/gui/client/client-configuration.lisp index 87b46a4..4b687d7 100644 --- a/src/gui/client/client-configuration.lisp +++ b/src/gui/client/client-configuration.lisp @@ -21,7 +21,9 @@ (defparameter *client-configuration* ()) -(a:define-constant +client-conf-filename+ "gui.conf" :test #'string=) +(a:define-constant +client-conf-filename+ "gui.conf" :test #'string=) + +(a:define-constant +client-sys-conf-filename+ "shared-gui.conf" :test #'string=) (swconf::gen-key-constants text font diff --git a/src/main.lisp b/src/main.lisp index ba37bca..0039664 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -239,6 +239,7 @@ etc.) happened" (load command-line:*script-file* :verbose nil :print nil))) (defun rpc-client-load-configuration () + (gui-conf:load-config-file gui-conf:+client-sys-conf-filename+) (handler-bind ((error (lambda (e) (format *error-output* diff --git a/src/package.lisp b/src/package.lisp index 5f32613..ecefd0b 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -3266,6 +3266,7 @@ (:a :alexandria)) (:export :+client-conf-filename+ + :+client-sys-conf-filename+ :load-config-file :gemini-default-favicon :gemini-fetch-favicon-p