mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Track output scales

Browse Source
This commit is contained in:
Alexander Larsson
2013-05-22 14:41:27 +02:00
committed by Kristian Høgsberg
parent fd456fb5e0
commit afd319afce
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+28 -2
View File
@@ -322,6 +322,7 @@ struct output {
struct rectangle allocation; struct rectangle allocation;
struct wl_list link; struct wl_list link;
int transform; int transform;
int scale;
display_output_handler_t destroy_handler; display_output_handler_t destroy_handler;
void *user_data; void *user_data;
@@ -4395,6 +4396,22 @@ display_handle_geometry(void *data,
output->transform = transform; output->transform = transform;
} }
static void
display_handle_done(void *data,
struct wl_output *wl_output)
{
}
static void
display_handle_scale(void *data,
struct wl_output *wl_output,
uint32_t scale)
{
struct output *output = data;
output->scale = scale;
}
static void static void
display_handle_mode(void *data, display_handle_mode(void *data,
struct wl_output *wl_output, struct wl_output *wl_output,
@@ -4417,7 +4434,9 @@ display_handle_mode(void *data,
static const struct wl_output_listener output_listener = { static const struct wl_output_listener output_listener = {
display_handle_geometry, display_handle_geometry,
display_handle_mode display_handle_mode,
display_handle_done,
display_handle_scale
}; };
static void static void
@@ -4431,8 +4450,9 @@ display_add_output(struct display *d, uint32_t id)
memset(output, 0, sizeof *output); memset(output, 0, sizeof *output);
output->display = d; output->display = d;
output->scale = 1;
output->output = output->output =
wl_registry_bind(d->registry, id, &wl_output_interface, 1); wl_registry_bind(d->registry, id, &wl_output_interface, 2);
wl_list_insert(d->output_list.prev, &output->link); wl_list_insert(d->output_list.prev, &output->link);
wl_output_add_listener(output->output, &output_listener, output); wl_output_add_listener(output->output, &output_listener, output);
@@ -4536,6 +4556,12 @@ output_get_transform(struct output *output)
return output->transform; return output->transform;
} }
uint32_t
output_get_scale(struct output *output)
{
return output->scale;
}
static void static void
fini_xkb(struct input *input) fini_xkb(struct input *input)
{ {
clients/window.h
+3
View File
@@ -504,6 +504,9 @@ output_get_wl_output(struct output *output);
enum wl_output_transform enum wl_output_transform
output_get_transform(struct output *output); output_get_transform(struct output *output);
uint32_t
output_get_scale(struct output *output);
void void
keysym_modifiers_add(struct wl_array *modifiers_map, keysym_modifiers_add(struct wl_array *modifiers_map,
const char *name); const char *name);