mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: allow for inline to end of line comments

Browse source 
Allows for the following syntax in the config:
    `command <arguments...> # the rest of this line is a comment`
Example:
    `input * repeat_delay 200 # milliseconds`

Note: The space before and after the `#` is mandatory otherwise the
`#` will be seen as part of an argument (such as colors). If a `#`
is needed as it's own argument, then it can be enclosed in quotes. For
example, `bar bar-0 separator_symbol "#"`.
This commit is contained in:
Brian Ashworth 2018-11-03 00:19:31 -04:00
parent 684414ce7b
commit c6c5a71863
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/commands.c
View file

@ -415,7 +415,13 @@ struct cmd_results *config_command(char *exec) {
free(command); free(command);
// Strip quotes and unescape the string // Strip quotes and unescape the string
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { int i;
for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
if (strcmp(argv[i], "#") == 0) {
wlr_log(WLR_DEBUG, "Inline comment detected at argv[%d]."
"Ignoring all further arguments.", i);
break;
}
if (handler->handle != cmd_exec && handler->handle != cmd_exec_always if (handler->handle != cmd_exec && handler->handle != cmd_exec_always
&& handler->handle != cmd_bindsym && handler->handle != cmd_bindsym
&& handler->handle != cmd_bindcode && handler->handle != cmd_bindcode
@ -427,7 +433,7 @@ struct cmd_results *config_command(char *exec) {
} }
// Run command // Run command
results = handler->handle(argc - 1, argv + 1); results = handler->handle(i - 1, argv + 1);
cleanup: cleanup:
free_argv(argc, argv); free_argv(argc, argv);