p/haven
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Provide access to the X display number in the XGB Conn.

Browse Source
This commit is contained in:
Andrew Gallant 2013-01-26 12:51:21 -05:00 committed by Přemysl Janouch
parent 269a7b9cc6
commit e635de5e1d
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nexgb/conn.go
View File

@ -141,8 +141,9 @@ func (c *Conn) dial(display string) error {
scr = display[dotIdx+1:]
}
dispnum, err := strconv.Atoi(c.display)
if err != nil || dispnum < 0 {
var err error
c.DisplayNumber, err = strconv.Atoi(c.display)
if err != nil || c.DisplayNumber < 0 {
return errors.New("bad display string: " + display0)
}
@ -160,7 +161,8 @@ func (c *Conn) dial(display string) error {
if protocol == "" {
protocol = "tcp"
}
c.conn, err = net.Dial(protocol, c.host+":"+strconv.Itoa(6000+dispnum))
c.conn, err = net.Dial(protocol,
c.host+":"+strconv.Itoa(6000+c.DisplayNumber))
} else {
c.conn, err = net.Dial("unix", "/tmp/.X11-unix/X"+c.display)
}

1
nexgb/xgb.go
View File

@ -49,6 +49,7 @@ type Conn struct {
host string
conn net.Conn
display string
DisplayNumber int
DefaultScreen int
SetupBytes []byte