Create x package

1 files changed, 42 insertions, 85 deletions

diff --git a/bar/bar.go b/bar/bar.go
index 43122d2..560f928 100644
--- a/bar/bar.go
+++ b/bar/bar.go
@@ -3,10 +3,13 @@ package bar // import "hhvn.uk/hbspbar/bar"
 import (
 	"fmt"
 	"sync"
+	"image"
 	"errors"
 
+	"hhvn.uk/hbspbar/config"
 	"hhvn.uk/hbspbar/common"
 	"hhvn.uk/hbspbar/bspc"
+	X "hhvn.uk/hbspbar/x"
 
 	"github.com/jezek/xgb"
 	"github.com/jezek/xgb/xproto"
@@ -15,113 +18,94 @@ import (
 	"github.com/jezek/xgbutil/icccm"
 	"github.com/jezek/xgbutil/ewmh"
 	"github.com/jezek/xgbutil/xgraphics"
-
-	"github.com/BurntSushi/freetype-go/freetype/truetype"
 )
 
-var conf = struct {
-	H        uint
-	Bg       uint32
-	Bg2      uint32
-	Bg3      uint32
-	Fg       uint32
-	FgDark   uint32
-	Sel      uint32
-	Urg      uint32
-	Font     string
-	FontSize float64
-	FontYPad int
-} { 	17,
-	0xff050a10,
-	0xff0c1726,
-	0xff14283c,
-	0xffeeeeee,
-	0xff444444,
-	0xff1b364b,
-	0xff90222b,
-	"/usr/share/fonts/TTF/DejaVuSansMono.ttf",
-	11.0, 1 }
 
 var bars     map[int]*bar
-var font     *truetype.Font
 var stoploop chan bool
 
 type bar struct {
-	X       *xgb.Conn
-	Xu      *xgbutil.XUtil
-	Scr     *xproto.ScreenInfo
 	Mon     *bspc.Monitor
 	w       xproto.Window
 	i       *xgraphics.Image
-	tw, th  int
-	tbpad   int
 	drawing sync.Mutex
 }
 
 func (b *bar) init() error {
 	var err error
 
-	go b.Mon.TopPadding(conf.H)
+	go b.Mon.TopPadding(config.H)
 
-	b.w, err = xproto.NewWindowId(b.X)
+	b.w, err = xproto.NewWindowId(X.X)
 	if err != nil {
 		return common.Perror("xproto.NewWindowId", err)
 	}
 
 	geom := b.Mon.Rectangle
-	xproto.CreateWindow(b.X, b.Scr.RootDepth, b.w, b.Scr.Root,
-		int16(geom.X), int16(geom.Y), uint16(geom.Width), uint16(conf.H), 0,
-		xproto.WindowClassInputOutput, b.Scr.RootVisual,
+	xproto.CreateWindow(X.X, X.Screen.RootDepth, b.w, X.Screen.Root,
+		int16(geom.X), int16(geom.Y), uint16(geom.Width), uint16(config.H), 0,
+		xproto.WindowClassInputOutput, X.Screen.RootVisual,
 		xproto.CwBackPixel|xproto.CwEventMask, []uint32{
-			conf.Bg,
+			config.Bg,
 			xproto.EventMaskStructureNotify })
 
 	class := icccm.WmClass{"hbspbar", "hbspbar"}
-	icccm.WmClassSet(b.Xu, b.w, &class)
+	icccm.WmClassSet(X.XU, b.w, &class)
 
-	ewmh.WmWindowTypeSet(b.Xu, b.w, []string{"_NET_WM_WINDOW_TYPE_DOCK"})
-	ewmh.WmStateSet(b.Xu, b.w, []string{"_NET_WM_STATE_STICKY", "_NET_WM_STATE_ABOVE"})
+	ewmh.WmWindowTypeSet(X.XU, b.w, []string{"_NET_WM_WINDOW_TYPE_DOCK"})
+	ewmh.WmStateSet(X.XU, b.w, []string{"_NET_WM_STATE_STICKY", "_NET_WM_STATE_ABOVE"})
 
-	err = xproto.MapWindowChecked(b.X, b.w).Check()
+	err = xproto.MapWindowChecked(X.X, b.w).Check()
 	if err != nil {
 		return common.Perror("xproto.MapWindow", err)
 	}
 
-	b.drawReInit()
-	b.tw, b.th, _ = b.i.Text(0, 0, int2BGRA(conf.Fg), conf.FontSize, font, "X")
-	b.tbpad = (int(conf.H) - b.th) / 2
+	b.reInit()
 
 	return nil
 }
 
+func (b *bar) reInit() {
+	X.GraphicReInit(&b.i, image.Rect(0, 0,
+		int(b.Mon.Rectangle.Width), int(config.H)))
+}
+
+func (b *bar) drawText(x int, col uint32, text string) (int, error) {
+	return X.DrawText(b.i, x, col, text)
+}
+
+func (b *bar) drawRect(x, y, w, h int, c uint32, fill bool) {
+	X.DrawRect(b.i, x, y, w, h, c, fill)
+}
+
 func (b *bar) draw() {
 	var bg     uint32
 	var filled bool
 
 	b.drawing.Lock()
-	b.drawReInit()
+	b.reInit()
 
 	// Dimensions of drawing space
 	cx := 0
 	w  := int(b.Mon.Rectangle.Width)
-	h  := int(conf.H)
+	h  := int(config.H)
 
 
 	// Draw background
-	b.drawRect(0, 0, w, h, conf.Bg, true)
+	b.drawRect(0, 0, w, h, config.Bg, true)
 
 	// Monitor
 	montext := b.Mon.Name
-	monw    := 6 + b.textWidth(montext) + 8
+	monw    := 6 + X.TextWidth(montext) + 8
 
 	if b.Mon.Focused {
-		bg = conf.Sel
+		bg = config.Sel
 	} else {
-		bg = conf.Bg2
+		bg = config.Bg2
 	}
 
 	b.drawRect(cx, 0, monw, h, bg, true)
-	b.drawText(cx + 6, conf.Fg, montext)
+	b.drawText(cx + 6, config.Fg, montext)
 	cx += monw
 
 	// Desktops
@@ -130,7 +114,7 @@ func (b *bar) draw() {
 	dw   := 4 + (4 + boxw + 2 + 3) * ds + 5
 
 	for i := 0; i < ds; i++ {
-		dw += b.textWidth(b.Mon.Desktops[i].Name)
+		dw += X.TextWidth(b.Mon.Desktops[i].Name)
 	}
 
 	cx += 4
@@ -140,16 +124,16 @@ func (b *bar) draw() {
 		cx += 5
 
 		if d.Focused {
-			bg = conf.Sel
+			bg = config.Sel
 		} else {
-			bg = conf.FgDark
+			bg = config.FgDark
 		}
 
 		filled = d.Root != nil
 
 		b.drawRect(cx, 3, boxw, h - 7, bg, filled)
 		cx += boxw + 2
-		ax, _ := b.drawText(cx, conf.Fg, d.Name)
+		ax, _ := b.drawText(cx, config.Fg, d.Name)
 		cx += ax + 2
 	}
 	cx += 5
@@ -165,7 +149,7 @@ func (b *bar) destroy() {
 	if (b.Mon != nil) {
 		b.Mon.TopPadding(0)
 	}
-	xproto.DestroyWindow(b.X, b.w)
+	xproto.DestroyWindow(X.X, b.w)
 }
 
 type eventwrap struct {
@@ -181,33 +165,9 @@ type handle struct {
 	Err      chan error
 }
 
-var InitErr error
 var Handle  handle
 
 func init() {
-	InitErr = nil
-
-	x, err := xgb.NewConn()
-	if err != nil {
-		InitErr = err
-		return
-	}
-
-	xu, err := xgbutil.NewConnXgb(x)
-	if err != nil {
-		InitErr = err
-		return
-	}
-
-	font, err = getFont(conf.Font)
-	if err != nil {
-		InitErr = err
-		return
-	}
-
-	setup  := xproto.Setup(x)
-	screen := setup.DefaultScreen(x)
-
 	var state *bspc.State
 	state = nil
 
@@ -221,7 +181,7 @@ func init() {
 	xstop    := make(chan bool, 1)
 
 	go func() { for {
-		ev, err := x.WaitForEvent()
+		ev, err := X.X.WaitForEvent()
 		w := eventwrap{ev, err}
 
 		select {
@@ -250,7 +210,7 @@ func init() {
 				}
 
 				if e.Err != nil {
-					common.Perror("x.WaitForEvents", err)
+					common.Perror("X.WaitForEvents", e.Err)
 					continue
 				}
 
@@ -269,7 +229,7 @@ func init() {
 					return
 				}
 				if _, ok := bars[id]; ok { break }
-				if err := create(x, xu, screen, state.GetMon(id)); err != nil {
+				if err := create(X.X, X.XU, X.Screen, state.GetMon(id)); err != nil {
 					Handle.Err <- fmt.Errorf("Couldn't create window: %s\n", err)
 					return
 				}
@@ -291,9 +251,6 @@ func create(x *xgb.Conn, xu *xgbutil.XUtil,
 		scr *xproto.ScreenInfo, m *bspc.Monitor) (error) {
 	var b bar
 
-	b.X   = x
-	b.Xu  = xu
-	b.Scr = scr
 	b.Mon = m
 	b.i   = nil