1 files changed, 86 insertions, 345 deletions

diff --git a/libc/bios/bios_vid.c b/libc/bios/bios_vid.c
index bbe7545..8c55100 100644
--- a/libc/bios/bios_vid.c
+++ b/libc/bios/bios_vid.c
@@ -3,11 +3,6 @@
  * under the GNU Library General Public License.
  */
 
-/* Various possible console types */
-#define VT52_CON	/* IMO the best, no clear to EOS/EOL tho */
-#define XANSI_CON	/* Largest but still not complete */
-#define XDUMB_CON	/* Can't do much */
-
 #if !__FIRST_ARG_IN_AX__
 #ifdef __AS386_16__
 #ifdef __STANDALONE__
@@ -16,352 +11,102 @@
 #include <errno.h>
 int errno;
 
-#ifdef L_bios_putc
-#define CTRL(x) ((x)&0x1F)
-static int last_attr = 0x07;
-static int con_mode;
-static unsigned char con_height = 24, con_width = 79;
-
-static int con_colour = 0;
-static unsigned char con_row, con_col;
-
-#ifdef VT52_CON
-putch(c)
-int c;
-{
-static int ctrl = 0;
-   int new_attr;
-   if( con_mode==0 ) asm_coninit();
-
-   switch( ctrl )
-   {
-   case 1:
-      ctrl=0;
-      switch(c)
-      {
-      case 'A': if( con_row ) con_row--; asm_cpos(con_row, con_col); break;
-      case 'B': if( con_row != con_height ) con_row++;
-                asm_cpos(con_row, con_col); break;
-      case 'C': if( con_col != con_height ) con_col++;
-                asm_cpos(con_row, con_col); break;
-      case 'D': if( con_col ) con_col--; asm_cpos(con_row, con_col); break;
-      case 'E': last_attr = 0x07; asm_cls();
-      case 'H': asm_cpos(0,0); break;
-      case 'J': asm_cls(); break;
-      case 'K': break;
-      case 'R': ctrl = 2; break; 	/* Foreground */
-      case 'S': ctrl = 3; break; 	/* Background */
-      case 'Y': ctrl = 4; break;	/* ttypos */
-      }
-      break;
-   case 2: ctrl=0; new_attr = (last_attr & 0xF0) + (c&0xF);
-	   if(0) {
-   case 3: ctrl=0; new_attr = (last_attr & 0x0F) + (c<<4); 
-           }
-	   switch(c)
-	   {
-	   case '_': if( !con_colour ) last_attr = (last_attr&0x88) + 1;
-	             break;
-	   case '!': last_attr  = (last_attr&0x88) + 0x70; break;
-	   case ' ': last_attr  = 0x07; break;
-	   case '+': last_attr |= 0x08; break;
-	   case '*': last_attr |= 0x80; break;
-
-	   default: if( con_colour )
-	               last_attr = new_attr;
-	   }
-           break;
-   case 4: ctrl=5; con_col = c-' '; break;
-   case 5: ctrl=0; con_row = c-' '; asm_cpos(con_row, con_col); break;
-      break;
-
-   default:
-      if( c & 0xE0 )
-         { asm_colour(last_attr) ; asm_putc(c); }
-      else switch(c)
-      {
-      default:
-	 asm_putc(c);
-	 break;
-      case CTRL('I'):
-	 asm_gpos();
-	 con_col = ((con_col+8)& -8);
-	 asm_cpos(con_row, con_col);
-	 break;
-      case CTRL('L'):
-	 asm_cpos(0,0);
-	 asm_cls();
-	 break;
-      case CTRL('['):
-         ctrl = 1;
-	 asm_gpos();
-	 break;
-      }
-      break;
-   }
-}
-#endif
-
-#ifdef ANSI_CON
-#define MAX_ARGS 8
-static int colconv[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-static int vidcnt = 0;
-static int ansi_2 = 0;
-static int ansi_argc = 0;
-static int ansi_argv[MAX_ARGS];
-static void do_ansi();
+#ifdef L_bios_putch
+void (*__smart_putch)() = 0;
 
 putch(c)
 int c;
 {
-   if( con_mode==0 ) asm_coninit();
-
-   if( vidcnt == 0 || c < ' ' || c > '~' )
-   {
-      switch(c & 0xFF)
-      {
-      default:
-         asm_colour(last_attr);
-	 asm_putc(c);
-	 break;
-      case CTRL('I'):
-	 asm_gpos();
-	 con_col = ((con_col+8)& -8);
-	 asm_cpos(con_row, con_col);
-	 break;
-      case CTRL('L'):
-	 asm_cpos(0,0);
-	 asm_cls();
-	 break;
-      case CTRL('['):
-         vidcnt=1;
-	 break;
-      }
-      return;
-   }
-
-   /* ... ansi/vt100 interpretation, this collects _all_ ansi control strings */
-   switch(vidcnt)
-   {
-   case 1: for(ansi_argc=0; ansi_argc<MAX_ARGS; ansi_argc++)
-	      ansi_argv[ansi_argc] = 0;
-	   ansi_2 = 0;
-	   ansi_argc = 0;
-	   vidcnt++;
-
-           if( c != '[' )
-           {
-	      do_ansi(c + 0x1B00, ansi_argc, ansi_argv);
-	      vidcnt = 0;
-	   }
-           break;
-
-   case 2: if( c == ';' )
-           {
-	      if( ansi_argc < MAX_ARGS )
-	         ansi_argc++;
-	   }
-	   else if( c >= '0' && c <= '9' )
-	      ansi_argv[ansi_argc] = ansi_argv[ansi_argc] * 10 + c - '0';
-	   else if( c >= '@' )
-	   {
-	      do_ansi(c+ansi_2, ++ansi_argc, ansi_argv);
-	      vidcnt = 0;
-	   }
-	   else
-	      ansi_2 = (c<<8);
-           break;
-
-   default: vidcnt = 0; /* This definitly won't happen ... definitly ... */
+static int col = 0;
+   if (__smart_putch)
+      (*__smart_putch)(c);
+   else if (c&0xE0) {
+      col++;
+      asm_putc(c);
    }
-}
-
-void 
-do_ansi(ctrl, argc, argv)
-int ctrl, argc, *argv;
-{
-   switch(ctrl)
+   else switch(c)
    {
-   case 'A':
-   case 'B':
-   case 'C':
-   case 'D':
-      asm_gpos();
-      if( argv[0] < 1 ) argv[0] = 1;
-      switch(ctrl)
-      {
-      case 'A': if( argv[0]>con_row ) con_row=0; else con_row-=argv[0]; break;
-      case 'B': if( argv[0]+con_row>con_height )
-                   con_row = con_height;
-                else
-                   con_row += argv[0];
-                break;
-      case 'C': if( argv[0]+con_col>con_width )
-                   con_col = con_width;
-                else
-                   con_col += argv[0];
-                break;
-      case 'D': if( argv[0]>con_col ) con_col=0; else con_col-=argv[0]; break;
-      }
-      asm_cpos(con_row, con_col);
+   case '\t': 
+      do putch(' '); while(col&7);
       break;
-
-   case 'H':
-             if( --argv[0] < 0 ) argv[0] = 0; 
-             if( --argv[1] < 0 ) argv[1] = 0; 
-	     asm_cpos(argv[0],argv[1]);
-	     break;
-   case 'J': if( argv[0] == 2 ) asm_cls();
-             break;
-   case 'm':
-      {
-         int ar;
-	 for(ar=0; ar<argc; ar++) switch(argv[ar])
-	 {
-	 case 0: last_attr  = 0x07; break;
-	 case 1: last_attr |= 0x08; break;
-	 case 5: last_attr |= 0x80; break;
-	 case 7: last_attr  = 0x70; break;
-         case 30: case 31: case 32: case 33:
-         case 34: case 35: case 36: case 37:
-	    if( con_colour )
-     	       last_attr = ((last_attr&0xF8)|(colconv[argv[ar]-30]));
-     	    break;
-         case 40: case 41: case 42: case 43:
-         case 44: case 45: case 46: case 47:
-	    if( con_colour )
-     	       last_attr = ((last_attr&0x8F)|((colconv[argv[ar]-40])<<4));
-     	    break;
-         default: break;
-	 }
-      }
-   }
-}
-#endif
-
-#ifdef DUMB_CON
-putch(c)
-int c;
-{
-   if( con_mode==0 ) asm_coninit();
-   switch(c)
-   {
-   default:
+   case '\n':
+      asm_putc('\r');
+   case '\r':
+      col = 0;
       asm_putc(c);
       break;
-   case CTRL('L'):
-      asm_cls();
-   case CTRL('^'):
-      asm_cpos(0,0);
-      break;
-   }
-}
-#endif
-
-static asm_coninit()
-{
+   case '\f':
+      col = 0;
 #asm
-  mov	ax,#$0F00
-  int	$10
-  mov	_con_mode,ax
+      mov ah,#$0F
+      int $10
+      mov ah,#$00
+      int $10
 #endasm
-  if( (con_mode &0xFF) > 39 ) con_width = (con_mode>>8);
-  if( (con_mode&0xFF) != 0x7)
-     con_colour = 1;
+      break;
+   }
 }
 
 static asm_putc(c)
 {
 #asm
 #if !__FIRST_ARG_IN_AX__
-  mov	bx,sp
-  mov	ax,[bx+2]
+  mov   bx,sp
+  mov   ax,[bx+2]
 #endif
-  cmp	al,#$0A
-  jne	not_nl
-  mov	ax,#$0E0D
-  mov	bx,#7
-  int	$10
-  mov	al,#$0A
-not_nl:
-  mov	ah,#$0E
-  mov	bx,#7
-  int	$10
+  mov   ah,#$0E
+  mov   bx,#7
+  int   $10
 #endasm
 }
 
-static asm_cls()
-{
-#asm
-  push	bp	! Bug in some old BIOS`s
-  !mov	ax,#$0500
-  !int	$10
-  mov	ax,#$0600
-  mov	bh,_last_attr
-  mov	cx,#$0000
-  mov	dl,_con_width
-  mov	dh,_con_height
-  int	$10
-  pop	bp
-#endasm
-}
+#endif
 
-static asm_cpos(r,c)
+/****************************************************************************/
+
+#ifdef L_bios_getch
+getch()
 {
 #asm
-#if __FIRST_ARG_IN_AX__
-  mov	bx,sp
-  mov	dh,al
-  mov	ax,[bx+2]
-  mov	dl,al
-#else
-  mov	bx,sp
-  mov	ax,[bx+2]
-  mov	dh,al
-  mov	ax,[bx+4]
-  mov	dl,al
-#endif
-  mov	ah,#$02
-  mov	bx,#7
-  int	$10
+  xor	ax,ax
+  int	$16
 #endasm
 }
+#endif
+
+/****************************************************************************/
 
-#ifndef DUMB_CON
-static asm_colour(c)
+#ifdef L_bios_kbhit
+kbhit()
 {
 #asm
-#if __FIRST_ARG_IN_AX__
-  mov	bx,ax
-#else
-  mov	bx,sp
-  mov	bx,[bx+2]
-#endif
-  mov	ah,#$08
-  int	$10
-  mov	ah,#$09
-  mov	cx,#1
-  int	$10
+  mov	ah,#1
+  int	$16
+  jz	nokey
+  cmp	ax,#0
+  jnz	dort
+  mov	ax,#3
+dort:
+  ret
+nokey:
+  xor	ax,ax
 #endasm
 }
+#endif
+
+/****************************************************************************/
 
-static asm_gpos()
+#ifdef L_bios_cputs
+cputs(str)
+   char * str;
 {
-#asm
-  mov	ah,#$03
-  mov	bx,#7
-  int	$10
-  mov	[_con_row],dh
-  mov	[_con_col],dl
-  mov	ax,cx
-#endasm
+      while(*str) putch(*str++);
 }
 #endif
-#endif
 
 /****************************************************************************/
 
-#ifdef L_bios_getce
+#ifdef L_bios_getche
 getche()
 {
    static char linebuf[80];
@@ -380,6 +125,33 @@ getche()
 }
 #endif
 
+/****************************************************************************/
+
+#ifdef L_bios_gotoxy
+static gotoxy(x,y)
+{
+#asm
+#if __FIRST_ARG_IN_AX__
+  mov	bx,sp
+  mov	dl,al
+  mov	ax,[bx+2]
+  mov	dh,al
+#else
+  mov	bx,sp
+  mov	ax,[bx+4]
+  mov	dh,al
+  mov	ax,[bx+2]
+  mov	dl,al
+#endif
+  mov	ah,#$02
+  mov	bx,#7
+  int	$10
+#endasm
+}
+#endif
+
+/****************************************************************************/
+
 #ifdef L_bios_rdline
 bios_rdline(buf, len)
 char * buf;
@@ -436,38 +208,7 @@ int len;
 
 /****************************************************************************/
 
-#ifdef L_bios_getc
-getch()
-{
-#asm
-  xor	ax,ax
-  int	$16
-#endasm
-}
-#endif
-
-/****************************************************************************/
-
-#ifdef L_bios_khit
-kbhit()
-{
-#asm
-  mov	ah,#1
-  int	$16
-  jz	nokey
-  cmp	ax,#0
-  jnz	dort
-  mov	ax,#3
-dort:
-  ret
-nokey:
-  xor	ax,ax
-#endasm
-}
-#endif
-
-/****************************************************************************/
-
 #endif
 #endif
 #endif
+