Merge branch 'TabCustomize' into dev

Author: Neko-Box-Coder

internal/config/settings.go

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

internal/display/tabwindow.go

@@ -31,15 +31,26 @@ func (w *TabWindow) Resize(width, height int) {
 
 func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {
 	x := -w.hscroll
-
+	tabactiverunes, tabinactiverunes, tabdivrunes := GetTabRunes()
 	for i, n := range w.Names {
-		x++
+		if i == w.active {
+			x += len(tabactiverunes) / 2
+		} else {
+			x += len(tabinactiverunes) / 2
+		}
+
 		s := util.CharacterCountInString(n)
 		if vloc.Y == w.Y && vloc.X < x+s {
 			return i
 		}
 		x += s
-		x += 1 + int(config.GetGlobalOption("tabdist").(float64))
+
+		if i == w.active {
+			x += len(tabactiverunes) - len(tabactiverunes)/2
+		} else {
+			x += len(tabinactiverunes) - len(tabinactiverunes)/2
+		}
+		x += len(tabdivrunes)
 		if x >= w.Width {
 			break
 		}
@@ -92,6 +103,39 @@ func (w *TabWindow) SetActive(a int) {
 	}
 }
 
+func GetTabRunes() ([]rune, []rune, []rune) {
+	var tabactivechars string
+	var tabinactivechars string
+	var tabdivchars string
+	for _, entry := range strings.Split(config.GetGlobalOption("tabbarchars").(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 = ""
+	}
+	if utf8.RuneCountInString(tabinactivechars) < 2 {
+		tabinactivechars = ""
+	}
+
+	tabactiverunes := []rune(tabactivechars)
+	tabinactiverunes := []rune(tabinactivechars)
+	tabdivrunes := []rune(tabdivchars)
+	return tabactiverunes, tabinactiverunes, tabdivrunes
+}
+
 func (w *TabWindow) Display() {
 	x := -w.hscroll
 	done := false
@@ -155,46 +199,22 @@ 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
-		}
-	}
+	tabactiverunes, tabinactiverunes, tabdivrunes := GetTabRunes()
+	leftactiverunes := tabactiverunes[0 : len(tabactiverunes)/2]
+	rightactiverunes := tabactiverunes[len(tabactiverunes)/2:]
+
+	leftinactiverunes := tabinactiverunes[0 : len(tabinactiverunes)/2]
+	rightinactiverunes := tabinactiverunes[len(tabinactiverunes)/2:]
 
-	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(tabactiverunes[0], 1, true, true, false)
+			for j := 0; j < len(leftactiverunes); j++ {
+				draw(leftactiverunes[j], 1, true, true, false)
+			}
 		} else {
-			draw(tabinactiverunes[0], 1, false, true, false)
+			for j := 0; j < len(leftinactiverunes); j++ {
+				draw(leftinactiverunes[j], 1, false, true, false)
+			}
 		}
 
 		for _, c := range n {
@@ -206,12 +226,16 @@ func (w *TabWindow) Display() {
 		}
 
 		if i == w.active {
-			draw(tabactiverunes[1], 1, true, true, false)
+			for j := 0; j < len(rightactiverunes); j++ {
+				draw(rightactiverunes[j], 1, true, true, false)
+			}
 		} else {
-			draw(tabinactiverunes[1], 1, false, true, false)
+			for j := 0; j < len(rightinactiverunes); j++ {
+				draw(rightinactiverunes[j], 1, false, true, false)
+			}
 		}
 
-		for j := 0; j < tabdist; j++ {
+		for j := 0; j < len(tabdivrunes); j++ {
 			draw(tabdivrunes[j], 1, false, false, true)
 		}
 

runtime/help/options.md

@@ -460,19 +460,19 @@ Here are the available options:
 
     default value: `true`
 
-* `tabchars`: sets what visual characters to be shown for various tab options.
+* `tabbarchars`: sets what visual characters to be shown for various tabbar options.
    This option is specified in the form of `key1=value1,key2=value2,...`.
 
    Here are the list of keys:
-   - `active`: the opening and closing tab characters for the current active tab.
+   - `active`: the opening and closing tab characters for the current active tab,
+               where the values are splitted in half for opening and closing characters.
+               For example, value of `[[]]` will have `[[` as opening characters and
+               `]]` as closing characters.
    - `div`: the characters to be filled between each tab.
    - `inactive`: the opening and closing tab characters for the inactive tabs.
+                 where the values are splitted in half for opening and closing characters.
 
-    default value: `div=|`
-
-* `tabdist`: the distance between each tab.
-
-    default value: `1`
+    default value: `div=│,active= [] ,inactive=  `
 
 * `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.