blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #466 from emersion/wlr-output-set-scale 

Add wlr_output_set_scale
This commit is contained in:
Drew DeVault 2017-12-06 12:17:04 -05:00 committed by GitHub
parent dad19394cf dac0233804
commit aead5019a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/types/wlr_output.h
View File

@ -85,6 +85,7 @@ bool wlr_output_set_mode(struct wlr_output *output,
void wlr_output_transform(struct wlr_output *output, void wlr_output_transform(struct wlr_output *output,
enum wl_output_transform transform); enum wl_output_transform transform);
void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly); void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly);
void wlr_output_set_scale(struct wlr_output *output, uint32_t scale);
void wlr_output_destroy(struct wlr_output *output); void wlr_output_destroy(struct wlr_output *output);
void wlr_output_effective_resolution(struct wlr_output *output, void wlr_output_effective_resolution(struct wlr_output *output,
int *width, int *height); int *width, int *height);

6
rootston/output.c
View File

@ -314,10 +314,10 @@ void output_add_notify(struct wl_listener *listener, void *data) {
if (output_config->mode.width) { if (output_config->mode.width) {
set_mode(wlr_output, output_config); set_mode(wlr_output, output_config);
} }
wlr_output->scale = output_config->scale; wlr_output_set_scale(wlr_output, output_config->scale);
wlr_output_transform(wlr_output, output_config->transform); wlr_output_transform(wlr_output, output_config->transform);
wlr_output_layout_add(desktop->layout, wlr_output_layout_add(desktop->layout, wlr_output, output_config->x,
wlr_output, output_config->x, output_config->y); output_config->y);
} else { } else {
wlr_output_layout_add_auto(desktop->layout, wlr_output); wlr_output_layout_add_auto(desktop->layout, wlr_output);
} }

29
types/wlr_output.c
View File

@ -52,6 +52,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
static void wlr_output_send_current_mode_to_resource( static void wlr_output_send_current_mode_to_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(resource);
struct wlr_output *output = wl_resource_get_user_data(resource); struct wlr_output *output = wl_resource_get_user_data(resource);
assert(output); assert(output);
const uint32_t version = wl_resource_get_version(resource); const uint32_t version = wl_resource_get_version(resource);
@ -119,7 +120,6 @@ struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
struct wl_global *wl_global = wl_global_create(display, struct wl_global *wl_global = wl_global_create(display,
&wl_output_interface, 3, wlr_output, wl_output_bind); &wl_output_interface, 3, wlr_output, wl_output_bind);
wlr_output->wl_global = wl_global; wlr_output->wl_global = wl_global;
wl_list_init(&wlr_output->wl_resources);
return wl_global; return wl_global;
} }
@ -155,6 +155,7 @@ bool wlr_output_set_mode(struct wlr_output *output,
bool result = output->impl->set_mode(output, mode); bool result = output->impl->set_mode(output, mode);
if (result) { if (result) {
wlr_output_update_matrix(output); wlr_output_update_matrix(output);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) { wl_resource_for_each(resource, &output->wl_resources) {
wlr_output_send_current_mode_to_resource(resource); wlr_output_send_current_mode_to_resource(resource);
@ -168,21 +169,27 @@ void wlr_output_update_size(struct wlr_output *output, int32_t width,
if (output->width == width && output->height == height) { if (output->width == width && output->height == height) {
return; return;
} }
output->width = width; output->width = width;
output->height = height; output->height = height;
wlr_output_update_matrix(output); wlr_output_update_matrix(output);
if (output->wl_global != NULL) {
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) { wl_resource_for_each(resource, &output->wl_resources) {
wlr_output_send_current_mode_to_resource(resource); wlr_output_send_current_mode_to_resource(resource);
} }
}
} }
void wlr_output_transform(struct wlr_output *output, void wlr_output_transform(struct wlr_output *output,
enum wl_output_transform transform) { enum wl_output_transform transform) {
output->impl->transform(output, transform); output->impl->transform(output, transform);
wlr_output_update_matrix(output); wlr_output_update_matrix(output);
// TODO: only send geometry and done
struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) {
wl_output_send_to_resource(resource);
}
} }
void wlr_output_set_position(struct wlr_output *output, int32_t lx, void wlr_output_set_position(struct wlr_output *output, int32_t lx,
@ -194,6 +201,21 @@ void wlr_output_set_position(struct wlr_output *output, int32_t lx,
output->lx = lx; output->lx = lx;
output->ly = ly; output->ly = ly;
// TODO: only send geometry and done
struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) {
wl_output_send_to_resource(resource);
}
}
void wlr_output_set_scale(struct wlr_output *output, uint32_t scale) {
if (output->scale == scale) {
return;
}
output->scale = scale;
// TODO: only send mode and done
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) { wl_resource_for_each(resource, &output->wl_resources) {
wl_output_send_to_resource(resource); wl_output_send_to_resource(resource);
@ -209,6 +231,7 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
output->transform = WL_OUTPUT_TRANSFORM_NORMAL; output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
output->scale = 1; output->scale = 1;
wl_list_init(&output->cursors); wl_list_init(&output->cursors);
wl_list_init(&output->wl_resources);
wl_signal_init(&output->events.frame); wl_signal_init(&output->events.frame);
wl_signal_init(&output->events.swap_buffers); wl_signal_init(&output->events.swap_buffers);
wl_signal_init(&output->events.resolution); wl_signal_init(&output->events.resolution);