Reduce visibility wherever possible

[st.git] / x.c

diff --git a/x.c b/x.c
index 970d6dd..f7b0528 100644 (file)
--- a/x.c
+++ b/x.c
@@ -75,6 +75,15 @@ typedef XftColor Color;
 typedef XftGlyphFontSpec GlyphFontSpec;
 
 /* Purely graphic info */
 typedef XftGlyphFontSpec GlyphFontSpec;
 
 /* Purely graphic info */

+typedef struct {
+       int tw, th; /* tty width and height */
+       int w, h; /* window width and height */
+       int ch; /* char height */
+       int cw; /* char width  */
+       int mode; /* window state/mode flags */
+       int cursor; /* cursor style */
+} TermWindow;
+

 typedef struct {
        Display *dpy;
        Colormap cmap;
 typedef struct {
        Display *dpy;
        Colormap cmap;


@@ -133,6 +142,8 @@ static int xgeommasktogravity(int);
 static void xinit(int, int);
 static void cresize(int, int);
 static void xresize(int, int);
 static void xinit(int, int);
 static void cresize(int, int);
 static void xresize(int, int);

+static void xhints(void);
+static int xloadcolor(int, const char *, Color *);

 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static void xunloadfont(Font *);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static void xunloadfont(Font *);


@@ -1430,8 +1441,8 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
        /* draw the new one */
        if (IS_SET(MODE_FOCUSED)) {
                switch (win.cursor) {
        /* draw the new one */
        if (IS_SET(MODE_FOCUSED)) {
                switch (win.cursor) {

-               case 7: /* st extension: snowman */
-                       utf8decode("☃", &g.u, UTF_SIZ);
+               case 7: /* st extension: snowman (U+2603) */
+                       g.u = 0x2603;

                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */
                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */