From 42430ba7d7a05f98105888cb19f79d9bd7cd22ad Mon Sep 17 00:00:00 2001 From: mycroft Date: Sat, 29 Apr 1995 00:44:03 +0000 Subject: Use POSIX tty semantics. --- backgammon/backgammon/main.c | 30 ++++++++++++++---------------- backgammon/backgammon/move.c | 10 +++++----- backgammon/backgammon/text.c | 12 ++++++------ 3 files changed, 25 insertions(+), 27 deletions(-) (limited to 'backgammon/backgammon') diff --git a/backgammon/backgammon/main.c b/backgammon/backgammon/main.c index 78bf69e2..7554ff65 100644 --- a/backgammon/backgammon/main.c +++ b/backgammon/backgammon/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.3 1995/04/24 12:21:52 cgd Exp $ */ +/* $NetBSD: main.c,v 1.4 1995/04/29 00:44:03 mycroft Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/04/24 12:21:52 cgd Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.4 1995/04/29 00:44:03 mycroft Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/04/24 12:21:52 cgd Exp $"; char *instr[]; /* text of instructions */ char *message[]; /* update message */ -char ospeed; /* tty output speed */ +speed_t ospeed; /* tty output speed */ char *helpm[] = { /* help message */ "Enter a space or newline to roll, or", @@ -111,16 +111,14 @@ char **argv; /* initialization */ bflag = 2; /* default no board */ - signal (2,getout); /* trap interrupts */ - if (gtty (0,&tty) == -1) /* get old tty mode */ + signal (2, getout); /* trap interrupts */ + if (tcgetattr (0, &old) == -1) /* get old tty mode */ errexit ("backgammon(gtty)"); - old = tty.sg_flags; -#ifdef V7 - raw = ((noech = old & ~ECHO) | CBREAK); /* set up modes */ -#else - raw = ((noech = old & ~ECHO) | RAW); /* set up modes */ -#endif - ospeed = tty.sg_ospeed; /* for termlib */ + noech = old; + noech.c_lflag &= ~ECHO; + raw = noech; + raw.c_lflag &= ~ICANON; /* set up modes */ + ospeed = cfgetospeed (&old); /* for termlib */ /* check user count */ # ifdef CORY @@ -152,11 +150,11 @@ char **argv; getarg (&argv); args[acnt] = '\0'; if (tflag) { /* clear screen */ - noech &= ~(CRMOD|XTABS); - raw &= ~(CRMOD|XTABS); + noech.c_oflag &= ~(ONLCR|OXTABS); + raw.c_oflag &= ~(ONLCR|OXTABS); clear(); } - fixtty (raw); /* go into raw mode */ + fixtty (&raw); /* go into raw mode */ /* check if restored * game and save flag @@ -179,7 +177,7 @@ char **argv; writel (rules); if (yorn(0)) { - fixtty (old); /* restore tty */ + fixtty (&old); /* restore tty */ execl (TEACH,"teachgammon",args,0); tflag = 0; /* error! */ diff --git a/backgammon/backgammon/move.c b/backgammon/backgammon/move.c index 1f437feb..f96c57a1 100644 --- a/backgammon/backgammon/move.c +++ b/backgammon/backgammon/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.4 1995/03/21 15:05:10 cgd Exp $ */ +/* $NetBSD: move.c,v 1.5 1995/04/29 00:44:05 mycroft Exp $ */ /* * Copyright (c) 1980, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$NetBSD: move.c,v 1.4 1995/03/21 15:05:10 cgd Exp $"; +static char rcsid[] = "$NetBSD: move.c,v 1.5 1995/04/29 00:44:05 mycroft Exp $"; #endif #endif /* not lint */ @@ -131,14 +131,14 @@ int okay; /* zero if first move */ * while thinking */ if (tflag) cline(); - fixtty (noech); + fixtty (&noech); /* find out how many moves */ mvlim = movallow(); if (mvlim == 0) { writel (" but cannot use it.\n"); nexturn(); - fixtty (raw); + fixtty (&raw); return; } @@ -176,7 +176,7 @@ int okay; /* zero if first move */ buflush(); sleep (3); } - fixtty (raw); /* no more tty interrupt */ + fixtty (&raw); /* no more tty interrupt */ } trymove (mvnum,swapped) diff --git a/backgammon/backgammon/text.c b/backgammon/backgammon/text.c index 8dbe621d..69467994 100644 --- a/backgammon/backgammon/text.c +++ b/backgammon/backgammon/text.c @@ -1,4 +1,4 @@ -/* $NetBSD: text.c,v 1.3 1995/03/21 15:05:13 cgd Exp $ */ +/* $NetBSD: text.c,v 1.4 1995/04/29 00:44:06 mycroft Exp $ */ /* * Copyright (c) 1980, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)text.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$NetBSD: text.c,v 1.3 1995/03/21 15:05:13 cgd Exp $"; +static char rcsid[] = "$NetBSD: text.c,v 1.4 1995/04/29 00:44:06 mycroft Exp $"; #endif #endif /* not lint */ @@ -117,7 +117,7 @@ char **t; register int i; register char *s, *a; - fixtty (noech); + fixtty (&noech); while (*t != 0) { s = a = *t; for (i = 0; *a != '\0'; i--) @@ -127,12 +127,12 @@ char **t; writec ('\n'); } else { writel ("-->"); - fixtty (raw); + fixtty (&raw); while ((i = readc()) != ' ' && i != '\n'); - fixtty (noech); + fixtty (&noech); clear(); } t++; } - fixtty (raw); + fixtty (&raw); } -- cgit v1.2.3-56-ge451