Fix blocking socketstream recv/send, clean up ips/serialize & types/color

Write always blocks for now, as it's too big of a footgun not to

1 files changed, 4 insertions, 4 deletions

diff --git a/src/buffer/cell.nim b/src/buffer/cell.nim
index d7de064f..a5e33645 100644
--- a/src/buffer/cell.nim
+++ b/src/buffer/cell.nim
@@ -190,7 +190,7 @@ proc handleAnsiCode(format: var Format, final: char, params: string) =
           of 25: format.blink = false
           of 27: format.reverse = false
           of 29: format.strike = false
-          of 30..37: format.fgcolor = CellColor(rgb: false, color: uint8(ip[pi]))
+          of 30..37: format.fgcolor = uint8(ip[pi]).cellColor()
           of 38:
             inc pi
             if pi < ip.len:
@@ -202,7 +202,7 @@ proc handleAnsiCode(format: var Format, final: char, params: string) =
                   let g = ip[pi]
                   inc pi
                   let b = ip[pi]
-                  format.fgcolor = CellColor(rgb: true, rgbcolor: rgb(r, g, b))
+                  format.fgcolor = rgb(r, g, b).cellColor()
               else:
                 #TODO
                 inc pi
@@ -212,7 +212,7 @@ proc handleAnsiCode(format: var Format, final: char, params: string) =
           of 39:
             format.fgcolor = defaultColor
           of 40..47:
-            format.bgcolor = CellColor(rgb: false, color: uint8(ip[0]))
+            format.bgcolor = uint8(ip[0]).cellColor()
           of 48:
             inc pi
             if pi < ip.len:
@@ -224,7 +224,7 @@ proc handleAnsiCode(format: var Format, final: char, params: string) =
                   let g = ip[pi]
                   inc pi
                   let b = ip[pi]
-                  format.bgcolor = CellColor(rgb: true, rgbcolor: rgb(r, g, b))
+                  format.bgcolor = rgb(r, g, b).cellColor()
               else:
                 #TODO
                 inc pi