Rely on ttyresize to set tty size

[st.git] / st.c

diff --git a/st.c b/st.c
index 641f896..dae7b91 100644 (file)
--- a/st.c
+++ b/st.c
@@ -21,13 +21,8 @@
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>

-#include <fontconfig/fontconfig.h>

 #include <wchar.h>
 
 #include <wchar.h>
 

-/* X11 */
-#include <X11/cursorfont.h>
-#include <X11/Xft/Xft.h>
-

 #include "st.h"
 #include "win.h"
 
 #include "st.h"
 #include "win.h"
 


@@ -109,19 +104,6 @@ typedef struct {
        int narg;              /* nb of args */
 } STREscape;
 
        int narg;              /* nb of args */
 } STREscape;
 

-/* function definitions used in config.h */
-static void clipcopy(const Arg *);
-static void clippaste(const Arg *);
-static void numlock(const Arg *);
-static void selpaste(const Arg *);
-static void printsel(const Arg *);
-static void printscreen(const Arg *) ;
-static void iso14755(const Arg *);
-static void toggleprinter(const Arg *);
-static void sendbreak(const Arg *);
-
-/* config.h for applying patches and the configuration. */
-#include "config.h"

 
 static void execsh(char **);
 static void stty(char **);
 
 static void execsh(char **);
 static void stty(char **);


@@ -183,7 +165,6 @@ static char *base64dec(const char *);
 static ssize_t xwrite(int, const char *, size_t);
 
 /* Globals */
 static ssize_t xwrite(int, const char *, size_t);
 
 /* Globals */

-TermWindow win;

 Term term;
 Selection sel;
 int cmdfd;
 Term term;
 Selection sel;
 int cmdfd;


@@ -199,14 +180,6 @@ static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 

-/* config.h array lengths */
-size_t colornamelen = LEN(colorname);
-size_t mshortcutslen = LEN(mshortcuts);
-size_t shortcutslen = LEN(shortcuts);
-size_t selmaskslen = LEN(selmasks);
-size_t keyslen = LEN(key);
-size_t mappedkeyslen = LEN(mappedkeys);
-

 ssize_t
 xwrite(int fd, const char *s, size_t len)
 {
 ssize_t
 xwrite(int fd, const char *s, size_t len)
 {


@@ -585,24 +558,6 @@ getsel(void)
        return str;
 }
 
        return str;
 }
 

-void
-selpaste(const Arg *dummy)
-{
-       xselpaste();
-}
-
-void
-clipcopy(const Arg *dummy)
-{
-       xclipcopy();
-}
-
-void
-clippaste(const Arg *dummy)
-{
-       xclippaste();
-}
-

 void
 selclear(void)
 {
 void
 selclear(void)
 {


@@ -715,7 +670,6 @@ void
 ttynew(char *line, char *out, char **args)
 {
        int m, s;
 ttynew(char *line, char *out, char **args)
 {
        int m, s;

-       struct winsize w = {term.row, term.col, 0, 0};

 
        if (out) {
                term.mode |= MODE_PRINT;
 
        if (out) {
                term.mode |= MODE_PRINT;


@@ -736,7 +690,7 @@ ttynew(char *line, char *out, char **args)
        }
 
        /* seems to work fine on linux, openbsd and freebsd */
        }
 
        /* seems to work fine on linux, openbsd and freebsd */

-       if (openpty(&m, &s, NULL, NULL, &w) < 0)
+       if (openpty(&m, &s, NULL, NULL, NULL) < 0)

                die("openpty failed: %s\n", strerror(errno));
 
        switch (pid = fork()) {
                die("openpty failed: %s\n", strerror(errno));
 
        switch (pid = fork()) {


@@ -1572,7 +1526,7 @@ csihandle(void)
                break;
        case 'c': /* DA -- Device Attributes */
                if (csiescseq.arg[0] == 0)
                break;
        case 'c': /* DA -- Device Attributes */
                if (csiescseq.arg[0] == 0)

-                       ttywrite(vtiden, sizeof(vtiden) - 1);
+                       ttywrite(vtiden, strlen(vtiden));

                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */


@@ -1722,11 +1676,8 @@ csihandle(void)
        case ' ':
                switch (csiescseq.mode[1]) {
                case 'q': /* DECSCUSR -- Set Cursor Style */
        case ' ':
                switch (csiescseq.mode[1]) {
                case 'q': /* DECSCUSR -- Set Cursor Style */

-                       DEFAULT(csiescseq.arg[0], 1);
-                       if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
+                       if (xsetcursor(csiescseq.arg[0]))

                                goto unknown;
                                goto unknown;

-                       }
-                       win.cursor = csiescseq.arg[0];

                        break;
                default:
                        goto unknown;
                        break;
                default:
                        goto unknown;


@@ -1790,8 +1741,8 @@ strhandle(void)
 
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
 
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {

-                                       xsetsel(dec, CurrentTime);
-                                       clipcopy(NULL);
+                                       xsetsel(dec);
+                                       xclipcopy();

                                } else {
                                        fprintf(stderr, "erresc: invalid base64\n");
                                }
                                } else {
                                        fprintf(stderr, "erresc: invalid base64\n");
                                }


@@ -2134,7 +2085,7 @@ tcontrolcode(uchar ascii)
        case 0x99:   /* TODO: SGCI */
                break;
        case 0x9a:   /* DECID -- Identify Terminal */
        case 0x99:   /* TODO: SGCI */
                break;
        case 0x9a:   /* DECID -- Identify Terminal */

-               ttywrite(vtiden, sizeof(vtiden) - 1);
+               ttywrite(vtiden, strlen(vtiden));

                break;
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */
                break;
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */


@@ -2206,7 +2157,7 @@ eschandle(uchar ascii)
                }
                break;
        case 'Z': /* DECID -- Identify Terminal */
                }
                break;
        case 'Z': /* DECID -- Identify Terminal */

-               ttywrite(vtiden, sizeof(vtiden) - 1);
+               ttywrite(vtiden, strlen(vtiden));

                break;
        case 'c': /* RIS -- Reset to inital state */
                treset();
                break;
        case 'c': /* RIS -- Reset to inital state */
                treset();