diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-15 11:04:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 11:04:27 -0500 |
| commit | a6704fd16d53fb82c8cea527b4a546ba92572ea8 (patch) | |
| tree | 4ef0a8c88272e7715f6f2b6fd2da853850de328c /rootston | |
| parent | 23fb663ea4eaff436d9bfab7f74cdd298fac44c5 (diff) | |
| parent | 51bbcc0fbf7b668c73eeffbb6839f402a0ca368f (diff) | |
Merge pull request #488 from emersion/fractional-scaling
Add fractional scaling support
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/config.c | 2 | ||||
| -rw-r--r-- | rootston/seat.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/rootston/config.c b/rootston/config.c index db77506f..ed91d4fd 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -270,7 +270,7 @@ static int config_ini_handler(void *user, const char *section, const char *name, } else if (strcmp(name, "y") == 0) { oc->y = strtol(value, NULL, 10); } else if (strcmp(name, "scale") == 0) { - oc->scale = strtol(value, NULL, 10); + oc->scale = strtof(value, NULL); assert(oc->scale >= 1); } else if (strcmp(name, "rotate") == 0) { if (strcmp(value, "normal") == 0) { diff --git a/rootston/seat.c b/rootston/seat.c index 8a581157..ce0f1374 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -459,11 +459,10 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) { struct roots_output *output; wl_list_for_each(output, &seat->input->server->desktop->outputs, link) { - if (wlr_xcursor_manager_load(seat->cursor->xcursor_manager, - output->wlr_output->scale)) { + float scale = output->wlr_output->scale; + if (wlr_xcursor_manager_load(seat->cursor->xcursor_manager, scale)) { wlr_log(L_ERROR, "Cannot load xcursor theme for output '%s' " - "with scale %d", output->wlr_output->name, - output->wlr_output->scale); + "with scale %f", output->wlr_output->name, scale); } } |