Rely on ttyresize to set tty size

[st.git] / st.c

diff --git a/st.c b/st.c
index fdf697b..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"
 


@@ -675,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;


@@ -696,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()) {


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

-                                       xsetsel(dec, CurrentTime);
+                                       xsetsel(dec);

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