Fix title initialization

[st.git] / st.c

diff --git a/st.c b/st.c
index ce32cc0..65a0cb6 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3,24 +3,18 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

-#include <locale.h>

 #include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>

-#include <stdint.h>

 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>

-#include <sys/stat.h>
-#include <sys/time.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>

-#include <time.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <libgen.h>

 #include <wchar.h>
 
 #include "st.h"
 #include <wchar.h>
 
 #include "st.h"


@@ -36,6 +30,7 @@
 
 /* Arbitrary sizes */
 #define UTF_INVALID   0xFFFD
 
 /* Arbitrary sizes */
 #define UTF_INVALID   0xFFFD

+#define UTF_SIZ       4

 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   ESC_BUF_SIZ
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   ESC_BUF_SIZ


@@ -95,6 +90,31 @@ enum escape_state {
        ESC_DCS        =128,
 };
 
        ESC_DCS        =128,
 };
 

+typedef struct {
+       Glyph attr; /* current char attributes */
+       int x;
+       int y;
+       char state;
+} TCursor;
+
+typedef struct {
+       int mode;
+       int type;
+       int snap;
+       /*
+        * Selection variables:
+        * nb – normalized coordinates of the beginning of the selection
+        * ne – normalized coordinates of the end of the selection
+        * ob – original coordinates of the beginning of the selection
+        * oe – original coordinates of the end of the selection
+        */
+       struct {
+               int x, y;
+       } nb, ne, ob, oe;
+
+       int alt;
+} Selection;
+

 /* Internal representation of the screen */
 typedef struct {
        int row;      /* nb row */
 /* Internal representation of the screen */
 typedef struct {
        int row;      /* nb row */


@@ -187,15 +207,18 @@ static void tstrsequence(uchar);
 
 static void drawregion(int, int, int, int);
 
 
 static void drawregion(int, int, int, int);
 

+static void selnormalize(void);

 static void selscroll(int, int);
 static void selsnap(int *, int *, int);
 
 static void selscroll(int, int);
 static void selsnap(int *, int *, int);
 

+static size_t utf8decode(const char *, Rune *, size_t);

 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);

-static char *utf8strchr(char *s, Rune u);
+static char *utf8strchr(char *, Rune);

 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);
 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);

+static char base64dec_getc(const char **);

 
 static ssize_t xwrite(int, const char *, size_t);
 
 
 static ssize_t xwrite(int, const char *, size_t);
 


@@ -1671,7 +1694,6 @@ csihandle(void)
                tputtab(csiescseq.arg[0]);
                break;
        case 'J': /* ED -- Clear screen */
                tputtab(csiescseq.arg[0]);
                break;
        case 'J': /* ED -- Clear screen */

-               selclear();

                switch (csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch (csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);