diff --git a/README.md b/README.md index fbea680..61f02ac 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ melonbar - A concurrent, hackable bar/panel for X written in Go. +![](https://punpun.xyz/54c7.png) + ## INSTALLATION diff --git a/bar.go b/bar.go index eff9ca6..3364e0c 100644 --- a/bar.go +++ b/bar.go @@ -127,7 +127,6 @@ func initBar(x, y, w, h int, font string, fontSize float64) (*Bar, var block *Block bar.block.Range(func(val, i interface{}) bool { block = i.(*Block) - fmt.Println(val) if ev.EventX > int16(block.x) && ev.EventX < int16( block.x+block.w) { return false @@ -142,7 +141,7 @@ func initBar(x, y, w, h int, font string, fontSize float64) (*Bar, return bar, nil } -func (bar *Bar) paint(block *Block) error { +func (bar *Bar) draw(block *Block) error { // Calculate the required x coordinate for the different // aligments. tw, _ := xgraphics.Extents(bar.font, bar.fontSize, block.txt) diff --git a/blocks.go b/blocks.go index 10ac305..eb5d433 100644 --- a/blocks.go +++ b/blocks.go @@ -259,7 +259,7 @@ func (bar *Bar) workspaceFun() { blockwww := bar.initBlock("www", "www", 74, 'c', 0, "#5394C9", "#FFFFFF") blockwww.actions["button1"] = func() { - if err := ewmh.CurrentDesktopReq(bar.xu, 1); err != nil { + if err := ewmh.CurrentDesktopReq(bar.xu, 0); err != nil { log.Println(err) } } @@ -275,7 +275,7 @@ func (bar *Bar) workspaceFun() { blocksrc := bar.initBlock("src", "src", 70, 'c', 0, "#5394C9", "#FFFFFF") blocksrc.actions["button1"] = func() { - if err := ewmh.CurrentDesktopReq(bar.xu, 1); err != nil { + if err := ewmh.CurrentDesktopReq(bar.xu, 2); err != nil { log.Println(err) } } diff --git a/main.go b/main.go index 06e35d7..0a9ac03 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ func main() { time.Sleep(time.Millisecond) for { - if err := bar.paint(<-bar.redraw); err != nil { + if err := bar.draw(<-bar.redraw); err != nil { log.Fatal(err) } }