Use BETWEEN in tsetchar.

[st.git] / st.c

diff --git a/st.c b/st.c
index 92fd7da..bb3e687 100644 (file)
--- a/st.c
+++ b/st.c
@@ -298,13 +298,13 @@ typedef struct {
 
 typedef union {
        int i;
 
 typedef union {
        int i;

-       unsigned int ui;
+       uint ui;

        float f;
        const void *v;
 } Arg;
 
 typedef struct {
        float f;
        const void *v;
 } Arg;
 
 typedef struct {

-       unsigned int mod;
+       uint mod;

        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;


@@ -360,7 +360,7 @@ static void strparse(void);
 static void strreset(void);
 
 static int tattrset(int);
 static void strreset(void);
 
 static int tattrset(int);

-static void tprinter(char *s, size_t len);
+static void tprinter(char *, size_t);

 static void tdumpsel(void);
 static void tdumpline(int);
 static void tdump(void);
 static void tdumpsel(void);
 static void tdumpline(int);
 static void tdump(void);


@@ -371,7 +371,7 @@ static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);

-static void tmoveato(int x, int y);
+static void tmoveato(int, int);

 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);


@@ -380,7 +380,7 @@ static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);

-static void tsetattr(int*, int);
+static void tsetattr(int *, int);

 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);


@@ -413,9 +413,9 @@ static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);

-static void xsetsel(char*);
+static void xsetsel(char *);

 static void xtermclear(int, int, int, int);
 static void xtermclear(int, int, int, int);

-static void xunloadfont(Font *f);
+static void xunloadfont(Font *);

 static void xunloadfonts(void);
 static void xresize(int, int);
 
 static void xunloadfonts(void);
 static void xresize(int, int);
 


@@ -453,7 +453,7 @@ static size_t utf8validate(long *, size_t);
 static ssize_t xwrite(int, char *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static ssize_t xwrite(int, char *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);

-static char *xstrdup(char *s);
+static char *xstrdup(char *);

 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,


@@ -1544,8 +1544,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
         * The table is proudly stolen from rxvt.
         */
        if(attr->mode & ATTR_GFX) {
         * The table is proudly stolen from rxvt.
         */
        if(attr->mode & ATTR_GFX) {

-               if(c[0] >= 0x41 && c[0] <= 0x7e
-                               && vt100_0[c[0] - 0x41]) {
+               if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {

                        c = vt100_0[c[0] - 0x41];
                }
        }
                        c = vt100_0[c[0] - 0x41];
                }
        }


@@ -2256,8 +2255,7 @@ printsel(const Arg *arg) {
 }
 
 void
 }
 
 void

-tdumpsel(void)
-{
+tdumpsel(void) {

        char *ptr;
 
        if((ptr = getsel())) {
        char *ptr;
 
        if((ptr = getsel())) {


@@ -3077,7 +3075,7 @@ xinit(void) {
 
        xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
 
        xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,

-                       PropModeReplace, (unsigned char *)&thispid, 1);
+                       PropModeReplace, (uchar *)&thispid, 1);

 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);