[hackers] [st][PATCH 09/23] Move font variables into x.c

From: Devin J. Pohly <djpohly_AT_gmail.com>
Date: Sun, 24 Sep 2017 16:11:31 -0500

---
 st.c | 4 ----
 st.h | 4 ----
 x.c  | 4 ++++
 3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/st.c b/st.c
index b23c87e..341ad7d 100644
--- a/st.c
+++ b/st.c
_AT_@ -207,10 +207,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};
diff --git a/st.h b/st.h
index 2a8bb55..0cfffa5 100644
--- a/st.h
+++ b/st.h
_AT_@ -225,10 +225,6 @@ extern char *opt_name;
 extern char *opt_title;
 extern int oldbutton;
 
-extern char *usedfont;
-extern double usedfontsize;
-extern double defaultfontsize;
-
 /* config.h globals */
 extern char font[];
 extern int borderpx;
diff --git a/x.c b/x.c
index e7acf2e..aa8ad35 100644
--- a/x.c
+++ b/x.c
_AT_@ -179,6 +179,10 @@ typedef struct {
 static Fontcache frc[16];
 static int frclen = 0;
 
+static char *usedfont = NULL;
+static double usedfontsize = 0;
+static double defaultfontsize = 0;
+
 int
 x2col(int x)
 {
-- 
2.14.1
Received on Sun Sep 24 2017 - 23:11:31 CEST

This archive was generated by hypermail 2.3.0 : Sun Sep 24 2017 - 23:25:06 CEST