auto-sync: draw on idle to avoid flicker/tearing

[st.git] / st.h

diff --git a/st.h b/st.h
index b5bc1b5..d978458 100644 (file)
--- a/st.h
+++ b/st.h
@@ -1,7 +1,7 @@
 /* See LICENSE for license details. */
 
 /* See LICENSE for license details. */
 

-/* Arbitrary sizes */
-#define UTF_SIZ       4
+#include <stdint.h>
+#include <sys/types.h>

 
 /* macros */
 #define MIN(a, b)              ((a) < (b) ? (a) : (b))
 
 /* macros */
 #define MIN(a, b)              ((a) < (b) ? (a) : (b))


@@ -69,53 +69,18 @@ typedef struct {
 
 typedef Glyph *Line;
 
 
 typedef Glyph *Line;
 

-typedef struct {
-       Glyph attr; /* current char attributes */
-       int x;
-       int y;
-       char state;
-} TCursor;
-
-/* Purely graphic info */
-typedef struct {
-       int tw, th; /* tty width and height */
-       int w, h; /* window width and height */
-       int ch; /* char height */
-       int cw; /* char width  */
-       int mode; /* window state/mode flags */
-       int cursor; /* cursor style */
-} TermWindow;
-
-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;
-

 typedef union {
        int i;
        uint ui;
        float f;
        const void *v;
 typedef union {
        int i;
        uint ui;
        float f;
        const void *v;

+       const char *s;

 } Arg;
 
 void die(const char *, ...);
 void redraw(void);
 void draw(void);
 
 } Arg;
 
 void die(const char *, ...);
 void redraw(void);
 void draw(void);
 

-void iso14755(const Arg *);

 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);


@@ -125,7 +90,8 @@ int tattrset(int);
 void tnew(int, int);
 void tresize(int, int);
 void tsetdirtattr(int);
 void tnew(int, int);
 void tresize(int, int);
 void tsetdirtattr(int);

-void ttynew(char *, char *, char **);
+void ttyhangup(void);
+int ttynew(char *, char *, char *, char **);

 size_t ttyread(void);
 void ttyresize(int, int);
 void ttywrite(const char *, size_t, int);
 size_t ttyread(void);
 void ttyresize(int, int);
 void ttywrite(const char *, size_t, int);


@@ -136,28 +102,21 @@ void selclear(void);
 void selinit(void);
 void selstart(int, int, int);
 void selextend(int, int, int, int);
 void selinit(void);
 void selstart(int, int, int);
 void selextend(int, int, int, int);

-void selnormalize(void);

 int selected(int, int);
 char *getsel(void);
 
 int selected(int, int);
 char *getsel(void);
 

-size_t utf8decode(const char *, Rune *, size_t);

 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 char *xstrdup(char *);
 
 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 char *xstrdup(char *);
 

-/* Globals */
-extern int cmdfd;
-extern pid_t pid;
-extern int oldbutton;
-

 /* config.h globals */
 /* config.h globals */

-extern char *shell;

 extern char *utmp;
 extern char *utmp;

+extern char *scroll;

 extern char *stty_args;
 extern char *vtiden;
 extern char *stty_args;
 extern char *vtiden;

-extern char *worddelimiters;
+extern wchar_t *worddelimiters;

 extern int allowaltscreen;
 extern char *termname;
 extern unsigned int tabspaces;
 extern int allowaltscreen;
 extern char *termname;
 extern unsigned int tabspaces;