diff options
| author | Devin J. Pohly <djpohly@gmail.com> | 2018-02-24 16:32:20 -0600 |
|---|---|---|
| committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:56:26 -0600 |
| commit | e0215d53770a9b6bc6e5d7b9a603ecd34dbd7100 (patch) | |
| tree | b696b3fa2c69270a198c3bcc1e0a289b12b3538c /x.c | |
| parent | 30683c70ab62fd37b5921cf72077b9aef2cb842e (diff) | |
| download | st-e0215d53770a9b6bc6e5d7b9a603ecd34dbd7100.tar.gz st-e0215d53770a9b6bc6e5d7b9a603ecd34dbd7100.tar.bz2 | |
Reduce visibility wherever possible
When possible, declare functions/variables static and move struct
definitions out of headers. In order to allow utf8decode to become
internal, use codepoint for DECSCUSR extension directly.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'x.c')
| -rw-r--r-- | x.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -76,6 +76,15 @@ 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; Window win; @@ -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 xhints(void); +static int xloadcolor(int, const char *, Color *); 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) { - 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 */ |