Merging xft and current st heads.
This commit is contained in:
commit
21a0c4a2e0
8
st.c
8
st.c
|
@ -201,7 +201,7 @@ typedef struct {
|
||||||
XftDraw *xft_draw;
|
XftDraw *xft_draw;
|
||||||
Visual *vis;
|
Visual *vis;
|
||||||
int scr;
|
int scr;
|
||||||
Bool isfixed; /* is fixed geometry? */
|
bool isfixed; /* is fixed geometry? */
|
||||||
int fx, fy, fw, fh; /* fixed geometry */
|
int fx, fy, fw, fh; /* fixed geometry */
|
||||||
int tw, th; /* tty width and height */
|
int tw, th; /* tty width and height */
|
||||||
int w; /* window width */
|
int w; /* window width */
|
||||||
|
@ -940,7 +940,7 @@ tcursor(int mode) {
|
||||||
|
|
||||||
void
|
void
|
||||||
treset(void) {
|
treset(void) {
|
||||||
unsigned i;
|
uint i;
|
||||||
term.c = (TCursor){{
|
term.c = (TCursor){{
|
||||||
.mode = ATTR_NULL,
|
.mode = ATTR_NULL,
|
||||||
.fg = DefaultFG,
|
.fg = DefaultFG,
|
||||||
|
@ -1603,7 +1603,7 @@ strreset(void) {
|
||||||
|
|
||||||
void
|
void
|
||||||
tputtab(bool forward) {
|
tputtab(bool forward) {
|
||||||
unsigned x = term.c.x;
|
uint x = term.c.x;
|
||||||
|
|
||||||
if(forward) {
|
if(forward) {
|
||||||
if(x == term.col)
|
if(x == term.col)
|
||||||
|
@ -2381,7 +2381,7 @@ run(void) {
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[]) {
|
main(int argc, char *argv[]) {
|
||||||
int i, bitm, xr, yr;
|
int i, bitm, xr, yr;
|
||||||
unsigned int wr, hr;
|
uint wr, hr;
|
||||||
|
|
||||||
xw.fw = xw.fh = xw.fx = xw.fy = 0;
|
xw.fw = xw.fh = xw.fx = xw.fy = 0;
|
||||||
xw.isfixed = False;
|
xw.isfixed = False;
|
||||||
|
|
Loading…
Reference in New Issue