X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcrt.c;h=b3d13f5a885a43fef598d289a662fd2187ece7c4;hb=3684640e6bdec97cb1b60a34d03e8cde63149215;hp=36011a986ba710cd936159e404f3987b9dc101d8;hpb=8ba373fecb91b8f276c754f63a5a7f1490f76dcc;p=sympathy.git

diff --git a/src/crt.c b/src/crt.c
index 36011a9..b3d13f5 100644
--- a/src/crt.c
+++ b/src/crt.c
@@ -10,6 +10,18 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.7  2008/02/07 12:41:06  james
+ * *** empty log message ***
+ *
+ * Revision 1.6  2008/02/07 12:16:04  james
+ * *** empty log message ***
+ *
+ * Revision 1.5  2008/02/06 11:30:37  james
+ * *** empty log message ***
+ *
+ * Revision 1.4  2008/02/05 01:11:46  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/04 20:23:55  james
  * *** empty log message ***
  *
@@ -24,7 +36,7 @@ static char rcsid[] = "$Id$";
 #include "project.h"
 
 void
-crt_erase (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
+crt_erase (CRT * c, CRT_Pos s, CRT_Pos e, int ea)
 {
   CRT_CA *ps = &c->screen[CRT_ADDR_POS (&s)];
   CRT_CA *pe = &c->screen[CRT_ADDR_POS (&e)];
@@ -32,8 +44,10 @@ crt_erase (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
   while (ps <= pe)
     {
       ps->chr = ' ';
-      if (ea)
-      ps->attr = CRT_ATTR_NORMAL;
+      if (ea){
+        ps->attr = CRT_ATTR_NORMAL;
+        ps->color = CRT_COLOR_NORMAL;
+	}
       ps++;
     }
 
@@ -46,26 +60,22 @@ crt_cls (CRT * c)
   CRT_Pos e = { CRT_COLS - 1, CRT_ROWS - 1 };
   int i;
 
-  crt_erase (c, s, e,1);
-
-#if 0
-  for (i = 0; i < CRT_ROWS; ++i)
-    {
-      c->screen[CRT_ADDR (i, i)].chr = '@' + i;
-      c->screen[CRT_ADDR (i, i)].attr = CRT_ATTR_NORMAL;
-    }
-#endif
-
+  crt_erase (c, s, e, 1);
+  c->sh.dir=0;
 }
 
 void
-crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
+crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e, int ea)
 {
   int l, n;
   int p;
 
-  s.x=0;
-  e.x=CRT_COLS-1;
+  c->sh.s=s;
+  c->sh.e=e;
+  c->sh.dir=-1;
+
+  s.x = 0;
+  e.x = CRT_COLS - 1;
 
   l = e.x - s.x;
   l++;
@@ -73,6 +83,7 @@ crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
 
   n = e.y - s.y;
 
+
   p = CRT_ADDR_POS (&s);
 
   while (n--)
@@ -82,35 +93,41 @@ crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
     }
 
   s.y = e.y;
-  crt_erase (c, s, e,ea);
+  crt_erase (c, s, e, ea);
 
 }
 
 void
-crt_scroll_down (CRT * c, CRT_Pos s, CRT_Pos e,int ea)
+crt_scroll_down (CRT * c, CRT_Pos s, CRT_Pos e, int ea)
 {
   int l, n;
   int p;
 
-  s.x=0;
-  e.x=CRT_COLS-1;
+  c->sh.s=s;
+  c->sh.e=e;
+  c->sh.dir=1;
+
+
+  s.x = 0;
+  e.x = CRT_COLS - 1;
 
   l = e.x - s.x;
   l++;
   l *= sizeof (CRT_CA);
 
   n = e.y - s.y;
+  n++;
 
   p = CRT_ADDR_POS (&e);
 
   while (n--)
     {
-      memcpy (&c->screen[p], &c->screen[p + CRT_COLS], l);
+      memcpy (&c->screen[p], &c->screen[p - CRT_COLS], l);
       p -= CRT_COLS;
     }
 
   e.y = s.y;
-  crt_erase (c, s, e,ea);
+  crt_erase (c, s, e, ea);
 
 }
 
@@ -122,6 +139,7 @@ crt_reset (CRT * c)
   c->pos.x = 0;
   c->pos.y = 0;
   c->hide_cursor = 1;
+  c->sh.dir=0;
 }
 
 void
@@ -138,6 +156,5 @@ crt_insert (CRT * c, CRT_CA ca)
 
   c->screen[CRT_ADDR (c->pos.y, c->pos.x)] = ca;
 
-
-
+  c->sh.dir=0;
 }