Changeset f1b4e74 in mainline

Timestamp:

2006-06-02T17:45:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960c

Parents:

0c6984e

Message:

More porting, awaiting 2 functions of console.

Location:

tetris

Files:

• screen.c (modified) (11 diffs)
• screen.h (modified) (1 diff)
• tetris.c (modified) (1 diff)

tetris/screen.c

@@ -47 +47 @@
 #include <io/stream.h>
 
+
+#include <async.h>
 #include "screen.h"
 #include "tetris.h"
+#include "../console/console.h"
 
 static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
@@ -59 +62 @@
 static void     stopset(int);
 
-/*
- * Capabilities from TERMCAP.
- */
-char    PC, *BC, *UP;           /* tgoto requires globals: ugh! */
-
 static char
-        *bcstr,                 /* backspace char */
-        *CEstr,                 /* clear to end of line */
-        *CLstr,                 /* clear screen */
-        *CMstr,                 /* cursor motion string */
-#ifdef unneeded
-        *CRstr,                 /* "\r" equivalent */
-#endif
-        *HOstr,                 /* cursor home */
-        *LLstr,                 /* last line, first column */
-        *pcstr,                 /* pad character */
-        *TEstr,                 /* end cursor motion mode */
-        *TIstr;                 /* begin cursor motion mode */
-char
-        *SEstr,                 /* end standout mode */
-        *SOstr;                 /* begin standout mode */
-static int
-        COnum,                  /* co# value */
-        LInum,                  /* li# value */
-        MSflag;                 /* can move in standout mode */
-
-
-struct tcsinfo {                /* termcap string info; some abbrevs above */
-        char tcname[3];
-        char **tcaddr;
-} tcstrings[] = {
-        {"bc", &bcstr},
-        {"ce", &CEstr},
-        {"cl", &CLstr},
-        {"cm", &CMstr},
-#ifdef unneeded
-        {"cr", &CRstr},
-#endif
-        {"le", &BC},            /* move cursor left one space */
-        {"pc", &pcstr},
-        {"se", &SEstr},
-        {"so", &SOstr},
-        {"te", &TEstr},
-        {"ti", &TIstr},
-        {"up", &UP},            /* cursor up */
-        { {0}, NULL}
+        *CEstr;                 /* clear to end of line */
+
+
+/*
+ * putstr() is for unpadded strings (either as in termcap(5) or
+ * simply literal strings); 
+ */
+#define putstr(s)       puts(s)
+
+static int con_phone;
+
+
+
+static void set_style(int fgcolor, int bgcolor)
+{
+        send_call_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor);
+}
+
+static void start_standout(void)
+{
+        set_style(0, 0xe0e0e0);
+}
+
+static void resume_normal(void)
+{
+        set_style(0xe0e0e0, 0);
+}
+
+/*
+ * Clear the screen, forgetting the current contents in the process.
+ */
+void
+scr_clear(void)
+{
+
+        send_call(con_phone, CONSOLE_CLEAR, 0);
+        curscore = -1;
+        memset((char *)curscreen, 0, sizeof(curscreen));
+}
+
+/*
+ * Set up screen
+ */
+void
+scr_init(void)
+{
+        con_phone = get_fd_phone(1);
+        resume_normal();
+        scr_clear();
+}
+
+static void moveto(int r, int c)
+{
+        send_call_2(con_phone, CONSOLE_GOTO, r, c);
+}
+
+static void fflush(void)
+{
+        send_call(con_phone, CONSOLE_FLUSH, 0);
+}
+
+struct winsize {
+        ipcarg_t ws_row;
+        ipcarg_t ws_col;
 };
 
-/* This is where we will actually stuff the information */
-
-static char combuf[1024], tbuf[1024];
-
-
-/*
- * Routine used by tputs().
- */
-int
-put(int c)
-{
-
-        return (putchar(c));
-}
-
-/*
- * putstr() is for unpadded strings (either as in termcap(5) or
- * simply literal strings); putpad() is for padded strings with
- * count=1.  (See screen.h for putpad().)
- */
-#define putstr(s)       (void)fputs(s, stdout)
-#define moveto(r, c)    putpad(tgoto(CMstr, c, r))
-
-static int con_phone;
-
-/*
- * Set up from termcap.
- */
-void
-scr_init(void)
-{
-        con_phone = get_fd_phone(1);
-}
-
+static int get_display_size(struct winsize *ws)
+{
+        return sync_send_2(con_phone, CONSOLE_GETSIZE, 0, 0, &ws->ws_row, &ws->ws_col);
+}
 
 static void
@@ -158 +150 @@
 {
         struct winsize ws;
-        struct termios newtt;
-        void (*ttou)(int);
 
         Rows = 0, Cols = 0;
-        if (ioctl(0, TIOCGWINSZ, &ws) == 0) {
+        if (get_display_size(&ws) == 0) {
                 Rows = ws.ws_row;
                 Cols = ws.ws_col;
         }
-        if (Rows == 0)
-                Rows = LInum;
-        if (Cols == 0)
-        Cols = COnum;
         if (Rows < MINROWS || Cols < MINCOLS) {
                 char smallscr[55];
@@ -178 +164 @@
                 stop(smallscr);
         }
-        if (tcgetattr(0, &oldtt) < 0)
-                stop("tcgetattr() fails");
-        newtt = oldtt;
-        newtt.c_lflag &= ~(ICANON|ECHO);
-        newtt.c_oflag &= ~OXTABS;
-        if (tcsetattr(0, TCSADRAIN, &newtt) < 0)
-                stop("tcsetattr() fails");
-
-        /*
-         * We made it.  We are now in screen mode, modulo TIstr
-         * (which we will fix immediately).
-         */
-        if (TIstr)
-                putstr(TIstr);  /* termcap(5) says this is not padded */
-
         isset = 1;
 
@@ -215 +186 @@
 }
 
-/*
- * Clear the screen, forgetting the current contents in the process.
- */
-void
-scr_clear(void)
-{
-
-        putpad(CLstr);
-        curscore = -1;
-        memset((char *)curscreen, 0, sizeof(curscreen));
-}
 
 #if vax && !__GNUC__
@@ -248 +208 @@
 
         if (score != curscore) {
-                if (HOstr)
-                        putpad(HOstr);
-                else
-                        moveto(0, 0);
+                moveto(0, 0);
                 (void) printf("Score: %d", score);
                 curscore = score;
@@ -265 +222 @@
 
                 /* clean */
-                putpad(SEstr);
+                resume_normal();
                 moveto(r-1, c-1); putstr("          ");
                 moveto(r,   c-1); putstr("          ");
@@ -275 +232 @@
 
                 /* draw */
-                if (SOstr)
-                        putpad(SOstr);
+                start_standout();
                 moveto(r, 2 * c);
-                putstr(SOstr ? "  " : "[]");
+                putstr("  ");
                 for (i = 0; i < 3; i++) {
                         t = c + r * B_COLS;
@@ -287 +243 @@
 
                         moveto(tr, 2*tc);
-                        putstr(SOstr ? "  " : "[]");
+                        putstr("  ");
                 }
-                putpad(SEstr);
+                resume_normal();
         }
 
@@ -301 +257 @@
                         *sp = so;
                         if (i != ccol) {
-                                if (cur_so && MSflag) {
-                                        putpad(SEstr);
-                                        cur_so = 0;
-                                }
                                 moveto(RTOD(j), CTOD(i));
                         }
-                        if (SOstr) {
-                                if (so != cur_so) {
-                                        putpad(so ? SOstr : SEstr);
-                                        cur_so = so;
-                                }
-                                putstr("  ");
-                        } else
-                                putstr(so ? "[]" : "  ");
+                        if (so != cur_so) {
+                                if (so)
+                                        start_standout();
+                                else
+                                        resume_normal();
+                                cur_so = so;
+                        }
+                        putstr("  ");
                         ccol = i + 1;
                         /*
@@ -335 +287 @@
                 }
         }
-        if (cur_so)
-                putpad(SEstr);
-/*      (void) fflush(stdout); */
-/*      (void) sigprocmask(SIG_SETMASK, &osigset, (sigset_t *)0); */
+        resume_normal();
+
+        fflush();
 }
 

tetris/screen.h

@@ -37 +37 @@
 
 /*
- * Capabilities from TERMCAP (used in the score code).
- */
-extern char *SEstr;                     /* end standout mode */
-extern char *SOstr;                     /* begin standout mode */
-
-/*
  * putpad() is for padded strings with count=1.
  */

tetris/tetris.c

@@ -236 +236 @@
                 key_write[4], key_write[5]);
 
-//      (void)signal(SIGINT, onintr);
         scr_init();
         setup_board();