1211a81aad
This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
50 lines
1.3 KiB
C
50 lines
1.3 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include "sway/commands.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
|
|
struct cmd_results *bar_cmd_output(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "output", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
if (!config->current_bar) {
|
|
return cmd_results_new(CMD_FAILURE, "No bar defined.");
|
|
}
|
|
|
|
const char *output = argv[0];
|
|
list_t *outputs = config->current_bar->outputs;
|
|
if (!outputs) {
|
|
outputs = create_list();
|
|
config->current_bar->outputs = outputs;
|
|
}
|
|
|
|
bool add_output = true;
|
|
if (strcmp("*", output) == 0) {
|
|
// remove all previous defined outputs and replace with '*'
|
|
for (int i = 0; i < outputs->length; ++i) {
|
|
free(outputs->items[i]);
|
|
list_del(outputs, i);
|
|
}
|
|
} else {
|
|
// only add output if not already defined with either the same
|
|
// name or as '*'
|
|
for (int i = 0; i < outputs->length; ++i) {
|
|
const char *find = outputs->items[i];
|
|
if (strcmp("*", find) == 0 || strcmp(output, find) == 0) {
|
|
add_output = false;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (add_output) {
|
|
list_add(outputs, strdup(output));
|
|
sway_log(SWAY_DEBUG, "Adding bar: '%s' to output '%s'",
|
|
config->current_bar->id, output);
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|