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

Merge branch 'master' into popup-during-fullscreen

Browse source
This commit is contained in:
Brian Ashworth 2018-10-08 15:18:49 -04:00 • committed by GitHub
commit 3f328b6276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/bar/status_command.c
View file

@ -20,6 +20,8 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
config->current_bar->status_command = new_command;
wlr_log(WLR_DEBUG, "Feeding bar with status command: %s",
config->current_bar->status_command);
} else {
free(new_command);
}
if (config->active && !config->validating) {

4
sway/commands/opacity.c
View file

@ -21,6 +21,10 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
struct sway_container *con = config->handler_context.container;
if (con == NULL) {
return cmd_results_new(CMD_FAILURE, "opacity", "No current container");
}
float opacity = 0.0f;
if (!parse_opacity(argv[0], &opacity)) {

15
sway/commands/swaybg_command.c
View file

@ -9,12 +9,17 @@ struct cmd_results *cmd_swaybg_command(int argc, char **argv) {
return error;
}
if (config->swaybg_command) {
free(config->swaybg_command);
free(config->swaybg_command);
config->swaybg_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 swaybg command: %s",
config->swaybg_command);
} else {
free(new_command);
}
config->swaybg_command = join_args(argv, argc);
wlr_log(WLR_DEBUG, "Using custom swaybg command: %s",
config->swaybg_command);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

15
sway/commands/swaynag_command.c
View file

@ -9,12 +9,17 @@ struct cmd_results *cmd_swaynag_command(int argc, char **argv) {
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);
}

3
sway/commands/urgent.c
View file

@ -12,6 +12,9 @@ struct cmd_results *cmd_urgent(int argc, char **argv) {
return error;
}
struct sway_container *container = config->handler_context.container;
if (!container) {
return cmd_results_new(CMD_FAILURE, "urgent", "No current container");
}
if (!container->view) {
return cmd_results_new(CMD_INVALID, "urgent",
"Only views can be urgent");