#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
-#ifdef USE_PTY
-#include <pty.h>
-#endif
#include <stdio.h>
#include <string.h>
+#include <sys/ioctl.h>
#include "madtty.h"
-#include "roteprivate.h"
-
-#define ROTE_VT_UPDATE_ITERATIONS 5
+#include "madtty_priv.h"
RoteTerm *rote_vt_create(int rows, int cols)
{
/* allocate private data */
rt->pd = (RoteTermPrivate*)calloc(sizeof(RoteTermPrivate), 1);
- rt->pd->pty = -1; /* no pty for now */
+ rt->pty = -1; /* no pty for now */
/* initial scrolling area is the whole window */
rt->pd->scrolltop = 0;
void (*cur_set_attr)(WINDOW*,unsigned char)) {
int i, j;
- rote_vt_update(rt);
- if (!cur_set_attr) cur_set_attr = default_cur_set_attr;
+ if (!cur_set_attr)
+ cur_set_attr = default_cur_set_attr;
+
for (i = 0; i < rt->rows; i++) {
wmove(win, srow + i, scol);
for (j = 0; j < rt->cols; j++) {
return 0;
}
-
-#ifdef USE_PTY
-
pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[])
{
struct winsize ws;
ws.ws_col = rt->cols;
ws.ws_xpixel = ws.ws_ypixel = 0;
- if (run_process(path, argv, &rt->pd->pty, &rt->childpid)) {
+ if (run_process(path, argv, &rt->pty, &rt->childpid)) {
return -1;
}
- ioctl(rt->pd->pty, TIOCSWINSZ, &ws);
+ ioctl(rt->pty, TIOCSWINSZ, &ws);
return rt->childpid;
}
void rote_vt_forsake_child(RoteTerm *rt)
{
- if (rt->pd->pty >= 0)
- close(rt->pd->pty);
- rt->pd->pty = -1;
+ if (rt->pty >= 0)
+ close(rt->pty);
+ rt->pty = -1;
rt->childpid = 0;
}
-#endif
-
-void rote_vt_update(RoteTerm *rt)
-{
- char buf[512];
- int nbread;
- int n = ROTE_VT_UPDATE_ITERATIONS;
-
- while (n--) { /* iterate at most ROVE_VT_UPDATE_ITERATIONS times.
- * As Phil Endecott pointed out, if we don't restrict this,
- * a program that floods the terminal with output
- * could cause this loop to iterate forever, never
- * being able to catch up. So we'll rely on the client
- * calling rote_vt_update often, as the documentation
- * recommends :-) */
-
- nbread = rote_vt_read(rt, buf, sizeof(buf));
- if (nbread <= 0)
- return;
-
- /* inject the data into the terminal */
- rote_vt_inject(rt, buf, nbread);
- }
-}
-
int rote_vt_read(RoteTerm *rt, char *buf, int buflen)
{
- if (rt->pd->pty < 0) {
+ if (rt->pty < 0) {
errno = EINVAL;
return -1;
}
- return read(rt->pd->pty, buf, buflen);
+ return read(rt->pty, buf, buflen);
}
void rote_vt_write(RoteTerm *rt, const char *data, int len)
{
- if (rt->pd->pty < 0) {
+ if (rt->pty < 0) {
/* no pty, so just inject the data plain and simple */
rote_vt_inject(rt, data, len);
return;
/* write data to pty. Keep calling write() until we have written
* everything. */
while (len > 0) {
- int byteswritten = write(rt->pd->pty, data, len);
+ int byteswritten = write(rt->pty, data, len);
if (byteswritten < 0) {
/* very ugly way to inform the error. Improvements welcome! */
static char errormsg[] = "\n(ROTE: pty write() error)\n";
void *ptr = buf;
int i;
- for (i = 0; i < rt->rows; i++, ptr += bytes_per_row)
+ for (i = 0; i < rt->rows; i++) {
memcpy(ptr, rt->cells[i], bytes_per_row);
+ ptr = (char *)ptr + bytes_per_row;
+ }
return buf;
}
int i;
- for (i = 0; i < rt->rows; i++, snapbuf += bytes_per_row) {
+ for (i = 0; i < rt->rows; i++) {
rt->line_dirty[i] = true;
memcpy(rt->cells[i], snapbuf, bytes_per_row);
+ snapbuf = (char *)snapbuf + bytes_per_row;
}
}
-int rote_vt_get_pty_fd(RoteTerm *rt)
-{
- return rt->pd->pty;
-}
-
static const char *keytable[KEY_MAX+1];
static void keytable_init()
{
char c = (char) keycode;
- if (keytable['\n'] != NULL)
+ if (keytable['\n'] == NULL)
keytable_init();
if (keycode >= 0 && keycode < KEY_MAX && keytable[keycode]) {