Be more verbose about teleports, and fix a minor problem in autobot mode.

[bsdgames-darwin.git] / tetris / screen.c

diff --git a/tetris/screen.c b/tetris/screen.c
index f27fb5520e48c9e1390fa5360aa13d62e6e565d4..49031645b83b3f43f689eee980d1e8612a0a17c0 100644 (file)
--- a/tetris/screen.c
+++ b/tetris/screen.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: screen.c,v 1.12 1999/09/08 21:45:31 jsm Exp $  */
+/*     $NetBSD: screen.c,v 1.16 2001/11/02 18:27:00 christos Exp $     */

 
 /*-
  * Copyright (c) 1992, 1993
 
 /*-
  * Copyright (c) 1992, 1993


@@ -73,7 +73,6 @@ static        void    stopset __P((int)) __attribute__((__noreturn__));
 /*
  * Capabilities from TERMCAP.
  */
 /*
  * Capabilities from TERMCAP.
  */

-char   PC, *BC, *UP;           /* tgoto requires globals: ugh! */

 short  ospeed;
 
 static char
 short  ospeed;
 
 static char


@@ -121,18 +120,17 @@ struct tcsinfo {  /* termcap string info; some abbrevs above */
 
 /* This is where we will actually stuff the information */
 
 
 /* This is where we will actually stuff the information */
 

-static char combuf[1024], tbuf[1024];
-
+static struct tinfo *info;

 
 /*
  * Routine used by tputs().
  */
 
 /*
  * Routine used by tputs().
  */

-void
+int

 put(c)
        int c;
 {
 
 put(c)
        int c;
 {
 

-       (void) putchar(c);
+       return (putchar(c));

 }
 
 /*
 }
 
 /*


@@ -141,7 +139,15 @@ put(c)
  * count=1.  (See screen.h for putpad().)
  */
 #define        putstr(s)       (void)fputs(s, stdout)
  * count=1.  (See screen.h for putpad().)
  */
 #define        putstr(s)       (void)fputs(s, stdout)

-#define        moveto(r, c)    putpad(tgoto(CMstr, c, r))
+
+void
+moveto(int r, int c)
+{
+       char buf[256];
+
+       if (t_goto(info, CMstr, c, r, buf, 255) == 0)
+               putpad(buf);
+}

 
 /*
  * Set up from termcap.
 
 /*
  * Set up from termcap.


@@ -153,7 +159,7 @@ scr_init()
 #ifdef unneeded
        static int ncflag;
 #endif
 #ifdef unneeded
        static int ncflag;
 #endif

-       char *term, *fill;
+       char *term;

        static struct tcninfo { /* termcap numeric and flag info */
                char tcname[3];
                int *tcaddr;
        static struct tcninfo { /* termcap numeric and flag info */
                char tcname[3];
                int *tcaddr;


@@ -174,22 +180,21 @@ scr_init()
        
        if ((term = getenv("TERM")) == NULL)
                stop("you must set the TERM environment variable");
        
        if ((term = getenv("TERM")) == NULL)
                stop("you must set the TERM environment variable");

-       if (tgetent(tbuf, term) <= 0)
+       if (t_getent(&info, term) <= 0)

                stop("cannot find your termcap");
                stop("cannot find your termcap");

-       fill = combuf;

        {
                register struct tcsinfo *p;
 
                for (p = tcstrings; p->tcaddr; p++)
        {
                register struct tcsinfo *p;
 
                for (p = tcstrings; p->tcaddr; p++)

-                       *p->tcaddr = tgetstr(p->tcname, &fill);
+                       *p->tcaddr = t_agetstr(info, p->tcname);

        }
        {
                register struct tcninfo *p;
 
                for (p = tcflags; p->tcaddr; p++)
        }
        {
                register struct tcninfo *p;
 
                for (p = tcflags; p->tcaddr; p++)

-                       *p->tcaddr = tgetflag(p->tcname);
+                       *p->tcaddr = t_getflag(info, p->tcname);

                for (p = tcnums; p->tcaddr; p++)
                for (p = tcnums; p->tcaddr; p++)

-                       *p->tcaddr = tgetnum(p->tcname);
+                       *p->tcaddr = t_getnum(info, p->tcname);

        }
        if (bsflag)
                BC = "\b";
        }
        if (bsflag)
                BC = "\b";