X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcrt.h;h=93941d591a2db8eea5263dbe473f302582c90bbc;hb=refs%2Fheads%2Fmaster;hp=002f67fe4d8e650d0deb65997a895cb140b8837e;hpb=5175425f563e29f4698d2941ba1825b09965aaa5;p=sympathy.git

diff --git a/src/crt.h b/src/crt.h
index 002f67f..93941d5 100644
--- a/src/crt.h
+++ b/src/crt.h
@@ -1,17 +1,62 @@
-/*
+/* 
  * crt.h:
  *
- * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+ * Copyright (c) 2008 James McKenzie <sympathy@madingley.org>,
  * All rights reserved.
  *
  */
 
-/*
- * $Id$
+/* 
+ * $Id: crt.h,v 1.18 2008/03/10 11:49:33 james Exp $
  */
 
-/*
- * $Log$
+/* 
+ * $Log: crt.h,v $
+ * Revision 1.18  2008/03/10 11:49:33  james
+ * *** empty log message ***
+ *
+ * Revision 1.17  2008/03/07 12:37:04  james
+ * *** empty log message ***
+ *
+ * Revision 1.16  2008/03/03 06:04:42  james
+ * *** empty log message ***
+ *
+ * Revision 1.15  2008/03/02 10:37:56  james
+ * *** empty log message ***
+ *
+ * Revision 1.14  2008/02/28 16:57:51  james
+ * *** empty log message ***
+ *
+ * Revision 1.13  2008/02/27 09:42:22  james
+ * *** empty log message ***
+ *
+ * Revision 1.12  2008/02/26 23:23:17  james
+ * *** empty log message ***
+ *
+ * Revision 1.11  2008/02/26 19:08:27  james
+ * *** empty log message ***
+ *
+ * Revision 1.10  2008/02/24 00:42:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.9  2008/02/20 19:25:09  james
+ * *** empty log message ***
+ *
+ * Revision 1.8  2008/02/13 09:12:21  james
+ * *** empty log message ***
+ *
+ * Revision 1.7  2008/02/13 01:08:18  james
+ * *** empty log message ***
+ *
+ * Revision 1.6  2008/02/07 13:22:51  james
+ * *** empty log message ***
+ *
+ * Revision 1.5  2008/02/07 12:41:06  james
+ * *** empty log message ***
+ *
+ * Revision 1.4  2008/02/07 12:16:04  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/06 11:30:37  james
  * *** empty log message ***
  *
@@ -26,8 +71,8 @@
 #ifndef __CRT_H__
 #define __CRT_H__
 
-#define CRT_ROWS 25
-#define CRT_COLS 80
+#define CRT_ROWS 60
+#define CRT_COLS 132
 
 #define CRT_CELS (CRT_ROWS*CRT_COLS)
 #define CRT_ADDR(r,c) (((r)*CRT_COLS)+(c))
@@ -39,24 +84,56 @@
 #define CRT_ATTR_BLINK	   0x4
 #define CRT_ATTR_BOLD	   0x8
 
-typedef struct
-{
-  uint8_t chr;
+
+#define CRT_COLOR_BLACK		0x0
+#define CRT_COLOR_RED		0x1
+#define CRT_COLOR_GREEN		0x2
+#define CRT_COLOR_YELLOW	0x3
+#define CRT_COLOR_BLUE		0x4
+#define CRT_COLOR_MAGENTA	0x5
+#define CRT_COLOR_CYAN		0x6
+#define CRT_COLOR_WHITE		0x7
+#define CRT_COLOR_INTENSITY	0x8
+
+#define CRT_COLOR_FG_MASK	0xf0
+#define CRT_COLOR_FG_SHIFT	4
+
+#define CRT_COLOR_BG_MASK	0xf
+#define CRT_COLOR_BG_SHIFT	0
+
+#define CRT_COLOR_BG(a)		(((a) & CRT_COLOR_BG_MASK) >> CRT_COLOR_BG_SHIFT)
+#define CRT_COLOR_FG(a)		(((a) & CRT_COLOR_FG_MASK) >> CRT_COLOR_FG_SHIFT)
+
+#define CRT_MAKE_COLOR(f,b)	(((f) << CRT_COLOR_FG_SHIFT)|(b))
+
+#define CRT_BGCOLOR_NORMAL	CRT_COLOR_BLACK
+#define CRT_FGCOLOR_NORMAL	CRT_COLOR_WHITE
+
+#define CRT_COLOR_NORMAL	CRT_MAKE_COLOR(CRT_FGCOLOR_NORMAL,CRT_BGCOLOR_NORMAL)
+
+typedef struct __attribute__ ((packed)) {
+  uint32_t chr;
   uint8_t attr;
+  uint8_t color;
 } CRT_CA;
 
-typedef struct
-{
+typedef struct {
   int x;
   int y;
 } CRT_Pos;
 
 
-typedef struct
-{
+typedef struct {
+  CRT_Pos s;
+  CRT_Pos e;
+  int dir;
+} CRT_ScrollHint;
+
+typedef struct CRT_struct {
   CRT_CA screen[CRT_CELS];
   CRT_Pos pos;
   int hide_cursor;
+  CRT_Pos size;
 } CRT;
 
 
@@ -66,4 +143,10 @@ crt_ca_cmp (CRT_CA a, CRT_CA b)
   return memcmp (&a, &b, sizeof (a));
 }
 
+static inline
+crt_pos_cmp (CRT_Pos a, CRT_Pos b)
+{
+  return memcmp (&a, &b, sizeof (a));
+}
+
 #endif /* __CRT_H__ */