mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-25 06:59:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consider scale factor when rendering views

Browse source
This commit is contained in:
Drew DeVault 2017-10-22 23:19:21 -04:00
parent 03c0d41ca9
commit a7446792a1
7 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rootston/config.c
View file

@ -220,6 +220,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);
}
@ -227,6 +228,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, "90") == 0) {
oc->transform = WL_OUTPUT_TRANSFORM_90;

3
rootston/output.c
View file

@ -27,6 +27,8 @@ static void render_surface(struct wlr_surface *surface,
if (wlr_output_layout_intersects(desktop->layout, wlr_output,
lx, ly, lx + width, ly + height)) {
// TODO: accomodate for mismatched scale, which can happen, for
// example, when a view is rendered over two outputs
float matrix[16];
float translate_origin[16];
@ -217,6 +219,7 @@ void output_add_notify(struct wl_listener *listener, void *data) {
if (output_config->mode.width) {
set_mode(wlr_output, output_config);
}
wlr_output->scale = output_config->scale;
wlr_output_transform(wlr_output, output_config->transform);
wlr_output_layout_add(desktop->layout,
wlr_output, output_config->x, output_config->y);