diff options
| author | ascent12 <ascent12@hotmail.com> | 2017-06-01 23:10:19 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 23:10:19 +1200 |
| commit | 62d612a01e10947db2c2047be528ed525e5f91be (patch) | |
| tree | 0fe44a59a19c09b0a7b8673dc93de57096eb49a9 /include/wlr | |
| parent | f9d363fece0046cabfa00ad6b72b50f45b70db60 (diff) | |
| parent | ae770043460cdfca496dd6caeab55f337f3db37b (diff) | |
Merge branch 'master' into session
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend.h | 4 | ||||
| -rw-r--r-- | include/wlr/backend/drm.h | 7 | ||||
| -rw-r--r-- | include/wlr/types.h (renamed from include/wlr/wayland.h) | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/include/wlr/backend.h b/include/wlr/backend.h index b424c29f..32d96a8d 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -2,6 +2,7 @@ #define _WLR_BACKEND_H #include <wayland-server.h> +#include <wlr/session.h> struct wlr_backend_impl; struct wlr_backend_state; @@ -22,7 +23,8 @@ struct wlr_backend { } events; }; -struct wlr_backend *wlr_backend_autocreate(); +struct wlr_backend *wlr_backend_autocreate(struct wl_display *display, + struct wlr_session *session); bool wlr_backend_init(struct wlr_backend *backend); void wlr_backend_destroy(struct wlr_backend *backend); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index c76d280a..2863f926 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -4,15 +4,8 @@ #include <wayland-server.h> #include <wlr/session.h> #include <wlr/backend.h> -#include <xf86drmMode.h> // drmModeModeInfo -#include <wlr/wayland.h> struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_session *session); -void wlr_drm_backend_dpms(struct wlr_backend *backend, bool screen_on); - -void wlr_drm_output_begin(struct wlr_output *out); -void wlr_drm_output_end(struct wlr_output *out); - #endif diff --git a/include/wlr/wayland.h b/include/wlr/types.h index 158acc33..4870b84c 100644 --- a/include/wlr/wayland.h +++ b/include/wlr/types.h @@ -40,5 +40,7 @@ struct wlr_output { }; bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); +void wlr_output_enable(struct wlr_output *output, bool enable); +void wlr_output_destroy(struct wlr_output *output); #endif |