Merge branch 'TabCustomize' into dev

Author: Neko-Box-Coder

README.md

@@ -17,6 +17,7 @@
 > - [Pasting multi cursor clipboard with newlines for non matching cursors #3809](https://github.com/zyedidia/micro/pull/3809)
 > - [Added support for multi-cursor comments to the comment plugin #3543 (Removed the version part)](https://github.com/zyedidia/micro/pull/3543)
 > - [Allow multi-cursor to work properly for autoclose plugin #3886](https://github.com/zyedidia/micro/pull/3886)
+> - [Adding tabbar customization options, fixing tabhighlight and tabreverse to work as intended. #3954](https://github.com/zyedidia/micro/pull/3954)
 >
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
 

internal/config/colorscheme.go

@@ -208,6 +208,16 @@ func StringToStyle(str string) tcell.Style {
 	return style
 }
 
+func ReverseColor(s tcell.Style) tcell.Style {
+	_, _, attr := s.Decompose()
+	attr = attr ^ tcell.AttrReverse
+	if attr&tcell.AttrReverse == tcell.AttrReverse {
+		return s.Reverse(true)
+	} else {
+		return s.Reverse(false)
+	}
+}
+
 // StringToColor returns a tcell color from a string representation of a color
 // We accept either bright... or light... to mean the brighter version of a color
 func StringToColor(str string) (tcell.Color, bool) {

internal/config/settings.go

@@ -130,8 +130,10 @@ var DefaultGlobalOnlySettings = map[string]any{
 	"savehistory":    true,
 	"scrollbarchar":  "|",
 	"sucmd":          "sudo",
-	"tabhighlight":   false,
-	"tabreverse":     true,
+	"tabchars":       "div=│",
+	"tabdist":        float64(1),
+	"tabhighlight":   true,
+	"tabreverse":     false,
 	"xterm":          false,
 }
 

internal/display/tabwindow.go

@@ -2,11 +2,12 @@ package display
 
 import (
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
+	"strings"
+	"unicode/utf8"
 )
 
 type TabWindow struct {
@@ -38,7 +39,7 @@ func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {
 			return i
 		}
 		x += s
-		x += 3
+		x += 1 + int(config.GetGlobalOption("tabdist").(float64))
 		if x >= w.Width {
 			break
 		}
@@ -97,29 +98,42 @@ func (w *TabWindow) Display() {
 
 	globalTabReverse := config.GetGlobalOption("tabreverse").(bool)
 	globalTabHighlight := config.GetGlobalOption("tabhighlight").(bool)
+	tabBarStyle := config.DefStyle
 
-	// xor of reverse and tab highlight to get tab character (as in filename and surrounding characters) reverse state
-	tabCharHighlight := (globalTabReverse || globalTabHighlight) && !(globalTabReverse && globalTabHighlight)
-
-	reverseStyles := func(reverse bool) (tcell.Style, tcell.Style) {
-		tabBarStyle := config.DefStyle.Reverse(reverse)
-		if style, ok := config.Colorscheme["tabbar"]; ok {
-			tabBarStyle = style
-		}
-		tabBarActiveStyle := tabBarStyle
-		if style, ok := config.Colorscheme["tabbar.active"]; ok {
-			tabBarActiveStyle = style
-		}
-		return tabBarStyle, tabBarActiveStyle
+	if style, ok := config.Colorscheme["tabbar"]; ok {
+		tabBarStyle = style
+	}
+	if globalTabReverse {
+		tabBarStyle = config.ReverseColor(tabBarStyle)
+	}
+	tabBarActiveStyle := tabBarStyle
+	if globalTabHighlight {
+		tabBarActiveStyle = config.ReverseColor(tabBarStyle)
+	}
+	if style, ok := config.Colorscheme["tabbar.active"]; ok {
+		tabBarActiveStyle = style
+	}
+	tabBarInactiveStyle := tabBarStyle
+	if style, ok := config.Colorscheme["tabbar.inactive"]; ok {
+		tabBarInactiveStyle = style
+	}
+	tabBarDivStyle := tabBarStyle
+	if style, ok := config.Colorscheme["tabbar.div"]; ok {
+		tabBarDivStyle = style
 	}
 
-	draw := func(r rune, n int, active bool, reversed bool) {
-		tabBarStyle, tabBarActiveStyle := reverseStyles(reversed)
-
+	draw := func(r rune, n int, active bool, tab bool, div bool) {
 		style := tabBarStyle
-		if active {
-			style = tabBarActiveStyle
+		if tab {
+			if active {
+				style = tabBarActiveStyle
+			} else {
+				style = tabBarInactiveStyle
+			}
+		} else if div {
+			style = tabBarDivStyle
 		}
+
 		for i := 0; i < n; i++ {
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
@@ -128,11 +142,11 @@ func (w *TabWindow) Display() {
 					c = ' '
 				}
 				if x == w.Width-1 && !done {
-					screen.SetContent(w.Width-1, w.Y, '>', nil, tabBarStyle)
+					screen.SetContent(w.Width-1, w.Y, '>', nil, style)
 					x++
 					break
 				} else if x == 0 && w.hscroll > 0 {
-					screen.SetContent(0, w.Y, '<', nil, tabBarStyle)
+					screen.SetContent(0, w.Y, '<', nil, style)
 				} else if x >= 0 && x < w.Width {
 					screen.SetContent(x, w.Y, c, nil, style)
 				}
@@ -141,27 +155,64 @@ func (w *TabWindow) Display() {
 		}
 	}
 
+	var tabactivechars string
+	var tabinactivechars string
+	var tabdivchars string
+	for _, entry := range strings.Split(config.GetGlobalOption("tabchars").(string), ",") {
+		split := strings.SplitN(entry, "=", 2)
+		if len(split) < 2 {
+			continue
+		}
+		key, val := split[0], split[1]
+		switch key {
+		case "active":
+			tabactivechars = val
+		case "inactive":
+			tabinactivechars = val
+		case "div":
+			tabdivchars = val
+		}
+	}
+
+	if utf8.RuneCountInString(tabactivechars) < 2 {
+		tabactivechars += strings.Repeat(" ", 2-utf8.RuneCountInString(tabactivechars))
+	}
+	if utf8.RuneCountInString(tabinactivechars) < 2 {
+		tabinactivechars += strings.Repeat(" ", 2-utf8.RuneCountInString(tabinactivechars))
+	}
+	if utf8.RuneCountInString(tabinactivechars) < 2 {
+		tabinactivechars += strings.Repeat(" ", 2-utf8.RuneCountInString(tabinactivechars))
+	}
+	tabdist := int(config.GetGlobalOption("tabdist").(float64))
+	if utf8.RuneCountInString(tabdivchars) < tabdist {
+		tabdivchars += strings.Repeat(" ", tabdist-utf8.RuneCountInString(tabdivchars))
+	}
+	tabactiverunes := []rune(tabactivechars)
+	tabinactiverunes := []rune(tabinactivechars)
+	tabdivrunes := []rune(tabdivchars)
 	for i, n := range w.Names {
 		if i == w.active {
-			draw('[', 1, true, tabCharHighlight)
+			draw(tabactiverunes[0], 1, true, true, false)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
+			draw(tabinactiverunes[0], 1, false, true, false)
 		}
 
 		for _, c := range n {
-			draw(c, 1, i == w.active, tabCharHighlight)
+			draw(c, 1, i == w.active, true, false)
 		}
 
 		if i == len(w.Names)-1 {
 			done = true
 		}
 
 		if i == w.active {
-			draw(']', 1, true, tabCharHighlight)
-			draw(' ', 2, true, globalTabReverse)
+			draw(tabactiverunes[1], 1, true, true, false)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
-			draw(' ', 2, false, globalTabReverse)
+			draw(tabinactiverunes[1], 1, false, true, false)
+		}
+
+		for j := 0; j < tabdist; j++ {
+			draw(tabdivrunes[j], 1, false, false, true)
 		}
 
 		if x >= w.Width {
@@ -170,6 +221,6 @@ func (w *TabWindow) Display() {
 	}
 
 	if x < w.Width {
-		draw(' ', w.Width-x, false, globalTabReverse)
+		draw(' ', w.Width-x, false, false, false)
 	}
 }

runtime/colorschemes/gotham.micro

@@ -25,5 +25,6 @@ color-link cursor-line "#091F2E"
 color-link color-column "#11151C"
 color-link symbol "#99D1CE,#0C1014"
 color-link match-brace "#0C1014,#D26937"
+color-link tabbar "#0C1014,#99D1CE"
 color-link tab-error "#D75F5F"
 color-link trailingws "#D75F5F"

runtime/colorschemes/monokai-dark.micro

@@ -25,4 +25,5 @@ color-link cursor-line "#323232"
 color-link color-column "#323232"
 color-link match-brace "#1D0000,#AE81FF"
 color-link tab-error "#D75F5F"
+color-link tabbar "#1D0000,#D5D8D6"
 color-link trailingws "#D75F5F"

runtime/colorschemes/sunny-day.micro

@@ -26,4 +26,5 @@ color-link cursor-line "229"
 color-link current-line-number "246"
 color-link match-brace "230,22"
 color-link tab-error "210"
+color-link tabbar "230,0"
 color-link trailingws "210"

runtime/help/colors.md

@@ -40,7 +40,7 @@ color support comes in three flavors.
   same regardless of the configured 16-color palette. However, the color
   range is fairly limited due to the small number of colors available.
   Default 256-color colorschemes include `monokai`, `twilight`, `zenburn`,
-  `darcula` and more.
+  `dracula` and more.
 
 * true-color: Some terminals support displaying "true color" with 16 million
   colors using standard RGB values. This mode will be able to support
@@ -179,6 +179,8 @@ Here is a list of the colorscheme groups that you can use:
 * statusline.suggestions (Color of the autocomplete suggestions menu)
 * tabbar (Color of the tabbar that lists open files)
 * tabbar.active (Color of the active tab in the tabbar)
+* tabbar.inactive (Color of the inactive tabs in the tabbar)
+* tabbar.div (Color of the space/divider between each tab in the tabbar)
 * indent-char (Color of the character which indicates tabs if the option is
   enabled)
 * line-number

runtime/help/options.md

@@ -460,20 +460,34 @@ Here are the available options:
 
     default value: `true`
 
-* `tabhighlight`: inverts the tab characters' (filename, save indicator, etc)
-   colors with respect to the tab bar.
+* `tabchars`: sets what visual characters to be shown for various tab options.
+   This option is specified in the form of `key1=value1,key2=value2,...`.
 
-    default value: `false`
+   Here are the list of keys:
+   - `active`: the opening and closing tab characters for the current active tab.
+   - `div`: the characters to be filled between each tab.
+   - `inactive`: the opening and closing tab characters for the inactive tabs.
+
+    default value: `div=|`
+
+* `tabdist`: the distance between each tab.
+
+    default value: `1`
+
+* `tabhighlight`: highlighting the current active tab by using the inverted tab bar color.
+   Has no effect if `tabbar.active` is present in the current colorscheme.
+
+    default value: `true`
 
 * `tabmovement`: navigate spaces at the beginning of lines as if they are tabs
    (e.g. move over 4 spaces at once). This option only does anything if
    `tabstospaces` is on.
 
     default value: `false`
 
-* `tabreverse`: reverses the tab bar colors when active.
+* `tabreverse`: reverses the tab bar colors.
 
-    default value: `true`
+    default value: `false`
 
 * `tabsize`: the size in spaces that a tab character should be displayed with.
 
@@ -633,7 +647,7 @@ so that you can see what the formatting should look like.
     "statusline": true,
     "sucmd": "sudo",
     "syntax": true,
-    "tabhighlight": true,
+    "tabhighlight": false,
     "tabmovement": false,
     "tabreverse": false,
     "tabsize": 4,