Generalize DPMS, remove DRM refs from example

5 files changed, 5 insertions, 7 deletions

diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 93de4fb8..52ca65f0 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -55,7 +55,6 @@ struct wlr_output_state {
 };
 
 void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
-void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on);
 
 void wlr_drm_scan_connectors(struct wlr_backend_state *state);
 int wlr_drm_event(int fd, uint32_t mask, void *data);
diff --git a/include/wayland.h b/include/wayland.h
index 68817936..ca79fe33 100644
--- a/include/wayland.h
+++ b/include/wayland.h
@@ -7,12 +7,12 @@
 
 struct wlr_output_impl {
 	bool (*set_mode)(struct wlr_output_state *state, struct wlr_output_mode *mode);
+	void (*enable)(struct wlr_output_state *state, bool enable);
 	void (*destroy)(struct wlr_output_state *state);
 };
 
 struct wlr_output *wlr_output_create(struct wlr_output_impl *impl,
 		struct wlr_output_state *state);
-
 void wlr_output_free(struct wlr_output *output);
 
 #endif
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 fecd65dd..2863f926 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -4,12 +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);
-
 #endif
diff --git a/include/wlr/wayland.h b/include/wlr/wayland.h
index 158acc33..92bfa459 100644
--- a/include/wlr/wayland.h
+++ b/include/wlr/wayland.h
@@ -40,5 +40,6 @@ 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);
 
 #endif