mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2795 from RedSoxFan/swaynag-disable

Browse Source 
Allow swaynag to be disabled
This commit is contained in:
emersion 2018-10-08 16:24:46 +02:00 committed by GitHub
commit 16e727a654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sway/commands/swaynag_command.c
View File

@ -9,12 +9,17 @@ struct cmd_results *cmd_swaynag_command(int argc, char **argv) {
return error; return error;
} }
if (config->swaynag_command) { free(config->swaynag_command);
free(config->swaynag_command); config->swaynag_command = NULL;
char *new_command = join_args(argv, argc);
if (strcmp(new_command, "-") != 0) {
config->swaybg_command = new_command;
wlr_log(WLR_DEBUG, "Using custom swaynag command: %s",
config->swaynag_command);
} else {
free(new_command);
} }
config->swaynag_command = join_args(argv, argc);
wlr_log(WLR_DEBUG, "Using custom swaynag command: %s",
config->swaynag_command);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

3
sway/config.c
View File

@ -137,6 +137,7 @@ void free_config(struct sway_config *config) {
free(config->floating_scroll_right_cmd); free(config->floating_scroll_right_cmd);
free(config->font); free(config->font);
free(config->swaybg_command); free(config->swaybg_command);
free(config->swaynag_command);
free((char *)config->current_config_path); free((char *)config->current_config_path);
free((char *)config->current_config); free((char *)config->current_config);
free(config); free(config);
@ -167,7 +168,7 @@ static void set_color(float dest[static 4], uint32_t color) {
} }
static void config_defaults(struct sway_config *config) { static void config_defaults(struct sway_config *config) {
config->swaynag_command = strdup("swaynag"); if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup;
config->swaynag_config_errors = (struct swaynag_instance){ config->swaynag_config_errors = (struct swaynag_instance){
.args = "--type error " .args = "--type error "
"--message 'There are errors in your config file' " "--message 'There are errors in your config file' "

3
sway/sway.5.scd
View File

@ -81,6 +81,9 @@ The following commands may only be used in the configuration file.
arguments. This should be placed at the top of the config for the best arguments. This should be placed at the top of the config for the best
results. results.
It can be disabled by setting the command to a single dash:
_swaynag\_command -_
The following commands cannot be used directly in the configuration file. The following commands cannot be used directly in the configuration file.
They are expected to be used with *bindsym* or at runtime through *swaymsg*(1). They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).

8
sway/swaynag.c
View File

@ -11,6 +11,10 @@
bool swaynag_spawn(const char *swaynag_command, bool swaynag_spawn(const char *swaynag_command,
struct swaynag_instance *swaynag) { struct swaynag_instance *swaynag) {
if (!swaynag_command) {
return true;
}
if (swaynag->detailed) { if (swaynag->detailed) {
if (pipe(swaynag->fd) != 0) { if (pipe(swaynag->fd) != 0) {
wlr_log(WLR_ERROR, "Failed to create pipe for swaynag"); wlr_log(WLR_ERROR, "Failed to create pipe for swaynag");
@ -58,6 +62,10 @@ void swaynag_kill(struct swaynag_instance *swaynag) {
void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag,
const char *fmt, ...) { const char *fmt, ...) {
if (!swaynag_command) {
return;
}
if (!swaynag->detailed) { if (!swaynag->detailed) {
wlr_log(WLR_ERROR, "Attempting to write to non-detailed swaynag inst"); wlr_log(WLR_ERROR, "Attempting to write to non-detailed swaynag inst");
return; return;