pbentes/st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move font/fontspec variables into x.c and XWindow

Browse Source 
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly
2017-10-10 12:17:25 -05:00
parent 626b0ae40c
commit a09138afa5
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
st.c
View File

@ -28,9 +28,6 @@
#include <X11/cursorfont.h>
#include <X11/Xft/Xft.h>
#define Glyph Glyph_
#define Font Font_
#include "st.h"
#include "win.h"
@ -196,7 +193,6 @@ static size_t utf8validate(Rune *, size_t);
static char *base64dec(const char *);
static ssize_t xwrite(int, const char *, size_t);
static void *xrealloc(void *, size_t);
/* Globals */
TermWindow win;
@ -218,10 +214,6 @@ static CSIEscape csiescseq;
static STREscape strescseq;
static int iofd = 1;
char *usedfont = NULL;
double usedfontsize = 0;
double defaultfontsize = 0;
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
@ -2516,9 +2508,6 @@ tresize(int col, int row)
free(term.alt[i]);
}
/* resize to new width */
term.specbuf = xrealloc(term.specbuf, col * sizeof(GlyphFontSpec));
/* resize to new height */
term.line = xrealloc(term.line, row * sizeof(Line));
term.alt = xrealloc(term.alt, row * sizeof(Line));