From be33b26d5580032f002ff1b15d55b2bc332e06a3 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Mon, 15 Jan 2018 19:54:51 +0100
Subject: [PATCH] yaft.h: fix build with g++, add neutrino stuff

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/5c9cc283b84f165f0dfbcfc20aa92d08f0167557
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)
---
 src/gui/widget/yaft/yaft.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/gui/widget/yaft/yaft.h b/src/gui/widget/yaft/yaft.h
index bc5b8d8fa..6b59cac60 100644
--- a/src/gui/widget/yaft/yaft.h
+++ b/src/gui/widget/yaft/yaft.h
@@ -13,7 +13,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#if 0
 #include <sys/mman.h>
+#endif
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <termios.h>
@@ -110,7 +112,7 @@ struct color_pair_t { uint8_t fg, bg; };
 struct cell_t {
 	const struct glyph_t *glyphp;   /* pointer to glyph */
 	struct color_pair_t color_pair; /* color (fg, bg) */
-	enum char_attr attribute;       /* bold, underscore, etc... */
+	/*enum char_attr*/ int attribute;       /* bold, underscore, etc... */
 	enum glyph_width width;         /* wide char flag: WIDE, NEXT_TO_WIDE, HALF */
 	bool has_pixmap;                /* has sixel pixmap data or not */
 	/*	sixel pixmap data:
@@ -133,10 +135,11 @@ struct charset_t {
 
 struct state_t {   /* for save, restore state */
 	struct point_t cursor;
-	enum term_mode mode;
-	enum char_attr attribute;
+	/*enum term_mode*/ int mode;
+	/*enum char_attr*/ int attribute;
 };
 
+#if 0
 struct sixel_canvas_t {
 	uint8_t *pixmap;
 	struct point_t point;
@@ -145,7 +148,9 @@ struct sixel_canvas_t {
 	uint8_t color_index;
 	uint32_t color_table[COLORS];
 };
+#endif
 
+class CFrameBuffer;
 struct terminal_t {
 	int fd;                                  /* master of pseudo terminal */
 	int width, height;                       /* terminal size (pixel) */
@@ -155,18 +160,21 @@ struct terminal_t {
 	struct point_t cursor;                   /* cursor pos (x, y) */
 	bool *line_dirty;                        /* dirty flag */
 	bool *tabstop;                           /* tabstop flag */
-	enum term_mode mode;                     /* for set/reset mode */
+	/*enum term_mode*/ int mode;                     /* for set/reset mode */
 	bool wrap_occured;                       /* whether auto wrap occured or not */
 	struct state_t state;                    /* for restore */
 	struct color_pair_t color_pair;          /* color (fg, bg) */
-	enum char_attr attribute;                /* bold, underscore, etc... */
+	/*enum char_attr*/int attribute;                /* bold, underscore, etc... */
 	struct charset_t charset;                /* store UTF-8 byte stream */
 	struct esc_t esc;                        /* store escape sequence */
 	uint32_t virtual_palette[COLORS];        /* virtual color palette: always 32bpp */
 	bool palette_modified;                   /* true if palette changed by OSC 4/104 */
 	const struct glyph_t *glyph[UCS2_CHARS]; /* array of pointer to glyphs[] */
+#if 0
 	struct glyph_t drcs[DRCS_CHARS];         /* DRCS chars */
 	struct sixel_canvas_t sixel;
+#endif
+	CFrameBuffer *cfb;
 };
 
 struct parm_t { /* for parse_arg() */