Add scrollbar color group (#1840)

[micro.git] / internal / display / termwindow.go

diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go
index 23ae1dbeb6789b39e016deea73919432705132f0..6250fea906c18046d0f1d811262e8733fdef5a20 100644 (file)
--- a/internal/display/termwindow.go
+++ b/internal/display/termwindow.go
@@ -1,12 +1,11 @@
 package display
 
 import (
-       "unicode/utf8"
-
-       "github.com/zyedidia/micro/internal/buffer"
-       "github.com/zyedidia/micro/internal/config"
-       "github.com/zyedidia/micro/internal/screen"
-       "github.com/zyedidia/micro/internal/shell"
+       "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/shell"
+       "github.com/zyedidia/micro/v2/internal/util"
        "github.com/zyedidia/tcell"
        "github.com/zyedidia/terminal"
 )
@@ -51,7 +50,7 @@ func (w *TermWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 func (w *TermWindow) Clear() {
        for y := 0; y < w.Height; y++ {
                for x := 0; x < w.Width; x++ {
-                       screen.Screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
+                       screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
                }
        }
 }
@@ -88,7 +87,7 @@ func (w *TermWindow) Display() {
                                st = st.Reverse(true)
                        }
 
-                       screen.Screen.SetContent(w.X+x, w.Y+y, c, nil, st)
+                       screen.SetContent(w.X+x, w.Y+y, c, nil, st)
                }
        }
        if config.GetGlobalOption("statusline").(bool) {
@@ -98,14 +97,14 @@ func (w *TermWindow) Display() {
                }
 
                text := []byte(w.Name())
-               textLen := utf8.RuneCount(text)
+               textLen := util.CharacterCount(text)
                for x := 0; x < w.Width; x++ {
                        if x < textLen {
-                               r, size := utf8.DecodeRune(text)
+                               r, combc, size := util.DecodeCharacter(text)
                                text = text[size:]
-                               screen.Screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
+                               screen.SetContent(w.X+x, w.Y+w.Height, r, combc, statusLineStyle)
                        } else {
-                               screen.Screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
+                               screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
                        }
                }
        }