Add stdint include

[st.git] / st.c

diff --git a/st.c b/st.c
index 16bf68b..91eb2cc 100644 (file)
--- a/st.c
+++ b/st.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>

+#include <stdint.h>

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


@@ -180,8 +181,8 @@ typedef unsigned short ushort;
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */

-       ulong fg;        /* foreground  */
-       ulong bg;        /* background  */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */

 } Glyph;
 
 typedef Glyph *Line;
 } Glyph;
 
 typedef Glyph *Line;


@@ -239,7 +240,7 @@ typedef struct {
        Colourmap cmap;
        Window win;
        Drawable buf;
        Colourmap cmap;
        Window win;
        Drawable buf;

-       Atom xembed, wmdeletewin;
+       Atom xembed, wmdeletewin, netwmname;

        XIM xim;
        XIC xic;
        Draw draw;
        XIM xim;
        XIC xic;
        Draw draw;


@@ -256,9 +257,9 @@ typedef struct {
 } XWindow;
 
 typedef struct {
 } XWindow;
 
 typedef struct {

-       int b;
+       uint b;

        uint mask;
        uint mask;

-       char s[ESC_BUF_SIZ];
+       char *s;

 } Mousekey;
 
 typedef struct {
 } Mousekey;
 
 typedef struct {


@@ -379,13 +380,14 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);

-static long tdefcolor(int *, int *, int);
+static int32_t tdefcolor(int *, int *, int);

 static void tselcs(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);
 static void tselcs(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);

+static void ttysend(char *, size_t);

 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);


@@ -893,9 +895,7 @@ bpress(XEvent *e) {
        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
                if(e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {
        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
                if(e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {

-                       ttywrite(mk->s, strlen(mk->s));
-                       if(IS_SET(MODE_ECHO))
-                               techo(mk->s, strlen(mk->s));
+                       ttysend(mk->s, strlen(mk->s));

                        return;
                }
        }
                        return;
                }
        }


@@ -1031,7 +1031,7 @@ selnotify(XEvent *e) {
 
                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[200~", 6);
 
                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[200~", 6);

-               ttywrite((const char *)data, nitems * format / 8);
+               ttysend((char *)data, nitems * format / 8);

                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[201~", 6);
                XFree(data);
                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[201~", 6);
                XFree(data);


@@ -1299,6 +1299,13 @@ ttywrite(const char *s, size_t n) {
                die("write error on tty: %s\n", SERRNO);
 }
 
                die("write error on tty: %s\n", SERRNO);
 }
 

+void
+ttysend(char *s, size_t n) {
+       ttywrite(s, n);
+       if(IS_SET(MODE_ECHO))
+               techo(s, n);
+}
+

 void
 ttyresize(void) {
        struct winsize w;
 void
 ttyresize(void) {
        struct winsize w;


@@ -1660,9 +1667,9 @@ tdeleteline(int n) {
        tscrollup(term.c.y, n);
 }
 
        tscrollup(term.c.y, n);
 }
 

-long
+int32_t

 tdefcolor(int *attr, int *npar, int l) {
 tdefcolor(int *attr, int *npar, int l) {

-       long idx = -1;
+       int32_t idx = -1;

        uint r, g, b;
 
        switch (attr[*npar + 1]) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {


@@ -1711,7 +1718,7 @@ tdefcolor(int *attr, int *npar, int l) {
 void
 tsetattr(int *attr, int l) {
        int i;
 void
 tsetattr(int *attr, int l) {
        int i;

-       long idx;
+       int32_t idx;

 
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
 
        for(i = 0; i < l; i++) {
                switch(attr[i]) {


@@ -3017,6 +3024,7 @@ xinit(void) {
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);

+       xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);

        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        xresettitle();
        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        xresettitle();


@@ -3349,6 +3357,7 @@ xsettitle(char *p) {
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);

+       XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);

        XFree(prop.value);
 }
 
        XFree(prop.value);
 }
 


@@ -3495,15 +3504,7 @@ focus(XEvent *ev) {
 
 static inline bool
 match(uint mask, uint state) {
 
 static inline bool
 match(uint mask, uint state) {

-       state &= ~ignoremod;
-
-       if(mask == XK_NO_MOD && state)
-               return false;
-       if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
-               return false;
-       if(mask == XK_ANY_MOD)
-               return true;
-       return state == mask;
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);

 }
 
 void
 }
 
 void


@@ -3533,25 +3534,16 @@ kmap(KeySym k, uint state) {
                if(!match(kp->mask, state))
                        continue;
 
                if(!match(kp->mask, state))
                        continue;
 

-               if(kp->appkey > 0) {
-                       if(!IS_SET(MODE_APPKEYPAD))
-                               continue;
-                       if(term.numlock && kp->appkey == 2)
-                               continue;
-               } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+               if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                       continue;
+               if(term.numlock && kp->appkey == 2)

                        continue;
                        continue;

-               }

 
 

-               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-                               (kp->appcursor > 0
-                                && !IS_SET(MODE_APPCURSOR))) {
+               if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)

                        continue;
                        continue;

-               }

 
 

-               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
-                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+               if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)

                        continue;
                        continue;

-               }

 
                return kp->s;
        }
 
                return kp->s;
        }


@@ -3573,7 +3565,6 @@ kpress(XEvent *ev) {
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);

-       e->state &= ~Mod2Mask;

        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {


@@ -3584,10 +3575,7 @@ kpress(XEvent *ev) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {

-               len = strlen(customkey);
-               ttywrite(customkey, len);
-               if(IS_SET(MODE_ECHO))
-                       techo(customkey, len);
+               ttysend(customkey, strlen(customkey));

                return;
        }
 
                return;
        }
 


@@ -3606,9 +3594,7 @@ kpress(XEvent *ev) {
                        len = 2;
                }
        }
                        len = 2;
                }
        }

-       ttywrite(buf, len);
-       if(IS_SET(MODE_ECHO))
-               techo(buf, len);
+       ttysend(buf, len);

 }
 
 
 }
 
 


@@ -3686,6 +3672,8 @@ run(void) {
        gettimeofday(&last, NULL);
 
        for(xev = actionfps;;) {
        gettimeofday(&last, NULL);
 
        for(xev = actionfps;;) {

+               long deltatime;
+

                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);


@@ -3719,8 +3707,9 @@ run(void) {
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }

-               if(TIMEDIFF(now, last) \
-                               > (xev? (1000/xfps) : (1000/actionfps))) {
+               deltatime = TIMEDIFF(now, last);
+               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+                               || deltatime < 0) {

                        dodraw = 1;
                        last = now;
                }
                        dodraw = 1;
                        last = now;
                }