summaryrefslogtreecommitdiffstats
path: root/src/tui
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2017-01-11 23:01:56 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2017-01-11 23:01:56 +0900
commitd64828ce6d974c016050ec6f3b39c7e6108c39ae (patch)
tree348b721475dabb462b59b6167c19579851c10a0c /src/tui
parent2aa739be81c7786eb9fd53606e2cfb4525344e8e (diff)
Print error message to stderr on unexpected exit
Diffstat (limited to 'src/tui')
-rw-r--r--src/tui/light.go2
-rw-r--r--src/tui/ncurses.go9
-rw-r--r--src/tui/tcell.go9
-rw-r--r--src/tui/tui.go4
4 files changed, 9 insertions, 15 deletions
diff --git a/src/tui/light.go b/src/tui/light.go
index 248477c7..0bfc57fd 100644
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -241,7 +241,7 @@ func (r *LightRenderer) getBytesInternal(buffer []byte) []byte {
c, ok := r.getch(false)
if !ok {
r.Close()
- errorExit()
+ errorExit("Failed to read /dev/tty")
}
retries := 0
diff --git a/src/tui/ncurses.go b/src/tui/ncurses.go
index 3e636ba2..db7cd83f 100644
--- a/src/tui/ncurses.go
+++ b/src/tui/ncurses.go
@@ -25,7 +25,6 @@ int c_getcurx(WINDOW* win) {
import "C"
import (
- "fmt"
"os"
"strconv"
"strings"
@@ -109,13 +108,11 @@ func (r *FullscreenRenderer) Init() {
C.setlocale(C.LC_ALL, C.CString(""))
tty := C.c_tty()
if tty == nil {
- fmt.Println("Failed to open /dev/tty")
- errorExit()
+ errorExit("Failed to open /dev/tty")
}
_screen = C.c_newterm(tty)
if _screen == nil {
- fmt.Println("Invalid $TERM: " + os.Getenv("TERM"))
- errorExit()
+ errorExit("Invalid $TERM: " + os.Getenv("TERM"))
}
C.set_term(_screen)
if r.mouse {
@@ -380,7 +377,7 @@ func (r *FullscreenRenderer) GetChar() Event {
case C.ERR:
// Unexpected error from blocking read
r.Close()
- errorExit()
+ errorExit("Failed to read /dev/tty")
case C.KEY_UP:
return Event{Up, 0, nil}
case C.KEY_DOWN:
diff --git a/src/tui/tcell.go b/src/tui/tcell.go
index 3399d32b..8de6fe35 100644
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -6,9 +6,6 @@ import (
"time"
"unicode/utf8"
- "fmt"
- "os"
-
"runtime"
// https://github.com/gdamore/tcell/pull/135
@@ -123,12 +120,10 @@ var (
func (r *FullscreenRenderer) initScreen() {
s, e := tcell.NewScreen()
if e != nil {
- fmt.Fprintf(os.Stderr, "%v\n", e)
- errorExit()
+ errorExit(e.Error())
}
if e = s.Init(); e != nil {
- fmt.Fprintf(os.Stderr, "%v\n", e)
- errorExit()
+ errorExit(e.Error())
}
if r.mouse {
s.EnableMouse()
diff --git a/src/tui/tui.go b/src/tui/tui.go
index 33358e85..4760a382 100644
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -1,6 +1,7 @@
package tui
import (
+ "fmt"
"os"
"strconv"
"time"
@@ -284,7 +285,8 @@ func EmptyTheme() *ColorTheme {
Border: colUndefined}
}
-func errorExit() {
+func errorExit(message string) {
+ fmt.Fprintln(os.Stderr, message)
os.Exit(2)
}