Drawing desktops

1 files changed, 29 insertions, 11 deletions

diff --git a/bspc/bspc.go b/bspc/bspc.go
index f88d839..4c5f9e7 100644
--- a/bspc/bspc.go
+++ b/bspc/bspc.go
@@ -12,7 +12,8 @@ import (
 )
 
 type State struct {
-	Monitors []*Monitor
+	Monitors         []*Monitor
+	FocusedMonitorID int
 }
 
 func (s *State) GetMon(id int) (*Monitor) {
@@ -26,9 +27,12 @@ func (s *State) GetMon(id int) (*Monitor) {
 }
 
 type Monitor struct {
-	ID        int
-	Rectangle *Rect
-	Desktops  []*Desktop
+	Focused          bool
+	ID               int 
+	Name             string
+	Rectangle        *Rect
+	Desktops         []*Desktop
+	FocusedDesktopID int
 }
 
 func (m *Monitor) TopPadding(px uint) {
@@ -59,9 +63,18 @@ type Rect struct {
 	Height uint
 }
 
+type Node struct {
+	ID          int
+	FirstChild  *Node
+	SecondChild *Node
+}
+
 type Desktop struct {
-	Name   string
-	Layout string
+	Focused bool
+	Name    string
+	Layout  string
+	ID      int
+	Root    *Node
 }
 
 func LoadState() (*State, error) {
@@ -91,6 +104,14 @@ func LoadState() (*State, error) {
 		return nil, common.Perror("json.Unmarshal", err)
 	}
 
+	for _, m := range state.Monitors {
+		m.Focused = m.ID == state.FocusedMonitorID
+
+		for _, d := range m.Desktops {
+			d.Focused = d.ID == m.FocusedDesktopID
+		}
+	}
+
 	return &state, nil
 }
 
@@ -128,11 +149,8 @@ func Subscribe() (*Subscriber, error) {
 	s.scanner = bufio.NewScanner(s.pipe)
 
 	go func() { for {
-		select {
-		default:
-			if event := s.get(); event != nil {
-				s.Event <- event
-			}
+		if event := s.get(); event != nil {
+			s.Event <- event
 		}
 	}}()