Richard's lazy-scrolling patch. This builds up scroll operations in a list,

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index ad845af..a9bca42 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -28,15 +28,14 @@ typedef struct terminal_tag Terminal;
 #include "network.h"
 
 /* Three attribute types: 
- * The ATTRs (normal attributes) are stored with the characters in the main
- * display arrays
+ * The ATTRs (normal attributes) are stored with the characters in
+ * the main display arrays
  *
- * The TATTRs (temporary attributes) are generated on the fly, they can overlap
- * with characters but not with normal attributes.
+ * The TATTRs (temporary attributes) are generated on the fly, they
+ * can overlap with characters but not with normal attributes.
  *
- * The LATTRs (line attributes) conflict with no others and only have one
- * value per line. But on area clears the LATTR cells are set to the erase_char
- * (or DEFAULT_ATTR + 'E')
+ * The LATTRs (line attributes) are an entirely disjoint space of
+ * flags.
  *
  * ATTR_INVALID is an illegal colour combination.
  */
@@ -53,7 +52,7 @@ typedef struct terminal_tag Terminal;
 #define LATTR_WRAPPED 0x10000000UL
 #define LATTR_WRAPPED2 0x20000000UL
 
-#define ATTR_INVALID 0x00FF0000UL
+#define ATTR_INVALID 0x03FF0000UL
 
 /* Like Linux use the F000 page for direct to font. */
 #define ATTR_OEMCP   0x0000F000UL      /* OEM Codepage DTF */
@@ -80,27 +79,27 @@ typedef struct terminal_tag Terminal;
  */
 #define UCSWIDE             0xDFFF
 
-#define ATTR_NARROW  0x20000000UL
-#define ATTR_WIDE    0x10000000UL
-#define ATTR_BOLD    0x01000000UL
-#define ATTR_UNDER   0x02000000UL
-#define ATTR_REVERSE 0x04000000UL
-#define ATTR_BLINK   0x08000000UL
-#define ATTR_FGMASK  0x000F0000UL
-#define ATTR_BGMASK  0x00F00000UL
-#define ATTR_COLOURS 0x00FF0000UL
+#define ATTR_NARROW  0x80000000UL
+#define ATTR_WIDE    0x40000000UL
+#define ATTR_BOLD    0x04000000UL
+#define ATTR_UNDER   0x08000000UL
+#define ATTR_REVERSE 0x10000000UL
+#define ATTR_BLINK   0x20000000UL
+#define ATTR_FGMASK  0x001F0000UL
+#define ATTR_BGMASK  0x03E00000UL
+#define ATTR_COLOURS 0x03FF0000UL
 #define ATTR_FGSHIFT 16
-#define ATTR_BGSHIFT 20
+#define ATTR_BGSHIFT 21
 
-#define ATTR_DEFAULT 0x00980000UL
+#define ATTR_DEFAULT 0x01280000UL      /* bg 9, fg 8 */
 #define ATTR_DEFFG   0x00080000UL
-#define ATTR_DEFBG   0x00900000UL
+#define ATTR_DEFBG   0x01200000UL
 #define ERASE_CHAR   (ATTR_DEFAULT | ATTR_ASCII | ' ')
 #define ATTR_MASK    0xFFFFFF00UL
 #define CHAR_MASK    0x000000FFUL
 
 #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS))
-#define ATTR_CUR_XOR 0x00BA0000UL
+#define ATTR_CUR_XOR 0x016A0000UL
 
 struct sesslist {
     int nsessions;
@@ -495,7 +494,7 @@ void do_text(Context, int, int, char *, int, unsigned long, int);
 void do_cursor(Context, int, int, char *, int, unsigned long, int);
 int char_width(Context ctx, int uc);
 #ifdef OPTIMISE_SCROLL
-void do_scroll(void *, int, int, int);
+void do_scroll(Context, int, int, int);
 #endif
 void set_title(void *frontend, char *);
 void set_icon(void *frontend, char *);