Add tabbar and tab mouse support

cmd/micro/display/tabbar.go

@@ -1,57 +0,0 @@
-package display
-
-import (
-	"log"
-
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-)
-
-type TabWindow struct {
-	Names   []string
-	Active  int
-	width   int
-	hscroll int
-	y       int
-}
-
-func NewTabWindow(w int, y int) *TabWindow {
-	tw := new(TabWindow)
-	tw.width = w
-	tw.y = y
-	return tw
-}
-
-func (w *TabWindow) Display() {
-	x := -w.hscroll
-
-	draw := func(r rune, n int) {
-		for i := 0; i < n; i++ {
-			screen.Screen.SetContent(x, w.y, r, nil, config.DefStyle.Reverse(true))
-			x++
-			log.Println(x)
-		}
-	}
-
-	for i, n := range w.Names {
-		if i == w.Active {
-			draw('[', 1)
-		}
-		for _, c := range n {
-			draw(c, 1)
-		}
-		if i == w.Active {
-			draw(']', 1)
-			draw(' ', 3)
-		} else {
-			draw(' ', 4)
-		}
-		if x >= w.width {
-			break
-		}
-	}
-
-	if x < w.width {
-		draw(' ', w.width-x)
-	}
-}

cmd/micro/display/tabwindow.go

@@ -0,0 +1,105 @@
+package display
+
+import (
+	"unicode/utf8"
+
+	"github.com/zyedidia/micro/cmd/micro/buffer"
+	"github.com/zyedidia/micro/cmd/micro/config"
+	"github.com/zyedidia/micro/cmd/micro/screen"
+	"github.com/zyedidia/micro/cmd/micro/util"
+)
+
+type TabWindow struct {
+	Names   []string
+	Active  int
+	Y       int
+	width   int
+	hscroll int
+}
+
+func NewTabWindow(w int, y int) *TabWindow {
+	tw := new(TabWindow)
+	tw.width = w
+	tw.Y = y
+	return tw
+}
+
+func (w *TabWindow) GetMouseLoc(vloc buffer.Loc) int {
+	x := -w.hscroll
+
+	for i, n := range w.Names {
+		x++
+		s := utf8.RuneCountInString(n)
+		if vloc.Y == w.Y && vloc.X < x+s {
+			return i
+		}
+		x += s
+		x += 3
+		if x >= w.width {
+			break
+		}
+	}
+	return -1
+}
+
+func (w *TabWindow) Scroll(amt int) {
+	w.hscroll += amt
+	w.hscroll = util.Clamp(w.hscroll, 0, w.TotalSize()-w.width)
+}
+
+func (w *TabWindow) TotalSize() int {
+	sum := 2
+	for _, n := range w.Names {
+		sum += utf8.RuneCountInString(n) + 4
+	}
+	return sum - 4
+}
+
+// TODO: handle files with character width >=2
+
+func (w *TabWindow) Display() {
+	x := -w.hscroll
+	done := false
+
+	draw := func(r rune, n int) {
+		for i := 0; i < n; i++ {
+			if x == w.width-1 && !done {
+				screen.Screen.SetContent(w.width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
+				x++
+				break
+			} else if x == 0 && w.hscroll > 0 {
+				screen.Screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
+			} else if x >= 0 && x < w.width {
+				screen.Screen.SetContent(x, w.Y, r, nil, config.DefStyle.Reverse(true))
+			}
+			x++
+		}
+	}
+
+	for i, n := range w.Names {
+		if i == w.Active {
+			draw('[', 1)
+		} else {
+			draw(' ', 1)
+		}
+		for _, c := range n {
+			draw(c, 1)
+		}
+		if i == len(w.Names)-1 {
+			done = true
+		}
+		if i == w.Active {
+			draw(']', 1)
+			draw(' ', 2)
+		} else {
+			draw(' ', 3)
+		}
+		if x >= w.width {
+			break
+		}
+	}
+
+	if x < w.width {
+		draw(' ', w.width-x)
+	}
+}