Change project layout to make easier debug / tests"

vendor/github.com/BurntSushi/xgb/README

@@ -1,8 +1,3 @@
-Note that this project is largely unmaintained as I don't have the time to do
-or support more development. Please consider using this fork instead:
-https://github.com/jezek/xgb
-
-
 XGB is the X Go Binding, which is a low-level API to communicate with the
 core X protocol and many of the X extensions. It is closely modeled after
 XCB and xpyb.
@@ -25,7 +20,7 @@ BurntSushi's Fork
 I've forked the XGB repository from Google Code due to inactivty upstream.
 
 Godoc documentation can be found here:
-https://godoc.org/github.com/BurntSushi/xgb
+http://godoc.burntsushi.net/pkg/github.com/BurntSushi/xgb/
 
 Much of the code has been rewritten in an effort to support thread safety
 and multiple extensions. Namely, go_client.py has been thrown away in favor

vendor/github.com/BurntSushi/xgb/conn.go

@@ -168,14 +168,13 @@ func (c *Conn) dial(display string) error {
 	// Connect to server
 	if len(socket) != 0 {
 		c.conn, err = net.Dial("unix", socket+":"+c.display)
-	} else if len(c.host) != 0 && c.host != "unix" {
+	} else if len(c.host) != 0 {
 		if protocol == "" {
 			protocol = "tcp"
 		}
 		c.conn, err = net.Dial(protocol,
 			c.host+":"+strconv.Itoa(6000+c.DisplayNumber))
 	} else {
-		c.host = ""
 		c.conn, err = net.Dial("unix", "/tmp/.X11-unix/X"+c.display)
 	}
 

vendor/github.com/BurntSushi/xgbutil/README

@@ -1,18 +1,18 @@
-xgbutil is a utility library designed to work with the X Go Binding. This
-project's main goal is to make various X related tasks easier. For example,
-binding keys, using the EWMH or ICCCM specs with the window manager,
+xgbutil is a utility library designed to work with the X Go Binding. This 
+project's main goal is to make various X related tasks easier. For example, 
+binding keys, using the EWMH or ICCCM specs with the window manager, 
 moving/resizing windows, assigning function callbacks to particular events,
 drawing images to a window, etc.
 
-xgbutil attempts to be thread safe, but it has not been completely tested in
-this regard. In general, the X event loop implemented in the xevent package is
-sequential. The idea is to be sequential by default, and let the user spawn
-concurrent code at their discretion. (i.e., the complexity of making the main
+xgbutil attempts to be thread safe, but it has not been completely tested in 
+this regard. In general, the X event loop implemented in the xevent package is 
+sequential. The idea is to be sequential by default, and let the user spawn 
+concurrent code at their discretion. (i.e., the complexity of making the main 
 event loop generally concurrent is vast.)
 
 You may sleep safely at night by assuming that XGB is thread safe, though.
 
-To start using xgbutil, you should have at least a passing familiarity with X.
+To start using xgbutil, you should have at least a passing familiarity with X. 
 Your first stop should be the examples directory.
 
 Installation
@@ -31,24 +31,29 @@ Quick Example
 go get github.com/BurntSushi/xgbutil/_examples/window-name-sizes
 "$GOPATH"/bin/window-name-sizes
 
-The output will be a list of names of all top-level windows and their geometry
-including window manager decorations. (Assuming your window manager supports
+The output will be a list of names of all top-level windows and their geometry 
+including window manager decorations. (Assuming your window manager supports 
 some basic EWMH properties.)
 
 Documentation
 =============
-https://godoc.org/github.com/BurntSushi/xgbutil
+gopkgdoc is well-suited to provide documentation for xgbutil. Its cross-package 
+hyperlinking on types is also extremely useful, since much of xgbutil relies on 
+XGB.
+
+With that said, documentation is also hosted here: 
+http://godoc.burntsushi.net/pkg/github.com/BurntSushi/xgbutil/
 
 Examples
 ========
-There are several examples in the examples directory covering common use cases.
+There are several examples in the examples directory covering common use cases. 
 They are heavily documented and should run out of the box.
 
 Python
 ======
-An older project of mine, xpybutil, served as inspiration for xgbutil. If you
-want to use Python, xpybutil should help quite a bit. Please note though, that
-at this point, xgbutil provides a lot more functionality and is much better
+An older project of mine, xpybutil, served as inspiration for xgbutil. If you 
+want to use Python, xpybutil should help quite a bit. Please note though, that 
+at this point, xgbutil provides a lot more functionality and is much better 
 documented.
 
 xpybutil project URL: https://github.com/BurntSushi/xpybutil