Merge pull request #2378 from midichef/keypresses_screen

[mainloop-] prevent input() errors while pasting keys

visidata/_input.py

@@ -354,6 +354,8 @@ def editText(vd, y, x, w, record=True, display=True, **kwargs):
  v = vd.getCommandInput()
 
  if v is None:
+ if vd.activeSheet._scr is None:
+ raise Exception('active sheet does not have a screen')
  try:
  v = vd.editline(vd.activeSheet._scr, y, x, w, display=display, **kwargs)
  except AcceptInput as e:

visidata/mainloop.py

@@ -182,7 +182,10 @@ def mainloop(vd, scr):
 
  vd.setWindows(vd.scrFull)
 
- if not vd.drainPendingKeys(scr) or time.time() - vd._lastDrawTime > vd.min_draw_ms/1000: #1459
+ # a newly created sheet needs to be drawn once to set its _scr
+ if vd.activeSheet._scr is None or \
+ not vd.drainPendingKeys(scr) or \
+ time.time() - vd._lastDrawTime > vd.min_draw_ms/1000: #1459
  vd.draw_all()
  vd._lastDrawTime = time.time()
 

visidata/tests/conftest.py

@@ -10,6 +10,7 @@ def curses_setup():
  import visidata
 
  curses.curs_set = lambda v: None
+ curses.doupdate = lambda: None
  visidata.options.overwrite = 'always'
 
 

visidata/tests/test_commands.py

@@ -179,6 +179,7 @@ def runOneTest(self, mock_screen, longname):
  vd.allSheets = [vs]
  vs.mouseX, vs.mouseY = (4, 4)
  vs.draw(mock_screen)
+ vs._scr = mock_screen
  if longname in inputLines:
  vd.currentReplayRow = vd.cmdlog.newRow(longname=longname, input=inputLines[longname])
  else: