From 632a7acb03f4c4b8d06fdf7f8d7839db27cde538 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 8 Jun 2017 00:39:40 +1200 Subject: Filled out more wlr_output fields. --- include/backend/drm/drm.h | 1 - include/wlr/types.h | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 004f3a10..2d063adb 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -34,7 +34,6 @@ struct wlr_output_state { struct wlr_output *wlr_output; enum wlr_drm_output_state state; uint32_t connector; - char name[16]; struct { uint32_t dpms; diff --git a/include/wlr/types.h b/include/wlr/types.h index 4870b84c..02c2f087 100644 --- a/include/wlr/types.h +++ b/include/wlr/types.h @@ -22,11 +22,10 @@ struct wlr_output { struct wlr_output_state *state; uint32_t flags; - char *name; - char *make; - char *model; + char name[16]; + char make[48]; + char model[16]; uint32_t scale; - int32_t x, y; int32_t phys_width, phys_height; // mm int32_t subpixel; // enum wl_output_subpixel int32_t transform; // enum wl_output_transform -- cgit v1.2.3