Remove X and fontconfig from st.c

[st.git] / st.c

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


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


@@ -1683,11 +1677,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;


@@ -1751,7 +1742,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");