From 5fd44c11631c66cff497fadd9bbc81b77c7509f7 Mon Sep 17 00:00:00 2001
From: james <>
Date: Wed, 27 Feb 2008 09:43:27 +0000
Subject: *** empty log message ***

---
 src/ansi.c  | 15 +++++++++------
 src/ptty.c  |  7 +++++--
 src/vt102.c | 50 ++++++++++++++++++++++++++++++--------------------
 src/vt102.h |  6 +++++-
 4 files changed, 49 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/ansi.c b/src/ansi.c
index 42f6a4c..408efd4 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.34  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *
  * Revision 1.33  2008/02/27 09:42:21  james
  * *** empty log message ***
  *
@@ -525,10 +528,10 @@ ansi_draw_line (ANSI * a, CRT_CA * cap, int y)
 }
 
 static void
-ansi_resize_check (ANSI * a, CRT_Pos *size)
+ansi_resize_check (ANSI * a, CRT_Pos * size)
 {
 
-  if ((size && crt_pos_cmp(a->crt.size,*size))
+  if ((size && crt_pos_cmp (a->crt.size, *size))
       || crt_pos_cmp (a->terminal->size, a->size))
     {
 
@@ -542,7 +545,7 @@ ansi_resize_check (ANSI * a, CRT_Pos *size)
       crt_reset (&a->crt);
 
       if (size)
-        a->crt.size =*size;
+        a->crt.size = *size;
 
 // FIXME: -- echos back crap?
 //  a->terminal->xmit (a->terminal, "\033[c", 3);
@@ -574,7 +577,7 @@ ansi_history (ANSI * a, History * h)
 {
   char buf[32];
   int i;
-      int guess_scroll;
+  int guess_scroll;
 /*Do we need to catch up on history?*/
 
   if (a->history_ptr == h->wptr)
@@ -584,7 +587,7 @@ ansi_history (ANSI * a, History * h)
   if ((a->size.x < a->crt.size.x) || (a->size.y < a->crt.size.y))
     return;
 
-  guess_scroll=a->crt.size.y-1; /*Bototm line should be a status line*/
+  guess_scroll = a->crt.size.y - 1; /*Bototm line should be a status line */
 
 
   ansi_force_attr_normal (a);
@@ -716,7 +719,7 @@ ansi_reset (ANSI * a, CRT * c)
 static void
 ansi_terminal_reset (ANSI * a)
 {
-  CRT_Pos p = { 0, a->crt.size.y};
+  CRT_Pos p = { 0, a->crt.size.y };
   ansi_force_attr_normal (a);
 
   ansi_move (a, p);
diff --git a/src/ptty.c b/src/ptty.c
index fba3202..3be35f2 100644
--- a/src/ptty.c
+++ b/src/ptty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.15  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *
  * Revision 1.14  2008/02/27 09:42:22  james
  * *** empty log message ***
  *
@@ -146,7 +149,7 @@ ptty_write (TTY * _t, void *buf, int len)
 }
 
 TTY *
-ptty_open (char *path, char *argv[], CRT_Pos *size)
+ptty_open (char *path, char *argv[], CRT_Pos * size)
 {
   PTTY *t;
   pid_t child;
@@ -158,7 +161,7 @@ ptty_open (char *path, char *argv[], CRT_Pos *size)
 
 
   client_termios (&ctermios);
-  winsize.ws_row = size ? size->y :VT102_ROWS;
+  winsize.ws_row = size ? size->y : VT102_ROWS;
   winsize.ws_col = size ? size->x : VT102_COLS_80;
 
   child = forkpty (&fd, name, &ctermios, &winsize);
diff --git a/src/vt102.c b/src/vt102.c
index 1940dcf..2132f83 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.48  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *
  * Revision 1.47  2008/02/27 09:42:22  james
  * *** empty log message ***
  *
@@ -743,10 +746,10 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set)
             VT102_COLS_80;
 
           v->crt.size = v->current_size;
-	  v->crt.size.y++;
-	  v->screen_end=v->current_size;
-	v->screen_end.x--;
-	v->screen_end.y--;
+          v->crt.size.y++;
+          v->screen_end = v->current_size;
+          v->screen_end.x--;
+          v->screen_end.y--;
           v->top_margin = v->screen_start;
           v->bottom_margin = v->screen_end;
           vt102_cursor_home (v);
@@ -1595,9 +1598,9 @@ vt102_reset_state (VT102 * v)
 
   v->application_keypad_mode = 0;
 
-  v->current_size=v->original_size;
+  v->current_size = v->original_size;
   v->crt.size = v->current_size;
-	  v->crt.size.y++;
+  v->crt.size.y++;
   v->screen_end = v->current_size;
   v->screen_end.x--;
   v->screen_end.y--;
@@ -2014,10 +2017,10 @@ vt102_reset (VT102 * v)
 
   v->screen_start.x = 0;
   v->screen_start.y = 0;
-  v->current_size=v->original_size;
-  v->crt.size=v->current_size;
-	  v->crt.size.y++;
-  v->screen_end=v->current_size;
+  v->current_size = v->original_size;
+  v->crt.size = v->current_size;
+  v->crt.size.y++;
+  v->screen_end = v->current_size;
   v->screen_end.x--;
   v->screen_end.y--;
 
@@ -2036,7 +2039,7 @@ vt102_reset (VT102 * v)
 }
 
 VT102 *
-vt102_new (CRT_Pos *size)
+vt102_new (CRT_Pos * size)
 {
   VT102 *v;
 
@@ -2044,19 +2047,26 @@ vt102_new (CRT_Pos *size)
 
   v->xn_glitch = 1;
 
- 
-  if (size) {
+
+  if (size)
+    {
       v->original_size = *size;
 
-	if (v->original_size.x<1) v->original_size.x=1;
-	if (v->original_size.y<1) v->original_size.y=1;
+      if (v->original_size.x < 1)
+        v->original_size.x = 1;
+      if (v->original_size.y < 1)
+        v->original_size.y = 1;
 
-	if (v->original_size.x>VT102_MAX_COLS) v->original_size.x=VT102_MAX_COLS; 
-	if (v->original_size.y>VT102_ROWS) v->original_size.y=VT102_ROWS; 
+      if (v->original_size.x > VT102_MAX_COLS)
+        v->original_size.x = VT102_MAX_COLS;
+      if (v->original_size.y > VT102_ROWS)
+        v->original_size.y = VT102_ROWS;
 
-    } else {
-	v->original_size.x=VT102_COLS_80;
-	v->original_size.y=VT102_ROWS;
+    }
+  else
+    {
+      v->original_size.x = VT102_COLS_80;
+      v->original_size.y = VT102_ROWS;
     }
 
   vt102_reset (v);
diff --git a/src/vt102.h b/src/vt102.h
index 7be7d05..e09fbf6 100644
--- a/src/vt102.h
+++ b/src/vt102.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.20  2008/02/27 09:42:22  james
+ * *** empty log message ***
+ *
  * Revision 1.19  2008/02/26 23:23:17  james
  * *** empty log message ***
  *
@@ -129,7 +132,8 @@ typedef struct
   int last_reg_char;
   int xn_glitch;
 
-  int current_width;
+  CRT_Pos current_size;
+  CRT_Pos original_size;
 
   int g[2];
   int cs;
-- 
cgit v1.2.3