diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1996-08-19 19:42:00 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1996-08-19 19:42:00 +0000 |
| commit | e151ec23152e3653ab68ad93684c17f65177ea19 (patch) | |
| tree | 897e8fc17dd2ef81d46fc360d75d518c6b770ee6 /usr.bin/talk | |
| parent | 313861b8968fefb2c14c31415f2fc3d75887d3fa (diff) | |
| download | src-test2-e151ec23152e3653ab68ad93684c17f65177ea19.tar.gz src-test2-e151ec23152e3653ab68ad93684c17f65177ea19.zip | |
Notes
Diffstat (limited to 'usr.bin/talk')
| -rw-r--r-- | usr.bin/talk/display.c | 2 | ||||
| -rw-r--r-- | usr.bin/talk/init_disp.c | 39 | ||||
| -rw-r--r-- | usr.bin/talk/io.c | 4 |
3 files changed, 25 insertions, 20 deletions
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c index aabb581333f8..7b43d4690574 100644 --- a/usr.bin/talk/display.c +++ b/usr.bin/talk/display.c @@ -142,7 +142,7 @@ display(win, text, size) continue; } if (*text == '\7') { - _putchar(*text); + write(STDOUT_FILENO, text, 1); text++; continue; } diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c index bfcfd948ec53..14f0e02d8d52 100644 --- a/usr.bin/talk/init_disp.c +++ b/usr.bin/talk/init_disp.c @@ -40,10 +40,10 @@ static char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94"; * as well as the signal handling routines. */ -#include <sys/ioctl.h> -#include <sys/ioctl_compat.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/termios.h> +#include <sys/ttydefaults.h> #include <unistd.h> #include <signal.h> @@ -74,13 +74,14 @@ check_writeable() void init_display() { - struct sigvec sigv; + struct sigaction sa; + int i; if (initscr() == NULL) errx(1, "Terminal type unset or lacking necessary features."); - (void) sigvec(SIGTSTP, (struct sigvec *)0, &sigv); - sigv.sv_mask |= sigmask(SIGALRM); - (void) sigvec(SIGTSTP, &sigv, (struct sigvec *)0); + (void) sigaction(SIGTSTP, (struct sigaction *)0, &sa); + sigaddset(&sa.sa_mask, SIGALRM); + (void) sigaction(SIGTSTP, &sa, (struct sigaction *)0); curses_initialized = 1; clear(); refresh(); @@ -103,7 +104,8 @@ init_display() wclear(his_win.x_win); line_win = newwin(1, COLS, my_win.x_nlines, 0); - box(line_win, '-', '-'); + for (i = 0; i < COLS; i++) + mvwaddch(line_win, 0, i, '-'); wrefresh(line_win); /* let them know we are working on it */ current_state = "No connection yet"; @@ -119,17 +121,18 @@ set_edit_chars() { char buf[3]; int cc; - struct sgttyb tty; - struct ltchars ltc; - - ioctl(0, TIOCGETP, &tty); - ioctl(0, TIOCGLTC, (struct sgttyb *)<c); - my_win.cerase = tty.sg_erase; - my_win.kill = tty.sg_kill; - if (ltc.t_werasc == (char) -1) - my_win.werase = '\027'; /* control W */ - else - my_win.werase = ltc.t_werasc; + struct termios tio; + + tcgetattr(0, &tio); + my_win.cerase = tio.c_cc[VERASE]; + my_win.kill = tio.c_cc[VKILL]; + my_win.werase = tio.c_cc[VWERASE]; + if (my_win.cerase == (char)_POSIX_VDISABLE) + my_win.kill = CERASE; + if (my_win.kill == (char)_POSIX_VDISABLE) + my_win.kill = CKILL; + if (my_win.werase == (char)_POSIX_VDISABLE) + my_win.werase = CWERASE; buf[0] = my_win.cerase; buf[1] = my_win.kill; buf[2] = my_win.werase; diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c index f6086544e034..7b8ead8a8090 100644 --- a/usr.bin/talk/io.c +++ b/usr.bin/talk/io.c @@ -61,7 +61,9 @@ talk() char buf[BUFSIZ]; struct timeval wait; - message("Connection established\007\007\007"); + message("Connection established"); + write(STDOUT_FILENO, "\007\007\007", 3); + current_line = 0; /* |