aboutsummaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
Diffstat (limited to 'example')
-rw-r--r--example/CMakeLists.txt8
-rw-r--r--example/example-drm.c124
-rw-r--r--example/main.c142
3 files changed, 128 insertions, 146 deletions
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 29a77675..f619b97f 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -8,13 +8,5 @@ add_executable(example
target_link_libraries(example
wlr-backend
-)
-
-add_executable(example-drm
- example-drm.c
-)
-
-target_link_libraries(example-drm
- wlr-backend
wlr-session
)
diff --git a/example/example-drm.c b/example/example-drm.c
deleted file mode 100644
index 2e33e039..00000000
--- a/example/example-drm.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#define _POSIX_C_SOURCE 199309L
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wayland-server.h>
-#include <GLES3/gl3.h>
-
-#include <wlr/backend/drm.h>
-#include <wlr/session.h>
-
-struct state {
- float color[3];
- int dec;
-
- struct timespec last_frame;
-
- struct wl_listener output_add;
- struct wl_listener output_remove;
- struct wl_listener output_frame;
-};
-
-void output_add(struct wl_listener *listener, void *data) {
- struct wlr_drm_output *out = data;
- fprintf(stderr, "Output '%s' added\n", wlr_drm_output_get_name(out));
-
- size_t num_modes;
- struct wlr_drm_mode *modes = wlr_drm_output_get_modes(out, &num_modes);
-
- wlr_drm_output_modeset(out, &modes[0]);
-}
-
-void output_remove(struct wl_listener *listener, void *data) {
- struct wlr_drm_output *out = data;
- fprintf(stderr, "Output '%s' removed\n", wlr_drm_output_get_name(out));
-}
-
-void output_frame(struct wl_listener *listener, void *data) {
- struct wlr_drm_output *out = data;
- struct state *s = wl_container_of(listener, s, output_frame);
-
- struct timespec now;
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 +
- (now.tv_nsec - s->last_frame.tv_nsec) / 1000000;
- int inc = (s->dec + 1) % 3;
-
- s->color[inc] += ms / 2000.0f;
- s->color[s->dec] -= ms / 2000.0f;
-
- if (s->color[s->dec] < 0.0f) {
- s->color[inc] = 1.0f;
- s->color[s->dec] = 0.0f;
-
- s->dec = inc;
- }
-
- s->last_frame = now;
-
- wlr_drm_output_begin(out);
-
- glClearColor(s->color[0], s->color[1], s->color[2], 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
-
- wlr_drm_output_end(out);
-}
-
-int timer_done(void *data) {
- *(bool *)data = true;
- return 1;
-}
-
-int main() {
- if (getenv("DISPLAY")) {
- fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n");
- return 1;
- } else if (getenv("WAYLAND_DISPLAY")) {
- fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n");
- return 1;
- }
-
- struct state state = {
- .color = { 1.0, 0.0, 0.0 },
- .dec = 0,
- .output_add = { .notify = output_add },
- .output_remove = { .notify = output_remove },
- .output_frame = { .notify = output_frame },
- };
-
- wl_list_init(&state.output_add.link);
- wl_list_init(&state.output_remove.link);
- wl_list_init(&state.output_frame.link);
- clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
-
- struct wl_display *display = wl_display_create();
- struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
-
- struct wlr_session *session = wlr_session_start();
- if (!session) {
- return 1;
- }
-
- struct wlr_backend *wlr = wlr_drm_backend_create(display, session);
- wl_signal_add(&wlr->events.output_add, &state.output_add);
- wl_signal_add(&wlr->events.output_remove, &state.output_remove);
- wl_signal_add(&wlr->events.output_frame, &state.output_frame);
- if (!wlr || !wlr_backend_init(wlr)) {
- return 1;
- }
-
- bool done = false;
- struct wl_event_source *timer = wl_event_loop_add_timer(event_loop,
- timer_done, &done);
-
- wl_event_source_timer_update(timer, 5000);
-
- while (!done) {
- wl_event_loop_dispatch(event_loop, 0);
- }
-
- wl_event_source_remove(timer);
- wlr_backend_destroy(wlr);
- wl_display_destroy(display);
-}
diff --git a/example/main.c b/example/main.c
index 4240b9e3..2c168d98 100644
--- a/example/main.c
+++ b/example/main.c
@@ -1,19 +1,133 @@
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 199309L
+#include <stdio.h>
#include <stdlib.h>
-#include <wlr/backend.h>
-#include <wlr/backend/wayland.h>
+#include <time.h>
#include <wayland-server.h>
+#include <GLES3/gl3.h>
+#include <wlr/backend/drm.h>
+#include <wlr/session.h>
+#include <wlr/common/list.h>
-int main(int argc, char **argv) {
- // TODO: Move this stuff to a wlr backend selector function
- char *_wl_display = getenv("WAYLAND_DISPLAY");
- if (_wl_display) {
- unsetenv("WAYLAND_DISPLAY");
- setenv("_WAYLAND_DISPLAY", _wl_display, 1);
+struct state {
+ float color[3];
+ int dec;
+ struct timespec last_frame;
+ struct wl_listener output_add;
+ struct wl_listener output_remove;
+ list_t *outputs;
+};
+
+struct output_state {
+ struct wlr_output *output;
+ struct state *state;
+ struct wl_listener frame;
+};
+
+void output_frame(struct wl_listener *listener, void *data) {
+ struct wlr_output *output = data;
+ struct output_state *ostate = wl_container_of(
+ listener, ostate, frame);
+ struct state *s = ostate->state;
+
+ struct timespec now;
+ clock_gettime(CLOCK_MONOTONIC, &now);
+
+ long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 +
+ (now.tv_nsec - s->last_frame.tv_nsec) / 1000000;
+ int inc = (s->dec + 1) % 3;
+
+ s->color[inc] += ms / 2000.0f;
+ s->color[s->dec] -= ms / 2000.0f;
+
+ if (s->color[s->dec] < 0.0f) {
+ s->color[inc] = 1.0f;
+ s->color[s->dec] = 0.0f;
+
+ s->dec = inc;
+ }
+
+ s->last_frame = now;
+
+ wlr_drm_output_begin(output);
+
+ glClearColor(s->color[0], s->color[1], s->color[2], 1.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ wlr_drm_output_end(output);
+}
+
+void output_add(struct wl_listener *listener, void *data) {
+ struct wlr_output *output = data;
+ struct state *state = wl_container_of(listener, state, output_add);
+ fprintf(stderr, "Output '%s' added\n", output->name);
+ wlr_output_set_mode(output, output->modes->items[0]);
+ struct output_state *ostate = calloc(1, sizeof(struct output_state));
+ ostate->output = output;
+ ostate->state = state;
+ ostate->frame.notify = output_frame;
+ wl_list_init(&ostate->frame.link);
+ wl_signal_add(&output->events.frame, &ostate->frame);
+ list_add(state->outputs, ostate);
+}
+
+void output_remove(struct wl_listener *listener, void *data) {
+ struct wlr_output *output = data;
+ fprintf(stderr, "Output '%s' removed\n", output->name);
+ // TODO: remove signal from state->output_frame
+}
+
+int timer_done(void *data) {
+ *(bool *)data = true;
+ return 1;
+}
+
+int main() {
+ if (getenv("DISPLAY")) {
+ fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n");
+ return 1;
+ } else if (getenv("WAYLAND_DISPLAY")) {
+ fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n");
+ return 1;
+ }
+
+ struct state state = {
+ .color = { 1.0, 0.0, 0.0 },
+ .dec = 0,
+ .output_add = { .notify = output_add },
+ .output_remove = { .notify = output_remove },
+ .outputs = list_create(),
+ };
+
+ wl_list_init(&state.output_add.link);
+ wl_list_init(&state.output_remove.link);
+ clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
+
+ struct wl_display *display = wl_display_create();
+ struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
+
+ struct wlr_session *session = wlr_session_start();
+ if (!session) {
+ return 1;
+ }
+
+ struct wlr_backend *wlr = wlr_drm_backend_create(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)) {
+ return 1;
+ }
+
+ bool done = false;
+ struct wl_event_source *timer = wl_event_loop_add_timer(event_loop,
+ timer_done, &done);
+
+ wl_event_source_timer_update(timer, 5000);
+
+ while (!done) {
+ wl_event_loop_dispatch(event_loop, 0);
}
- struct wl_display *wl_display = wl_display_create();
- struct wlr_wl_backend *backend = wlr_wl_backend_init(wl_display, 1);
- wlr_wl_backend_free(backend);
- wl_display_destroy(wl_display);
- return 0;
+
+ wl_event_source_remove(timer);
+ wlr_backend_destroy(wlr);
+ wl_display_destroy(display);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:59:27 +0000