Reorganize bar/bar.go

1 files changed, 27 insertions, 27 deletions

diff --git a/bar/bar.go b/bar/bar.go
index 0b9c271..9660844 100644
--- a/bar/bar.go
+++ b/bar/bar.go
@@ -28,7 +28,25 @@ type bar struct {
 	redraw  chan drawinfo
 }
 
-func (b *bar) init(state *bspc.State) error {
+func create(state *bspc.State, id int) (error) {
+	var b bar
+
+	if err := b.init(id, state); err != nil {
+		return err
+	}
+
+	if bars == nil {
+		bars = make(map[int]*bar)
+	}
+
+	bars[b.id] = &b
+	return nil
+}
+ 
+func (b *bar) init(id int, state *bspc.State) error {
+	b.id = id
+	b.i  = nil
+
 	mon, err := b.getmon(state)
 	if err != nil { return err }
 
@@ -61,6 +79,14 @@ func (b *bar) init(state *bspc.State) error {
 	return nil
 }
 
+func (b *bar) destroy(state *bspc.State) {
+	close(b.redraw)
+	mon, _ := b.getmon(state)
+	if (mon != nil) {
+		mon.TopPadding(0)
+	}
+}
+
 func (b bar) getmon(state *bspc.State) (*bspc.Monitor, error) {
 	return state.GetMon(b.id)
 }
@@ -166,14 +192,6 @@ func (b bar) draw(d drawinfo) {
 	b.w.Paint(b.i)
 }
 
-func (b *bar) destroy(state *bspc.State) {
-	close(b.redraw)
-	mon, _ := b.getmon(state)
-	if (mon != nil) {
-		mon.TopPadding(0)
-	}
-}
-
 var Create   = make(chan int)
 var Destroy  = make(chan int)
 var NewState = make(chan *bspc.State)
@@ -241,24 +259,6 @@ func init() {
 	}()
 }
 
-func create(state *bspc.State, id int) (error) {
-	var b bar
-
-	b.id = id
-	b.i  = nil
-
-	if err := b.init(state); err != nil {
-		return err
-	}
-
-	if bars == nil {
-		bars = make(map[int]*bar)
-	}
-
-	bars[b.id] = &b
-	return nil
-}
-
 func Cleanup() {
 	if finalstate != nil {
 		for _, b := range bars {