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

Merge pull request #275 from christophgysin/cmd_output

Browse source 
refactor cmd_output
This commit is contained in:
Drew DeVault 2015-11-29 09:07:22 -05:00
parent 0af15cc19e 7059eccaa1
commit c942f1624e
3 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config.h
View file

@ -98,6 +98,7 @@ bool read_config(FILE *file, bool is_active);
* Does variable replacement for a string based on the config's currently loaded variables. * Does variable replacement for a string based on the config's currently loaded variables.
*/ */
char *do_var_replacement(char *str); char *do_var_replacement(char *str);
int output_name_cmp(const void *item, const void *data);;
/** Sets up a WLC output handle based on a given output_config. /** Sets up a WLC output handle based on a given output_config.
*/ */
void apply_output_config(struct output_config *oc, swayc_t *output); void apply_output_config(struct output_config *oc, swayc_t *output);

32
sway/commands.c
View file

@ -716,20 +716,23 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
if ((error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1))) {
return error; return error;
} }
const char *name = argv[0];
struct output_config *output = calloc(1, sizeof(struct output_config)); struct output_config *output = calloc(1, sizeof(struct output_config));
output->x = output->y = output->width = output->height = -1; output->x = output->y = output->width = output->height = -1;
output->name = strdup(argv[0]); output->name = strdup(name);
output->enabled = true; output->enabled = true;
// TODO: atoi doesn't handle invalid numbers // TODO: atoi doesn't handle invalid numbers
if (strcasecmp(argv[1], "disable") == 0) {
output->enabled = false;
}
// TODO: Check missing params after each sub-command // TODO: Check missing params after each sub-command
int i; int i;
for (i = 1; i < argc; ++i) { for (i = 1; i < argc; ++i) {
if (strcasecmp(argv[i], "resolution") == 0 || strcasecmp(argv[i], "res") == 0) { const char *command = argv[i];
if (strcasecmp(command, "disable") == 0) {
output->enabled = false;
} else if (strcasecmp(command, "resolution") == 0 || strcasecmp(command, "res") == 0) {
char *res = argv[++i]; char *res = argv[++i];
char *x = strchr(res, 'x'); char *x = strchr(res, 'x');
int width = -1, height = -1; int width = -1, height = -1;
@ -747,7 +750,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
output->width = width; output->width = width;
output->height = height; output->height = height;
} else if (strcasecmp(argv[i], "position") == 0 || strcasecmp(argv[i], "pos") == 0) { } else if (strcasecmp(command, "position") == 0 || strcasecmp(command, "pos") == 0) {
char *res = argv[++i]; char *res = argv[++i];
char *c = strchr(res, ','); char *c = strchr(res, ',');
int x = -1, y = -1; int x = -1, y = -1;
@ -765,7 +768,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
output->x = x; output->x = x;
output->y = y; output->y = y;
} else if (strcasecmp(argv[i], "bg") == 0 || strcasecmp(argv[i], "background") == 0) { } else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) {
wordexp_t p; wordexp_t p;
if (++i >= argc) { if (++i >= argc) {
return cmd_results_new(CMD_INVALID, "output", "Missing background file."); return cmd_results_new(CMD_INVALID, "output", "Missing background file.");
@ -801,20 +804,19 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
} }
for (i = 0; i < config->output_configs->length; ++i) { i = list_seq_find(config->output_configs, output_name_cmp, name);
struct output_config *oc = config->output_configs->items[i]; if (i >= 0) {
if (strcmp(oc->name, output->name) == 0) {
// replace existing config // replace existing config
struct output_config *oc = config->output_configs->items[i];
list_del(config->output_configs, i); list_del(config->output_configs, i);
free_output_config(oc); free_output_config(oc);
break;
}
} }
list_add(config->output_configs, output); list_add(config->output_configs, output);
sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d) (bg %s %s)", sway_log(L_DEBUG, "Config stored for output %s (%s) (%d x %d @ %d, %d) (bg %s %s)",
output->name, output->width, output->height, output->x, output->y, output->name, output->enabled ? "enable" : "disable", output->width,
output->background, output->background_option); output->height, output->x, output->y, output->background,
output->background_option);
if (output->name) { if (output->name) {
// Try to find the output container and apply configuration now. If // Try to find the output container and apply configuration now. If

16
sway/config.c
View file

@ -261,6 +261,14 @@ bool read_config(FILE *file, bool is_active) {
return success; return success;
} }
int output_name_cmp(const void *item, const void *data)
{
const struct output_config *output = item;
const char *name = data;
return strcmp(output->name, name);
}
void apply_output_config(struct output_config *oc, swayc_t *output) { void apply_output_config(struct output_config *oc, swayc_t *output) {
if (oc && oc->width > 0 && oc->height > 0) { if (oc && oc->width > 0 && oc->height > 0) {
output->width = oc->width; output->width = oc->width;
@ -291,12 +299,10 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
if (!oc || !oc->background) { if (!oc || !oc->background) {
// Look for a * config for background // Look for a * config for background
int i; int i = list_seq_find(config->output_configs, output_name_cmp, "*");
for (i = 0; i < config->output_configs->length; ++i) { if (i >= 0) {
oc = config->output_configs->items[i]; oc = config->output_configs->items[i];
if (strcasecmp("*", oc->name) == 0) { } else {
break;
}
oc = NULL; oc = NULL;
} }
} }