Use messenger error instead of termerror

[micro.git] / cmd / micro / tab.go

diff --git a/cmd/micro/tab.go b/cmd/micro/tab.go
index f1744b6d557b8f94feae1ce880c058ab3664a83c..941e787aac56619ce4e3d9302c1d46b45b31b275 100644 (file)
--- a/cmd/micro/tab.go
+++ b/cmd/micro/tab.go
@@ -89,13 +89,17 @@ func TabbarString() (string, map[int]int) {
                } else {
                        str += " "
                }
-               str += t.views[t.CurView].Buf.GetName()
+               buf := t.views[t.CurView].Buf
+               str += buf.GetName()
+               if buf.IsModified {
+                       str += " +"
+               }
                if i == curTab {
                        str += "]"
                } else {
                        str += " "
                }
-               indicies[len(str)-1] = i + 1
+               indicies[Count(str)-1] = i + 1
                str += " "
        }
        return str, indicies
@@ -120,7 +124,7 @@ func TabbarHandleMouseEvent(event tcell.Event) bool {
                                return false
                        }
                        str, indicies := TabbarString()
-                       if x + tabBarOffset >= len(str) {
+                       if x+tabBarOffset >= len(str) {
                                return false
                        }
                        var tabnum int
@@ -130,7 +134,7 @@ func TabbarHandleMouseEvent(event tcell.Event) bool {
                        }
                        sort.Ints(keys)
                        for _, k := range keys {
-                               if x + tabBarOffset <= k {
+                               if x+tabBarOffset <= k {
                                        tabnum = indicies[k] - 1
                                        break
                                }
@@ -167,7 +171,7 @@ func DisplayTabs() {
        if tooWide == true {
                // first we have to work out where the selected tab is
                // out of the total length of the tab bar. this is done
-               // by extracting the hit-areas from the indicies map 
+               // by extracting the hit-areas from the indicies map
                // that was constructed by `TabbarString()`
                var keys []int
                for offset := range indicies {
@@ -197,7 +201,7 @@ func DisplayTabs() {
                rightBuffer := currentTabOffset + (centeringOffset / 2)
 
                // check to make sure we haven't overshot the bounds of the string,
-               // if we have, then take that remainder and put it on the left side 
+               // if we have, then take that remainder and put it on the left side
                overshotRight := rightBuffer - len(fileRunes)
                if overshotRight > 0 {
                        leftBuffer = leftBuffer + overshotRight
@@ -210,12 +214,12 @@ func DisplayTabs() {
                } else {
                        rightBuffer = leftBuffer + (w - 2)
                }
-               
-               if rightBuffer > len(fileRunes) - 1 {
+
+               if rightBuffer > len(fileRunes)-1 {
                        rightBuffer = len(fileRunes) - 1
                }
 
-               // construct a new buffer of text to put the 
+               // construct a new buffer of text to put the
                // newly formatted tab bar text into.
                var displayText []rune
 
@@ -232,23 +236,25 @@ func DisplayTabs() {
                }
                // if there is more text to the right of the right-most
                // column in the tab bar text, then indicate there are more
-               // tabs to ther right by displaying a "+"
-               if rightBuffer < len(fileRunes) - 1 {
+               // tabs to the right by displaying a "+"
+               if rightBuffer < len(fileRunes)-1 {
                        displayText = append(displayText, '+')
                }
 
                // now store the offset from zero of the left-most text
-               // that is being displayed. This is to ensure that when 
+               // that is being displayed. This is to ensure that when
                // clicking on the tab bar, the correct tab gets selected.
                tabBarOffset = leftBuffer
 
                // use the constructed buffer as the display buffer to print
                // onscreen.
                fileRunes = displayText
+       } else {
+               tabBarOffset = 0
        }
 
        // iterate over the width of the terminal display and for each column,
-       // write a character into the tab display area with the appropraite style.
+       // write a character into the tab display area with the appropriate style.
        for x := 0; x < w; x++ {
                if x < len(fileRunes) {
                        screen.SetContent(x, 0, fileRunes[x], nil, tabBarStyle)