add go mod support and gofmt code

Author: vcaesar

.gitignore

@@ -1,6 +1,12 @@
+# Object files
+.DS_Store
+.vscode
+.idea
+
+vendor
+
 *.swp
 *.png
 tst_first
 tst_graphics
-TAGS
-
+TAGS

_examples/pointer-painting/main.go

@@ -32,12 +32,12 @@ var (
 	// The keys represent the key sequences that must be pressed to
 	// switch to the color value.
 	pencils = map[string]xgraphics.BGRA{
-		"1": xgraphics.BGRA{0xff, 0xff, 0xff, 0xff}, // white
-		"2": xgraphics.BGRA{0xff, 0x0, 0x0, 0xff},   // blue
-		"3": xgraphics.BGRA{0x0, 0xff, 0x0, 0xff},   // green
-		"4": xgraphics.BGRA{0x0, 0x0, 0xff, 0xff},   // red
-		"5": xgraphics.BGRA{0x0, 0x7f, 0xff, 0xff},  // orange
-		"6": xgraphics.BGRA{0xaa, 0x0, 0xff, 0x55},  // transparent pink
+		"1": {0xff, 0xff, 0xff, 0xff}, // white
+		"2": {0xff, 0x0, 0x0, 0xff},   // blue
+		"3": {0x0, 0xff, 0x0, 0xff},   // green
+		"4": {0x0, 0x0, 0xff, 0xff},   // red
+		"5": {0x0, 0x7f, 0xff, 0xff},  // orange
+		"6": {0xaa, 0x0, 0xff, 0x55},  // transparent pink
 	}
 
 	// The current pencil color.

ewmh/ewmh.go

@@ -233,7 +233,7 @@ func DesktopViewportGet(xu *xgbutil.XUtil) ([]DesktopViewport, error) {
 	}
 
 	viewports := make([]DesktopViewport, len(coords)/2)
-	for i, _ := range viewports {
+	for i := range viewports {
 		viewports[i] = DesktopViewport{
 			X: int(coords[i*2]),
 			Y: int(coords[i*2+1]),
@@ -770,7 +770,7 @@ func WmOpaqueRegionGet(xu *xgbutil.XUtil,
 	}
 
 	regions := make([]WmOpaqueRegion, len(raw)/4)
-	for i, _ := range regions {
+	for i := range regions {
 		regions[i] = WmOpaqueRegion{
 			X:      int(raw[i*4+0]),
 			Y:      int(raw[i*4+1]),
@@ -1133,7 +1133,7 @@ func WorkareaGet(xu *xgbutil.XUtil) ([]Workarea, error) {
 	}
 
 	workareas := make([]Workarea, len(rects)/4)
-	for i, _ := range workareas {
+	for i := range workareas {
 		workareas[i] = Workarea{
 			X:      int(rects[i*4]),
 			Y:      int(rects[i*4+1]),

go.mod

@@ -0,0 +1,12 @@
+module github.com/robotn/xgbutil
+
+go 1.13
+
+require (
+	github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298
+	github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966
+	github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
+	github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046
+)
+
+replace github.com/BurntSushi/xgb => github.com/robotn/xgb v0.0.0-20190910151114-b250faa511c2

go.sum

@@ -0,0 +1,8 @@
+github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJXZHsaM8b6OLVo6muQUQd4CwkH/D3fnnbHXA=
+github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ=
+github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g=
+github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966/go.mod h1:Mid70uvE93zn9wgF92A/r5ixgnvX8Lh68fxp9KQBaI0=
+github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 h1:O/r2Sj+8QcMF7V5IcmiE2sMFV2q3J47BEirxbXJAdzA=
+github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046/go.mod h1:uw9h2sd4WWHOPdJ13MQpwK5qYWKYDumDqxWWIknEQ+k=
+github.com/robotn/xgb v0.0.0-20190910151114-b250faa511c2 h1:xqEFcO1uUaZ/keHtQkz9gVMWeDxs+zkzLNroyj9sjEI=
+github.com/robotn/xgb v0.0.0-20190910151114-b250faa511c2/go.mod h1:SxQhJskUJ4rleVU44YvnrdvxQr0tKy5SRSigBrCgyyQ=

keybind/xutil.go

@@ -61,7 +61,7 @@ func keyKeys(xu *xgbutil.XUtil) []xgbutil.KeyKey {
 
 	keys := make([]xgbutil.KeyKey, len(xu.Keybinds))
 	i := 0
-	for key, _ := range xu.Keybinds {
+	for key := range xu.Keybinds {
 		keys[i] = key
 		i++
 	}
@@ -100,7 +100,7 @@ func connectedKeyBind(xu *xgbutil.XUtil, evtype int, win xproto.Window) bool {
 
 	// Since we can't create a full key, loop through all key binds
 	// and check if evtype and window match.
-	for key, _ := range xu.Keybinds {
+	for key := range xu.Keybinds {
 		if key.Evtype == evtype && key.Win == win {
 			return true
 		}
@@ -121,7 +121,7 @@ func detachKeyBindWindow(xu *xgbutil.XUtil, evtype int, win xproto.Window) {
 
 	// Since we can't create a full key, loop through all key binds
 	// and check if evtype and window match.
-	for key, _ := range xu.Keybinds {
+	for key := range xu.Keybinds {
 		if key.Evtype == evtype && key.Win == win {
 			xu.Keygrabs[key] -= len(xu.Keybinds[key])
 			delete(xu.Keybinds, key)

mousebind/xutil.go

@@ -42,7 +42,7 @@ func mouseKeys(xu *xgbutil.XUtil) []xgbutil.MouseKey {
 
 	keys := make([]xgbutil.MouseKey, len(xu.Mousebinds))
 	i := 0
-	for key, _ := range xu.Mousebinds {
+	for key := range xu.Mousebinds {
 		keys[i] = key
 		i++
 	}
@@ -81,7 +81,7 @@ func connectedMouseBind(xu *xgbutil.XUtil, evtype int, win xproto.Window) bool {
 
 	// Since we can't create a full key, loop through all mouse binds
 	// and check if evtype and window match.
-	for key, _ := range xu.Mousebinds {
+	for key := range xu.Mousebinds {
 		if key.Evtype == evtype && key.Win == win {
 			return true
 		}
@@ -99,7 +99,7 @@ func detachMouseBindWindow(xu *xgbutil.XUtil, evtype int, win xproto.Window) {
 
 	// Since we can't create a full key, loop through all mouse binds
 	// and check if evtype and window match.
-	for key, _ := range xu.Mousebinds {
+	for key := range xu.Mousebinds {
 		if key.Evtype == evtype && key.Win == win {
 			xu.Mousegrabs[key] -= len(xu.Mousebinds[key])
 			delete(xu.Mousebinds, key)

xevent/xevent.go

@@ -219,7 +219,7 @@ func Detach(xu *xgbutil.XUtil, win xproto.Window) {
 	xu.CallbacksLck.Lock()
 	defer xu.CallbacksLck.Unlock()
 
-	for evtype, _ := range xu.Callbacks {
+	for evtype := range xu.Callbacks {
 		delete(xu.Callbacks[evtype], win)
 	}
 }