Merge branch 'libinput' into wayland-backend

1 files changed, 28 insertions, 127 deletions

diff --git a/example/simple.c b/example/simple.c
index 21f333c7..5a5a1300 100644
--- a/example/simple.c
+++ b/example/simple.c
@@ -1,4 +1,5 @@
 #define _POSIX_C_SOURCE 199309L
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -8,152 +9,52 @@
 #include <wlr/backend.h>
 #include <wlr/session.h>
 #include <wlr/types.h>
+#include <xkbcommon/xkbcommon.h>
+#include "shared.h"
 
-struct state {
+struct sample_state {
 	float color[3];
 	int dec;
-	struct timespec last_frame;
-	struct wl_listener output_add;
-	struct wl_listener output_remove;
-	struct wl_list outputs;
 };
 
-struct output_state {
-	struct wl_list link;
-	struct wlr_output *output;
-	struct state *state;
-	struct wl_listener frame;
-};
-
-void output_frame(struct wl_listener *listener, void *data) {
-	struct output_state *ostate = wl_container_of(listener, ostate, frame);
-	struct state *s = ostate->state;
+void handle_output_frame(struct output_state *output, struct timespec *ts) {
+	struct compositor_state *state = output->compositor;
+	struct sample_state *sample = state->data;
 
-	struct timespec now;
-	clock_gettime(CLOCK_MONOTONIC, &now);
+	long ms = (ts->tv_sec - state->last_frame.tv_sec) * 1000 +
+		(ts->tv_nsec - state->last_frame.tv_nsec) / 1000000;
+	int inc = (sample->dec + 1) % 3;
 
-	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;
+	sample->color[inc] += ms / 2000.0f;
+	sample->color[sample->dec] -= ms / 2000.0f;
 
-	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;
+	if (sample->color[sample->dec] < 0.0f) {
+		sample->color[inc] = 1.0f;
+		sample->color[sample->dec] = 0.0f;
+		sample->dec = inc;
 	}
 
-	s->last_frame = now;
-
-	glClearColor(s->color[0], s->color[1], s->color[2], 1.0);
+	glClearColor(sample->color[0], sample->color[1], sample->color[2], 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 }
 
-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);
-	fprintf(stderr, "%s %s %"PRId32"mm x %"PRId32"mm\n", output->make, output->model,
-		output->phys_width, output->phys_height);
-	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);
-	wl_list_insert(&state->outputs, &ostate->link);
-}
-
-void output_remove(struct wl_listener *listener, void *data) {
-	struct wlr_output *output = data;
-	struct state *state = wl_container_of(listener, state, output_remove);
-	struct output_state *ostate = NULL, *_ostate;
-	wl_list_for_each(_ostate, &state->outputs, link) {
-		if (_ostate->output == output) {
-			ostate = _ostate;
-			break;
-		}
-	}
-	if (!ostate) {
-		return; // We are unfamiliar with this output
+static void handle_keyboard_key(struct keyboard_state *kbstate,
+		xkb_keysym_t sym, enum wlr_key_state key_state) {
+	if (sym == XKB_KEY_Escape) {
+		kbstate->compositor->exit = true;
 	}
-	wl_list_remove(&ostate->link);
-	wl_list_remove(&ostate->frame.link);
-}
-
-int timer_done(void *data) {
-	*(bool *)data = true;
-	return 1;
-}
-
-int enable_outputs(void *data) {
-	struct state *state = data;
-	struct output_state *ostate;
-	wl_list_for_each(ostate, &state->outputs, link) {
-		struct wlr_output *output = ostate->output;
-		wlr_output_enable(output, true);
-	}
-	return 1;
-}
-
-int disable_outputs(void *data) {
-	struct state *state = data;
-	struct output_state *ostate;
-	wl_list_for_each(ostate, &state->outputs, link) {
-		struct wlr_output *output = ostate->output;
-		wlr_output_enable(output, false);
-	}
-	return 1;
 }
 
 int main() {
-	struct state state = {
+	struct sample_state state = {
 		.color = { 1.0, 0.0, 0.0 },
 		.dec = 0,
-		.output_add = { .notify = output_add },
-		.output_remove = { .notify = output_remove }
 	};
+	struct compositor_state compositor;
 
-	wl_list_init(&state.outputs);
-	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(display);
-	if (!session) {
-		return 1;
-	}
-
-	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)) {
-		return 1;
-	}
-
-	bool done = false;
-	struct wl_event_source *timer = wl_event_loop_add_timer(event_loop,
-		timer_done, &done);
-	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_disable_outputs, 5000);
-	wl_event_source_timer_update(timer_enable_outputs, 10000);
-
-	while (!done) {
-		wl_event_loop_dispatch(event_loop, 0);
-	}
-
-	wl_event_source_remove(timer);
-	wlr_backend_destroy(wlr);
-	wl_display_destroy(display);
+	compositor_init(&compositor);
+	compositor.output_frame_cb = handle_output_frame;
+	compositor.keyboard_key_cb = handle_keyboard_key;
+	compositor.data = &state;
+	compositor_run(&compositor);
 }