WindowAttributes: refactor

* rename module (window -> winattrs, to avoid conflict with env/window)
* do not use result
* remove unused cell_ratio

4 files changed, 64 insertions, 56 deletions

diff --git a/src/display/lineedit.nim b/src/display/lineedit.nim
index 374cb3d7..6dccdded 100644
--- a/src/display/lineedit.nim
+++ b/src/display/lineedit.nim
@@ -3,7 +3,7 @@ import strutils
 import unicode
 
 import bindings/quickjs
-import display/window
+import display/winattrs
 import js/javascript
 import types/cell
 import types/opt
diff --git a/src/display/term.nim b/src/display/term.nim
index bcdcaf86..792e8a5d 100644
--- a/src/display/term.nim
+++ b/src/display/term.nim
@@ -10,7 +10,7 @@ import unicode
 
 import bindings/termcap
 import config/config
-import display/window
+import display/winattrs
 import types/cell
 import types/color
 import types/opt
diff --git a/src/display/winattrs.nim b/src/display/winattrs.nim
new file mode 100644
index 00000000..74a713bc
--- /dev/null
+++ b/src/display/winattrs.nim
@@ -0,0 +1,62 @@
+import terminal
+
+when defined(posix):
+  import termios
+
+type
+  WindowAttributes* = object
+    width*: int
+    height*: int
+    ppc*: int # cell width
+    ppl*: int # cell height
+    width_px*: int
+    height_px*: int
+
+proc getWindowAttributes*(tty: File): WindowAttributes =
+  when defined(posix):
+    if tty.isatty():
+      var win: IOctl_WinSize
+      if ioctl(cint(getOsFileHandle(tty)), TIOCGWINSZ, addr win) != -1:
+        var cols = int(win.ws_col)
+        var rows = int(win.ws_row)
+        if cols == 0:
+          cols = 80
+        if rows == 0:
+          rows = 24
+        var ppc = int(win.ws_xpixel) div cols
+        var ppl = int(win.ws_ypixel) div rows
+        # some terminal emulators (aka vte) don't set ws_xpixel or ws_ypixel.
+        # solution: use xterm.
+        if ppc == 0:
+          ppc = 9
+        if ppl == 0:
+          ppl = 18
+        # Filling the last row without raw mode breaks things. However,
+        # not supporting Windows means we can always have raw mode, so we can
+        # use all available columns.
+        return WindowAttributes(
+          width: cols,
+          height: rows,
+          ppc: ppc,
+          ppl: ppl,
+          width_px: cols * ppc,
+          height_px: rows * ppl
+        )
+  # For Windows, which is no longer supported. We keep it as a fallback for
+  # when ioctl fails.
+  var height = terminalHeight()
+  if height == 0:
+    height = 24
+  # Windows has no raw mode afaik, so we do not fill the last column to
+  # prevent line wrapping.
+  let width = terminalWidth() - 1
+  let ppc = 9
+  let ppl = 18
+  return WindowAttributes(
+    width: width,
+    height: height,
+    ppc: ppc,
+    ppl: ppl,
+    width_px: ppc * width,
+    height_px: ppl * width
+  )
diff --git a/src/display/window.nim b/src/display/window.nim
deleted file mode 100644
index 278fc3fb..00000000
--- a/src/display/window.nim
+++ /dev/null
@@ -1,54 +0,0 @@
-import terminal
-
-when defined(posix):
-  import termios
-
-
-type
-  WindowAttributes* = object
-    width*: int
-    height*: int
-    ppc*: int # cell width
-    ppl*: int # cell height
-    cell_ratio*: float64 # ppl / ppc
-    width_px*: int
-    height_px*: int
-
-proc getWindowAttributes*(tty: File): WindowAttributes =
-  when defined(posix):
-    if tty.isatty():
-      var win: IOctl_WinSize
-      if ioctl(cint(getOsFileHandle(tty)), TIOCGWINSZ, addr win) != -1:
-        var cols = win.ws_col
-        var rows = win.ws_row
-        if cols == 0:
-          cols = 80
-        if rows == 0:
-          rows = 24
-        # Filling the last row without raw mode breaks things. However,
-        # not supporting Windows means we can always have raw mode, so we can
-        # use all available columns.
-        result.width = int(cols)
-        result.height = int(rows)
-        result.ppc = int(win.ws_xpixel) div result.width
-        result.ppl = int(win.ws_ypixel) div result.height
-        # some terminal emulators (aka vte) don't set ws_xpixel or ws_ypixel.
-        # solution: use xterm.
-        if result.ppc == 0:
-          result.ppc = 9
-        if result.ppl == 0:
-          result.ppl = 18
-        result.width_px = result.width * result.ppc
-        result.height_px = result.height * result.ppl
-        result.cell_ratio = result.ppl / result.ppc
-        return
-  # for Windows. unused.
-  result.width = terminalWidth() - 1
-  result.height = terminalHeight()
-  if result.height == 0:
-    result.height = 24
-  result.ppc = 9
-  result.ppl = 18
-  result.cell_ratio = result.ppl / result.ppc
-  result.width_px = result.ppc * result.width
-  result.height_px = result.ppl * result.height