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.h | |
parent | 626b0ae40c71b6c1e02ece79bf033432647381a6 (diff) | |
download | st-patched-a09138afa57adb4b76dba8ca72dc7ee2642a5c8d.tar.bz2 st-patched-a09138afa57adb4b76dba8ca72dc7ee2642a5c8d.tar.xz st-patched-a09138afa57adb4b76dba8ca72dc7ee2642a5c8d.zip |
Move font/fontspec variables into x.c and XWindow
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'st.h')
-rw-r--r-- | st.h | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -92,6 +92,7 @@ typedef unsigned short ushort; | |||
92 | 92 | ||
93 | typedef uint_least32_t Rune; | 93 | typedef uint_least32_t Rune; |
94 | 94 | ||
95 | #define Glyph Glyph_ | ||
95 | typedef struct { | 96 | typedef struct { |
96 | Rune u; /* character code */ | 97 | Rune u; /* character code */ |
97 | ushort mode; /* attribute flags */ | 98 | ushort mode; /* attribute flags */ |
@@ -100,7 +101,6 @@ typedef struct { | |||
100 | } Glyph; | 101 | } Glyph; |
101 | 102 | ||
102 | typedef Glyph *Line; | 103 | typedef Glyph *Line; |
103 | typedef XftGlyphFontSpec GlyphFontSpec; | ||
104 | 104 | ||
105 | typedef struct { | 105 | typedef struct { |
106 | Glyph attr; /* current char attributes */ | 106 | Glyph attr; /* current char attributes */ |
@@ -116,7 +116,6 @@ typedef struct { | |||
116 | Line *line; /* screen */ | 116 | Line *line; /* screen */ |
117 | Line *alt; /* alternate screen */ | 117 | Line *alt; /* alternate screen */ |
118 | int *dirty; /* dirtyness of lines */ | 118 | int *dirty; /* dirtyness of lines */ |
119 | GlyphFontSpec *specbuf; /* font spec buffer used for rendering */ | ||
120 | TCursor c; /* cursor */ | 119 | TCursor c; /* cursor */ |
121 | int top; /* top scroll limit */ | 120 | int top; /* top scroll limit */ |
122 | int bot; /* bottom scroll limit */ | 121 | int bot; /* bottom scroll limit */ |
@@ -213,6 +212,7 @@ size_t utf8decode(char *, Rune *, size_t); | |||
213 | size_t utf8encode(Rune, char *); | 212 | size_t utf8encode(Rune, char *); |
214 | 213 | ||
215 | void *xmalloc(size_t); | 214 | void *xmalloc(size_t); |
215 | void *xrealloc(void *, size_t); | ||
216 | char *xstrdup(char *); | 216 | char *xstrdup(char *); |
217 | 217 | ||
218 | /* Globals */ | 218 | /* Globals */ |
@@ -231,10 +231,6 @@ extern char *opt_name; | |||
231 | extern char *opt_title; | 231 | extern char *opt_title; |
232 | extern int oldbutton; | 232 | extern int oldbutton; |
233 | 233 | ||
234 | extern char *usedfont; | ||
235 | extern double usedfontsize; | ||
236 | extern double defaultfontsize; | ||
237 | |||
238 | /* config.h globals */ | 234 | /* config.h globals */ |
239 | extern char font[]; | 235 | extern char font[]; |
240 | extern int borderpx; | 236 | extern int borderpx; |