diff options
author | Devin J. Pohly <djpohly@gmail.com> | 2017-10-10 12:17:25 -0500 |
---|---|---|
committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
commit | a09138afa57adb4b76dba8ca72dc7ee2642a5c8d (patch) | |
tree | 4d5db9a65174fa159b3bd7be8b67a7d445ed6f2c /st.c | |
parent | 626b0ae40c71b6c1e02ece79bf033432647381a6 (diff) | |
download | st-a09138afa57adb4b76dba8ca72dc7ee2642a5c8d.tar.gz st-a09138afa57adb4b76dba8ca72dc7ee2642a5c8d.zip |
Move font/fontspec variables into x.c and XWindow
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -28,9 +28,6 @@ | |||
28 | #include <X11/cursorfont.h> | 28 | #include <X11/cursorfont.h> |
29 | #include <X11/Xft/Xft.h> | 29 | #include <X11/Xft/Xft.h> |
30 | 30 | ||
31 | #define Glyph Glyph_ | ||
32 | #define Font Font_ | ||
33 | |||
34 | #include "st.h" | 31 | #include "st.h" |
35 | #include "win.h" | 32 | #include "win.h" |
36 | 33 | ||
@@ -196,7 +193,6 @@ static size_t utf8validate(Rune *, size_t); | |||
196 | static char *base64dec(const char *); | 193 | static char *base64dec(const char *); |
197 | 194 | ||
198 | static ssize_t xwrite(int, const char *, size_t); | 195 | static ssize_t xwrite(int, const char *, size_t); |
199 | static void *xrealloc(void *, size_t); | ||
200 | 196 | ||
201 | /* Globals */ | 197 | /* Globals */ |
202 | TermWindow win; | 198 | TermWindow win; |
@@ -218,10 +214,6 @@ static CSIEscape csiescseq; | |||
218 | static STREscape strescseq; | 214 | static STREscape strescseq; |
219 | static int iofd = 1; | 215 | static int iofd = 1; |
220 | 216 | ||
221 | char *usedfont = NULL; | ||
222 | double usedfontsize = 0; | ||
223 | double defaultfontsize = 0; | ||
224 | |||
225 | static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; | 217 | static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; |
226 | static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; | 218 | static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; |
227 | static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; | 219 | static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; |
@@ -2516,9 +2508,6 @@ tresize(int col, int row) | |||
2516 | free(term.alt[i]); | 2508 | free(term.alt[i]); |
2517 | } | 2509 | } |
2518 | 2510 | ||
2519 | /* resize to new width */ | ||
2520 | term.specbuf = xrealloc(term.specbuf, col * sizeof(GlyphFontSpec)); | ||
2521 | |||
2522 | /* resize to new height */ | 2511 | /* resize to new height */ |
2523 | term.line = xrealloc(term.line, row * sizeof(Line)); | 2512 | term.line = xrealloc(term.line, row * sizeof(Line)); |
2524 | term.alt = xrealloc(term.alt, row * sizeof(Line)); | 2513 | term.alt = xrealloc(term.alt, row * sizeof(Line)); |