Skip to content

Commit

Permalink
Merge pull request #1 from mjtrangoni/compile-on-windows
Browse files Browse the repository at this point in the history
spinner.go: Add support for windows
  • Loading branch information
kovetskiy committed Aug 11, 2019
2 parents 00597fd + d3df02b commit d82ba8d
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 28 deletions.
28 changes: 0 additions & 28 deletions spinner.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import (
"os"
"strings"
"sync"
"syscall"
"time"
"unsafe"
)

var (
Expand Down Expand Up @@ -144,32 +142,6 @@ func (spinner *Spinner) Call(methods ...func() error) error {
return nil
}

func getTerminalWidth() int {
term, err := os.Open("/dev/tty")
if err != nil {
term = os.Stdin
}

window := struct {
Rows uint16
Columns uint16
X uint16
Y uint16
}{}

result, _, err := syscall.Syscall(
syscall.SYS_IOCTL,
term.Fd(),
uintptr(syscall.TIOCGWINSZ),
uintptr(unsafe.Pointer(&window)),
)
if int(result) == -1 || err != nil {
return 0
}

return int(window.Columns)
}

func getSpinnerSuffix(length int) string {
suffix := getTerminalWidth() - length
if suffix > 0 {
Expand Down
33 changes: 33 additions & 0 deletions spinner_linux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package spinner

import (
"os"
"syscall"
"unsafe"
)

func getTerminalWidth() int {
term, err := os.Open("/dev/tty")
if err != nil {
term = os.Stdin
}

window := struct {
Rows uint16
Columns uint16
X uint16
Y uint16
}{}

result, _, err := syscall.Syscall(
syscall.SYS_IOCTL,
term.Fd(),
uintptr(syscall.TIOCGWINSZ),
uintptr(unsafe.Pointer(&window)),
)
if int(result) == -1 || err != nil {
return 0
}

return int(window.Columns)
}
12 changes: 12 additions & 0 deletions spinner_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package spinner

import termbox "github.com/nsf/termbox-go"

func getTerminalWidth() int {
if err := termbox.Init(); err != nil {
panic(err)
}
width, _ := termbox.Size()
termbox.Close()
return width
}

0 comments on commit d82ba8d

Please sign in to comment.