Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Fix title initialization
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
537322b
..
d0b26ac
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-1,5
+1,6
@@
/* See LICENSE for license details. */
#include <errno.h>
/* See LICENSE for license details. */
#include <errno.h>
+#include <math.h>
#include <limits.h>
#include <locale.h>
#include <signal.h>
#include <limits.h>
#include <locale.h>
#include <signal.h>
@@
-901,7
+902,6
@@
xloadfonts(char *fontstr, double fontsize)
{
FcPattern *pattern;
double fontval;
{
FcPattern *pattern;
double fontval;
- float ceilf(float);
if (fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
if (fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
@@
-1492,7
+1492,7
@@
void
xsettitle(char *p)
{
XTextProperty prop;
xsettitle(char *p)
{
XTextProperty prop;
- DEFAULT(p,
"st"
);
+ DEFAULT(p,
opt_title
);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
@@
-1929,12
+1929,12
@@
main(int argc, char *argv[])
} ARGEND;
run:
} ARGEND;
run:
- if (argc > 0) {
- /* eat all remaining arguments */
+ if (argc > 0) /* eat all remaining arguments */
opt_cmd = argv;
opt_cmd = argv;
- if (!opt_title && !opt_line)
- opt_title = basename(xstrdup(argv[0]));
- }
+
+ if (!opt_title)
+ opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
+
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
cols = MAX(cols, 1);
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
cols = MAX(cols, 1);