From eb93a27d6cea5d15cc655185f401b3aba1e3b634 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 9 Feb 2018 15:41:50 -0500
Subject: Move gfx interface to header file

.o files should technically depend on this, but I don't think it will
matter much.
---
 bin/gfx/cocoa.m |  7 ++-----
 bin/gfx/fb.c    |  5 +----
 bin/gfx/gfx.h   | 24 ++++++++++++++++++++++++
 bin/gfx/none.c  |  2 ++
 bin/gfx/x11.c   |  5 +----
 5 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 bin/gfx/gfx.h

(limited to 'bin/gfx')

diff --git a/bin/gfx/cocoa.m b/bin/gfx/cocoa.m
index d3d2ef46..b511ff5a 100644
--- a/bin/gfx/cocoa.m
+++ b/bin/gfx/cocoa.m
@@ -21,12 +21,9 @@
 #import <stdlib.h>
 #import <sysexits.h>
 
-#define UNUSED __attribute__((unused))
+#import "gfx.h"
 
-extern int init(int argc, char *argv[]);
-extern const char *status(void);
-extern void draw(uint32_t *buf, size_t xres, size_t yres);
-extern bool input(char in);
+#define UNUSED __attribute__((unused))
 
 @interface BufferView : NSView {
     size_t bufSize;
diff --git a/bin/gfx/fb.c b/bin/gfx/fb.c
index bc4d9d46..651ed80c 100644
--- a/bin/gfx/fb.c
+++ b/bin/gfx/fb.c
@@ -28,10 +28,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-extern int init(int argc, char *argv[]);
-extern const char *status(void);
-extern void draw(uint32_t *buf, size_t xres, size_t yres);
-extern bool input(char in);
+#include "gfx.h"
 
 static struct termios saveTerm;
 static void restoreTerm(void) {
diff --git a/bin/gfx/gfx.h b/bin/gfx/gfx.h
new file mode 100644
index 00000000..715ec08c
--- /dev/null
+++ b/bin/gfx/gfx.h
@@ -0,0 +1,24 @@
+/* Copyright (c) 2018, June McEnroe <programble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+extern int init(int argc, char *argv[]);
+extern const char *status(void);
+extern void draw(uint32_t *buf, size_t width, size_t height);
+extern bool input(char in);
diff --git a/bin/gfx/none.c b/bin/gfx/none.c
index 7f78ce8a..f9ce12ff 100644
--- a/bin/gfx/none.c
+++ b/bin/gfx/none.c
@@ -16,6 +16,8 @@
 
 #include <sysexits.h>
 
+#include "gfx.h"
+
 int main() {
     return EX_CONFIG;
 }
diff --git a/bin/gfx/x11.c b/bin/gfx/x11.c
index 53d84895..d3b5f5ba 100644
--- a/bin/gfx/x11.c
+++ b/bin/gfx/x11.c
@@ -21,10 +21,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-extern int init(int argc, char *argv[]);
-extern const char *status(void);
-extern void draw(uint32_t *buf, size_t width, size_t height);
-extern bool input(char in);
+#include "gfx.h"
 
 static size_t width;
 static size_t height;
-- 
cgit 1.4.1