Merge pull request #111 from sysprog21/header-consolidation

Consolidate private headers

Author: jserv

backend/fbdev.c

@@ -14,7 +14,6 @@
 
 #include "linux_input.h"
 #include "linux_vt.h"
-#include "twin_backend.h"
 #include "twin_private.h"
 
 #define FBDEV_NAME "FRAMEBUFFER"

backend/sdl.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <twin.h>
 
-#include "twin_backend.h"
+#include "twin_private.h"
 
 typedef struct {
     SDL_Window *win;

backend/vnc.c

@@ -12,7 +12,6 @@ All rights reserved.
 #include <string.h>
 #include <twin.h>
 
-#include "twin_backend.h"
 #include "twin_private.h"
 
 #define SCREEN(x) ((twin_context_t *) x)->screen

src/api.c

@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <twin.h>
 
-#include "twin_backend.h"
+#include "twin_private.h"
 
 /* FIXME: Refine API design */
 

src/dispatch.c

@@ -7,7 +7,6 @@
 
 #include <unistd.h>
 
-#include "twin_backend.h"
 #include "twin_private.h"
 
 extern twin_backend_t g_twin_backend;

src/twin_backend.h

@@ -8,6 +8,7 @@
 #ifndef _TWIN_PRIVATE_H_
 #define _TWIN_PRIVATE_H_
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -16,7 +17,7 @@
 /* FIXME: Both twin_private.h and log.h are private header files. They should
  * be moved to src/ directory.
  */
-#include "../src/log.h"
+#include "log.h"
 
 /* Boilerplate for compiler compatibility */
 #ifndef __has_attribute
@@ -631,6 +632,20 @@ void _twin_button_init(twin_button_t *button,
                        twin_style_t font_style,
                        twin_dispatch_proc_t dispatch);
 
+typedef struct twin_backend {
+    /* Initialize the backend */
+    twin_context_t *(*init)(int width, int height);
+
+    /* Configure the device */
+    /* FIXME: Refine the parameter list */
+    void (*configure)(twin_context_t *ctx);
+
+    bool (*poll)(twin_context_t *ctx);
+
+    /* Device cleanup when drawing is done */
+    void (*exit)(twin_context_t *ctx);
+} twin_backend_t;
+
 /*
  * Visual effect stuff
  */