Formatting , Fixed Naming and Build Spaces

olekukonko · Jan 15, 2014 · f223bba · f223bba
1 parent 4417e82
commit f223bba
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 21 deletions.
diff --git a/ts.go b/ts.go
@@ -1,27  1,29 @@
 package ts
 
 // Return System Size
 type Size struct {
-	row           uint16
-	col           uint16
-	xpixel        uint16
-	ypixel        uint16
 	row    uint16
 	col    uint16
 	posX   uint16
 	posY   uint16
 }
 
 // Get Terminal Width
 func (w Size) Col() int {
 	return int(w.row)
 }
 
 // Get Terminal Height
 func (w Size) Row() int {
 	return int(w.row)
 }
 
-func (w Size) Xpixel() int {
-	return int(w.xpixel)
 // Get Position X
 func (w Size) PosX() int {
 	return int(w.posX)
 }
 
-func (w Size) Ypixel() int {
-	return int(w.ypixel)
 // Get Position Y
 func (w Size) PosY() int {
 	return int(w.posY)
 }
-
-
-
diff --git a/ts_darwin.go b/ts_darwin.go
@@ -1,4  1,5 @@
 //  build darwin
 
 package ts
 
 const (

diff --git a/ts_linux.go b/ts_linux.go
@@ -1,4  1,5 @@
 //  build linux
 
 package ts
 
 const (

diff --git a/ts_other.go b/ts_other.go
@@ -1,8  1,7 @@
-//  build !darwin,!freebsd,!netbsd,!openbsd,!linux
 //  build !windows,!darwin,!freebsd,!netbsd,!openbsd,!linux
 
 package ts
 
 const (
 	TIOCGWINSZ = 0
 )
-
-
diff --git a/ts_test.go b/ts_test.go
@@ -1,9  1,18 @@
 package ts
 
-import "testing"
 
-// TODO Add test
 import (
 	"fmt"
 	"testing"
 )
 
 func ExampleGetSize() {
 	size := GetSize()
 	fmt.Println(size.Col()) // Get Width
 	fmt.Println(size.Row()) // Get Height
 	fmt.Println(size.PosX())   // Get X position
 	fmt.Println(size.PosY())   // Get Y position
 }
 
 func TestSize(t *testing.T) {
 	size := GetSize()

diff --git a/ts_unix.go b/ts_unix.go
@@ -1,5  1,7 @@
 //  build  freebsd netbsd openbsd
 
 package ts
 
 const (
 	TIOCGWINSZ = 0x40087468
 )
diff --git a/ts_windows.go b/ts_windows.go
@@ -1,5  1,6 @@
 //  build windows
 
 
 package ts
 
 import (
@@ -30,13  31,13 @@ type CONSOLE_SCREEN_BUFFER_INFO struct {
 // The origin of the coordinate system (0,0) is at the top, left cell of the buffer.
 // See http://msdn.microsoft.com/en-us/library/windows/desktop/ms682119(v=vs.85).aspx
 type COORD struct {
-	X,           Y int16
 	X, Y uint16
 }
 
 // Defines the coordinates of the upper left and lower right corners of a rectangle.
 // See http://msdn.microsoft.com/en-us/library/windows/desktop/ms686311(v=vs.85).aspx
 type SMALL_RECT struct {
-	Left,             Top,             Right,             Bottom int16
 	Left, Top, Right, Bottom uint16
 }
 
 func GetSize() Size {

diff --git a/ts_x.go b/ts_x.go
@@ -1,5  1,6 @@
 //  build !windows
 
 
 package ts
 
 import (
@@ -15,8  16,7 @@ func GetSize() Size {
 			uintptr(0),
 			uintptr(TIOCGWINSZ),
 			uintptr(unsafe.Pointer(&ws)))
-
-		return int(ws.ws_col)
 		return ws
 	}
-	return ws
 	return Size{}
 }