Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Remove insane *_FILENO and EXIT_* usage
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
3dd5caf
..
46c0b6e
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-513,7
+513,7
@@
static STREscape strescseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
static int cmdfd;
static pid_t pid;
static Selection sel;
-static int iofd =
STDOUT_FILENO
;
+static int iofd =
1
;
static char **opt_cmd = NULL;
static char *opt_io = NULL;
static char *opt_title = NULL;
static char **opt_cmd = NULL;
static char *opt_io = NULL;
static char *opt_title = NULL;
@@
-1207,7
+1207,7
@@
die(const char *errstr, ...) {
va_start(ap, errstr);
vfprintf(stderr, errstr, ap);
va_end(ap);
va_start(ap, errstr);
vfprintf(stderr, errstr, ap);
va_end(ap);
- exit(
EXIT_FAILURE
);
+ exit(
1
);
}
void
}
void
@@
-1256,12
+1256,12
@@
execsh(void) {
signal(SIGALRM, SIG_DFL);
execvp(prog, args);
signal(SIGALRM, SIG_DFL);
execvp(prog, args);
- _exit(
EXIT_FAILURE
);
+ _exit(
1
);
}
void
sigchld(int a) {
}
void
sigchld(int a) {
- int stat
, ret
;
+ int stat;
pid_t p;
if((p = waitpid(pid, &stat, WNOHANG)) < 0)
pid_t p;
if((p = waitpid(pid, &stat, WNOHANG)) < 0)
@@
-1270,10
+1270,9
@@
sigchld(int a) {
if(pid != p)
return;
if(pid != p)
return;
- ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
- if (ret != EXIT_SUCCESS)
+ if (!WIFEXITED(stat) || WEXITSTATUS(stat))
die("child finished with error '%d'\n", stat);
die("child finished with error '%d'\n", stat);
- exit(
EXIT_SUCCESS
);
+ exit(
0
);
}
}
@@
-1309,8
+1308,7
@@
ttynew(void) {
if(opt_io) {
term.mode |= MODE_PRINT;
iofd = (!strcmp(opt_io, "-")) ?
if(opt_io) {
term.mode |= MODE_PRINT;
iofd = (!strcmp(opt_io, "-")) ?
- STDOUT_FILENO :
- open(opt_io, O_WRONLY | O_CREAT, 0666);
+ 1 : open(opt_io, O_WRONLY | O_CREAT, 0666);
if(iofd < 0) {
fprintf(stderr, "Error opening %s:%s\n",
opt_io, strerror(errno));
if(iofd < 0) {
fprintf(stderr, "Error opening %s:%s\n",
opt_io, strerror(errno));
@@
-1320,7
+1318,7
@@
ttynew(void) {
if (opt_line) {
if((cmdfd = open(opt_line, O_RDWR)) < 0)
die("open line failed: %s\n", strerror(errno));
if (opt_line) {
if((cmdfd = open(opt_line, O_RDWR)) < 0)
die("open line failed: %s\n", strerror(errno));
- close(
STDIN_FILENO
);
+ close(
0
);
dup(cmdfd);
stty();
return;
dup(cmdfd);
stty();
return;
@@
-1337,9
+1335,9
@@
ttynew(void) {
case 0:
close(iofd);
setsid(); /* create a new process group */
case 0:
close(iofd);
setsid(); /* create a new process group */
- dup2(s,
STDIN_FILENO
);
- dup2(s,
STDOUT_FILENO
);
- dup2(s,
STDERR_FILENO
);
+ dup2(s,
0
);
+ dup2(s,
1
);
+ dup2(s,
2
);
if(ioctl(s, TIOCSCTTY, NULL) < 0)
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
close(s);
if(ioctl(s, TIOCSCTTY, NULL) < 0)
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
close(s);
@@
-3061,7
+3059,6
@@
xloadfont(Font *f, FcPattern *pattern) {
void
xloadfonts(char *fontstr, double fontsize) {
FcPattern *pattern;
void
xloadfonts(char *fontstr, double fontsize) {
FcPattern *pattern;
- FcResult r_sz, r_psz;
double fontval;
float ceilf(float);
double fontval;
float ceilf(float);
@@
-3080,11
+3077,11
@@
xloadfonts(char *fontstr, double fontsize) {
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
usedfontsize = fontsize;
} else {
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
usedfontsize = fontsize;
} else {
- r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
- r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
- if(r_psz == FcResultMatch) {
+ if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
+ FcResultMatch) {
usedfontsize = fontval;
usedfontsize = fontval;
- } else if(r_sz == FcResultMatch) {
+ } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
+ FcResultMatch) {
usedfontsize = -1;
} else {
/*
usedfontsize = -1;
} else {
/*
@@
-3157,14
+3154,14
@@
void
xzoom(const Arg *arg) {
Arg larg;
xzoom(const Arg *arg) {
Arg larg;
- larg.
i = usedfontsize + arg->i
;
+ larg.
f = usedfontsize + arg->f
;
xzoomabs(&larg);
}
void
xzoomabs(const Arg *arg) {
xunloadfonts();
xzoomabs(&larg);
}
void
xzoomabs(const Arg *arg) {
xunloadfonts();
- xloadfonts(usedfont, arg->
i
);
+ xloadfonts(usedfont, arg->
f
);
cresize(0, 0);
redraw();
xhints();
cresize(0, 0);
redraw();
xhints();
@@
-3175,7
+3172,7
@@
xzoomreset(const Arg *arg) {
Arg larg;
if(defaultfontsize > 0) {
Arg larg;
if(defaultfontsize > 0) {
- larg.
i
= defaultfontsize;
+ larg.
f
= defaultfontsize;
xzoomabs(&larg);
}
}
xzoomabs(&larg);
}
}
@@
-3872,7
+3869,7
@@
cmessage(XEvent *e) {
} else if(e->xclient.data.l[0] == xw.wmdeletewin) {
/* Send SIGHUP to shell */
kill(pid, SIGHUP);
} else if(e->xclient.data.l[0] == xw.wmdeletewin) {
/* Send SIGHUP to shell */
kill(pid, SIGHUP);
- exit(
EXIT_SUCCESS
);
+ exit(
0
);
}
}
}
}
@@
-3913,6
+3910,13
@@
run(void) {
/* Waiting for window mapping */
do {
XNextEvent(xw.dpy, &ev);
/* Waiting for window mapping */
do {
XNextEvent(xw.dpy, &ev);
+ /*
+ * XFilterEvent is required to be called after you using XOpenIM,
+ * this is not unnecessary.It does not only filter the key event,
+ * but some clientmessage for input method as well.
+ */
+ if(XFilterEvent(&ev, None))
+ continue;
if(ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;
if(ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;