diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-11-11 09:58:59 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-11-11 09:59:39 -0500 |
| commit | 2a9dc60f28616211370fcd48de8c75ef17282d2e (patch) | |
| tree | be639c73a782ecfd680dabc31d3a4e4208cba61f /rootston/config.c | |
| parent | 27a3a810ab372ca699bb9da1ce506816432b39f6 (diff) | |
| parent | 78ed7f3c8983191b0b6399d4c66f5524a23f216a (diff) | |
Merge branch 'master' into feature/multiseat
Diffstat (limited to 'rootston/config.c')
| -rw-r--r-- | rootston/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rootston/config.c b/rootston/config.c index 815040bf..54f10fcd 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -221,6 +221,7 @@ static int config_ini_handler(void *user, const char *section, const char *name, oc = calloc(1, sizeof(struct output_config)); oc->name = strdup(output_name); oc->transform = WL_OUTPUT_TRANSFORM_NORMAL; + oc->scale = 1; wl_list_insert(&config->outputs, &oc->link); } @@ -228,6 +229,9 @@ static int config_ini_handler(void *user, const char *section, const char *name, oc->x = strtol(value, NULL, 10); } else if (strcmp(name, "y") == 0) { oc->y = strtol(value, NULL, 10); + } else if (strcmp(name, "scale") == 0) { + oc->scale = strtol(value, NULL, 10); + assert(oc->scale >= 1); } else if (strcmp(name, "rotate") == 0) { if (strcmp(value, "normal") == 0) { oc->transform = WL_OUTPUT_TRANSFORM_NORMAL; |