Skip to content

Xgb patch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stolyaroleh merged 3 commits into from
Sep 20, 2017
Merged

Xgb patch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fce993
Patch xgb
Sep 20, 2017
bd334b9
Replace BurntSushi with wwfx in xgbgen
Sep 20, 2017
f2cdc1c
Regenerate bindings using xcb-proto 1.11
Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
# necessary, but it's a good idea to make sure each sub-package is a valid
# Go package.

# My path to the X protocol XML descriptions.
ifndef XPROTO
# Path to the X protocol XML descriptions.
XPROTO=/usr/share/xcb
endif

# All of the XML files in my /usr/share/xcb directory EXCEPT XKB. -_-
# This is intended to build xgbgen and generate Go code for each supported
Expand Down
4 changes: 2 additions & 2 deletions bigreq/bigreq.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package bigreq
// This file is automatically generated from bigreq.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the BIG-REQUESTS extension.
Expand Down
6 changes: 3 additions & 3 deletions composite/composite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ package composite
// This file is automatically generated from composite.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xfixes"
"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xfixes"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the Composite extension.
Expand Down
6 changes: 6 additions & 0 deletions cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ func (c Cookie) replyChecked() ([]byte, error) {
return reply, nil
case err := <-c.errorChan:
return nil, err
case <-c.conn.done:
return nil, errors.New("X connection was closed")
}
}

Expand All @@ -121,6 +123,8 @@ func (c Cookie) replyUnchecked() ([]byte, error) {
return reply, nil
case <-c.pingChan:
return nil, nil
case <-c.conn.done:
return nil, errors.New("X connection was closed")
}
}

Expand Down Expand Up @@ -161,5 +165,7 @@ func (c Cookie) Check() error {
return err
case <-c.pingChan:
return nil
case <-c.conn.done:
return errors.New("X connection was closed")
}
}
6 changes: 3 additions & 3 deletions damage/damage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ package damage
// This file is automatically generated from damage.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xfixes"
"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xfixes"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the DAMAGE extension.
Expand Down
4 changes: 2 additions & 2 deletions dpms/dpms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package dpms
// This file is automatically generated from dpms.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the DPMS extension.
Expand Down
4 changes: 2 additions & 2 deletions dri2/dri2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package dri2
// This file is automatically generated from dri2.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the DRI2 extension.
Expand Down
4 changes: 2 additions & 2 deletions ge/ge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package ge
// This file is automatically generated from ge.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the Generic Event Extension extension.
Expand Down
4 changes: 2 additions & 2 deletions glx/glx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package glx
// This file is automatically generated from glx.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the GLX extension.
Expand Down
6 changes: 3 additions & 3 deletions randr/randr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ package randr
// This file is automatically generated from randr.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/render"
"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/render"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the RANDR extension.
Expand Down
4 changes: 2 additions & 2 deletions record/record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package record
// This file is automatically generated from record.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the RECORD extension.
Expand Down
4 changes: 2 additions & 2 deletions render/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package render
// This file is automatically generated from render.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the RENDER extension.
Expand Down
4 changes: 2 additions & 2 deletions res/res.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package res
// This file is automatically generated from res.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the X-Resource extension.
Expand Down
4 changes: 2 additions & 2 deletions screensaver/screensaver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package screensaver
// This file is automatically generated from screensaver.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the MIT-SCREEN-SAVER extension.
Expand Down
4 changes: 2 additions & 2 deletions shape/shape.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package shape
// This file is automatically generated from shape.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the SHAPE extension.
Expand Down
4 changes: 2 additions & 2 deletions shm/shm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package shm
// This file is automatically generated from shm.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the MIT-SHM extension.
Expand Down
4 changes: 2 additions & 2 deletions xcmisc/xcmisc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package xcmisc
// This file is automatically generated from xc_misc.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the XC-MISC extension.
Expand Down
4 changes: 2 additions & 2 deletions xevie/xevie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package xevie
// This file is automatically generated from xevie.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the XEVIE extension.
Expand Down
4 changes: 2 additions & 2 deletions xf86dri/xf86dri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package xf86dri
// This file is automatically generated from xf86dri.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the XFree86-DRI extension.
Expand Down
4 changes: 2 additions & 2 deletions xf86vidmode/xf86vidmode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package xf86vidmode
// This file is automatically generated from xf86vidmode.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the XFree86-VidModeExtension extension.
Expand Down
8 changes: 4 additions & 4 deletions xfixes/xfixes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ package xfixes
// This file is automatically generated from xfixes.xml. Edit at your peril!

import (
"github.com/BurntSushi/xgb"
"github.com/wwfx/xgb"

"github.com/BurntSushi/xgb/render"
"github.com/BurntSushi/xgb/shape"
"github.com/BurntSushi/xgb/xproto"
"github.com/wwfx/xgb/render"
"github.com/wwfx/xgb/shape"
"github.com/wwfx/xgb/xproto"
)

// Init must be called before using the XFIXES extension.
Expand Down
Loading