iUnboolify st - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 9de853a98da8fe0f458b244970f0e0d3e9b38a50 /scm/st//commit/9de853a98da8fe0f458b244970f0e0d3e9b38a50.gph gopher.r-36.net 70 1parent abfad4c4fc69ebb22febfe32677aadd112ce375a /scm/st//commit/abfad4c4fc69ebb22febfe32677aadd112ce375a.gph gopher.r-36.net 70 hAuthor: FRIGN URL:mailto:dev@frign.de gopher.r-36.net 70 iDate: Wed, 8 Jul 2015 23:56:55 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iUnboolify st Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iThis practice proved itself in sbase, ubase and a couple of other Err gopher.r-36.net 70 iprojects. Err gopher.r-36.net 70 iAlso remove the True and False defined in X11 and FcTrue and FcFalse Err gopher.r-36.net 70 idefined in Fontconfig. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 2 +- Err gopher.r-36.net 70 i st.c | 56 +++++++++++++++---------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 28 insertions(+), 30 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/config.def.h b/config.def.h /scm/st//file/config.def.h.gph gopher.r-36.net 70 i@@ -30,7 +30,7 @@ static unsigned int doubleclicktimeout = 300; Err gopher.r-36.net 70 i static unsigned int tripleclicktimeout = 600; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* alt screens */ Err gopher.r-36.net 70 i-static bool allowaltscreen = true; Err gopher.r-36.net 70 i+static int allowaltscreen = 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* frames per second st should at maximum draw to the screen */ Err gopher.r-36.net 70 i static unsigned int xfps = 120; Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -6,7 +6,6 @@ Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i-#include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i@@ -231,7 +230,7 @@ typedef struct { Err gopher.r-36.net 70 i int col; /* nb col */ Err gopher.r-36.net 70 i Line *line; /* screen */ Err gopher.r-36.net 70 i Line *alt; /* alternate screen */ Err gopher.r-36.net 70 i- bool *dirty; /* dirtyness of lines */ Err gopher.r-36.net 70 i+ int *dirty; /* dirtyness of lines */ Err gopher.r-36.net 70 i XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ Err gopher.r-36.net 70 i TCursor c; /* cursor */ Err gopher.r-36.net 70 i int top; /* top scroll limit */ Err gopher.r-36.net 70 i@@ -241,8 +240,8 @@ typedef struct { Err gopher.r-36.net 70 i char trantbl[4]; /* charset table translation */ Err gopher.r-36.net 70 i int charset; /* current charset */ Err gopher.r-36.net 70 i int icharset; /* selected charset for sequence */ Err gopher.r-36.net 70 i- bool numlock; /* lock numbers in keyboard */ Err gopher.r-36.net 70 i- bool *tabs; Err gopher.r-36.net 70 i+ int numlock; /* lock numbers in keyboard */ Err gopher.r-36.net 70 i+ int *tabs; Err gopher.r-36.net 70 i } Term; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Purely graphic info */ Err gopher.r-36.net 70 i@@ -258,7 +257,7 @@ typedef struct { Err gopher.r-36.net 70 i Visual *vis; Err gopher.r-36.net 70 i XSetWindowAttributes attrs; Err gopher.r-36.net 70 i int scr; Err gopher.r-36.net 70 i- bool isfixed; /* is fixed geometry? */ Err gopher.r-36.net 70 i+ int isfixed; /* is fixed geometry? */ Err gopher.r-36.net 70 i int l, t; /* left and top offset */ Err gopher.r-36.net 70 i int gm; /* geometry mask */ Err gopher.r-36.net 70 i int tw, th; /* tty width and height */ Err gopher.r-36.net 70 i@@ -302,7 +301,7 @@ typedef struct { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i char *primary, *clipboard; Err gopher.r-36.net 70 i Atom xtarget; Err gopher.r-36.net 70 i- bool alt; Err gopher.r-36.net 70 i+ int alt; Err gopher.r-36.net 70 i struct timespec tclick1; Err gopher.r-36.net 70 i struct timespec tclick2; Err gopher.r-36.net 70 i } Selection; Err gopher.r-36.net 70 i@@ -403,14 +402,14 @@ static void tsetscroll(int, int); Err gopher.r-36.net 70 i static void tswapscreen(void); Err gopher.r-36.net 70 i static void tsetdirt(int, int); Err gopher.r-36.net 70 i static void tsetdirtattr(int); Err gopher.r-36.net 70 i-static void tsetmode(bool, bool, int *, int); Err gopher.r-36.net 70 i+static void tsetmode(int, int, int *, int); Err gopher.r-36.net 70 i static void tfulldirt(void); Err gopher.r-36.net 70 i static void techo(Rune); Err gopher.r-36.net 70 i static void tcontrolcode(uchar ); Err gopher.r-36.net 70 i static void tdectest(char ); Err gopher.r-36.net 70 i static int32_t tdefcolor(int *, int *, int); Err gopher.r-36.net 70 i static void tdeftran(char); Err gopher.r-36.net 70 i-static inline bool match(uint, uint); Err gopher.r-36.net 70 i+static inline int match(uint, uint); Err gopher.r-36.net 70 i static void ttynew(void); Err gopher.r-36.net 70 i static void ttyread(void); Err gopher.r-36.net 70 i static void ttyresize(void); Err gopher.r-36.net 70 i@@ -459,7 +458,7 @@ static void selrequest(XEvent *); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void selinit(void); Err gopher.r-36.net 70 i static void selnormalize(void); Err gopher.r-36.net 70 i-static inline bool selected(int, int); Err gopher.r-36.net 70 i+static inline int selected(int, int); Err gopher.r-36.net 70 i static char *getsel(void); Err gopher.r-36.net 70 i static void selcopy(Time); Err gopher.r-36.net 70 i static void selscroll(int, int); Err gopher.r-36.net 70 i@@ -734,10 +733,10 @@ selnormalize(void) { Err gopher.r-36.net 70 i sel.ne.x = term.col - 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-bool Err gopher.r-36.net 70 i+int Err gopher.r-36.net 70 i selected(int x, int y) { Err gopher.r-36.net 70 i if(sel.mode == SEL_EMPTY) Err gopher.r-36.net 70 i- return false; Err gopher.r-36.net 70 i+ return 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(sel.type == SEL_RECTANGULAR) Err gopher.r-36.net 70 i return BETWEEN(y, sel.nb.y, sel.ne.y) Err gopher.r-36.net 70 i@@ -751,7 +750,7 @@ selected(int x, int y) { Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i selsnap(int *x, int *y, int direction) { Err gopher.r-36.net 70 i int newx, newy, xt, yt; Err gopher.r-36.net 70 i- bool delim, prevdelim; Err gopher.r-36.net 70 i+ int delim, prevdelim; Err gopher.r-36.net 70 i Glyph *gp, *prevgp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i switch(sel.snap) { Err gopher.r-36.net 70 i@@ -1143,7 +1142,7 @@ selrequest(XEvent *e) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* all done, send a notification to the listener */ Err gopher.r-36.net 70 i- if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev)) Err gopher.r-36.net 70 i+ if(!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev)) Err gopher.r-36.net 70 i fprintf(stderr, "Error sending SelectionNotify event\n"); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1457,7 +1456,7 @@ tfulldirt(void) { Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttcursor(int mode) { Err gopher.r-36.net 70 i static TCursor c[2]; Err gopher.r-36.net 70 i- bool alt = IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i+ int alt = IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(mode == CURSOR_SAVE) { Err gopher.r-36.net 70 i c[alt] = term.c; Err gopher.r-36.net 70 i@@ -1916,9 +1915,9 @@ tsetscroll(int t, int b) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i-ttsetmode(bool priv, bool set, int *args, int narg) { Err gopher.r-36.net 70 i+ttsetmode(int priv, int set, int *args, int narg) { Err gopher.r-36.net 70 i int *lim, mode; Err gopher.r-36.net 70 i- bool alt; Err gopher.r-36.net 70 i+ int alt; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i for(lim = args + narg; args < lim; ++args) { Err gopher.r-36.net 70 i if(priv) { Err gopher.r-36.net 70 i@@ -2684,7 +2683,7 @@ eschandle(uchar ascii) { Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttputc(Rune u) { Err gopher.r-36.net 70 i char c[UTF_SIZ]; Err gopher.r-36.net 70 i- bool control; Err gopher.r-36.net 70 i+ int control; Err gopher.r-36.net 70 i int width, len; Err gopher.r-36.net 70 i Glyph *gp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -2808,7 +2807,7 @@ tresize(int col, int row) { Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i int minrow = MIN(row, term.row); Err gopher.r-36.net 70 i int mincol = MIN(col, term.col); Err gopher.r-36.net 70 i- bool *bp; Err gopher.r-36.net 70 i+ int *bp; Err gopher.r-36.net 70 i TCursor c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(col < 1 || row < 1) { Err gopher.r-36.net 70 i@@ -2904,7 +2903,7 @@ sixd_to_16bit(int x) { Err gopher.r-36.net 70 i return x == 0 ? 0 : 0x3737 + 0x2828 * x; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-bool Err gopher.r-36.net 70 i+int Err gopher.r-36.net 70 i xloadcolor(int i, const char *name, Color *ncolor) { Err gopher.r-36.net 70 i XRenderColor color = { .alpha = 0xffff }; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -2929,7 +2928,7 @@ xloadcolor(int i, const char *name, Color *ncolor) { Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i xloadcols(void) { Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i- static bool loaded; Err gopher.r-36.net 70 i+ static int loaded; Err gopher.r-36.net 70 i Color *cp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(loaded) { Err gopher.r-36.net 70 i@@ -2944,7 +2943,7 @@ xloadcols(void) { Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i die("Could not allocate color %d\n", i); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- loaded = true; Err gopher.r-36.net 70 i+ loaded = 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i@@ -2998,7 +2997,7 @@ xhints(void) { Err gopher.r-36.net 70 i sizeh->width_inc = xw.cw; Err gopher.r-36.net 70 i sizeh->base_height = 2 * borderpx; Err gopher.r-36.net 70 i sizeh->base_width = 2 * borderpx; Err gopher.r-36.net 70 i- if(xw.isfixed == True) { Err gopher.r-36.net 70 i+ if(xw.isfixed) { Err gopher.r-36.net 70 i sizeh->flags |= PMaxSize | PMinSize; Err gopher.r-36.net 70 i sizeh->min_width = sizeh->max_width = xw.w; Err gopher.r-36.net 70 i sizeh->min_height = sizeh->max_height = xw.h; Err gopher.r-36.net 70 i@@ -3349,7 +3348,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i if(f >= frclen) { Err gopher.r-36.net 70 i if(!font->set) Err gopher.r-36.net 70 i font->set = FcFontSort(0, font->pattern, Err gopher.r-36.net 70 i- FcTrue, 0, &fcres); Err gopher.r-36.net 70 i+ 1, 0, &fcres); Err gopher.r-36.net 70 i fcsets[0] = font->set; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i@@ -3365,8 +3364,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i FcCharSetAddChar(fccharset, rune); Err gopher.r-36.net 70 i FcPatternAddCharSet(fcpattern, FC_CHARSET, Err gopher.r-36.net 70 i fccharset); Err gopher.r-36.net 70 i- FcPatternAddBool(fcpattern, FC_SCALABLE, Err gopher.r-36.net 70 i- FcTrue); Err gopher.r-36.net 70 i+ FcPatternAddBool(fcpattern, FC_SCALABLE, 1); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i FcConfigSubstitute(0, fcpattern, Err gopher.r-36.net 70 i FcMatchPattern); Err gopher.r-36.net 70 i@@ -3664,7 +3662,7 @@ drawregion(int x1, int y1, int x2, int y2) { Err gopher.r-36.net 70 i int i, x, y, ox, numspecs; Err gopher.r-36.net 70 i Glyph base, new; Err gopher.r-36.net 70 i XftGlyphFontSpec* specs; Err gopher.r-36.net 70 i- bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i+ int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(!(xw.state & WIN_VISIBLE)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i@@ -3757,7 +3755,7 @@ focus(XEvent *ev) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-bool Err gopher.r-36.net 70 i+int Err gopher.r-36.net 70 i match(uint mask, uint state) { Err gopher.r-36.net 70 i return mask == XK_ANY_MOD || mask == (state & ~ignoremod); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -4025,7 +4023,7 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i ARGBEGIN { Err gopher.r-36.net 70 i case 'a': Err gopher.r-36.net 70 i- allowaltscreen = false; Err gopher.r-36.net 70 i+ allowaltscreen = 0; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'c': Err gopher.r-36.net 70 i opt_class = EARGF(usage()); Err gopher.r-36.net 70 i@@ -4042,7 +4040,7 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i &xw.l, &xw.t, &cols, &rows); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'i': Err gopher.r-36.net 70 i- xw.isfixed = True; Err gopher.r-36.net 70 i+ xw.isfixed = 1; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'o': Err gopher.r-36.net 70 i opt_io = EARGF(usage()); Err gopher.r-36.net 70 .