Merging xft and current st heads.

diff --cc st.c
index f7fecf8,35f6f16..3c158c0
--- 1/st.c
--- 2/st.c
+++ b/st.c
@@@ -198,10 -195,8 +198,10 @@@ typedef struct 
        Atom xembed;
        XIM xim;
        XIC xic;
 +      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 */