move private headers to subfolders of src/

This keeps the include/ folder clean.

TODO

@@ -7,7 +7,6 @@ Issues:
 * #10        support fx-CG 20
 
 Extensions on existing code:
-* build:     move the private headers to the src/ folder
 * tmu:       make interrupt handlers more elegant
 * bopti:     try to display fullscreen images with TLB access + DMA on fxcg50
 * topti:     support unicode fonts

src/gray/engine.c

@@ -10,7 +10,7 @@
 #include <gint/display.h>
 #include <gint/timer.h>
 
-#include <display/fx.h>
+#include "../render-fx/render-fx.h"
 
 /* Three additional video RAMS, allocated statically if --static-gray was set
    at configure time, or with malloc() otherwise. */

src/gray/grect.c

@@ -1,6 +1,6 @@
 #include <gint/defs/util.h>
 #include <gint/gray.h>
-#include <display/fx.h>
+#include "../render-fx/render-fx.h"
 
 /* grect(): Fill a rectangle on the screen */
 void grect(int x1, int y1, int x2, int y2, color_t color)

src/gray/gsubimage.c

@@ -1,5 +1,5 @@
 #include <gint/gray.h>
-#include <display/fx.h>
+#include "../render-fx/render-fx.h"
 #include "../render-fx/bopti-asm.h"
 
 /* List of rendering functions */

src/gray/gtext.c

@@ -1,5 +1,5 @@
 #include <gint/gray.h>
-#include <display/common.h>
+#include "../render/render.h"
 #include "../render-fx/topti-asm.h"
 
 /* gtext_opt(): Display a string of text */

src/render-cg/dupdate.c

@@ -1,6 +1,6 @@
 #include <gint/display.h>
-#include <display/cg.h>
 #include <gint/drivers/r61524.h>
+#include "render-cg.h"
 
 /* dupdate() - Push the video RAM to the display driver */
 void dupdate(void)

src/render-cg/render-cg.h

@@ -1,12 +1,12 @@
 //---
-//	display:cg - Internal definitions for the display module on fxcg50
+//	render-cg - Internal definitions for the display module on fxcg50
 //---
 
-#ifndef DISPLAY_CG
-#define DISPLAY_CG
+#ifndef RENDER_CG
+#define RENDER_CG
 
 /* dvram_switch() - triple buffering switch
    Alternates VRAMs after a display update started. */
 void dvram_switch(void);
 
-#endif /* DISPLAY_CG */
+#endif /* RENDER_CG */

src/render-cg/topti.c

@@ -2,7 +2,8 @@
 #include <gint/defs/attributes.h>
 #include <gint/display.h>
 #include <gint/std/string.h>
-#include <display/common.h>
+
+#include "../render/render.h"
 #include "topti-asm.h"
 
 /* Default font */

src/render-fx/bopti.c

@@ -1,6 +1,6 @@
 #include <gint/defs/types.h>
 #include <gint/display.h>
-#include <display/fx.h>
+#include "render-fx.h"
 #include "bopti-asm.h"
 
 /* struct rbox: A rendering box (target coordinates and source rectangle)

src/render-fx/dclear.c

@@ -1,5 +1,5 @@
 #include <gint/display.h>
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* dclear() - fill the screen with a single color */
 void dclear(color_t color)

src/render-fx/dpixel.c

@@ -1,6 +1,6 @@
 #include <gint/display.h>
 #include <gint/defs/types.h>
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* dpixel() - change a pixel's color */
 void dpixel(int x, int y, int color)

src/render-fx/drect.c

@@ -1,6 +1,6 @@
 #include <gint/defs/util.h>
 #include <gint/display.h>
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* drect() - fill a rectangle of the screen */
 void drect(int x1, int y1, int x2, int y2, int color)

src/render-fx/dsubimage.c

@@ -1,5 +1,5 @@
 #include <gint/display.h>
-#include <display/fx.h>
+#include "render-fx.h"
 #include "bopti-asm.h"
 
 /* List of rendering functions */

src/render-fx/dupdate.c

@@ -1,6 +1,6 @@
 #include <gint/display.h>
 #include <gint/drivers/t6k11.h>
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* Standard video RAM for fx9860g is 1 bit per pixel */
 GSECTION(".bss") static uint32_t fx_vram[256];

src/render-fx/gint_dline.c

@@ -1,6 +1,6 @@
 #include <gint/display.h>
 #include <gint/defs/util.h>
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* gint_dhline(): Optimized horizontal line using a rectangle mask */
 void gint_dhline(int x1, int x2, int y, int color)

src/render-fx/masks.c

@@ -1,4 +1,4 @@
-#include <display/fx.h>
+#include "render-fx.h"
 
 /* masks() - compute the vram masks for a given rectangle */
 void masks(int x1, int x2, uint32_t *masks)

src/render-fx/render-fx.h

@@ -1,9 +1,9 @@
 //---
-//	display:fx - Internal definitions for the display module on fx9860g
+//	render-fx - Internal definitions for the display module on fx9860g
 //---
 
-#ifndef DISPLAY_FX
-#define DISPLAY_FX
+#ifndef RENDER_FX
+#define RENDER_FX
 
 #include <gint/defs/types.h>
 #include <gint/display.h>
@@ -102,4 +102,4 @@ void gsubimage
 		return;				\
 	}
 
-#endif /* DISPLAY_FX */
+#endif /* RENDER_FX */

src/render-fx/topti.c

@@ -1,8 +1,9 @@
 #include <gint/defs/types.h>
 #include <gint/defs/attributes.h>
 #include <gint/display.h>
-#include <display/common.h>
-#include <display/fx.h>
+
+#include "../render/render.h"
+#include "render-fx.h"
 #include "topti-asm.h"
 
 /* Default font */

src/render/dline.c

@@ -1,9 +1,9 @@
 #include <gint/display.h>
 #include <gint/defs/util.h>
-#include <display/common.h>
 
+#include "../render/render.h"
 #ifdef FX9860G
-#include <display/fx.h>
+#include "../render-fx/render-fx.h"
 #endif
 
 /* dline(): Bresenham line drawing algorithm

src/render/render.h

@@ -1,9 +1,9 @@
 //---
-//	display:common - Internal definitions for common display functions
+//	render - Internal definitions for common display functions
 //---
 
-#ifndef DISPLAY_COMMON
-#define DISPLAY_COMMON
+#ifndef RENDER_COMMON
+#define RENDER_COMMON
 
 #include <gint/display.h>
 
@@ -22,9 +22,9 @@ void gint_dvline(int y1, int y2, int x, color_t color);
 //---
 
 /* Current font */
-extern font_t const * topti_font;
+extern font_t const *topti_font;
 /* Default font */
-extern font_t const * gint_default_font;
+extern font_t const *gint_default_font;
 
 /* enum topti_charset: Available character set decoders
    Each charset is associated with a reduced character table. */
@@ -57,4 +57,4 @@ int charset_decode(enum topti_charset set, uint c);
    using a proportional font, the size array is not heeded for. */
 int topti_offset(font_t const *f, uint glyph);
 
-#endif /* DISPLAY_COMMON */
+#endif /* RENDER_COMMON */

src/render/topti.c

@@ -1,6 +1,7 @@
 #include <gint/defs/types.h>
 #include <gint/display.h>
-#include <display/common.h>
+
+#include "../render/render.h"
 
 /* TODO: These parameters will eventually be specified by the font */
 #define CHAR_SPACING 1