From 95a553dc51029406f9b52227e88ebd9f67b203a5 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 1 May 2017 15:33:42 +1200
Subject: [PATCH] Moved headers to the correct place.

---
 backend/drm/main.c                         | 160 ---------------------
 {backend => include/backend}/drm/drm.h     |   0
 {backend => include/backend}/drm/event.h   |   0
 {backend => include/backend}/drm/otd.h     |   0
 {backend => include/backend}/drm/session.h |   0
 {backend => include/backend}/drm/udev.h    |   0
 6 files changed, 160 deletions(-)
 delete mode 100644 backend/drm/main.c
 rename {backend => include/backend}/drm/drm.h (100%)
 rename {backend => include/backend}/drm/event.h (100%)
 rename {backend => include/backend}/drm/otd.h (100%)
 rename {backend => include/backend}/drm/session.h (100%)
 rename {backend => include/backend}/drm/udev.h (100%)

diff --git a/backend/drm/main.c b/backend/drm/main.c
deleted file mode 100644
index aab11e196..000000000
--- a/backend/drm/main.c
+++ /dev/null
@@ -1,160 +0,0 @@
-#include <stdio.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <time.h>
-#include <GLES3/gl3.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
-
-#include "otd.h"
-#include "drm.h"
-#include "event.h"
-
-// I know this is pretty crappy,
-// but it's just for the example's sake
-struct {
-	char *name;
-	char *mode;
-} displays[8];
-int num_displays = 0;
-
-noreturn void usage(const char *name, int ret)
-{
-	fprintf(stderr, "usage: %s [-o <name> [-m <mode>]]*\n"
-			"\n"
-			"  -h       \tDisplay this help text\n"
-			"  -o <name>\tWhich diplay to use. e.g. DVI-I-1.\n"
-			"  -m <mode>\tWhich mode to use. It must come after an -o option.\n"
-			"           \tMust be either 'preferred', 'current', widthxheight\n"
-			"           \tor widthxheight@rate. Defaults to 'preferred'.\n"
-			"\n"
-			"example: %s -o DVI-I-1 -m 1920x1080@60 -o DP-1 -m 1920x1200\n",
-			name, name);
-
-	exit(ret);
-}
-
-void parse_args(int argc, char *argv[])
-{
-	int c;
-	int i = -1;
-
-	while ((c = getopt(argc, argv, "ho:m:")) != -1) {
-		switch (c) {
-		case 'h':
-			usage(argv[0], 0);
-		case 'o':
-			i = num_displays++;
-
-			if (num_displays == 8) {
-				fprintf(stderr, "Too many displays\n");
-				exit(1);
-			}
-
-			displays[i].name = strdup(optarg);
-			break;
-		case 'm':
-			if (i == -1) {
-				fprintf(stderr, "A display is required first\n");
-				exit(1);
-			}
-
-			fprintf(stderr, "Assigned '%s' to '%s'\n", optarg, displays[i].name);
-			displays[i].mode = optarg;
-			i = -1;
-			break;
-		default:
-			usage(argv[0], 1);
-		}
-	}
-
-	// Trailing args
-	if (optind != argc) {
-		usage(argv[0], 1);
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	parse_args(argc, argv);
-
-	struct otd *otd = otd_start();
-	if (!otd)
-		return 1;
-
-	float colour[3] = {1.0, 0.0, 0.0};
-	int dec = 0;
-
-	struct timespec start, now;
-	clock_gettime(CLOCK_MONOTONIC, &start);
-	struct timespec last = start;
-
-	while (clock_gettime(CLOCK_MONOTONIC, &now) == 0 &&
-	       now.tv_sec < start.tv_sec + 10) {
-
-		struct otd_event ev;
-		if (!otd_get_event(otd, &ev))
-			continue;
-
-		struct otd_display *disp = ev.display;
-
-		switch (ev.type) {
-		case OTD_EV_RENDER:
-			rendering_begin(disp);
-
-			// This is all just calculating the colours.
-			// It's not particularly important.
-
-			long ms = (now.tv_sec - last.tv_sec) * 1000 +
-				(now.tv_nsec - last.tv_nsec) / 1000000;
-
-			int inc = (dec + 1) % 3;
-
-			colour[dec] -= ms / 2000.0f;
-			colour[inc] += ms / 2000.0f;
-
-			if (colour[dec] < 0.0f) {
-				colour[dec] = 0.0f;
-				colour[inc] = 1.0f;
-
-				dec = (dec + 1) % 3;
-			}
-
-			last = now;
-
-			glViewport(0, 0, disp->width, disp->height);
-			glClearColor(colour[0], colour[1], colour[2], 1.0f);
-			glClear(GL_COLOR_BUFFER_BIT);
-
-			rendering_end(disp);
-			break;
-		case OTD_EV_DISPLAY_REM:
-			printf("%s removed\n", disp->name);
-			break;
-		case OTD_EV_DISPLAY_ADD:
-			printf("%s added\n", disp->name);
-
-			const char *mode = NULL;
-			for (int i = 0; i < num_displays; ++i) {
-				if (strcmp(disp->name, displays[i].name) == 0) {
-					mode = displays[i].mode;
-				}
-			}
-			if (!mode)
-				mode = "preferred";
-
-			if (!modeset_str(otd, ev.display, mode)) {
-				fprintf(stderr, "Modesetting %s failed\n", disp->name);
-				goto out;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-out:
-	otd_finish(otd);
-}
diff --git a/backend/drm/drm.h b/include/backend/drm/drm.h
similarity index 100%
rename from backend/drm/drm.h
rename to include/backend/drm/drm.h
diff --git a/backend/drm/event.h b/include/backend/drm/event.h
similarity index 100%
rename from backend/drm/event.h
rename to include/backend/drm/event.h
diff --git a/backend/drm/otd.h b/include/backend/drm/otd.h
similarity index 100%
rename from backend/drm/otd.h
rename to include/backend/drm/otd.h
diff --git a/backend/drm/session.h b/include/backend/drm/session.h
similarity index 100%
rename from backend/drm/session.h
rename to include/backend/drm/session.h
diff --git a/backend/drm/udev.h b/include/backend/drm/udev.h
similarity index 100%
rename from backend/drm/udev.h
rename to include/backend/drm/udev.h