container: fix control char display

Also, kill twidth and its friends; we haven't been using it for a
while now. (In the future, a solution with PUA chars might be worth
exploring.)

4 files changed, 23 insertions, 28 deletions

diff --git a/src/local/container.nim b/src/local/container.nim
index 61db75ec..bbd90f1e 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -308,7 +308,7 @@ func findColBytes(s: string; endx: int; startx = 0; starti = 0): int =
   var i = starti
   while i < s.len and w < endx:
     let u = s.nextUTF8(i)
-    w += u.twidth(w)
+    w += u.width()
   return i
 
 func cursorBytes(container: Container; y: int; cc = container.cursorx): int =
@@ -327,7 +327,7 @@ func cursorFirstX(container: Container): int =
   let cc = container.cursorx
   while i < line.len:
     let u = line.nextUTF8(i)
-    let tw = u.twidth(w)
+    let tw = u.width()
     if w + tw > cc:
       return w
     w += tw
@@ -343,7 +343,7 @@ func cursorLastX(container: Container): int =
   let cc = container.cursorx
   while i < line.len and w <= cc:
     let u = line.nextUTF8(i)
-    w += u.twidth(w)
+    w += u.width()
   return max(w - 1, 0)
 
 # Last cell for tab, first cell for everything else (e.g. double width.)
@@ -361,7 +361,7 @@ func cursorDispX(container: Container): int =
   while i < line.len and w <= cc:
     u = line.nextUTF8(i)
     pw = w
-    w += u.twidth(w)
+    w += u.width()
   if u == uint32('\t'):
     return max(w - 1, 0)
   return pw
@@ -640,7 +640,7 @@ proc cursorLineTextStart(container: Container) {.jsfunc.} =
   for u in container.currentLine.points:
     if not container.luctx.isWhiteSpaceLU(u):
       break
-    x += u.twidth(x)
+    x += u.width()
   if x == 0:
     dec x
   container.setCursorX(x)
@@ -745,7 +745,7 @@ proc skipCat(container: Container; b, x: var int; breakFunc: BreakFunc;
     if container.luctx.breakFunc(u) != cat:
       b = pb
       break
-    x += u.twidth(x)
+    x += u.width()
 
 proc skipSpace(container: Container; b, x: var int; breakFunc: BreakFunc) =
   container.skipCat(b, x, breakFunc, bcSpace)
@@ -858,7 +858,7 @@ proc cursorWordEnd(container: Container; breakFunc: BreakFunc) =
       b = pb
     else:
       px = x
-      x += u.twidth(x)
+      x += u.width()
   container.skipSpace(b, x, breakFunc)
   # move to the last char in the current category
   let ob = b
@@ -873,7 +873,7 @@ proc cursorWordEnd(container: Container; breakFunc: BreakFunc) =
         b = pb
         break
       px = x
-      x += u.twidth(x)
+      x += u.width()
     x = px
   if b < container.currentLine.len or ob != b:
     container.setCursorX(x)
@@ -1255,7 +1255,7 @@ proc onMatch(container: Container; res: BufferMatch; refresh: bool) =
     container.setCursorXYCenter(res.x, res.y, refresh)
     if container.hlon:
       container.clearSearchHighlights()
-      let ex = res.x + res.str.twidth(res.x) - 1
+      let ex = res.x + res.str.width() - 1
       let hl = Highlight(
         t: hltSearch,
         x1: res.x,
@@ -1723,7 +1723,7 @@ proc drawLines*(container: Container; display: var FixedGrid; hlcolor: CellColor
     # Skip cells till fromx.
     while w < container.fromx and i < line.str.len:
       let u = line.str.nextUTF8(i)
-      w += u.twidth(w)
+      w += u.width()
     let dls = by * display.width # starting position of row in display
     # Fill in the gap in case we skipped more cells than fromx mandates (i.e.
     # we encountered a double-width character.)
@@ -1740,25 +1740,20 @@ proc drawLines*(container: Container; display: var FixedGrid; hlcolor: CellColor
       let pw = w
       let pi = i
       let u = line.str.nextUTF8(i)
-      let uw = u.twidth(w)
+      let uw = u.width()
       w += uw
       if w > container.fromx + display.width:
         break # die on exceeding the width limit
       if nf.pos != -1 and nf.pos <= pw:
         cf = nf
         nf = line.findNextFormat(pw)
-      if u == uint32('\t'):
-        # Needs to be replaced with spaces, otherwise bgcolor isn't displayed.
-        let tk = k + uw
-        while k < tk:
-          display[dls + k].str &= ' '
-          set_fmt display[dls + k], cf
-          inc k
+      if u <= 0xFF and char(u) in Controls:
+        display[dls + k].str &= '^' & char(u).getControlLetter()
       else:
         for j in pi ..< i:
           display[dls + k].str &= line.str[j]
-        set_fmt display[dls + k], cf
-        k += uw
+      set_fmt display[dls + k], cf
+      k += uw
     if bgcolor != defaultColor:
       # Fill the screen if bgcolor is not default.
       while k < display.width:
diff --git a/src/local/lineedit.nim b/src/local/lineedit.nim
index 2f998b84..f64c37fd 100644
--- a/src/local/lineedit.nim
+++ b/src/local/lineedit.nim
@@ -26,9 +26,9 @@ type
     promptw: int
     state*: LineEditState
     escNext*: bool
-    cursorx: int # 0 ..< news.notwidth
+    cursorx: int # 0 ..< news.width
     cursori: int # 0 ..< news.len
-    shiftx: int # 0 ..< news.notwidth
+    shiftx: int # 0 ..< news.width
     shifti: int # 0 ..< news.len
     padding: int # 0 or 1
     maxwidth: int
@@ -127,7 +127,7 @@ proc insertCharseq(edit: LineEdit; s: string) =
     return
   edit.news.insert(s, edit.cursori)
   edit.cursori += s.len
-  edit.cursorx += s.notwidth()
+  edit.cursorx += s.width()
   edit.redraw = true
 
 proc cancel(edit: LineEdit) {.jsfunc.} =
@@ -270,7 +270,7 @@ proc begin(edit: LineEdit) {.jsfunc.} =
 proc `end`(edit: LineEdit) {.jsfunc.} =
   if edit.cursori < edit.news.len:
     edit.cursori = edit.news.len
-    edit.cursorx = edit.news.notwidth()
+    edit.cursorx = edit.news.width()
     if edit.cursorx >= edit.shiftx + edit.maxwidth:
       edit.redraw = true
 
@@ -315,7 +315,7 @@ proc readLine*(prompt, current: string; termwidth: int; disallowed: set[char];
     hide: hide,
     redraw: true,
     cursori: current.len,
-    cursorx: current.notwidth(),
+    cursorx: current.width(),
     # - 1, so that the cursor always has place
     maxwidth: termwidth - promptw - 1,
     hist: hist,
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 2d0b12f4..f623bf06 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -449,7 +449,7 @@ proc refreshStatusMsg*(pager: Pager) =
       " (" & $container.atPercentOf() & "%)" &
       " <" & container.getTitle()
     let hover = container.getHoverText()
-    let sl = hover.notwidth()
+    let sl = hover.width()
     var l = 0
     var i = 0
     var maxw = pager.status.grid.width - 1 # -1 for '>'
diff --git a/src/local/select.nim b/src/local/select.nim
index 70726e7c..766abd1e 100644
--- a/src/local/select.nim
+++ b/src/local/select.nim
@@ -183,7 +183,7 @@ proc drawBorders(display: var FixedGrid; sx, ex, sy, ey: int;
         display[y * display.width + x].str = " "
         inc x
       else:
-        #x = display[y * display.width + x].str.twidth(x)
+        #x = display[y * display.width + x].str.width()
         inc x
   # Draw corners.
   let tl = if upmore: VerticalBar else: CornerTopLeft
@@ -261,7 +261,7 @@ proc drawSelect*(select: Select; display: var FixedGrid) =
     while j < select.options[i].len:
       let pj = j
       let u = select.options[i].nextUTF8(j)
-      let nx = x + u.twidth(x)
+      let nx = x + u.width()
       if nx > ex:
         break
       display[dls + x].str = select.options[i].substr(pj, j - 1)