Merging xft and current st heads.

diff --git a/st.c b/st.c
index f7fecf85be8e8368afff571a3d11d74228d337bb..3c158c055e3e971299b84461778b94578b050d91 100644 (file)
--- a/st.c
+++ b/st.c
@@ -201,7 +201,7 @@ typedef struct {
        XftDraw *xft_draw;
        Visual *vis;
        int scr;
-       Bool isfixed; /* is fixed geometry? */
+       bool isfixed; /* is fixed geometry? */
        int fx, fy, fw, fh; /* fixed geometry */
        int tw, th; /* tty width and height */
        int w;  /* window width */
@@ -940,7 +940,7 @@ tcursor(int mode) {
 
 void
 treset(void) {
-       unsigned i;
+       uint i;
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
@@ -1603,7 +1603,7 @@ strreset(void) {
 
 void
 tputtab(bool forward) {
-       unsigned x = term.c.x;
+       uint x = term.c.x;
 
        if(forward) {
                if(x == term.col)
@@ -2381,7 +2381,7 @@ run(void) {
 int
 main(int argc, char *argv[]) {
        int i, bitm, xr, yr;
-       unsigned int wr, hr;
+       uint wr, hr;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
        xw.isfixed = False;