text: move font_char_attr to text.h

This way we can now remove all font.h includes. We can rename the
structure later.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

src/console.c

@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "console.h"
-#include "font.h"
 #include "log.h"
 #include "text.h"
 #include "unicode.h"

src/console.h

@@ -36,7 +36,6 @@
 
 #include <inttypes.h>
 #include <stdlib.h>
-#include "font.h"
 #include "text.h"
 #include "unicode.h"
 

src/terminal.c

@@ -36,7 +36,6 @@
 #include "conf.h"
 #include "console.h"
 #include "eloop.h"
-#include "font.h"
 #include "log.h"
 #include "pty.h"
 #include "static_misc.h"

src/text.c

@@ -35,7 +35,6 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include "font.h"
 #include "log.h"
 #include "static_misc.h"
 #include "text.h"

src/text.h

@@ -39,10 +39,25 @@
 #define KMSCON_TEXT_H
 
 #include <stdlib.h>
-#include "font.h"
 #include "unicode.h"
 #include "uterm.h"
 
+/* chars */
+
+/* TODO: rename to kmscon_char_attr */
+struct font_char_attr {
+	uint8_t fr;			/* foreground red */
+	uint8_t fg;			/* foreground green */
+	uint8_t fb;			/* foreground blue */
+	uint8_t br;			/* background red */
+	uint8_t bg;			/* background green */
+	uint8_t bb;			/* background blue */
+	unsigned int bold : 1;		/* bold character */
+	unsigned int underline : 1;	/* underlined character */
+	unsigned int inverse : 1;	/* inverse colors */
+	unsigned int protect : 1;	/* cannot be erased */
+};
+
 /* fonts */
 
 struct kmscon_font_attr;

src/text_bblit.c

@@ -36,7 +36,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "font.h"
 #include "log.h"
 #include "static_misc.h"
 #include "text.h"

src/vte.c

@@ -55,7 +55,6 @@
 #include <X11/keysym.h>
 
 #include "console.h"
-#include "font.h"
 #include "log.h"
 #include "unicode.h"
 #include "vte.h"