aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
authorScott Anderson <ascent12@hotmail.com>2017-06-08 00:52:33 +1200
committerScott Anderson <ascent12@hotmail.com>2017-06-08 00:52:33 +1200
commit382f712792007ad839c4b6febf7f6387128ca7af (patch)
tree03a8e31a065c43f5c5cce46fd6e366b62d12a646 /include/wlr
parent53dd622263cb2b952a148463cfb046ba084d57ac (diff)
parent69deb99a654846d6c94ee7fc0f1da818c5965e3e (diff)
Merge remote-tracking branch 'upstream/master' into rotation
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/types.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/wlr/types.h b/include/wlr/types.h
index 27819f56..a3afb258 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 width, height;
int32_t phys_width, phys_height; // mm
int32_t subpixel; // enum wl_output_subpixel