From a1d1151017ada36a0431969e3e05f35f1dd6204f Mon Sep 17 00:00:00 2001
From: fangyuanziti <tiziyuanfang@gmail.com>
Date: Sun, 22 Feb 2015 20:22:38 +0800
Subject: add a new api: NewConnNet

---
 nexgb/conn.go | 11 +++++++++++
 nexgb/xgb.go  | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'nexgb')

diff --git a/nexgb/conn.go b/nexgb/conn.go
index 41ba5a8..1b7d838 100644
--- a/nexgb/conn.go
+++ b/nexgb/conn.go
@@ -29,6 +29,17 @@ func (c *Conn) connect(display string) error {
 		return err
 	}
 
+	return c.postConnect()
+}
+
+// connect init from to the net.Conn,
+func (c *Conn) connectNet(netConn net.Conn) error {
+	c.conn = netConn
+	return c.postConnect()
+}
+
+// do the postConnect action after Conn get it's underly net.Conn
+func (c *Conn) postConnect() error {
 	// Get authentication data
 	authName, authData, err := readAuthority(c.host, c.display)
 	noauth := false
diff --git a/nexgb/xgb.go b/nexgb/xgb.go
index 3c7964c..4403ea0 100644
--- a/nexgb/xgb.go
+++ b/nexgb/xgb.go
@@ -98,6 +98,26 @@ func NewConnDisplay(display string) (*Conn, error) {
 		return nil, err
 	}
 
+	return postNewConn(conn)
+}
+
+// NewConnDisplay is just like NewConn, but allows a specific net.Conn
+// to be used.
+func NewConnNet(netConn net.Conn) (*Conn, error) {
+	conn := &Conn{}
+
+	// First connect. This reads authority, checks DISPLAY environment
+	// variable, and loads the initial Setup info.
+	err := conn.connectNet(netConn)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return postNewConn(conn)
+}
+
+func postNewConn(conn *Conn) (*Conn, error) {
 	conn.Extensions = make(map[string]byte)
 
 	conn.cookieChan = make(chan *Cookie, cookieBuffer)
-- 
cgit v1.2.3-70-g09d2