cmd_output: Use list_seq_find() to find matching config

master
Christoph Gysin 9 years ago
parent 88f372a22a
commit 7d82cd9c0a

@ -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.
*/
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.
*/
void apply_output_config(struct output_config *oc, swayc_t *output);

@ -804,14 +804,12 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
}
}
for (i = 0; i < config->output_configs->length; ++i) {
struct output_config *oc = config->output_configs->items[i];
if (strcmp(oc->name, output->name) == 0) {
i = list_seq_find(config->output_configs, output_name_cmp, name);
if (i >= 0) {
// replace existing config
struct output_config *oc = config->output_configs->items[i];
list_del(config->output_configs, i);
free_output_config(oc);
break;
}
}
list_add(config->output_configs, output);

@ -261,6 +261,14 @@ bool read_config(FILE *file, bool is_active) {
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) {
if (oc && oc->width > 0 && oc->height > 0) {
output->width = oc->width;

Loading…
Cancel
Save