diff options
| author | Christoph Lohmann <20h@r-36.net> | 2012-09-24 10:24:36 +0200 |
|---|---|---|
| committer | Christoph Lohmann <20h@r-36.net> | 2012-09-24 10:24:36 +0200 |
| commit | 21a0c4a2e08ede1d04c472497db7d9aef644d00c (patch) | |
| tree | 10f7bfb24c9b94b1c0daac6ade4b30528eb65690 /st.c | |
| parent | 2b3c1219c863d9faa30ae58e5bf56d58ada0247d (diff) | |
| parent | 816a70c01ba6bf5e5d2d5e91830f75ef8e4b595d (diff) | |
| download | st-21a0c4a2e08ede1d04c472497db7d9aef644d00c.tar.gz | |
Merging xft and current st heads.
Diffstat (limited to 'st.c')
| -rw-r--r-- | st.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; |