summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lohmann2013-05-06 19:50:14 +0200
committerChristoph Lohmann2013-05-06 19:50:14 +0200
commit678eff6e1882a888deda5e4e429df42c39b604fe (patch)
tree25edfc204d3317c08d7276dc1906f49cb39e8db5
parent8e968739c3cfc4e9f7088a9ea360bc4f37e9ad9f (diff)
downloadst-678eff6e1882a888deda5e4e429df42c39b604fe.tar.gz
st-678eff6e1882a888deda5e4e429df42c39b604fe.tar.xz
st-678eff6e1882a888deda5e4e429df42c39b604fe.zip
Removing an old select() regression.
-rw-r--r--st.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/st.c b/st.c
index 5251e70..50090a4 100644
--- a/st.c
+++ b/st.c
@@ -3481,25 +3481,23 @@ run(void) {
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- switch(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
- case -1:
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
- default:
- if(FD_ISSET(cmdfd, &rfd)) {
- ttyread();
- if(blinktimeout) {
- blinkset = tattrset(ATTR_BLINK);
- if(!blinkset && term.mode & ATTR_BLINK)
- term.mode &= ~(MODE_BLINK);
- }
+ }
+ if(FD_ISSET(cmdfd, &rfd)) {
+ ttyread();
+ if(blinktimeout) {
+ blinkset = tattrset(ATTR_BLINK);
+ if(!blinkset && term.mode & ATTR_BLINK)
+ term.mode &= ~(MODE_BLINK);
}
-
- if(FD_ISSET(xfd, &rfd))
- xev = actionfps;
- break;
}
+
+ if(FD_ISSET(xfd, &rfd))
+ xev = actionfps;
+
gettimeofday(&now, NULL);
drawtimeout.tv_sec = 0;
drawtimeout.tv_usec = (1000/xfps) * 1000;