hacks for readline so that it at least kind of works

Proper fix needed later

3 files changed, 22 insertions, 4 deletions

diff --git a/src/display/pager.nim b/src/display/pager.nim
index 908c0800..1163e6c9 100644
--- a/src/display/pager.nim
+++ b/src/display/pager.nim
@@ -359,13 +359,24 @@ proc draw*(pager: Pager) =
   if pager.askpromise != nil:
     discard
   elif pager.lineedit.isSome:
-    pager.term.writeGrid(pager.lineedit.get.generateOutput(), 0, pager.attrs.height - 1)
+    if pager.lineedit.get.isnew:
+      #TODO hack
+      # make term notice that it must redraw when status is restored
+      let x = newFixedGrid(pager.attrs.width)
+      pager.term.writeGrid(x, 0, pager.attrs.height - 1)
   else:
     pager.term.writeGrid(pager.statusgrid, 0, pager.attrs.height - 1)
   pager.term.outputGrid()
   if pager.askpromise != nil:
     pager.term.setCursor(pager.askcursor, pager.attrs.height - 1)
   elif pager.lineedit.isSome:
+    if pager.lineedit.get.isnew:
+      #TODO hack
+      pager.term.setCursor(0, pager.attrs.height - 1)
+      pager.lineedit.get.drawPrompt()
+      pager.term.setCursor(pager.lineedit.get.getCursorX(), pager.attrs.height - 1)
+      pager.lineedit.get.fullRedraw()
+      pager.lineedit.get.isnew = false
     pager.term.setCursor(pager.lineedit.get.getCursorX(), pager.attrs.height - 1)
   else:
     pager.term.setCursor(pager.container.acursorx, pager.container.acursory)
diff --git a/src/display/term.nim b/src/display/term.nim
index 60be99b0..0cdbfa4f 100644
--- a/src/display/term.nim
+++ b/src/display/term.nim
@@ -49,7 +49,7 @@ type
     infile: File
     outfile: File
     cleared: bool
-    canvas: FixedGrid
+    canvas*: FixedGrid
     pcanvas: FixedGrid
     attrs*: WindowAttributes
     mincontrast: int
diff --git a/src/io/lineedit.nim b/src/io/lineedit.nim
index 39ef480c..7b822d1c 100644
--- a/src/io/lineedit.nim
+++ b/src/io/lineedit.nim
@@ -19,6 +19,7 @@ type
     lines: seq[string]
 
   LineEdit* = ref object
+    isnew*: bool #TODO hack
     news*: seq[Rune]
     prompt*: string
     promptw: int
@@ -88,6 +89,8 @@ proc begin0(edit: LineEdit) =
 proc space(edit: LineEdit, i: int) =
   edit.term.write(' '.repeat(i))
 
+#TODO this is broken (e.g. it doesn't account for shift, but for other
+# reasons too)
 proc generateOutput*(edit: LineEdit): FixedGrid =
   result = newFixedGrid(edit.promptw + edit.maxwidth)
   var x = 0
@@ -134,7 +137,7 @@ proc zeroShiftRedraw(state: LineEdit) =
   state.displen = state.news.len
   state.redraw()
 
-proc fullRedraw(state: LineEdit) =
+proc fullRedraw*(state: LineEdit) =
   state.displen = state.news.len
   if state.cursor > state.shift:
     var shiftw = state.news.width(state.shift, state.cursor)
@@ -145,6 +148,9 @@ proc fullRedraw(state: LineEdit) =
     state.shift = max(state.cursor - 1, 0)
   state.redraw()
 
+proc drawPrompt*(edit: LineEdit) =
+  edit.term.write(edit.prompt)
+
 proc insertCharseq(edit: LineEdit, cs: var seq[Rune]) =
   let escNext = edit.escNext
   cs.keepIf((r) => (escNext or not r.isControlChar) and not (r.isAscii and char(r) in edit.disallowed))
@@ -340,7 +346,8 @@ proc readLine*(prompt: string, termwidth: int, current = "",
     minlen: prompt.width(),
     disallowed: disallowed,
     hide: hide,
-    term: term
+    term: term,
+    isnew: true
   )
   result.cursor = result.news.width()
   result.maxwidth = termwidth - result.promptw