X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=madtty%2Fmadtty.c;h=8fbc4695cd3e533868807926db7f59535c10f090;hb=d0e48d929c19d39c4a13e57e0f8a8dd6194d6dde;hp=6556890416934f53b08c69e65bd640fa9912798a;hpb=7f1449a1f3dc70202c19005d74c6afe7cb0f18c0;p=apps%2Fmadtty.git

diff --git a/madtty/madtty.c b/madtty/madtty.c
index 6556890..8fbc469 100644
--- a/madtty/madtty.c
+++ b/madtty/madtty.c
@@ -22,11 +22,9 @@
 #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"
@@ -75,7 +73,7 @@ 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;
@@ -213,9 +211,6 @@ run_process(const char *path, const char **argv, int *fd_ptr, int *pid_ptr)
     return 0;
 }
 
-
-#ifdef USE_PTY
-
 pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[])
 {
     struct winsize ws;
@@ -224,24 +219,22 @@ pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[])
     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];
@@ -267,17 +260,17 @@ void rote_vt_update(RoteTerm *rt)
 
 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;
@@ -286,7 +279,7 @@ void rote_vt_write(RoteTerm *rt, const char *data, int len)
     /* 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";
@@ -324,11 +317,6 @@ void rote_vt_restore_snapshot(RoteTerm *rt, void *snapbuf)
     }
 }
 
-int rote_vt_get_pty_fd(RoteTerm *rt)
-{
-    return rt->pd->pty;
-}
-
 static const char *keytable[KEY_MAX+1];
 
 static void keytable_init()
@@ -364,7 +352,7 @@ void rote_vt_keypress(RoteTerm *rt, int keycode)
 {
     char c = (char) keycode;
 
-    if (keytable['\n'] != NULL)
+    if (keytable['\n'] == NULL)
         keytable_init();
 
     if (keycode >= 0 && keycode < KEY_MAX && keytable[keycode]) {