aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/backend.c10
-rw-r--r--backend/drm/backend.c8
-rw-r--r--backend/drm/drm.c43
-rw-r--r--example/main.c38
-rw-r--r--include/backend/drm/drm.h1
-rw-r--r--include/wayland.h2
-rw-r--r--include/wlr/backend.h4
-rw-r--r--include/wlr/backend/drm.h4
-rw-r--r--include/wlr/wayland.h1
-rw-r--r--wayland/types/wlr_output.c4
10 files changed, 65 insertions, 50 deletions
diff --git a/backend/backend.c b/backend/backend.c
index 753bb3ae..c6afe9ed 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -2,7 +2,9 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <wlr/session.h>
#include "common/log.h"
+#include "backend/drm/backend.h"
#include "backend.h"
struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
@@ -34,3 +36,11 @@ void wlr_backend_destroy(struct wlr_backend *backend) {
// TODO: free outputs
free(backend);
}
+
+struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
+ struct wlr_session *session) {
+ // TODO: Choose the most appropriate backend for the situation
+ struct wlr_backend *wlr;
+ wlr = wlr_drm_backend_create(display, session);
+ return wlr;
+}
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index f202d4d6..0da84745 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -101,11 +101,3 @@ error_backend:
free(backend);
return NULL;
}
-
-void wlr_drm_backend_dpms(struct wlr_backend *backend, bool screen_on) {
- struct wlr_backend_state *state = backend->state;
- for (size_t i = 0; i < state->outputs->length; ++i) {
- struct wlr_output_state *output = state->outputs->items[i];
- wlr_drm_output_dpms(state->fd, output, screen_on);
- }
-}
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 8ec27b80..e9af9899 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -236,6 +236,28 @@ error:
return false;
}
+static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable) {
+ struct wlr_backend_state *state =
+ wl_container_of(output->renderer, state, renderer);
+ if (output->state != DRM_OUTPUT_CONNECTED) {
+ return;
+ }
+
+ if (enable) {
+ drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
+ DRM_MODE_DPMS_ON);
+
+ // Start rendering loop again by drawing a black frame
+ wlr_drm_output_begin(output);
+ glClearColor(0.0, 0.0, 0.0, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ wlr_drm_output_end(output);
+ } else {
+ drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
+ DRM_MODE_DPMS_STANDBY);
+ }
+}
+
static void wlr_drm_output_destroy(struct wlr_output_state *output) {
wlr_drm_output_cleanup(output, true);
wlr_drm_renderer_free(output->renderer);
@@ -244,6 +266,7 @@ static void wlr_drm_output_destroy(struct wlr_output_state *output) {
static struct wlr_output_impl output_impl = {
.set_mode = wlr_drm_output_set_mode,
+ .enable = wlr_drm_output_enable,
.destroy = wlr_drm_output_destroy,
};
@@ -454,23 +477,3 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
}
// TODO: free wlr_output
}
-
-void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on) {
- if (output->state != DRM_OUTPUT_CONNECTED) {
- return;
- }
-
- if (screen_on) {
- drmModeConnectorSetProperty(fd, output->connector, output->props.dpms,
- DRM_MODE_DPMS_ON);
-
- // Start rendering loop again by drawing a black frame
- wlr_drm_output_begin(output);
- glClearColor(0.0, 0.0, 0.0, 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
- wlr_drm_output_end(output);
- } else {
- drmModeConnectorSetProperty(fd, output->connector, output->props.dpms,
- DRM_MODE_DPMS_STANDBY);
- }
-}
diff --git a/example/main.c b/example/main.c
index fb475ac8..6fd7010c 100644
--- a/example/main.c
+++ b/example/main.c
@@ -4,8 +4,9 @@
#include <time.h>
#include <wayland-server.h>
#include <GLES3/gl3.h>
-#include <wlr/backend/drm.h>
+#include <wlr/backend.h>
#include <wlr/session.h>
+#include <wlr/wayland.h>
#include <wlr/common/list.h>
struct state {
@@ -40,7 +41,6 @@ void output_frame(struct wl_listener *listener, void *data) {
if (s->color[s->dec] < 0.0f) {
s->color[inc] = 1.0f;
s->color[s->dec] = 0.0f;
-
s->dec = inc;
}
@@ -75,15 +75,23 @@ int timer_done(void *data) {
return 1;
}
-int dpms_on(void *data) {
- struct wlr_backend *backend = data;
- wlr_drm_backend_dpms(backend, false);
+int enable_outputs(void *data) {
+ struct state *state = data;
+ for (size_t i = 0; i < state->outputs->length; ++i) {
+ struct output_state *ostate = state->outputs->items[i];
+ struct wlr_output *output = ostate->output;
+ wlr_output_enable(output, true);
+ }
return 1;
}
-int dpms_off(void *data) {
- struct wlr_backend *backend = data;
- wlr_drm_backend_dpms(backend, true);
+int disable_outputs(void *data) {
+ struct state *state = data;
+ for (size_t i = 0; i < state->outputs->length; ++i) {
+ struct output_state *ostate = state->outputs->items[i];
+ struct wlr_output *output = ostate->output;
+ wlr_output_enable(output, false);
+ }
return 1;
}
@@ -116,7 +124,7 @@ int main() {
return 1;
}
- struct wlr_backend *wlr = wlr_drm_backend_create(display, session);
+ struct wlr_backend *wlr = wlr_backend_autocreate(display, session);
wl_signal_add(&wlr->events.output_add, &state.output_add);
wl_signal_add(&wlr->events.output_remove, &state.output_remove);
if (!wlr || !wlr_backend_init(wlr)) {
@@ -126,14 +134,14 @@ int main() {
bool done = false;
struct wl_event_source *timer = wl_event_loop_add_timer(event_loop,
timer_done, &done);
- struct wl_event_source *timer_dpms_on = wl_event_loop_add_timer(event_loop,
- dpms_on, wlr);
- struct wl_event_source *timer_dpms_off = wl_event_loop_add_timer(event_loop,
- dpms_off, wlr);
+ struct wl_event_source *timer_disable_outputs =
+ wl_event_loop_add_timer(event_loop, disable_outputs, &state);
+ struct wl_event_source *timer_enable_outputs =
+ wl_event_loop_add_timer(event_loop, enable_outputs, &state);
wl_event_source_timer_update(timer, 20000);
- wl_event_source_timer_update(timer_dpms_on, 5000);
- wl_event_source_timer_update(timer_dpms_off, 10000);
+ wl_event_source_timer_update(timer_disable_outputs, 5000);
+ wl_event_source_timer_update(timer_enable_outputs, 10000);
while (!done) {
wl_event_loop_dispatch(event_loop, 0);
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
diff --git a/wayland/types/wlr_output.c b/wayland/types/wlr_output.c
index bc093c00..21ffa078 100644
--- a/wayland/types/wlr_output.c
+++ b/wayland/types/wlr_output.c
@@ -29,3 +29,7 @@ void wlr_output_free(struct wlr_output *output) {
bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode) {
return output->impl->set_mode(output->state, mode);
}
+
+void wlr_output_enable(struct wlr_output *output, bool enable) {
+ output->impl->enable(output->state, enable);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:28:00 +0000