diff options
author | james <> | 2008-03-03 06:04:42 +0000 |
---|---|---|
committer | james <> | 2008-03-03 06:04:42 +0000 |
commit | f2c620137fa5290d913373e5579a97f0fee25fa3 (patch) | |
tree | dfbbe3562ae58e8f540a92654cb4f4d7323d59d7 /src/terminal.c | |
parent | 800cb4bdfb56dcd606216788fb023fcc23fb69bf (diff) | |
download | sympathy-f2c620137fa5290d913373e5579a97f0fee25fa3.tar.gz sympathy-f2c620137fa5290d913373e5579a97f0fee25fa3.tar.bz2 sympathy-f2c620137fa5290d913373e5579a97f0fee25fa3.zip |
*** empty log message ***
Diffstat (limited to 'src/terminal.c')
-rw-r--r-- | src/terminal.c | 65 |
1 files changed, 37 insertions, 28 deletions
diff --git a/src/terminal.c b/src/terminal.c index ca317b7..65ec41c 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.14 2008/03/03 06:04:42 james + * *** empty log message *** + * * Revision 1.13 2008/03/02 10:37:56 james * *** empty log message *** * @@ -73,7 +76,8 @@ static char rcsid[] = #include "project.h" -typedef struct TERMINAL_struct { +typedef struct TERMINAL_struct +{ TTY_SIGNATURE; struct termios orig_termios; struct TERMINAL_struct *next; @@ -156,13 +160,16 @@ terminal_getsize (TTY * _t) if (!t) return; - if (ioctl (t->wfd, TIOCGWINSZ, &sz)) { - t->size.x = CRT_COLS; - t->size.y = CRT_ROWS; - } else { - t->size.x = sz.ws_col; - t->size.y = sz.ws_row; - } + if (ioctl (t->wfd, TIOCGWINSZ, &sz)) + { + t->size.x = CRT_COLS; + t->size.y = CRT_ROWS; + } + else + { + t->size.x = sz.ws_col; + t->size.y = sz.ws_row; + } } @@ -192,18 +199,19 @@ terminal_read (TTY * _t, void *buf, int len) terminal_dispatch (); set_nonblocking (t->rfd); - do { + do + { - red = wrap_read (t->rfd, buf, len); - if (red < 0) - return -1; - if (!red) - return done; + red = wrap_read (t->rfd, buf, len); + if (red < 0) + return -1; + if (!red) + return done; - buf += red; - len -= red; - done += red; - } + buf += red; + len -= red; + done += red; + } while (len); @@ -221,19 +229,20 @@ terminal_write (TTY * _t, void *buf, int len) set_blocking (t->wfd); - do { + do + { - writ = wrap_write (t->wfd, buf, len); - if (writ < 0) - return -1; + writ = wrap_write (t->wfd, buf, len); + if (writ < 0) + return -1; - if (!writ) - usleep (1000); + if (!writ) + usleep (1000); - buf += writ; - len -= writ; - done += writ; - } + buf += writ; + len -= writ; + done += writ; + } while (len); |