Archives/fzf
2
0
Fork 0
mirror of https://github.com/junegunn/fzf synced 2024-11-05 00:00:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #252 from dominikh/portable-swapOutput

Browse Source 
Use ncurses's newterm instead of swapping stdout and stderr
This commit is contained in:
Junegunn Choi 2015-06-07 14:31:44 +09:00
commit 8017635a71
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/curses/curses.go
View File

@ -4,11 +4,6 @@ package curses
#include <ncurses.h> #include <ncurses.h>
#include <locale.h> #include <locale.h>
#cgo LDFLAGS: -lncurses #cgo LDFLAGS: -lncurses
void swapOutput() {
FILE* temp = stdout;
stdout = stderr;
stderr = temp;
}
*/ */
import "C" import "C"
@ -142,6 +137,7 @@ var (
_colorMap map[int]int _colorMap map[int]int
_prevDownTime time.Time _prevDownTime time.Time
_clickY []int _clickY []int
_screen *C.SCREEN
Default16 *ColorTheme Default16 *ColorTheme
Dark256 *ColorTheme Dark256 *ColorTheme
Light256 *ColorTheme Light256 *ColorTheme
@ -254,10 +250,9 @@ func Init(theme *ColorTheme, black bool, mouse bool) {
// syscall.Dup2(int(in.Fd()), int(os.Stdin.Fd())) // syscall.Dup2(int(in.Fd()), int(os.Stdin.Fd()))
} }
C.swapOutput()
C.setlocale(C.LC_ALL, C.CString("")) C.setlocale(C.LC_ALL, C.CString(""))
C.initscr() _screen = C.newterm(nil, C.stderr, C.stdin)
C.set_term(_screen)
if mouse { if mouse {
C.mousemask(C.ALL_MOUSE_EVENTS, nil) C.mousemask(C.ALL_MOUSE_EVENTS, nil)
} }
@ -316,7 +311,7 @@ func initPairs(theme *ColorTheme, black bool) {
func Close() { func Close() {
C.endwin() C.endwin()
C.swapOutput() C.delscreen(_screen)
} }
func GetBytes() []byte { func GetBytes() []byte {