start refactoring to draw parsed text to an intermediary data structure

1 files changed, 15 insertions, 33 deletions

diff --git a/src/term.h b/src/term.h
index 71e0bcc..6baf961 100644
--- a/src/term.h
+++ b/src/term.h
@@ -4,12 +4,26 @@
 struct runes_term {
     RunesWindowBackend w;
     RunesPtyBackend pty;
+    RunesScreen scr;
 
     cairo_t *cr;
     cairo_t *backend_cr;
-    cairo_t *alternate_cr;
     uv_loop_t *loop;
 
+    PangoLayout *layout;
+
+    char readbuf[RUNES_READ_BUFFER_LENGTH];
+    int readlen;
+    int remaininglen;
+
+    int xpixel;
+    int ypixel;
+    int fontx;
+    int fonty;
+
+    char visual_bell_is_ringing;
+    char unfocused;
+
     cairo_pattern_t *mousecursorcolor;
     cairo_pattern_t *cursorcolor;
 
@@ -19,48 +33,16 @@ struct runes_term {
     cairo_pattern_t *fgcustom;
     cairo_pattern_t *bgcustom;
 
-    int fgcolor;
-    int bgcolor;
-
-    int row;
-    int col;
-    int saved_row;
-    int saved_col;
-    int scroll_top;
-    int scroll_bottom;
-
-    int rows;
-    int cols;
-    int xpixel;
-    int ypixel;
-    int fontx;
-    int fonty;
     int default_rows;
     int default_cols;
 
     char *cmd;
-
     char *font_name;
-    PangoLayout *layout;
-
-    char readbuf[RUNES_READ_BUFFER_LENGTH];
-    int readlen;
-    int remaininglen;
 
     char bell_is_urgent;
     char bold_is_bright;
     char bold_is_bold;
-    char bold;
-    char inverse;
-    char hide_cursor;
-    char unfocused;
     char audible_bell;
-    char visual_bell_is_ringing;
-
-    char application_keypad;
-    char application_cursor;
-    char mouse_reporting_press;
-    char mouse_reporting_press_release;
 };
 
 void runes_term_init(RunesTerm *t, int argc, char *argv[]);