mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into rotation

Browse source
This commit is contained in:
Scott Anderson 2017-06-08 00:52:33 +12:00
commit 382f712792
7 changed files with 337 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/backend/drm/drm.h
View file

@ -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;

7
include/wlr/types.h
View file

@ -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