Merge branch 'topic-insert-linefeed'

Author: robhagemans

pcbasic/basic/display/text.py

@@ -138,6 +138,9 @@ def scroll_down(self, pagenum, from_line, bottom, attr):
         self.pages[pagenum].row.insert(
             from_line - 1, TextRow(attr, self.width, self._conv, self._dbcs_enabled)
         )
+        # if we were already a wrapping row, make sure the new empty row wraps
+        if self.pages[pagenum].row[from_line-2].wrap:
+            self.pages[pagenum].row[from_line-1].wrap = True
         del self.pages[pagenum].row[bottom-1]
 
     def get_char(self, pagenum, row, col):

pcbasic/basic/display/textscreen.py

@@ -595,6 +595,9 @@ def _insert_fullchar_at(self, row, col, c, attr):
             else:
                 therow.end = col
             self._redraw_row(col-1, row)
+            if  therow.wrap and therow.end == self.mode.width:
+                self.scroll_down(row+1)
+                therow.wrap = True
             return True
         else:
             # pushing the end of the row past the screen edge
@@ -627,6 +630,7 @@ def line_feed(self):
             # adjust end of line and wrapping flag - LF connects lines like word wrap
             self.text.pages[self.apagenum].row[self.current_row-1].end = self.current_col - 1
             self.text.pages[self.apagenum].row[self.current_row-1].wrap = True
+            # cursor stays in place after line feed!
         else:
             # find last row in logical line
             end = self.text.find_end_of_line(self.apagenum, self.current_row)
@@ -641,8 +645,13 @@ def line_feed(self):
             # self.current_row has changed, don't use row var
             if self.current_row < self.mode.height:
                 self.scroll_down(self.current_row+1)
-            self.text.pages[self.apagenum].row[self.current_row].wrap = True
-        # cursor stays in place after line feed!
+                # if we were already a wrapping row, make sure the new empty row wraps
+                #if self.text.pages[self.apagenum].row[self.current_row-1].wrap:
+                #    self.text.pages[self.apagenum].row[self.current_row].wrap = True
+            # ensure the current row now wraps
+            self.text.pages[self.apagenum].row[self.current_row-1].wrap = True
+            # cursor moves to start of next line
+            self.set_pos(self.current_row+1, 1)
 
     ###########################################################################
     # vpage text retrieval