Made rotation example standalone

1 files changed, 199 insertions, 80 deletions

diff --git a/examples/rotation.c b/examples/rotation.c
index 37def808..a7bbbf32 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -1,6 +1,7 @@
-#define _POSIX_C_SOURCE 199309L
+#define _POSIX_C_SOURCE 200112L
 #define _XOPEN_SOURCE 500
 #include <GLES2/gl2.h>
+#include <getopt.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,29 +15,48 @@
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
-#include "support/shared.h"
-#include "support/config.h"
 #include "cat.h"
 
 struct sample_state {
-	struct example_config *config;
+	struct wl_display *display;
+	struct wl_listener new_output;
+	struct wl_listener new_input;
+	struct timespec last_frame;
 	struct wlr_renderer *renderer;
 	struct wlr_texture *cat_texture;
+	struct wl_list outputs;
+	enum wl_output_transform transform;
 };
 
-struct output_data {
+struct sample_output {
+	struct sample_state *sample;
+	struct wlr_output *output;
+	struct wl_listener frame;
+	struct wl_listener destroy;
 	float x_offs, y_offs;
 	float x_vel, y_vel;
+	struct wl_list link;
 };
 
-static void handle_output_frame(struct output_state *output, struct timespec *ts) {
-	struct compositor_state *state = output->compositor;
-	struct sample_state *sample = state->data;
-	struct output_data *odata = output->data;
-	struct wlr_output *wlr_output = output->output;
+struct sample_keyboard {
+	struct sample_state *sample;
+	struct wlr_input_device *device;
+	struct wl_listener key;
+	struct wl_listener destroy;
+};
+
+static void output_frame_notify(struct wl_listener *listener, void *data) {
+	struct sample_output *sample_output = wl_container_of(listener, sample_output, frame);
+	struct sample_state *sample = sample_output->sample;
+	struct wlr_output *wlr_output = sample_output->output;
+	struct timespec now;
+	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	int32_t width, height;
 	wlr_output_effective_resolution(wlr_output, &width, &height);
@@ -45,8 +65,8 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
 	wlr_renderer_begin(sample->renderer, wlr_output->width, wlr_output->height);
 	wlr_renderer_clear(sample->renderer, (float[]){0.25f, 0.25f, 0.25f, 1});
 
-	for (int y = -128 + (int)odata->y_offs; y < height; y += 128) {
-		for (int x = -128 + (int)odata->x_offs; x < width; x += 128) {
+	for (int y = -128 + (int)sample_output->y_offs; y < height; y += 128) {
+		for (int x = -128 + (int)sample_output->x_offs; x < width; x += 128) {
 			wlr_render_texture(sample->renderer, sample->cat_texture,
 				wlr_output->transform_matrix, x, y, 1.0f);
 		}
@@ -55,90 +75,191 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
 	wlr_renderer_end(sample->renderer);
 	wlr_output_swap_buffers(wlr_output, NULL, NULL);
 
-	long ms = (ts->tv_sec - output->last_frame.tv_sec) * 1000 +
-		(ts->tv_nsec - output->last_frame.tv_nsec) / 1000000;
+	long ms = (now.tv_sec - sample->last_frame.tv_sec) * 1000 +
+		(now.tv_nsec - sample->last_frame.tv_nsec) / 1000000;
 	float seconds = ms / 1000.0f;
 
-	odata->x_offs += odata->x_vel * seconds;
-	odata->y_offs += odata->y_vel * seconds;
-	if (odata->x_offs > 128) {
-		odata->x_offs = 0;
+	sample_output->x_offs += sample_output->x_vel * seconds;
+	sample_output->y_offs += sample_output->y_vel * seconds;
+	if (sample_output->x_offs > 128) {
+		sample_output->x_offs = 0;
 	}
-	if (odata->y_offs > 128) {
-		odata->y_offs = 0;
+	if (sample_output->y_offs > 128) {
+		sample_output->y_offs = 0;
 	}
+	sample->last_frame = now;
 }
 
-static void handle_output_add(struct output_state *output) {
-	struct output_data *odata = calloc(1, sizeof(struct output_data));
-	odata->x_offs = odata->y_offs = 0;
-	odata->x_vel = odata->y_vel = 128;
-	output->data = odata;
-	struct sample_state *state = output->compositor->data;
-
-	struct output_config *conf;
-	wl_list_for_each(conf, &state->config->outputs, link) {
-		if (strcmp(conf->name, output->output->name) == 0) {
-			wlr_output_set_transform(output->output, conf->transform);
-			break;
-		}
+static void update_velocities(struct sample_state *sample,
+		float x_diff, float y_diff) {
+	struct sample_output *sample_output;
+	wl_list_for_each(sample_output, &sample->outputs, link) {
+		sample_output->x_vel += x_diff;
+		sample_output->y_vel += y_diff;
 	}
 }
 
-static void handle_output_remove(struct output_state *output) {
-	free(output->data);
+void output_remove_notify(struct wl_listener *listener, void *data) {
+	struct sample_output *sample_output = wl_container_of(listener, sample_output, destroy);
+	wl_list_remove(&sample_output->frame.link);
+	wl_list_remove(&sample_output->destroy.link);
+	free(sample_output);
 }
 
-static void update_velocities(struct compositor_state *state,
-		float x_diff, float y_diff) {
-	struct output_state *output;
-	wl_list_for_each(output, &state->outputs, link) {
-		struct output_data *odata = output->data;
-		odata->x_vel += x_diff;
-		odata->y_vel += y_diff;
+void new_output_notify(struct wl_listener *listener, void *data) {
+	struct wlr_output *output = data;
+	struct sample_state *sample = wl_container_of(listener, sample, new_output);
+	struct sample_output *sample_output = calloc(1, sizeof(struct sample_output));
+	if (wl_list_length(&output->modes) > 0) {
+		struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link);
+		wlr_output_set_mode(output, mode);
 	}
+	sample_output->x_offs = sample_output->y_offs = 0;
+	sample_output->x_vel = sample_output->y_vel = 128;
+
+	wlr_output_set_transform(output, sample->transform);
+	sample_output->output = output;
+	sample_output->sample = sample;
+	wl_signal_add(&output->events.frame, &sample_output->frame);
+	sample_output->frame.notify = output_frame_notify;
+	wl_signal_add(&output->events.destroy, &sample_output->destroy);
+	sample_output->destroy.notify = output_remove_notify;
+	wl_list_insert(&sample->outputs, &sample_output->link);
 }
 
-static void handle_keyboard_key(struct keyboard_state *kbstate,
-		uint32_t keycode, xkb_keysym_t sym, enum wlr_key_state key_state,
-		uint64_t time_usec) {
-	// NOTE: It may be better to simply refer to our key state during each frame
-	// and make this change in pixels/sec^2
-	// Also, key repeat
-	if (key_state == WLR_KEY_PRESSED) {
-		switch (sym) {
-		case XKB_KEY_Left:
-			update_velocities(kbstate->compositor, -16, 0);
-			break;
-		case XKB_KEY_Right:
-			update_velocities(kbstate->compositor, 16, 0);
-			break;
-		case XKB_KEY_Up:
-			update_velocities(kbstate->compositor, 0, -16);
-			break;
-		case XKB_KEY_Down:
-			update_velocities(kbstate->compositor, 0, 16);
-			break;
+void keyboard_key_notify(struct wl_listener *listener, void *data) {
+	struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, key);
+	struct sample_state *sample = keyboard->sample;
+	struct wlr_event_keyboard_key *event = data;
+	uint32_t keycode = event->keycode + 8;
+	const xkb_keysym_t *syms;
+	int nsyms = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state,
+			keycode, &syms);
+	for (int i = 0; i < nsyms; i++) {
+		xkb_keysym_t sym = syms[i];
+		if (sym == XKB_KEY_Escape) {
+				wl_display_terminate(sample->display);
+			}
+		if (event->state == WLR_KEY_PRESSED) {
+			switch (sym) {
+			case XKB_KEY_Left:
+				update_velocities(sample, -16, 0);
+				break;
+			case XKB_KEY_Right:
+				update_velocities(sample, 16, 0);
+				break;
+	 	   	case XKB_KEY_Up:
+	 	   		update_velocities(sample, 0, -16);
+	 	   		break;
+	 	   	case XKB_KEY_Down:
+				update_velocities(sample, 0, 16);
+	 	   		break;
+	   		}
+		}
+	}
+}
+
+void keyboard_destroy_notify(struct wl_listener *listener, void *data) {
+	struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, destroy);
+	wl_list_remove(&keyboard->destroy.link);
+	wl_list_remove(&keyboard->key.link);
+	free(keyboard);
+}
+
+void new_input_notify(struct wl_listener *listener, void *data) {
+	struct wlr_input_device *device = data;
+	struct sample_state *sample = wl_container_of(listener, sample, new_input);
+	struct sample_keyboard *keyboard;
+	struct xkb_rule_names rules;
+	struct xkb_context *context;
+	switch (device->type) {
+	case WLR_INPUT_DEVICE_KEYBOARD:
+		keyboard = calloc(1, sizeof(struct sample_keyboard));
+		keyboard->device = device;
+		keyboard->sample = sample;
+		wl_signal_add(&device->events.destroy, &keyboard->destroy);
+		keyboard->destroy.notify = keyboard_destroy_notify;
+		wl_signal_add(&device->keyboard->events.key, &keyboard->key);
+		keyboard->key.notify = keyboard_key_notify;
+		memset(&rules, 0, sizeof(rules));
+		rules.rules = getenv("XKB_DEFAULT_RULES");
+		rules.model = getenv("XKB_DEFAULT_MODEL");
+		rules.layout = getenv("XKB_DEFAULT_LAYOUT");
+		rules.variant = getenv("XKB_DEFAULT_VARIANT");
+		rules.options = getenv("XKB_DEFAULT_OPTIONS");
+		context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+		if (!context) {
+			wlr_log(L_ERROR, "Failed to create XKB context");
+			exit(1);
 		}
+		wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context,
+					&rules, XKB_KEYMAP_COMPILE_NO_FLAGS));
+		xkb_context_unref(context);
+		break;
+	default:
+		break;
 	}
 }
 
+
 int main(int argc, char *argv[]) {
+	int c;
+	enum wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
+	while ((c = getopt(argc, argv, "r:")) != -1) {
+		switch (c) {
+		case 'r':
+			if (strcmp(optarg, "90") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_90;
+			} else if (strcmp(optarg, "180") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_180;
+			} else if (strcmp(optarg, "270") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_270;
+			} else if (strcmp(optarg, "flipped") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_FLIPPED;
+			} else if (strcmp(optarg, "flipped-90") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_FLIPPED_90;
+			} else if (strcmp(optarg, "flipped-180") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_FLIPPED_180;
+			} else if (strcmp(optarg, "flipped-270") == 0) {
+				transform = WL_OUTPUT_TRANSFORM_FLIPPED_270;
+			} else {
+				wlr_log(L_ERROR, "got unknown transform value: %s", optarg);
+			}
+			break;
+		default:
+			break;
+		}
+	}
 	wlr_log_init(L_DEBUG, NULL);
-	struct sample_state state = {0};
-	state.config = parse_args(argc, argv);
-
-	struct compositor_state compositor = { 0 };
-	compositor.data = &state;
-	compositor.output_add_cb = handle_output_add;
-	compositor.output_remove_cb = handle_output_remove;
-	compositor.output_frame_cb = handle_output_frame;
-	compositor.keyboard_key_cb = handle_keyboard_key;
-	compositor_init(&compositor);
-
-	state.renderer = wlr_backend_get_renderer(compositor.backend);
+	struct wl_display *display = wl_display_create();
+	struct sample_state state = {
+		.display = display,
+		.transform = transform
+	};
+	wl_list_init(&state.outputs);
+
+	struct wlr_backend *wlr = wlr_backend_autocreate(display);
+	if (!wlr) {
+		exit(1);
+	}
+
+	wl_signal_add(&wlr->events.new_output, &state.new_output);
+	state.new_output.notify = new_output_notify;
+	wl_signal_add(&wlr->events.new_input, &state.new_input);
+	state.new_input.notify = new_input_notify;
+	clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
+	const char *socket = wl_display_add_socket_auto(display);
+	if (!socket) {
+		wlr_log_errno(L_ERROR, "Unable to open wayland socket");
+		wlr_backend_destroy(wlr);
+		exit(1);
+	}
+	setenv("_WAYLAND_DISPLAY", socket, true);
+
+	state.renderer = wlr_backend_get_renderer(wlr);
 	if (!state.renderer) {
 		wlr_log(L_ERROR, "Could not start compositor, OOM");
+		wlr_backend_destroy(wlr);
 		exit(EXIT_FAILURE);
 	}
 	state.cat_texture = wlr_texture_from_pixels(state.renderer,
@@ -149,16 +270,14 @@ int main(int argc, char *argv[]) {
 		exit(EXIT_FAILURE);
 	}
 
-	if (!wlr_backend_start(compositor.backend)) {
+	if (!wlr_backend_start(wlr)) {
 		wlr_log(L_ERROR, "Failed to start backend");
-		wlr_backend_destroy(compositor.backend);
+		wlr_backend_destroy(wlr);
 		exit(1);
 	}
-	wl_display_run(compositor.display);
+	wl_display_run(display);
 
 	wlr_texture_destroy(state.cat_texture);
 	wlr_renderer_destroy(state.renderer);
-	compositor_fini(&compositor);
-
-	example_config_destroy(state.config);
+	wl_display_destroy(display);
 }