Working typesetting

fedicurses.py

@@ -10,28 +10,38 @@ def initColours():
 
 def newLine(ncwin, lines=1):
     cy, cx = ncwin.getyx()
-    ncwin.move(cy + lines, 0)
+    # my, mx = ncwin.getmaxyx()
+    try:
+        ncwin.move(cy + lines, 0)
+    except curses.error:
+        pass
 
 def bump(win):
     my, mx = win.getmaxyx()
     cy, cx = win.getyx()
-    if cx != mx:
-        win.move(cy, cx + 1)
-
+    if cx < mx and cx != 0:
+        try:
+            win.move(cy, cx + 1)
+        except curses.error:
+            pass
 
 def typeset(text, win, attr, colour):
     my, mx = win.getmaxyx()
     line = 0
     position = 0
     strlen = len(text)
-    while position < (strlen - 1):
+    while position < (strlen):
         cy, cx = win.getyx()
         if cx == mx:
             if cy == my:
                 raise curses.error("Out of space")
         rem = (mx - cx) + 1
         nsp = text.find(' ', position)
-        if nsp == -1 or nsp - position > rem:
+        if (strlen - position <= rem):
+            win.addnstr(text[position:], rem,
+                        attr | curses.color_pair(colour))
+            position = strlen
+        elif (nsp == -1 or nsp - position > rem): # and not strlen - position <= rem:
             if cx == 0:
                 win.addnstr(text[position:], rem, attr |
                             curses.color_pair(colour))
@@ -40,15 +50,19 @@ def typeset(text, win, attr, colour):
         else:
             win.addnstr(text[position:], nsp - position,
                         attr | curses.color_pair(colour))
-            position = nsp + 1
+            position = max(nsp, 0) + 1
             bump(win)
 
 def printPost(win, post, parser):
-    win.addstr(post["account"]["acct"], curses.A_BOLD)
+    # win.addstr(post["account"]["acct"], curses.A_BOLD)
+    typeset(post["account"]["acct"], win, curses.A_BOLD, 0)
     if (post["reblog"] is not None):
-        win.addstr(" boosted ")
-        win.addstr(post["reblog"]["account"]["acct"], curses.A_BOLD)
-    win.addstr(":")
+        # win.addstr(" boosted ")
+        typeset(" boosted ", win, 0, 0)
+        # win.addstr(post["reblog"]["account"]["acct"], curses.A_BOLD)
+        typeset(post["reblog"]["account"]["acct"], win, curses.A_BOLD, 0)
+    # win.addstr(":")
+    typeset(":", win, 0, 0)
     newLine(win)
     if (post["spoiler_text"] != ""):
         win.addstr(post["spoiler_text"], curses.A_UNDERLINE)
@@ -115,7 +129,7 @@ class PostParser(HTMLParser):
 
     def handle_endtag(self, tag):
         if tag == 'p':
-            newLine(self.win)
+            newLine(self.win, 2)
             self.openp = False
         elif tag == 'strong' or tag == 'b':
             self.curatt = self.curatt ^ curses.A_REVERSE