Add function to load a user config file #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sdilts
reviewed
Apr 5, 2024
lisp/main.lisp
Outdated
| (error (c) (values nil (format nil "~a" c) config-file)) | ||
| (:no-error (&rest args) (declare (ignore args)) (values t nil config-file))) | ||
| (progn | ||
| (log-string :debug (format nil "Found config file at ~a" config-file)) |
There was a problem hiding this comment.
log-string accepts format arguments, so you don't need the extra call to format.
Suggested change
| (log-string :debug (format nil "Found config file at ~a" config-file)) | |
| (log-string :debug "Found config file at ~a" config-file) |
This log statement would also make more sense to have above the catch-error if statement so it is always printed when the config file is found.
lisp/main.lisp
Outdated
Comment on lines
69
to
89
| (init-callback-struct output-callbacks (:struct hrt-output-callbacks) | ||
| (output-added handle-new-output) | ||
| (output-removed handle-output-removed) | ||
| (output-mode-changed output-mode-change-callback)) | ||
| (init-callback-struct seat-callbacks (:struct hrt-seat-callbacks) | ||
| (button-event cursor-callback) | ||
| (wheel-event cursor-callback) | ||
| (keyboard-keypress-event keyboard-callback)) | ||
| (init-view-callbacks view-callbacks) | ||
|
|
||
| (setf (mahogany-state-server *compositor-state*) server) | ||
| (log-string :debug "Initialized mahogany state") | ||
| (hrt-server-init server output-callbacks seat-callbacks view-callbacks 3) | ||
| (log-string :debug "Initialized heart state") | ||
| (unwind-protect | ||
| (hrt-server-start server) | ||
| (log-string :debug "Cleaning up...") | ||
| (server-stop *compositor-state*) | ||
| (hrt-server-finish server) | ||
| (server-state-reset *compositor-state*) | ||
| (log-string :debug "Shutdown reached.")))) | ||
| (setf (mahogany-state-server *compositor-state*) server) | ||
| (log-string :debug "Initialized mahogany state") | ||
| (hrt-server-init server output-callbacks seat-callbacks view-callbacks 3) | ||
| (log-string :debug "Initialized heart state") | ||
| (unwind-protect | ||
| (hrt-server-start server) | ||
| (log-string :debug "Cleaning up...") | ||
| (server-stop *compositor-state*) | ||
| (hrt-server-finish server) | ||
| (server-state-reset *compositor-state*) | ||
| (log-string :debug "Shutdown reached.")))) |
There was a problem hiding this comment.
Please don't change the indentation and formatting of unrelated code, especially where the formatting is correct. If your editor thought this needed to be changed, check that cffi was loaded properly.
lisp/main.lisp
Outdated
| (if config-file | ||
| (if catch-errors | ||
| (handler-case (load config-file) | ||
| (error (c) (values nil (format nil "~a" c) config-file)) |
There was a problem hiding this comment.
In addition to returning the error, I would log the error at the :warn level just so it isn't silently ignored.
This loads a config file first checking $XDG_CONFIG_HOME and if that does not exist falls back to .config/mahogany/init.lisp. It is adapted from the function in stumpwm.
adlai
reviewed
Jan 16, 2025
| (values t nil config-file)))) | ||
| (progn | ||
| (log-string :debug "Did not find config file") | ||
| (values t nil nil))))) |
There was a problem hiding this comment.
The formatting of the above code is a little difficult to read in the website; specifically, the two progn blocks should be indented to line up under the test config-file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This loads a config file first checking $XDG_CONFIG_HOME and if that does not exist falls back to .config/mahogany/init.lisp.
It is adapted from the function in stumpwm.