Re-engineering of terminal emulator, phase 1.

[u/mdw/putty] / terminal.h

diff --git a/terminal.h b/terminal.h
index d969ecc..d4eef39 100644 (file)
--- a/terminal.h
+++ b/terminal.h
@@ -29,6 +29,21 @@ struct scrollregion {
 };
 #endif /* OPTIMISE_SCROLL */
 
+typedef struct termchar termchar;
+typedef struct termline termline;
+
+struct termchar {
+    unsigned long chr;
+    unsigned long attr;
+};
+
+struct termline {
+    unsigned short lattr;
+    int cols;
+    int temporary;                    /* TRUE if decompressed from scrollback */
+    struct termchar *chars;
+};
+
 struct terminal_tag {
 
     int compatibility_level;
@@ -37,12 +52,14 @@ struct terminal_tag {
     tree234 *screen;                  /* lines on primary screen */
     tree234 *alt_screen;              /* lines on alternate screen */
     int disptop;                      /* distance scrolled back (0 or -ve) */
+    int tempsblines;                  /* number of lines in temporary
+                                         scrollback */
 
-    unsigned long *cpos;              /* cursor position (convenience) */
+    termchar *cpos;                   /* cursor position (convenience) */
 
-    unsigned long *disptext;          /* buffer of text on real screen */
-    unsigned long *dispcurs;          /* location of cursor on real screen */
-    unsigned long curstype;           /* type of cursor on real screen */
+    termline **disptext;              /* buffer of text on real screen */
+    int dispcursx, dispcursy;         /* location of cursor on real screen */
+    int curstype;                     /* type of cursor on real screen */
 
 #define VBELL_TIMEOUT (TICKSPERSEC/10) /* visual bell lasts 1/10 sec */
 
@@ -51,17 +68,18 @@ struct terminal_tag {
     int beep_overloaded;
     long lastbeep;
 
-#define TSIZE (sizeof(unsigned long))
+#define TTYPE termchar
+#define TSIZE (sizeof(TTYPE))
 #define fix_cpos do { \
-    term->cpos = lineptr(term->curs.y) + term->curs.x; \
+    term->cpos = lineptr(term->curs.y)->chars + term->curs.x; \
 } while(0)
 
 #ifdef OPTIMISE_SCROLL
     struct scrollregion *scrollhead, *scrolltail;
 #endif /* OPTIMISE_SCROLL */
 
-    unsigned long curr_attr, save_attr;
-    unsigned long erase_char;
+    int default_attr, curr_attr, save_attr;
+    termchar basic_erase_char, erase_char;
 
     bufchain inbuf;                   /* terminal input buffer */
     pos curs;                         /* cursor */
@@ -109,7 +127,7 @@ struct terminal_tag {
     int xterm_mouse;                  /* send mouse messages to app */
     int mouse_is_down;                /* used while tracking mouse buttons */
 
-    unsigned long cset_attr[2];
+    int cset_attr[2];
 
 /*
  * Saved settings on the alternate screen.
@@ -170,7 +188,7 @@ struct terminal_tag {
     short wordness[256];
 
     /* Mask of attributes to pay attention to when painting. */
-    unsigned long attr_mask;
+    int attr_mask;
 
     wchar_t *paste_buffer;
     int paste_len, paste_pos, paste_hold;
@@ -195,6 +213,24 @@ struct terminal_tag {
      * than only the default.
      */
     Config cfg;
+
+    /*
+     * from_backend calls term_out, but it can also be called from
+     * the ldisc if the ldisc is called _within_ term_out. So we
+     * have to guard against re-entrancy - if from_backend is
+     * called recursively like this, it will simply add data to the
+     * end of the buffer term_out is in the process of working
+     * through.
+     */
+    int in_term_out;
+
+    /*
+     * These are buffers used by the bidi and Arabic shaping code.
+     */
+    termchar *ltemp;
+    bidi_char *wcFrom, *wcTo;
+    termchar **pre_bidi_cache, **post_bidi_cache;
+    int bidi_cache_size;
 };
 
 #define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)