toytoolkit: Expose output make and model

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand
2014-04-02 19:53:50 -05:00
committed by Kristian Høgsberg
parent ce97a6b184
commit 738715d628
2 changed files with 28 additions and 0 deletions
+22
View File
@@ -348,6 +348,8 @@ struct output {
struct wl_list link; struct wl_list link;
int transform; int transform;
int scale; int scale;
char *make;
char *model;
display_output_handler_t destroy_handler; display_output_handler_t destroy_handler;
void *user_data; void *user_data;
@@ -4667,6 +4669,14 @@ display_handle_geometry(void *data,
output->allocation.x = x; output->allocation.x = x;
output->allocation.y = y; output->allocation.y = y;
output->transform = transform; output->transform = transform;
if (output->make)
free(output->make);
output->make = strdup(make);
if (output->model)
free(output->model);
output->model = strdup(model);
} }
static void static void
@@ -4854,6 +4864,18 @@ output_get_scale(struct output *output)
return output->scale; return output->scale;
} }
const char *
output_get_make(struct output *output)
{
return output->make;
}
const char *
output_get_model(struct output *output)
{
return output->model;
}
static void static void
fini_xkb(struct input *input) fini_xkb(struct input *input)
{ {
+6
View File
@@ -602,6 +602,12 @@ output_get_transform(struct output *output);
uint32_t uint32_t
output_get_scale(struct output *output); output_get_scale(struct output *output);
const char *
output_get_make(struct output *output);
const char *
output_get_model(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);