removed pty support. Editable scrollback wasnt as useful as I hoped. I may revive...

diff --git a/Makefile b/Makefile
index f8a828131723a4ef1548fe4993180e10c0226a33..73bc626fe43f5500301d318d2922ec5e1f76bbf0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ LIBEDIT_OBJS =     \
        lib/win.o      \
        lib/colors.o   \
        lib/config.o   \
-       lib/event.o    \
-       lib/pty.o
+       lib/event.o
 
 TEST_BINS =     \
        tests/tide  \

diff --git a/lib/pty.c b/lib/pty.c
deleted file mode 100644 (file)
index 2b20d5c..0000000
--- a/lib/pty.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#define _XOPEN_SOURCE 700
-#include <stdc.h>
-#include <x11.h>
-#include <utf.h>
-#include <edit.h>
-#include <win.h>
-#include <shortcuts.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/select.h>
-#ifdef __MACH__
-    #include <util.h>
-#else
-    #include <pty.h>
-#endif
-
-static int PtyFD = -1;
-
-static void update(int fd, void* data);
-
-bool pty_active(void) { return (PtyFD >= 0);}
-void pty_send_intr(void) { (void)write(PtyFD, "\x03", 1); }
-void pty_send_eof(void) { (void)write(PtyFD, "\x04", 1); }
-void pty_send_susp(void) { (void)write(PtyFD, "\x1A", 1); }
-
-void pty_spawn(char** argv) {
-    assert(!pty_active());
-    struct termios tio;
-    pid_t pid;
-    putenv("TERM=dumb");
-    switch ( (pid = forkpty(&PtyFD, NULL, NULL, NULL)) ) {
-        case -1: // Failed
-            die("forkpty() :");
-            break;
-
-        case 0: // Child Process
-            if (execvp(argv[0], argv) < 0)
-                die("execvp('%s', ...) :", argv[0]);
-            exit(EXIT_FAILURE);
-            break;
-
-        default: // Parent Process
-            tcgetattr(PtyFD, &tio);
-            tio.c_lflag      &= ~(ECHO | ECHONL);
-            tio.c_cc[ VMIN ]  = 1;
-            tio.c_cc[ VTIME ] = 0;
-            tcsetattr(PtyFD, TCSANOW, &tio);
-            break;
-    }
-    event_watchfd(PtyFD, INPUT, update, NULL);
-}
-
-void send_string(char* str) {
-    size_t sz = strlen(str);
-    if (str[sz-1] == '\n') str[sz-1] = '\0';
-    while (*str) {
-        Rune rune = 0;
-        size_t length = 0;
-        while (!utf8decode(&rune, &length, *str++));
-        pty_send_rune(rune);
-    }
-}
-
-void pty_send(char* cmd, char* arg) {
-    if (!cmd) return;
-    view_eof(win_view(EDIT), false);
-    send_string(cmd);
-    if (arg) {
-        pty_send_rune(' ');
-        send_string(arg);
-    }
-    pty_send_rune('\n');
-}
-
-void pty_send_rune(Rune rune) {
-    view_insert(win_view(EDIT), false, rune);
-    size_t point = win_buf(EDIT)->outpoint;
-    size_t pos   = win_view(EDIT)->selection.end;
-    if ((rune == '\n' || rune == RUNE_CRLF) && pos > point) {
-        Sel range = { .beg = point, .end = pos };
-        char* str = view_getstr(win_view(EDIT), &range);
-        if (write(PtyFD, str, strlen(str)-1) < 0)
-            PtyFD = -1;
-        free(str);
-        win_buf(EDIT)->outpoint = pos;
-    }
-}
-
-static void read_escape(char* data, long* i, long n) {
-    /* only one escape code supported and that is to change the working dir */
-    if (data[*i] != 'P') return;
-    for (long x = *i; x < n && data[x]; x++)
-        if (data[x] == '\a') data[x] = '\0';
-    size_t sz = strlen(&data[*i + 1]);
-    chdir(&data[*i + 1]);
-    *i = *i + 1 + sz;
-}
-
-static void update(int fd, void* data) {
-    /* Read from command if we have one */
-    long n = 0, i = 0;
-    static char cmdbuf[8192];
-    if ((n = read(PtyFD, cmdbuf, sizeof(cmdbuf)-1)) < 0)
-        PtyFD = -1;
-    cmdbuf[n] = '\0';
-    while (i < n) {
-        Rune rune = 0;
-        size_t length = 0;
-        while (!utf8decode(&rune, &length, cmdbuf[i++]));
-        if (rune == '\033')
-            read_escape(cmdbuf, &i, n);
-        else
-            view_insert(win_view(EDIT), false, rune);
-    }
-    win_buf(EDIT)->outpoint = win_view(EDIT)->selection.end;
-}

diff --git a/tide.c b/tide.c
index 64b40bcc32d44d91376671e6a05382102daec0fd..5380921a0b4b12afef8bc4f925cee08bbd56a2bf 100644 (file)
--- a/tide.c
+++ b/tide.c
@@ -101,8 +101,6 @@ static void exec(char* cmd) {
     if (tag) {
         while (*cmd && !isspace(*cmd++));
         tag_exec(tag, (*cmd ? stringdup(cmd) : NULL));
-    } else if (pty_active() && !rissigil(*cmd)) {
-        pty_send(cmd, NULL);
     } else {
         cmd_exec(cmd);
     }
@@ -374,10 +372,6 @@ static void jumpmark(void) {
         view_jumpto(win_view(FOCUSED), false, Marks[mark]);
 }
 
-static void tag_send(char* cmd) {
-    pty_send(cmd, NULL);
-}
-
 /* Main Routine
  ******************************************************************************/
 static Tag Builtins[] = {
@@ -394,7 +388,6 @@ static Tag Builtins[] = {
     { .tag = "Reload",    .action.noarg = reload    },
     { .tag = "Save",      .action.noarg = save      },
     { .tag = "SaveAs",    .action.arg   = saveas    },
-    { .tag = "Send",      .action.arg   = tag_send  },
     { .tag = "Tabs",      .action.noarg = tabs      },
     { .tag = "Undo",      .action.noarg = tag_undo  },
     { .tag = "LineNums",  .action.noarg = tag_lnnum },
@@ -465,11 +458,6 @@ static KeyBinding Bindings[] = {
     { ModOneOrMore, '\n',       newline      },
     { ModCtrl,      ' ',        complete     },
 
-    /* Pseudo-terminal control shortcuts */
-    { ModCtrl|ModShift, 'c', pty_send_intr },
-    { ModCtrl|ModShift, 'd', pty_send_eof  },
-    { ModCtrl|ModShift, 'z', pty_send_susp },
-
     { 0, 0, 0 }
 };
 
@@ -506,10 +494,7 @@ void onshutdown(void) {
 }
 
 static void oninput(Rune rune) {
-    if (win_getregion() == EDIT && pty_active())
-        pty_send_rune(rune);
-    else
-        view_insert(win_view(FOCUSED), true, rune);
+    view_insert(win_view(FOCUSED), true, rune);
 }
 
 void edit_relative(char* path) {
@@ -561,13 +546,6 @@ void edit_relative(char* path) {
     free(origdir);
 }
 
-void edit_command(char** cmd) {
-    char* shellcmd[] = { ShellCmd[0], NULL };
-    win_buf(EDIT)->crlf = 1;
-    config_set_int(TabWidth, 8);
-    pty_spawn(*cmd ? cmd : shellcmd);
-}
-
 #ifndef TEST
 int main(int argc, char** argv) {
     /* setup the shell */
@@ -584,24 +562,12 @@ int main(int argc, char** argv) {
     }
 
     /* if we still have args left we're going to open it in this instance */
-    if (*argv) {
-        /* if it's a command we treat that specially */
-        if (!strcmp(*argv, "--"))
-            edit_command(argv+1);
-        else
-            edit_relative(*argv);
-    }
+    if (*argv) edit_relative(*argv);
 
     /* now create the window and start the event loop */
-    if (!pty_active()) {
-        win_settext(TAGS, config_get_str(EditTagString));
-        win_setruler(config_get_int(RulerColumn));
-        win_setlinenums(config_get_bool(LineNumbers));
-    } else {
-        win_settext(TAGS, config_get_str(CmdTagString));
-        win_setruler(0);
-        win_setlinenums(false);
-    }
+    win_settext(TAGS, config_get_str(EditTagString));
+    win_setruler(config_get_int(RulerColumn));
+    win_setlinenums(config_get_bool(LineNumbers));
     win_setkeys(Bindings, oninput);
     win_loop();
     return 0;

diff --git a/tools/c- b/tools/c-
old mode 100755 (executable)
new mode 100644 (file)