From 7aa2601e66155f841fe39ebaa83323969d7849bc Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sat, 8 Sep 2018 19:57:27 +0200 Subject: nexgb: rewrite import paths --- nexgb/bigreq/bigreq.go | 4 ++-- nexgb/composite/composite.go | 6 +++--- nexgb/damage/damage.go | 6 +++--- nexgb/doc.go | 8 ++++---- nexgb/dpms/dpms.go | 4 ++-- nexgb/dri2/dri2.go | 4 ++-- nexgb/examples/atoms/main.go | 4 ++-- nexgb/examples/create-window/main.go | 4 ++-- nexgb/examples/doc.go | 2 +- nexgb/examples/get-active-window/main.go | 4 ++-- nexgb/examples/randr/main.go | 6 +++--- nexgb/examples/xinerama/main.go | 4 ++-- nexgb/ge/ge.go | 4 ++-- nexgb/glx/glx.go | 4 ++-- nexgb/randr/randr.go | 6 +++--- nexgb/record/record.go | 4 ++-- nexgb/render/render.go | 4 ++-- nexgb/res/res.go | 4 ++-- nexgb/screensaver/screensaver.go | 4 ++-- nexgb/shape/shape.go | 4 ++-- nexgb/shm/shm.go | 4 ++-- nexgb/xcmisc/xcmisc.go | 4 ++-- nexgb/xevie/xevie.go | 4 ++-- nexgb/xf86dri/xf86dri.go | 4 ++-- nexgb/xf86vidmode/xf86vidmode.go | 4 ++-- nexgb/xfixes/xfixes.go | 8 ++++---- nexgb/xgbgen/context.go | 6 +++--- nexgb/xinerama/xinerama.go | 4 ++-- nexgb/xprint/xprint.go | 4 ++-- nexgb/xproto/xproto.go | 2 +- nexgb/xproto/xproto_test.go | 2 +- nexgb/xselinux/xselinux.go | 4 ++-- nexgb/xtest/xtest.go | 4 ++-- nexgb/xv/xv.go | 6 +++--- nexgb/xvmc/xvmc.go | 6 +++--- 35 files changed, 78 insertions(+), 78 deletions(-) diff --git a/nexgb/bigreq/bigreq.go b/nexgb/bigreq/bigreq.go index 6590376..d045d7f 100644 --- a/nexgb/bigreq/bigreq.go +++ b/nexgb/bigreq/bigreq.go @@ -4,9 +4,9 @@ package bigreq // This file is automatically generated from bigreq.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the BIG-REQUESTS extension. diff --git a/nexgb/composite/composite.go b/nexgb/composite/composite.go index 1373f8b..a7047d0 100644 --- a/nexgb/composite/composite.go +++ b/nexgb/composite/composite.go @@ -4,10 +4,10 @@ package composite // This file is automatically generated from composite.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xfixes" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xfixes" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the Composite extension. diff --git a/nexgb/damage/damage.go b/nexgb/damage/damage.go index 26eca04..d83246c 100644 --- a/nexgb/damage/damage.go +++ b/nexgb/damage/damage.go @@ -4,10 +4,10 @@ package damage // This file is automatically generated from damage.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xfixes" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xfixes" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the DAMAGE extension. diff --git a/nexgb/doc.go b/nexgb/doc.go index a587d4c..90f3cea 100644 --- a/nexgb/doc.go +++ b/nexgb/doc.go @@ -21,8 +21,8 @@ accompanying documentation can be found in examples/create-window. import ( "fmt" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xproto" ) func main() { @@ -72,8 +72,8 @@ can be found in examples/xinerama. import ( "fmt" "log" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xinerama" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xinerama" ) func main() { diff --git a/nexgb/dpms/dpms.go b/nexgb/dpms/dpms.go index 4bf5883..64aa176 100644 --- a/nexgb/dpms/dpms.go +++ b/nexgb/dpms/dpms.go @@ -4,9 +4,9 @@ package dpms // This file is automatically generated from dpms.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the DPMS extension. diff --git a/nexgb/dri2/dri2.go b/nexgb/dri2/dri2.go index 820cf2b..30dd60c 100644 --- a/nexgb/dri2/dri2.go +++ b/nexgb/dri2/dri2.go @@ -4,9 +4,9 @@ package dri2 // This file is automatically generated from dri2.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the DRI2 extension. diff --git a/nexgb/examples/atoms/main.go b/nexgb/examples/atoms/main.go index 8985768..a416ee1 100644 --- a/nexgb/examples/atoms/main.go +++ b/nexgb/examples/atoms/main.go @@ -9,8 +9,8 @@ import ( "runtime/pprof" "time" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xproto" ) var ( diff --git a/nexgb/examples/create-window/main.go b/nexgb/examples/create-window/main.go index 73a0099..64c1d64 100644 --- a/nexgb/examples/create-window/main.go +++ b/nexgb/examples/create-window/main.go @@ -7,8 +7,8 @@ package main import ( "fmt" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xproto" ) func main() { diff --git a/nexgb/examples/doc.go b/nexgb/examples/doc.go index 80ea5b7..e18180b 100644 --- a/nexgb/examples/doc.go +++ b/nexgb/examples/doc.go @@ -11,7 +11,7 @@ to events. If you're looking to query information about your window manager, get-active-window is a start. However, to do anything extensive requires a lot of boiler plate. To that end, I'd recommend use of my higher level -library, xgbutil: https://github.com/BurntSushi/xgbutil +library, xgbutil: https://janouch.name/haven/nexgbutil There are also examples of using the Xinerama and RandR extensions, if you're interested in querying information about your active heads. In RandR's case, diff --git a/nexgb/examples/get-active-window/main.go b/nexgb/examples/get-active-window/main.go index 48e020c..a54f106 100644 --- a/nexgb/examples/get-active-window/main.go +++ b/nexgb/examples/get-active-window/main.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xproto" ) func main() { diff --git a/nexgb/examples/randr/main.go b/nexgb/examples/randr/main.go index e349144..b41e653 100644 --- a/nexgb/examples/randr/main.go +++ b/nexgb/examples/randr/main.go @@ -14,9 +14,9 @@ import ( "fmt" "log" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/randr" - "github.com/BurntSushi/xgb/xproto" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/randr" + "janouch.name/haven/nexgb/xproto" ) func main() { diff --git a/nexgb/examples/xinerama/main.go b/nexgb/examples/xinerama/main.go index 896bb63..aea8ead 100644 --- a/nexgb/examples/xinerama/main.go +++ b/nexgb/examples/xinerama/main.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xinerama" + xgb "janouch.name/haven/nexgb" + "janouch.name/haven/nexgb/xinerama" ) func main() { diff --git a/nexgb/ge/ge.go b/nexgb/ge/ge.go index f7e1ce4..b2bffdd 100644 --- a/nexgb/ge/ge.go +++ b/nexgb/ge/ge.go @@ -4,9 +4,9 @@ package ge // This file is automatically generated from ge.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the Generic Event Extension extension. diff --git a/nexgb/glx/glx.go b/nexgb/glx/glx.go index 0ecc3b5..9a03429 100644 --- a/nexgb/glx/glx.go +++ b/nexgb/glx/glx.go @@ -4,9 +4,9 @@ package glx // This file is automatically generated from glx.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the GLX extension. diff --git a/nexgb/randr/randr.go b/nexgb/randr/randr.go index d280e95..bb7bc61 100644 --- a/nexgb/randr/randr.go +++ b/nexgb/randr/randr.go @@ -4,10 +4,10 @@ package randr // This file is automatically generated from randr.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/render" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/render" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the RANDR extension. diff --git a/nexgb/record/record.go b/nexgb/record/record.go index 1cb022b..fd04dc7 100644 --- a/nexgb/record/record.go +++ b/nexgb/record/record.go @@ -4,9 +4,9 @@ package record // This file is automatically generated from record.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the RECORD extension. diff --git a/nexgb/render/render.go b/nexgb/render/render.go index 01ea481..fdd9d41 100644 --- a/nexgb/render/render.go +++ b/nexgb/render/render.go @@ -4,9 +4,9 @@ package render // This file is automatically generated from render.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the RENDER extension. diff --git a/nexgb/res/res.go b/nexgb/res/res.go index 0ad0389..b97f562 100644 --- a/nexgb/res/res.go +++ b/nexgb/res/res.go @@ -4,9 +4,9 @@ package res // This file is automatically generated from res.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the X-Resource extension. diff --git a/nexgb/screensaver/screensaver.go b/nexgb/screensaver/screensaver.go index 0e9511f..eb128cf 100644 --- a/nexgb/screensaver/screensaver.go +++ b/nexgb/screensaver/screensaver.go @@ -4,9 +4,9 @@ package screensaver // This file is automatically generated from screensaver.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the MIT-SCREEN-SAVER extension. diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go index 7069f7e..3a4af24 100644 --- a/nexgb/shape/shape.go +++ b/nexgb/shape/shape.go @@ -4,9 +4,9 @@ package shape // This file is automatically generated from shape.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the SHAPE extension. diff --git a/nexgb/shm/shm.go b/nexgb/shm/shm.go index b310c34..cad726a 100644 --- a/nexgb/shm/shm.go +++ b/nexgb/shm/shm.go @@ -4,9 +4,9 @@ package shm // This file is automatically generated from shm.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the MIT-SHM extension. diff --git a/nexgb/xcmisc/xcmisc.go b/nexgb/xcmisc/xcmisc.go index 1778057..71cc078 100644 --- a/nexgb/xcmisc/xcmisc.go +++ b/nexgb/xcmisc/xcmisc.go @@ -4,9 +4,9 @@ package xcmisc // This file is automatically generated from xc_misc.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XC-MISC extension. diff --git a/nexgb/xevie/xevie.go b/nexgb/xevie/xevie.go index 180312b..6a3637d 100644 --- a/nexgb/xevie/xevie.go +++ b/nexgb/xevie/xevie.go @@ -4,9 +4,9 @@ package xevie // This file is automatically generated from xevie.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XEVIE extension. diff --git a/nexgb/xf86dri/xf86dri.go b/nexgb/xf86dri/xf86dri.go index 06f49a0..dec6b37 100644 --- a/nexgb/xf86dri/xf86dri.go +++ b/nexgb/xf86dri/xf86dri.go @@ -4,9 +4,9 @@ package xf86dri // This file is automatically generated from xf86dri.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XFree86-DRI extension. diff --git a/nexgb/xf86vidmode/xf86vidmode.go b/nexgb/xf86vidmode/xf86vidmode.go index 22e236f..fd9d70f 100644 --- a/nexgb/xf86vidmode/xf86vidmode.go +++ b/nexgb/xf86vidmode/xf86vidmode.go @@ -4,9 +4,9 @@ package xf86vidmode // This file is automatically generated from xf86vidmode.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XFree86-VidModeExtension extension. diff --git a/nexgb/xfixes/xfixes.go b/nexgb/xfixes/xfixes.go index 440c3fd..7716d09 100644 --- a/nexgb/xfixes/xfixes.go +++ b/nexgb/xfixes/xfixes.go @@ -4,11 +4,11 @@ package xfixes // This file is automatically generated from xfixes.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/render" - "github.com/BurntSushi/xgb/shape" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/render" + "janouch.name/haven/nexgb/shape" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XFIXES extension. diff --git a/nexgb/xgbgen/context.go b/nexgb/xgbgen/context.go index 0728b64..8c658e6 100644 --- a/nexgb/xgbgen/context.go +++ b/nexgb/xgbgen/context.go @@ -79,10 +79,10 @@ func (c *Context) Morph(xmlBytes []byte) { // Write imports. We always need to import at least xgb. // We also need to import xproto if it's an extension. c.Putln("import (") - c.Putln("\"github.com/BurntSushi/xgb\"") + c.Putln("xgb \"janouch.name/haven/nexgb\"") c.Putln("") if c.protocol.isExt() { - c.Putln("\"github.com/BurntSushi/xgb/xproto\"") + c.Putln("\"janouch.name/haven/nexgb/xproto\"") } sort.Sort(Protocols(c.protocol.Imports)) @@ -91,7 +91,7 @@ func (c *Context) Morph(xmlBytes []byte) { if imp.Name == "xproto" { continue } - c.Putln("\"github.com/BurntSushi/xgb/%s\"", imp.Name) + c.Putln("\"janouch.name/haven/nexgb/%s\"", imp.Name) } c.Putln(")") c.Putln("") diff --git a/nexgb/xinerama/xinerama.go b/nexgb/xinerama/xinerama.go index ec97406..fe4f164 100644 --- a/nexgb/xinerama/xinerama.go +++ b/nexgb/xinerama/xinerama.go @@ -4,9 +4,9 @@ package xinerama // This file is automatically generated from xinerama.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XINERAMA extension. diff --git a/nexgb/xprint/xprint.go b/nexgb/xprint/xprint.go index 330003d..7616845 100644 --- a/nexgb/xprint/xprint.go +++ b/nexgb/xprint/xprint.go @@ -4,9 +4,9 @@ package xprint // This file is automatically generated from xprint.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XpExtension extension. diff --git a/nexgb/xproto/xproto.go b/nexgb/xproto/xproto.go index 237f3cb..b18315f 100644 --- a/nexgb/xproto/xproto.go +++ b/nexgb/xproto/xproto.go @@ -4,7 +4,7 @@ package xproto // This file is automatically generated from xproto.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" ) // Setup parses the setup bytes retrieved when diff --git a/nexgb/xproto/xproto_test.go b/nexgb/xproto/xproto_test.go index a5bec71..9e327a8 100644 --- a/nexgb/xproto/xproto_test.go +++ b/nexgb/xproto/xproto_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" ) // The X connection used throughout testing. diff --git a/nexgb/xselinux/xselinux.go b/nexgb/xselinux/xselinux.go index c237857..7265c26 100644 --- a/nexgb/xselinux/xselinux.go +++ b/nexgb/xselinux/xselinux.go @@ -4,9 +4,9 @@ package xselinux // This file is automatically generated from xselinux.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the SELinux extension. diff --git a/nexgb/xtest/xtest.go b/nexgb/xtest/xtest.go index 182760e..bf961f7 100644 --- a/nexgb/xtest/xtest.go +++ b/nexgb/xtest/xtest.go @@ -4,9 +4,9 @@ package xtest // This file is automatically generated from xtest.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XTEST extension. diff --git a/nexgb/xv/xv.go b/nexgb/xv/xv.go index 69a0549..df81bac 100644 --- a/nexgb/xv/xv.go +++ b/nexgb/xv/xv.go @@ -4,10 +4,10 @@ package xv // This file is automatically generated from xv.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/shm" - "github.com/BurntSushi/xgb/xproto" + "janouch.name/haven/nexgb/shm" + "janouch.name/haven/nexgb/xproto" ) // Init must be called before using the XVideo extension. diff --git a/nexgb/xvmc/xvmc.go b/nexgb/xvmc/xvmc.go index b943fa0..b05f952 100644 --- a/nexgb/xvmc/xvmc.go +++ b/nexgb/xvmc/xvmc.go @@ -4,10 +4,10 @@ package xvmc // This file is automatically generated from xvmc.xml. Edit at your peril! import ( - "github.com/BurntSushi/xgb" + xgb "janouch.name/haven/nexgb" - "github.com/BurntSushi/xgb/xproto" - "github.com/BurntSushi/xgb/xv" + "janouch.name/haven/nexgb/xproto" + "janouch.name/haven/nexgb/xv" ) // Init must be called before using the XVideo-MotionCompensation extension. -- cgit v1.2.3-70-g09d2