aboutsummaryrefslogtreecommitdiff
path: root/x.c
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2017-10-12 22:25:49 -0500
committerDevin J. Pohly <djpohly@gmail.com>2018-02-25 21:53:24 -0600
commit69e32a61df15787c410a48eaa10a89240c36257d (patch)
treea8de7f88f5d712df627e9c0302ce7e77f2f208c2 /x.c
parented132e11271d18a5d8aa163096bc6192c694bc47 (diff)
downloadst-69e32a61df15787c410a48eaa10a89240c36257d.tar.gz
st-69e32a61df15787c410a48eaa10a89240c36257d.tar.bz2
st-69e32a61df15787c410a48eaa10a89240c36257d.zip
Move opt_* into same file as main()/run()
This commit is purely about reducing externs and LOC. If the main and run functions ever move elsewhere (which will probably make sense eventually), these should come along with them. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'x.c')
-rw-r--r--x.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/x.c b/x.c
index 371a467..e267961 100644
--- a/x.c
+++ b/x.c
@@ -179,6 +179,15 @@ static char *usedfont = NULL;
static double usedfontsize = 0;
static double defaultfontsize = 0;
+static char *opt_class = NULL;
+static char **opt_cmd = NULL;
+static char *opt_embed = NULL;
+static char *opt_font = NULL;
+static char *opt_io = NULL;
+static char *opt_line = NULL;
+static char *opt_name = NULL;
+static char *opt_title = NULL;
+
void
zoom(const Arg *arg)
{
@@ -1473,6 +1482,7 @@ void
xsettitle(char *p)
{
XTextProperty prop;
+ DEFAULT(p, "st");
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
@@ -1757,7 +1767,7 @@ run(void)
} while (ev.type != MapNotify);
cresize(w, h);
- ttynew();
+ ttynew(opt_line, opt_io, opt_cmd);
ttyresize(win.tw, win.th);
clock_gettime(CLOCK_MONOTONIC, &last);