aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2017-10-10 12:17:25 -0500
committerDevin J. Pohly <djpohly@gmail.com>2018-02-25 21:53:24 -0600
commita09138afa57adb4b76dba8ca72dc7ee2642a5c8d (patch)
tree4d5db9a65174fa159b3bd7be8b67a7d445ed6f2c /st.c
parent626b0ae40c71b6c1e02ece79bf033432647381a6 (diff)
downloadst-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.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/st.c b/st.c
index df43fac..540b487 100644
--- a/st.c
+++ b/st.c
@@ -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);
196static char *base64dec(const char *); 193static char *base64dec(const char *);
197 194
198static ssize_t xwrite(int, const char *, size_t); 195static ssize_t xwrite(int, const char *, size_t);
199static void *xrealloc(void *, size_t);
200 196
201/* Globals */ 197/* Globals */
202TermWindow win; 198TermWindow win;
@@ -218,10 +214,6 @@ static CSIEscape csiescseq;
218static STREscape strescseq; 214static STREscape strescseq;
219static int iofd = 1; 215static int iofd = 1;
220 216
221char *usedfont = NULL;
222double usedfontsize = 0;
223double defaultfontsize = 0;
224
225static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; 217static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
226static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; 218static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
227static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; 219static 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));