From 24ab4d30de6a939fd8cec13b689566f1939b262d Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Tue, 5 Mar 2024 04:10:29 -0600
Subject: [PATCH 01/11] LANTERNA-fix split panel cleanup TerminalPosition,
 reduce object memory churn

---
 .../lanterna/examples/DrawRectangle.java      |   3 +-
 .../googlecode/lanterna/TerminalPosition.java | 166 +++++++++---------
 .../lanterna/TerminalRectangle.java           |  18 +-
 .../com/googlecode/lanterna/TerminalSize.java |  47 ++++-
 .../graphics/AbstractTextGraphics.java        |   6 +-
 .../graphics/DefaultShapeRenderer.java        |   8 +-
 .../lanterna/graphics/TextGraphics.java       |   4 +-
 .../lanterna/graphics/TextGraphicsWriter.java |   2 +-
 .../lanterna/gui2/AbstractBasePane.java       |   4 +-
 .../lanterna/gui2/AbstractBorder.java         |   2 +-
 .../lanterna/gui2/AbstractComponent.java      |   4 +-
 .../lanterna/gui2/AbstractComposite.java      |   4 +-
 .../lanterna/gui2/AbstractListBox.java        |  10 +-
 .../lanterna/gui2/AbstractWindow.java         |   2 +-
 .../lanterna/gui2/BorderLayout.java           |  12 +-
 .../com/googlecode/lanterna/gui2/Borders.java |  14 +-
 .../com/googlecode/lanterna/gui2/Button.java  |   2 +-
 .../googlecode/lanterna/gui2/CheckBox.java    |   2 +-
 .../googlecode/lanterna/gui2/ComboBox.java    |   6 +-
 .../googlecode/lanterna/gui2/Component.java   |  11 +-
 .../gui2/DefaultWindowDecorationRenderer.java |  18 +-
 .../lanterna/gui2/DefaultWindowManager.java   |  12 +-
 .../gui2/EmptyWindowDecorationRenderer.java   |   2 +-
 .../gui2/FatWindowDecorationRenderer.java     |   4 +-
 .../googlecode/lanterna/gui2/GridLayout.java  |   2 +-
 .../lanterna/gui2/ImageComponent.java         |   2 +-
 .../lanterna/gui2/InteractableLookupMap.java  |  18 +-
 .../lanterna/gui2/LinearLayout.java           |   4 +-
 .../lanterna/gui2/MenuPopupWindow.java        |   2 +-
 .../lanterna/gui2/MultiWindowTextGUI.java     |   4 +-
 .../googlecode/lanterna/gui2/SplitPanel.java  |  12 +-
 .../com/googlecode/lanterna/gui2/TextBox.java |  18 +-
 .../gui2/table/DefaultTableRenderer.java      |  14 +-
 .../lanterna/input/MouseCharacterPattern.java |   2 +-
 .../input/ScreenInfoCharacterPattern.java     |   4 +-
 .../lanterna/screen/AbstractScreen.java       |   2 +-
 .../googlecode/lanterna/screen/Screen.java    |   2 +-
 .../lanterna/screen/TerminalScreen.java       |   4 +-
 .../lanterna/screen/VirtualScreen.java        |  16 +-
 .../terminal/TerminalTextGraphics.java        |   4 +-
 .../lanterna/terminal/ansi/ANSITerminal.java  |   4 +-
 .../GraphicalTerminalImplementation.java      |   4 +-
 .../virtual/DefaultVirtualTerminal.java       |  16 +-
 .../virtual/VirtualTerminalTextGraphics.java  |  19 +-
 .../terminal/win32/WindowsTerminal.java       |   2 +-
 .../lanterna/TestTerminalPosition.java        |  92 ++++++++++
 .../lanterna/gui2/FullScreenTextGUITest.java  |  32 ++--
 .../lanterna/gui2/GUIOverTelnet.java          |   2 +-
 .../googlecode/lanterna/gui2/InputUITest.java |   4 +-
 .../googlecode/lanterna/gui2/ThemeTest.java   |   4 +-
 .../lanterna/gui2/WindowManagerTest.java      |   2 +-
 .../lanterna/issue/Issue452Test.java          |   6 +-
 .../lanterna/screen/DrawImageTest.java        |  30 ++--
 .../lanterna/screen/ScreenLineTest.java       |   8 +-
 .../lanterna/screen/ScreenRectangleTest.java  |   2 +-
 .../lanterna/screen/ScreenResizeTest.java     |   2 +-
 .../lanterna/screen/ScreenTabTest.java        |  10 +-
 .../lanterna/screen/ScreenTriangleTest.java   |  12 +-
 .../lanterna/screen/VirtualScreenTest.java    |   4 +-
 .../googlecode/lanterna/terminal/KeyTest.java |   8 +-
 .../lanterna/terminal/SimpleTerminalTest.java |   2 +-
 .../terminal/TerminalTextGraphicsTest.java    |   6 +-
 .../virtual/DefaultVirtualTerminalTest.java   | 150 ++++++++--------
 .../lanterna/tutorial/Tutorial03.java         |   4 +-
 64 files changed, 526 insertions(+), 372 deletions(-)
 create mode 100644 src/test/java/com/googlecode/lanterna/TestTerminalPosition.java

diff --git a/src/examples/java/com/googlecode/lanterna/examples/DrawRectangle.java b/src/examples/java/com/googlecode/lanterna/examples/DrawRectangle.java
index b370a76d8..becf8a972 100644
--- a/src/examples/java/com/googlecode/lanterna/examples/DrawRectangle.java
+++ b/src/examples/java/com/googlecode/lanterna/examples/DrawRectangle.java
@@ -29,8 +29,7 @@ public static void main(String[] args) throws IOException {
 		screen.startScreen();
 		screen.clear();
 
-		tGraphics.drawRectangle(
-			new TerminalPosition(3,3), new TerminalSize(10,10), '*');
+		tGraphics.drawRectangle(TerminalPosition.of(3,3), TerminalSize.of(10,10), '*');
 		screen.refresh();
 
 		screen.readInput();
diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index b65af79db..f0d3d1e1e 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -28,17 +28,49 @@
 public class TerminalPosition implements Comparable<TerminalPosition> {
 
     /**
-     * Constant for the top-left corner (0x0)
+     * Constants for less objects memory churn, these are from the top-left corner (column x row)
      */
-    public static final TerminalPosition TOP_LEFT_CORNER = new TerminalPosition(0, 0);
-    /**
-     * Constant for the 1x1 position (one offset in both directions from top-left)
-     */
-    public static final TerminalPosition OFFSET_1x1 = new TerminalPosition(1, 1);
+    public static final TerminalPosition OF_0x0 = new TerminalPosition(0, 0);
+    public static final TerminalPosition OF_0x1 = new TerminalPosition(0, 1);
+    public static final TerminalPosition OF_1x0 = new TerminalPosition(1, 0);
+    public static final TerminalPosition OF_1x1 = new TerminalPosition(1, 1);
 
-    private final int row;
     private final int column;
-
+    private final int row;
+    /**
+     * @return a new TerminalPosition instance with the supplied column and row
+     */
+		public static final TerminalPosition of(int column, int row) {
+			if(column == 0 && row == 0) {
+          return OF_0x0;
+      } else if(column == 0 && row == 1) {
+          return OF_0x1;
+      } else if(column == 1 && row == 0) {
+          return OF_1x0;
+      } else if(column == 1 && row == 1) {
+          return OF_1x1;
+      }
+			return new TerminalPosition(column, row);
+		}
+		/**
+     * Returns a TerminalPositoin with the column and row supplied.
+     * If either the column or row supplied is different than this instances column or row, then a new instance is returned.
+     * If both column and row are the same as this instance's column and row, then this instance is returned.
+     * @return Either this instance, or a new instance if column/row are different than this instance's column/row.
+     */
+		public TerminalPosition as(int column, int row) {
+        return (column != this.column || row != this.row) ? of(column, row) : this;
+    }
+    /**
+     * Returns itself if it is equal to the supplied position, otherwise the supplied position. You can use this if you
+     * have a position field which is frequently recalculated but often resolves to the same; it will keep the same
+     * object in memory instead of swapping it out every cycle.
+     * @param position Position you want to return
+     * @return Itself if this position equals the position passed in, otherwise the position passed in
+     */
+    public TerminalPosition as(TerminalPosition position) {
+        return position == null ? this : as(position.column, position.row);
+    }
     /**
      * Creates a new TerminalPosition object, which represents a location on the screen. There is no check to verify
      * that the position you specified is within the size of the current terminal and you can specify negative positions
@@ -48,10 +80,9 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
      * @param row Row of the location, or the "y" coordinate, zero indexed (the first row is 0)
      */
     public TerminalPosition(int column, int row) {
-        this.row = row;
         this.column = column;
+        this.row = row;
     }
-
     /**
      * Returns the index of the column this position is representing, zero indexed (the first column has index 0).
      * @return Index of the column this position has
@@ -59,7 +90,6 @@ public TerminalPosition(int column, int row) {
     public int getColumn() {
         return column;
     }
-
     /**
      * Returns the index of the row this position is representing, zero indexed (the first row has index 0)
      * @return Index of the row this position has
@@ -67,7 +97,6 @@ public int getColumn() {
     public int getRow() {
         return row;
     }
-
     /**
      * Creates a new TerminalPosition object representing a position with the same column index as this but with a
      * supplied row index.
@@ -75,12 +104,8 @@ public int getRow() {
      * @return A TerminalPosition object with the same column as this but with a specified row index
      */
     public TerminalPosition withRow(int row) {
-        if(row == 0 && this.column == 0) {
-            return TOP_LEFT_CORNER;
-        }
-        return new TerminalPosition(this.column, row);
+        return as(column, row);
     }
-
     /**
      * Creates a new TerminalPosition object representing a position with the same row index as this but with a
      * supplied column index.
@@ -88,12 +113,8 @@ public TerminalPosition withRow(int row) {
      * @return A TerminalPosition object with the same row as this but with a specified column index
      */
     public TerminalPosition withColumn(int column) {
-        if(column == 0 && this.row == 0) {
-            return TOP_LEFT_CORNER;
-        }
-        return new TerminalPosition(column, this.row);
+        return as(column, row);
     }
-
     /**
      * Creates a new TerminalPosition object representing a position on the same row, but with a column offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
@@ -102,12 +123,8 @@ public TerminalPosition withColumn(int column) {
      * @return New terminal position based off this one but with an applied offset
      */
     public TerminalPosition withRelativeColumn(int delta) {
-        if(delta == 0) {
-            return this;
-        }
-        return withColumn(column + delta);
+        return plus(delta, 0);
     }
-
     /**
      * Creates a new TerminalPosition object representing a position on the same column, but with a row offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
@@ -116,12 +133,8 @@ public TerminalPosition withRelativeColumn(int delta) {
      * @return New terminal position based off this one but with an applied offset
      */
     public TerminalPosition withRelativeRow(int delta) {
-        if(delta == 0) {
-            return this;
-        }
-        return withRow(row + delta);
+        return plus(0, delta);
     }
-
     /**
      * Creates a new TerminalPosition object that is 'translated' by an amount of rows and columns specified by another
      * TerminalPosition. Same as calling
@@ -130,9 +143,8 @@ public TerminalPosition withRelativeRow(int delta) {
      * @return New TerminalPosition that is the result of the original with added translation
      */
     public TerminalPosition withRelative(TerminalPosition translate) {
-        return withRelative(translate.getColumn(), translate.getRow());
+        return plus(translate);
     }
-
     /**
      * Creates a new TerminalPosition object that is 'translated' by an amount of rows and columns specified by the two
      * parameters. Same as calling
@@ -142,9 +154,8 @@ public TerminalPosition withRelative(TerminalPosition translate) {
      * @return New TerminalPosition that is the result of the original position with added translation
      */
     public TerminalPosition withRelative(int deltaColumn, int deltaRow) {
-        return withRelativeRow(deltaRow).withRelativeColumn(deltaColumn);
+        return plus(deltaColumn, deltaRow);
     }
-
     /**
      * Returns itself if it is equal to the supplied position, otherwise the supplied position. You can use this if you
      * have a position field which is frequently recalculated but often resolves to the same; it will keep the same
@@ -153,60 +164,53 @@ public TerminalPosition withRelative(int deltaColumn, int deltaRow) {
      * @return Itself if this position equals the position passed in, otherwise the position passed in
      */
     public TerminalPosition with(TerminalPosition position) {
-        if(equals(position)) {
-            return this;
-        }
-        return position;
+        return as(position);
     }
-
-    public TerminalPosition plus(TerminalPosition position) {
-        return withRelative(position);
+    public TerminalPosition plus(TerminalPosition other) {
+        return plus(other.column, other.row);
     }
-    
-    public TerminalPosition minus(TerminalPosition position) {
-        return withRelative(-position.getColumn(), -position.getRow());
+    public TerminalPosition minus(TerminalPosition other) {
+        return minus(other.column, other.row);
     }
-    
-    public TerminalPosition multiply(TerminalPosition position) {
-        return new TerminalPosition(column * position.column, row * position.row);
+    public TerminalPosition multiply(TerminalPosition other) {
+        return multiply(other.column, other.row);
     }
-    
     public TerminalPosition divide(TerminalPosition denominator) {
-        return new TerminalPosition(column / denominator.column, row / denominator.row);
+        return divide(denominator.column, denominator.row);
+    }
+    public TerminalPosition plus(int column, int row) {
+        return as(this.column + column, this.row + row);
+    }
+    public TerminalPosition minus(int column, int row) {
+        return as(this.column - column, this.row - row);
+    }
+    public TerminalPosition multiply(int column, int row) {
+        return as(this.column * column, this.row * row);
+    }
+    public TerminalPosition divide(int columnsDenominator, int rowsDenominator) {
+        return as(column / columnsDenominator, row / rowsDenominator);
     }
+    public TerminalPosition plus(int amount)        { return plus(amount, amount); }
+    public TerminalPosition minus(int amount)       { return minus(amount, amount); }
+    public TerminalPosition multiply(int amount)    { return multiply(amount, amount); }
+    public TerminalPosition divide(int denominator) { return divide(denominator, denominator); }
     
     public TerminalPosition abs() {
-        int x = Math.abs(column);
-        int y = Math.abs(row);
-        return new TerminalPosition(x, y);
+        return as(Math.abs(column), Math.abs(row));
     }
     
     public TerminalPosition min(TerminalPosition position) {
-        int x = Math.min(column, position.column);
-        int y = Math.min(row, position.row);
-        return new TerminalPosition(x, y);
+        return as(Math.min(column, position.column), Math.min(row, position.row));
     }
     
     public TerminalPosition max(TerminalPosition position) {
-        int x = Math.max(column, position.column);
-        int y = Math.max(row, position.row);
-        return new TerminalPosition(x, y);
+        return as(Math.max(column, position.column), Math.max(row, position.row));
     }
 
     @Override
-    public int compareTo(TerminalPosition o) {
-        if(row < o.row) {
-            return -1;
-        }
-        else if(row == o.row) {
-            if(column < o.column) {
-                return -1;
-            }
-            else if(column == o.column) {
-                return 0;
-            }
-        }
-        return 1;
+    public int compareTo(TerminalPosition other) {
+        int result = Integer.compare(row, other.row);
+        return result != 0 ? result : Integer.compare(column, other.column);
     }
 
     @Override
@@ -223,19 +227,15 @@ public int hashCode() {
     }
 
     public boolean equals(int columnIndex, int rowIndex) {
-        return this.column == columnIndex &&
-                this.row == rowIndex;
+        return column == columnIndex && row == rowIndex;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TerminalPosition other = (TerminalPosition) obj;
-        return this.row == other.row && this.column == other.column;
+        return obj != null
+            && obj.getClass() == getClass()
+            && ((TerminalPosition) obj).column == column
+            && ((TerminalPosition) obj).row == row
+            ;
     }
 }
diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index 2dd12f609..78d576cad 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -47,7 +47,7 @@ public class TerminalRectangle {
      * @param height number of rows
      */
     public TerminalRectangle(int x, int y, int width, int height) {
-        position = new TerminalPosition(x, y);
+        position = TerminalPosition.of(x, y);
         size = new TerminalSize(width, height);
         
         this.x = x;
@@ -57,6 +57,17 @@ public TerminalRectangle(int x, int y, int width, int height) {
         this.xAndWidth = x + width;
         this.yAndHeight = y + height;
     }
+    public TerminalRectangle(TerminalPosition position, TerminalSize size) {
+        this.position = position;
+        this.size = size;
+
+        this.x = position.getColumn();
+        this.y = position.getRow();
+        this.width = size.getColumns();
+        this.height = size.getRows();
+        this.xAndWidth = x + width;
+        this.yAndHeight = y + height;
+    }
     
     /**
      * @return Returns the width of this rect, in number of columns
@@ -94,7 +105,10 @@ public boolean whenContains(TerminalPosition p, Runnable op) {
         return whenContains(p.getColumn(), p.getRow(), op);
     }
     public boolean whenContains(int x, int y, Runnable op) {
-        if (this.x <= x && x < this.xAndWidth && this.y <= y && y < this.yAndHeight) {
+        return whenContains(this.x, this.y, width, height, x, y, op);
+    }
+		public static final boolean whenContains(int rx, int ry, int rw, int rh, int x, int y, Runnable op) {
+        if (rx <= x && x < (rx + rw) && ry <= y && y < (ry + rh)) {
             op.run();
             return true;
         }
diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 5b5b0afdb..1d905613c 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -28,8 +28,12 @@ public class TerminalSize {
     public static final TerminalSize ZERO = new TerminalSize(0, 0);
     public static final TerminalSize ONE = new TerminalSize(1, 1);
 
-    private final int columns;
-    private final int rows;
+    public final int columns;
+    public final int rows;
+
+    public static final TerminalSize of(int columns, int rows) {
+        return new TerminalSize(columns, rows);
+    }
 
     /**
      * Creates a new terminal size representation with a given width (columns) and height (rows)
@@ -165,6 +169,35 @@ public TerminalSize min(TerminalSize other) {
                 .withRows(Math.min(rows, other.rows));
     }
 
+    public TerminalSize plus(TerminalSize other) {
+        return plus(other.columns, other.rows);
+    }
+    public TerminalSize minus(TerminalSize other) {
+        return minus(other.columns, other.rows);
+    }
+    public TerminalSize multiply(TerminalSize other) {
+        return multiply(other.columns, other.rows);
+    }
+    public TerminalSize divide(TerminalSize denominator) {
+        return divide(denominator.columns, denominator.rows);
+    }
+    public TerminalSize plus(int columns, int rows) {
+        return of(this.columns + columns, this.rows + rows);
+    }
+    public TerminalSize minus(int columns, int rows) {
+        return of(this.columns - columns, this.rows - rows);
+    }
+    public TerminalSize multiply(int columns, int rows) {
+        return of(this.columns * columns, this.rows * rows);
+    }
+    public TerminalSize divide(int columnsDenominator, int rowsDenominator) {
+        return of(columns / columnsDenominator, rows / rowsDenominator);
+    }
+    public TerminalSize plus(int amount)        { return plus(amount, amount); }
+    public TerminalSize minus(int amount)       { return minus(amount, amount); }
+    public TerminalSize multiply(int amount)    { return multiply(amount, amount); }
+    public TerminalSize divide(int denominator) { return divide(denominator, denominator); }
+
     /**
      * Returns itself if it is equal to the supplied size, otherwise the supplied size. You can use this if you have a
      * size field which is frequently recalculated but often resolves to the same size; it will keep the same object
@@ -179,6 +212,16 @@ public TerminalSize with(TerminalSize size) {
         return size;
     }
 
+    /**
+     * x dimension, when d is zero
+     * y dimension, when d is not zero
+     *
+     * @return either getColumns() for x dimension or getRows() for y dimension
+    */
+    public int getDimension(int d) {
+        return d == 0 ? getColumns() : getRows();
+    }
+
     @Override
     public String toString() {
         return "{" + columns + "x" + rows + "}";
diff --git a/src/main/java/com/googlecode/lanterna/graphics/AbstractTextGraphics.java b/src/main/java/com/googlecode/lanterna/graphics/AbstractTextGraphics.java
index ecf641192..ce38da024 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/AbstractTextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/AbstractTextGraphics.java
@@ -120,7 +120,7 @@ public TextGraphics setTabBehaviour(TabBehaviour tabBehaviour) {
 
     @Override
     public TextGraphics fill(char c) {
-        fillRectangle(TerminalPosition.TOP_LEFT_CORNER, getSize(), c);
+        fillRectangle(TerminalPosition.OF_0x0, getSize(), c);
         return this;
     }
 
@@ -158,7 +158,7 @@ public TextGraphics drawLine(int fromX, int fromY, int toX, int toY, char charac
 
     @Override
     public TextGraphics drawLine(int fromX, int fromY, int toX, int toY, TextCharacter character) {
-        return drawLine(new TerminalPosition(fromX, fromY), new TerminalPosition(toX, toY), character);
+        return drawLine(TerminalPosition.of(fromX, fromY), TerminalPosition.of(toX, toY), character);
     }
 
     @Override
@@ -207,7 +207,7 @@ public TextGraphics fillRectangle(TerminalPosition topLeft, TerminalSize size, T
 
     @Override
     public TextGraphics drawImage(TerminalPosition topLeft, TextImage image) {
-        return drawImage(topLeft, image, TerminalPosition.TOP_LEFT_CORNER, image.getSize());
+        return drawImage(topLeft, image, TerminalPosition.OF_0x0, image.getSize());
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/graphics/DefaultShapeRenderer.java b/src/main/java/com/googlecode/lanterna/graphics/DefaultShapeRenderer.java
index 563d567ce..05f778e9f 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/DefaultShapeRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/DefaultShapeRenderer.java
@@ -162,20 +162,20 @@ public void fillTriangle(TerminalPosition p1, TerminalPosition p2, TerminalPosit
         startY =        points[0].getRow();
         if (dx1 > dx2) {
             for (; startY <= points[1].getRow(); startY++, startX += dx2, endX += dx1) {
-                drawLine(new TerminalPosition((int)startX, (int)startY), new TerminalPosition((int)endX, (int)startY), character);
+                drawLine(TerminalPosition.of((int)startX, (int)startY), TerminalPosition.of((int)endX, (int)startY), character);
             }
             endX = points[1].getColumn();
             for (; startY <= points[2].getRow(); startY++, startX += dx2, endX += dx3) {
-                drawLine(new TerminalPosition((int)startX, (int)startY), new TerminalPosition((int)endX, (int)startY), character);
+                drawLine(TerminalPosition.of((int)startX, (int)startY), TerminalPosition.of((int)endX, (int)startY), character);
             }
         } else {
             for (; startY <= points[1].getRow(); startY++, startX += dx1, endX += dx2) {
-                drawLine(new TerminalPosition((int)startX, (int)startY), new TerminalPosition((int)endX, (int)startY), character);
+                drawLine(TerminalPosition.of((int)startX, (int)startY), TerminalPosition.of((int)endX, (int)startY), character);
             }
             startX = points[1].getColumn();
             startY = points[1].getRow();
             for (; startY <= points[2].getRow(); startY++, startX += dx3, endX += dx2) {
-                drawLine(new TerminalPosition((int)startX, (int)startY), new TerminalPosition((int)endX, (int)startY), character);
+                drawLine(TerminalPosition.of((int)startX, (int)startY), TerminalPosition.of((int)endX, (int)startY), character);
             }
         }
     }
diff --git a/src/main/java/com/googlecode/lanterna/graphics/TextGraphics.java b/src/main/java/com/googlecode/lanterna/graphics/TextGraphics.java
index 72d824e17..ad00560f6 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/TextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/TextGraphics.java
@@ -54,7 +54,7 @@ public interface TextGraphics extends StyleSet<TextGraphics> {
     /**
      * Creates a new TextGraphics of the same type as this one, using the same underlying subsystem. Using this method,
      * you need to specify a section of the current TextGraphics valid area that this new TextGraphic shall be
-     * restricted to. If you call <code>newTextGraphics(TerminalPosition.TOP_LEFT_CORNER, textGraphics.getSize())</code>
+     * restricted to. If you call <code>newTextGraphics(TerminalPosition.of(0, 0), textGraphics.getSize())</code>
      * then the resulting object will be identical to this one, but having a separated state for colors, position and
      * modifiers.
      * @param topLeftCorner Position of this TextGraphics's writable area that is to become the top-left corner (0x0) of
@@ -281,7 +281,7 @@ public interface TextGraphics extends StyleSet<TextGraphics> {
     /**
      * Takes a TextImage and draws it on the surface this TextGraphics is targeting, given the coordinates on the target
      * that is specifying where the top-left corner of the image should be drawn. This is equivalent of calling
-     * {@code drawImage(topLeft, image, TerminalPosition.TOP_LEFT_CORNER, image.getSize()}.
+     * {@code drawImage(topLeft, image, TerminalPosition.of(0, 0), image.getSize()}.
      * @param topLeft Position of the top-left corner of the image on the target
      * @param image Image to draw
      * @return Itself
diff --git a/src/main/java/com/googlecode/lanterna/graphics/TextGraphicsWriter.java b/src/main/java/com/googlecode/lanterna/graphics/TextGraphicsWriter.java
index d8885c61c..f84f2801f 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/TextGraphicsWriter.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/TextGraphicsWriter.java
@@ -24,7 +24,7 @@ public class TextGraphicsWriter implements StyleSet<TextGraphicsWriter> {
     public TextGraphicsWriter(TextGraphics backend) {
         this.backend = backend;
         setStyleFrom( backend );
-        cursorPosition = new TerminalPosition(0, 0);
+        cursorPosition = TerminalPosition.OF_0x0;
     }
 
     public TextGraphicsWriter putString(String string) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
index 6fdeebc92..32b3630e9 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
@@ -461,9 +461,9 @@ public TerminalSize getPreferredSize(Container component) {
                 public void drawComponent(TextGUIGraphics graphics, Container component) {
                     if (!(menuBar instanceof EmptyMenuBar)) {
                         int menuBarHeight = menuBar.getPreferredSize().getRows();
-                        TextGUIGraphics menuGraphics = graphics.newTextGraphics(TerminalPosition.TOP_LEFT_CORNER, graphics.getSize().withRows(menuBarHeight));
+                        TextGUIGraphics menuGraphics = graphics.newTextGraphics(TerminalPosition.OF_0x0, graphics.getSize().withRows(menuBarHeight));
                         menuBar.draw(menuGraphics);
-                        graphics = graphics.newTextGraphics(TerminalPosition.TOP_LEFT_CORNER.withRelativeRow(menuBarHeight), graphics.getSize().withRelativeRows(-menuBarHeight));
+                        graphics = graphics.newTextGraphics(TerminalPosition.of(0, menuBarHeight), graphics.getSize().withRelativeRows(-menuBarHeight));
                     }
 
                     Component subComponent = getComponent();
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractBorder.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractBorder.java
index 781f6fee4..52c1c60e5 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractBorder.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractBorder.java
@@ -32,7 +32,7 @@ public abstract class AbstractBorder extends AbstractComposite<Border> implement
     public void setComponent(Component component) {
         super.setComponent(component);
         if(component != null) {
-            component.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+            component.setPosition(TerminalPosition.OF_0x0);
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
index 369c30459..c74f4c878 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
@@ -77,7 +77,7 @@ public abstract class AbstractComponent<T extends Component> implements Componen
      */
     public AbstractComponent() {
         size = TerminalSize.ZERO;
-        position = TerminalPosition.TOP_LEFT_CORNER;
+        position = TerminalPosition.OF_0x0;
         explicitPreferredSize = null;
         layoutData = null;
         visible = true;
@@ -233,7 +233,7 @@ public TerminalPosition getPosition() {
     
     @Override
     public TerminalPosition getGlobalPosition() {
-        return toGlobal(TerminalPosition.TOP_LEFT_CORNER);
+        return toGlobal(TerminalPosition.OF_0x0);
     }
     
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractComposite.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractComposite.java
index debad26a6..940f33d83 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractComposite.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractComposite.java
@@ -60,9 +60,9 @@ public void setComponent(Component component) {
             if (getBasePane() != null) {
                 MenuBar menuBar = getBasePane().getMenuBar();
                 if (menuBar == null || menuBar.isEmptyMenuBar()) {
-                    component.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+                    component.setPosition(TerminalPosition.OF_0x0);
                 } else {
-                    component.setPosition(TerminalPosition.TOP_LEFT_CORNER.withRelativeRow(1));
+                    component.setPosition(TerminalPosition.OF_0x1);
                 }
             }
             invalidate();
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
index 44c158b13..f8d08a95f 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
@@ -39,7 +39,7 @@ public abstract class AbstractListBox<V, T extends AbstractListBox<V, T>> extend
     private final List<V> items;
     private int selectedIndex;
     private ListItemRenderer<V,T> listItemRenderer;
-    protected TerminalPosition scrollOffset = new TerminalPosition(0, 0);
+    protected TerminalPosition scrollOffset = TerminalPosition.OF_0x0;
     
     /**
      * This constructor sets up the component so it has no preferred size but will ask to be as big as the list is. If
@@ -403,7 +403,7 @@ public TerminalPosition getCursorLocation(T listBox) {
             if(columnAccordingToRenderer == -1) {
                 return null;
             }
-            return new TerminalPosition(columnAccordingToRenderer, selectedIndex - scrollTopIndex);
+            return TerminalPosition.of(columnAccordingToRenderer, selectedIndex - scrollTopIndex);
         }
 
         @Override
@@ -445,7 +445,7 @@ else if(selectedIndex >= componentHeight + scrollTopIndex)
                 scrollTopIndex = items.size() - componentHeight;
             }
             
-            listBox.scrollOffset = new TerminalPosition(0, -scrollTopIndex);
+            listBox.scrollOffset = TerminalPosition.of(0, -scrollTopIndex);
 
             graphics.applyThemeStyle(themeDefinition.getNormal());
             graphics.fill(' ');
@@ -456,7 +456,7 @@ else if(selectedIndex >= componentHeight + scrollTopIndex)
                     break;
                 }
                 listItemRenderer.drawItem(
-                        graphics.newTextGraphics(new TerminalPosition(0, i - scrollTopIndex), itemSize),
+                        graphics.newTextGraphics(TerminalPosition.of(0, i - scrollTopIndex), itemSize),
                         listBox,
                         i,
                         items.get(i),
@@ -471,7 +471,7 @@ else if(selectedIndex >= componentHeight + scrollTopIndex)
                 verticalScrollBar.setScrollMaximum(items.size());
                 verticalScrollBar.setScrollPosition(scrollTopIndex);
                 verticalScrollBar.draw(graphics.newTextGraphics(
-                        new TerminalPosition(graphics.getSize().getColumns() - 1, 0),
+                        TerminalPosition.of(graphics.getSize().getColumns() - 1, 0),
                         new TerminalSize(1, graphics.getSize().getRows())));
             }
         }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractWindow.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractWindow.java
index 3d7ac5fde..fb67650ab 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractWindow.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractWindow.java
@@ -60,7 +60,7 @@ public AbstractWindow(String title) {
         this.title = title;
         this.textGUI = null;
         this.visible = true;
-        this.contentOffset = TerminalPosition.TOP_LEFT_CORNER;
+        this.contentOffset = TerminalPosition.OF_0x0;
         this.lastKnownPosition = null;
         this.lastKnownSize = null;
         this.lastKnownDecoratedSize = null;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
index dc301af1b..29ef2ee20 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
@@ -115,7 +115,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
         if(layout.containsKey(Location.TOP)) {
             Component topComponent = layout.get(Location.TOP);
             topComponentHeight = Math.min(topComponent.getPreferredSize().getRows(), availableVerticalSpace);
-            topComponent.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+            topComponent.setPosition(TerminalPosition.OF_0x0);
             topComponent.setSize(new TerminalSize(availableHorizontalSpace, topComponentHeight));
             availableVerticalSpace -= topComponentHeight;
         }
@@ -124,7 +124,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
         if(layout.containsKey(Location.BOTTOM)) {
             Component bottomComponent = layout.get(Location.BOTTOM);
             int bottomComponentHeight = Math.min(bottomComponent.getPreferredSize().getRows(), availableVerticalSpace);
-            bottomComponent.setPosition(new TerminalPosition(0, area.getRows() - bottomComponentHeight));
+            bottomComponent.setPosition(TerminalPosition.of(0, area.getRows() - bottomComponentHeight));
             bottomComponent.setSize(new TerminalSize(availableHorizontalSpace, bottomComponentHeight));
             availableVerticalSpace -= bottomComponentHeight;
         }
@@ -133,27 +133,27 @@ public void doLayout(TerminalSize area, List<Component> components) {
         if(layout.containsKey(Location.LEFT)) {
             Component leftComponent = layout.get(Location.LEFT);
             leftComponentWidth = Math.min(leftComponent.getPreferredSize().getColumns(), availableHorizontalSpace);
-            leftComponent.setPosition(new TerminalPosition(0, topComponentHeight));
+            leftComponent.setPosition(TerminalPosition.of(0, topComponentHeight));
             leftComponent.setSize(new TerminalSize(leftComponentWidth, availableVerticalSpace));
             availableHorizontalSpace -= leftComponentWidth;
         }
         if(layout.containsKey(Location.RIGHT)) {
             Component rightComponent = layout.get(Location.RIGHT);
             int rightComponentWidth = Math.min(rightComponent.getPreferredSize().getColumns(), availableHorizontalSpace);
-            rightComponent.setPosition(new TerminalPosition(area.getColumns() - rightComponentWidth, topComponentHeight));
+            rightComponent.setPosition(TerminalPosition.of(area.getColumns() - rightComponentWidth, topComponentHeight));
             rightComponent.setSize(new TerminalSize(rightComponentWidth, availableVerticalSpace));
             availableHorizontalSpace -= rightComponentWidth;
         }
         if(layout.containsKey(Location.CENTER)) {
             Component centerComponent = layout.get(Location.CENTER);
-            centerComponent.setPosition(new TerminalPosition(leftComponentWidth, topComponentHeight));
+            centerComponent.setPosition(TerminalPosition.of(leftComponentWidth, topComponentHeight));
             centerComponent.setSize(new TerminalSize(availableHorizontalSpace, availableVerticalSpace));
         }
         
         //Set the remaining components to 0x0
         for(Component component: components) {
             if(component.isVisible() && !layout.containsValue(component)) {
-                component.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+                component.setPosition(TerminalPosition.OF_0x0);
                 component.setSize(TerminalSize.ZERO);
             }
         }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Borders.java b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
index 632ab2d6f..b8d298373 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Borders.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
@@ -197,7 +197,7 @@ public TerminalSize getPreferredSize(Border component) {
 
         @Override
         public TerminalPosition getWrappedComponentTopLeftOffset() {
-            return TerminalPosition.OFFSET_1x1;
+            return TerminalPosition.OF_1x1;
         }
 
         @Override
@@ -234,11 +234,11 @@ public void drawComponent(TextGUIGraphics graphics, Border component) {
             }
             graphics.setCharacter(0, drawableArea.getRows() - 1, bottomLeftCorner);
             if(drawableArea.getRows() > 2) {
-                graphics.drawLine(new TerminalPosition(0, drawableArea.getRows() - 2), new TerminalPosition(0, 1), verticalLine);
+                graphics.drawLine(TerminalPosition.of(0, drawableArea.getRows() - 2), TerminalPosition.OF_0x1, verticalLine);
             }
             graphics.setCharacter(0, 0, topLeftCorner);
             if(drawableArea.getColumns() > 2) {
-                graphics.drawLine(new TerminalPosition(1, 0), new TerminalPosition(drawableArea.getColumns() - 2, 0), horizontalLine);
+                graphics.drawLine(TerminalPosition.OF_1x0, TerminalPosition.of(drawableArea.getColumns() - 2, 0), horizontalLine);
             }
 
             if(borderStyle == BorderStyle.ReverseBevel) {
@@ -249,14 +249,14 @@ public void drawComponent(TextGUIGraphics graphics, Border component) {
             }
             graphics.setCharacter(drawableArea.getColumns() - 1, 0, topRightCorner);
             if(drawableArea.getRows() > 2) {
-                graphics.drawLine(new TerminalPosition(drawableArea.getColumns() - 1, 1),
-                        new TerminalPosition(drawableArea.getColumns() - 1, drawableArea.getRows() - 2),
+                graphics.drawLine(TerminalPosition.of(drawableArea.getColumns() - 1, 1),
+                        TerminalPosition.of(drawableArea.getColumns() - 1, drawableArea.getRows() - 2),
                         verticalLine);
             }
             graphics.setCharacter(drawableArea.getColumns() - 1, drawableArea.getRows() - 1, bottomRightCorner);
             if(drawableArea.getColumns() > 2) {
-                graphics.drawLine(new TerminalPosition(1, drawableArea.getRows() - 1),
-                        new TerminalPosition(drawableArea.getColumns() - 2, drawableArea.getRows() - 1),
+                graphics.drawLine(TerminalPosition.of(1, drawableArea.getRows() - 1),
+                        TerminalPosition.of(drawableArea.getColumns() - 2, drawableArea.getRows() - 1),
                         horizontalLine);
             }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Button.java b/src/main/java/com/googlecode/lanterna/gui2/Button.java
index 001ae7961..501f0e514 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Button.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Button.java
@@ -160,7 +160,7 @@ public static class DefaultButtonRenderer implements ButtonRenderer {
         @Override
         public TerminalPosition getCursorLocation(Button button) {
             if(button.getThemeDefinition().isCursorVisible()) {
-                return new TerminalPosition(1 + getLabelShift(button, button.getSize()), 0);
+                return TerminalPosition.of(1 + getLabelShift(button, button.getSize()), 0);
             }
             else {
                 return null;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java b/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
index a2b45354a..71f8e2567 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
@@ -175,7 +175,7 @@ public static abstract class CheckBoxRenderer implements InteractableRenderer<Ch
      * of a "[ ]" block which will contain a "X" inside it if the check box has toggle status on
      */
     public static class DefaultCheckBoxRenderer extends CheckBoxRenderer {
-        private static final TerminalPosition CURSOR_LOCATION = new TerminalPosition(1, 0);
+        private static final TerminalPosition CURSOR_LOCATION = TerminalPosition.OF_1x0;
         @Override
         public TerminalPosition getCursorLocation(CheckBox component) {
             if(component.getThemeDefinition().isCursorVisible()) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
index 955be2c3a..495f2fb04 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
@@ -476,7 +476,7 @@ private Result handleReadOnlyCBKeyStroke(KeyStroke keyStroke) {
     
     protected void showPopup(KeyStroke keyStroke) {
         popupWindow = new PopupWindow();
-        popupWindow.setPosition(toGlobal(new TerminalPosition(0, 1)));
+        popupWindow.setPosition(toGlobal(TerminalPosition.OF_0x1));
         ((WindowBasedTextGUI) getTextGUI()).addWindow(popupWindow);
         ((WindowBasedTextGUI) getTextGUI()).setActiveWindow(popupWindow);
     }
@@ -627,7 +627,7 @@ public DefaultComboBoxRenderer() {
         public TerminalPosition getCursorLocation(ComboBox<V> comboBox) {
             if(comboBox.isDropDownFocused()) {
                 if(comboBox.getThemeDefinition().isCursorVisible()) {
-                    return new TerminalPosition(comboBox.getSize().getColumns() - 1, 0);
+                    return TerminalPosition.of(comboBox.getSize().getColumns() - 1, 0);
                 }
                 else {
                     return null;
@@ -636,7 +636,7 @@ public TerminalPosition getCursorLocation(ComboBox<V> comboBox) {
             else {
                 int textInputPosition = comboBox.getTextInputPosition();
                 int textInputColumn = TerminalTextUtils.getColumnWidth(comboBox.getText().substring(0, textInputPosition));
-                return new TerminalPosition(textInputColumn - textVisibleLeftPosition, 0);
+                return TerminalPosition.of(textInputColumn - textVisibleLeftPosition, 0);
             }
         }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Component.java b/src/main/java/com/googlecode/lanterna/gui2/Component.java
index 9234536e3..94a9bca2d 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Component.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Component.java
@@ -18,6 +18,7 @@
  */
 package com.googlecode.lanterna.gui2;
 
+import com.googlecode.lanterna.TerminalRectangle;
 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.graphics.Theme;
@@ -30,6 +31,14 @@
  * @author Martin
  */
 public interface Component extends TextGUIElement {
+
+    /**
+     *
+     * @return the TerminalPosition and TerminalSize as a TerminalRectangle
+     */
+    default TerminalRectangle getBounds() {
+        return new TerminalRectangle(getPosition(), getSize());
+    }
     /**
      * Returns the top-left corner of this component, measured from its parent.
      * @return Position of this component
@@ -38,7 +47,7 @@ public interface Component extends TextGUIElement {
     
     /**
      * Returns the top-left corner of this component in global coordinates space
-     * using {@link TerminalPosition#TOP_LEFT_CORNER} with
+     * using {@link TerminalPosition#OF_0x0} with
      * {@link #toGlobal(TerminalPosition)}
      * 
      * @return global position of this component
diff --git a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
index d26988a03..816638738 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
@@ -69,8 +69,8 @@ public TextGUIGraphics draw(WindowBasedTextGUI textGUI, TextGUIGraphics graphics
         else {
             graphics.applyThemeStyle(themeDefinition.getPreLight());
         }
-        graphics.drawLine(new TerminalPosition(0, drawableArea.getRows() - 2), new TerminalPosition(0, 1), verticalLine);
-        graphics.drawLine(new TerminalPosition(1, 0), new TerminalPosition(drawableArea.getColumns() - 2, 0), horizontalLine);
+        graphics.drawLine(TerminalPosition.of(0, drawableArea.getRows() - 2), TerminalPosition.OF_0x1, verticalLine);
+        graphics.drawLine(TerminalPosition.OF_1x0, TerminalPosition.of(drawableArea.getColumns() - 2, 0), horizontalLine);
         graphics.setCharacter(0, 0, topLeftCorner);
         graphics.setCharacter(0, drawableArea.getRows() - 1, bottomLeftCorner);
 
@@ -87,12 +87,12 @@ public TextGUIGraphics draw(WindowBasedTextGUI textGUI, TextGUIGraphics graphics
 
         graphics.applyThemeStyle(themeDefinition.getNormal());
         graphics.drawLine(
-                new TerminalPosition(drawableArea.getColumns() - 1, 1),
-                new TerminalPosition(drawableArea.getColumns() - 1, drawableArea.getRows() - 2),
+                TerminalPosition.of(drawableArea.getColumns() - 1, 1),
+                TerminalPosition.of(drawableArea.getColumns() - 1, drawableArea.getRows() - 2),
                 verticalLine);
         graphics.drawLine(
-                new TerminalPosition(1, drawableArea.getRows() - 1),
-                new TerminalPosition(drawableArea.getColumns() - 2, drawableArea.getRows() - 1),
+                TerminalPosition.of(1, drawableArea.getRows() - 1),
+                TerminalPosition.of(drawableArea.getColumns() - 2, drawableArea.getRows() - 1),
                 horizontalLine);
 
         graphics.setCharacter(drawableArea.getColumns() - 1, 0, topRightCorner);
@@ -109,7 +109,7 @@ public TextGUIGraphics draw(WindowBasedTextGUI textGUI, TextGUIGraphics graphics
         }
 
         return graphics.newTextGraphics(
-                new TerminalPosition(1, 1),
+                TerminalPosition.OF_1x1,
                 drawableArea
                         // Make sure we don't make the new graphic's area smaller than 0
                         .withRelativeColumns(-(Math.min(2, drawableArea.getColumns())))
@@ -133,10 +133,8 @@ public TerminalSize getDecoratedSize(Window window, TerminalSize contentAreaSize
                 .max(new TerminalSize(titleWidth + minPadding, 1));  //Make sure the title fits!
     }
 
-    private static final TerminalPosition OFFSET = new TerminalPosition(1, 1);
-
     @Override
     public TerminalPosition getOffset(Window window) {
-        return OFFSET;
+        return TerminalPosition.OF_1x1;
     }
 }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
index a9dacd6f9..ee59c26c4 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
@@ -108,18 +108,18 @@ public void onAdded(WindowBasedTextGUI textGUI, Window window, List<Window> allW
             //Don't place the window, assume the position is already set
         }
         else if(allWindows.isEmpty()) {
-            window.setPosition(TerminalPosition.OFFSET_1x1);
+            window.setPosition(TerminalPosition.OF_1x1);
         }
         else if(window.getHints().contains(Window.Hint.CENTERED)) {
             int left = (lastKnownScreenSize.getColumns() - expectedDecoratedSize.getColumns()) / 2;
             int top = (lastKnownScreenSize.getRows() - expectedDecoratedSize.getRows()) / 2;
-            window.setPosition(new TerminalPosition(left, top));
+            window.setPosition(TerminalPosition.of(left, top));
         }
         else {
             TerminalPosition nextPosition = allWindows.get(allWindows.size() - 1).getPosition().withRelative(2, 1);
             if(nextPosition.getColumn() + expectedDecoratedSize.getColumns() > lastKnownScreenSize.getColumns() ||
                     nextPosition.getRow() + expectedDecoratedSize.getRows() > lastKnownScreenSize.getRows()) {
-                nextPosition = TerminalPosition.OFFSET_1x1;
+                nextPosition = TerminalPosition.of(1, 1);
             }
             window.setPosition(nextPosition);
         }
@@ -164,11 +164,11 @@ protected void prepareWindow(TerminalSize screenSize, Window window) {
         TerminalPosition position = window.getPosition();
 
         if(window.getHints().contains(Window.Hint.FULL_SCREEN)) {
-            position = TerminalPosition.TOP_LEFT_CORNER;
+            position = TerminalPosition.OF_0x0;
             size = screenSize;
         }
         else if(window.getHints().contains(Window.Hint.EXPANDED)) {
-            position = TerminalPosition.OFFSET_1x1;
+            position = TerminalPosition.OF_1x1;
             size = screenSize.withRelative(
                     -Math.min(4, screenSize.getColumns()),
                     -Math.min(3, screenSize.getRows()));
@@ -195,7 +195,7 @@ else if(window.getHints().contains(Window.Hint.FIT_TERMINAL_WINDOW) ||
             if(window.getHints().contains(Window.Hint.CENTERED)) {
                 int left = (lastKnownScreenSize.getColumns() - size.getColumns()) / 2;
                 int top = (lastKnownScreenSize.getRows() - size.getRows()) / 2;
-                position = new TerminalPosition(left, top);
+                position = TerminalPosition.of(left, top);
             }
         }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/EmptyWindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/EmptyWindowDecorationRenderer.java
index 0220ed6e1..7d0d2d53f 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/EmptyWindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/EmptyWindowDecorationRenderer.java
@@ -38,6 +38,6 @@ public TerminalSize getDecoratedSize(Window window, TerminalSize contentAreaSize
 
     @Override
     public TerminalPosition getOffset(Window window) {
-        return TerminalPosition.TOP_LEFT_CORNER;
+        return TerminalPosition.OF_0x0;
     }
 }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
index bc3c3e86c..aeec06116 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
@@ -119,8 +119,8 @@ public TerminalSize getDecoratedSize(Window window, TerminalSize contentAreaSize
         }
     }
 
-    private static final TerminalPosition OFFSET_WITH_TITLE = new TerminalPosition(1, 3);
-    private static final TerminalPosition OFFSET_WITHOUT_TITLE = new TerminalPosition(1, 1);
+    private static final TerminalPosition OFFSET_WITH_TITLE = TerminalPosition.of(1, 3);
+    private static final TerminalPosition OFFSET_WITHOUT_TITLE = TerminalPosition.of(1, 1);
 
     @Override
     public TerminalPosition getOffset(Window window) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java b/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
index 4bc220f2e..725237b5c 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
@@ -458,7 +458,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
 
         //Ok, all constraints are in place, we can start placing out components. To simplify, do it horizontally first
         //and vertically after
-        TerminalPosition tableCellTopLeft = TerminalPosition.TOP_LEFT_CORNER;
+        TerminalPosition tableCellTopLeft = TerminalPosition.OF_0x0;
         for(int y = 0; y < table.length; y++) {
             tableCellTopLeft = tableCellTopLeft.withColumn(0);
             for(int x = 0; x < table[y].length; x++) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ImageComponent.java b/src/main/java/com/googlecode/lanterna/gui2/ImageComponent.java
index fc43dabcc..e48df73cc 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ImageComponent.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ImageComponent.java
@@ -44,7 +44,7 @@ public InteractableRenderer<ImageComponent> createDefaultRenderer() {
         return new InteractableRenderer<ImageComponent>() {
             @Override
             public void drawComponent(TextGUIGraphics graphics, ImageComponent panel) {
-                graphics.drawImage(TerminalPosition.TOP_LEFT_CORNER, textImage);
+                graphics.drawImage(TerminalPosition.OF_0x0, textImage);
             }
             @Override
             public TerminalSize getPreferredSize(ImageComponent panel) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
index a67d6981e..d2df9da8d 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
@@ -57,7 +57,7 @@ TerminalSize getSize() {
      * @param interactable Interactable to add to the lookup map
      */
     public synchronized void add(Interactable interactable) {
-        TerminalPosition topLeft = interactable.toBasePane(TerminalPosition.TOP_LEFT_CORNER);
+        TerminalPosition topLeft = interactable.toBasePane(TerminalPosition.OF_0x0);
         TerminalSize size = interactable.getSize();
         interactables.add(interactable);
         int index = interactables.size() - 1;
@@ -121,10 +121,10 @@ private Interactable findNextUpOrDown(Interactable interactable, boolean isDown)
             // If the currently active interactable component is not showing the cursor, use the top-left position
             // instead if we're going up, or the bottom-left position if we're going down
             if(isDown) {
-                startPosition = new TerminalPosition(0, interactable.getSize().getRows() - 1);
+                startPosition = TerminalPosition.of(0, interactable.getSize().getRows() - 1);
             }
             else {
-                startPosition = TerminalPosition.TOP_LEFT_CORNER;
+                startPosition = TerminalPosition.OF_0x0;
             }
         }
         else {
@@ -144,9 +144,9 @@ private Interactable findNextUpOrDown(Interactable interactable, boolean isDown)
         }
         Set<Interactable> disqualified = getDisqualifiedInteractables(startPosition, true);
         TerminalSize size = getSize();
-        int maxShiftLeft = interactable.toBasePane(TerminalPosition.TOP_LEFT_CORNER).getColumn();
+        int maxShiftLeft = interactable.toBasePane(TerminalPosition.OF_0x0).getColumn();
         maxShiftLeft = Math.max(maxShiftLeft, 0);
-        int maxShiftRight = interactable.toBasePane(new TerminalPosition(interactable.getSize().getColumns() - 1, 0)).getColumn();
+        int maxShiftRight = interactable.toBasePane(TerminalPosition.of(interactable.getSize().getColumns() - 1, 0)).getColumn();
         maxShiftRight = Math.min(maxShiftRight, size.getColumns() - 1);
         int maxShift = Math.max(startPosition.getColumn() - maxShiftLeft, maxShiftRight - startPosition.getRow());
         for (int searchRow = startPosition.getRow() + directionTerm;
@@ -201,10 +201,10 @@ private Interactable findNextLeftOrRight(Interactable interactable, boolean isRi
             // If the currently active interactable component is not showing the cursor, use the top-left position
             // instead if we're going left, or the top-right position if we're going right
             if(isRight) {
-                startPosition = new TerminalPosition(interactable.getSize().getColumns() - 1, 0);
+                startPosition = TerminalPosition.of(interactable.getSize().getColumns() - 1, 0);
             }
             else {
-                startPosition = TerminalPosition.TOP_LEFT_CORNER;
+                startPosition = TerminalPosition.OF_0x0;
             }
         }
         else {
@@ -224,9 +224,9 @@ private Interactable findNextLeftOrRight(Interactable interactable, boolean isRi
         }
         Set<Interactable> disqualified = getDisqualifiedInteractables(startPosition, false);
         TerminalSize size = getSize();
-        int maxShiftUp = interactable.toBasePane(TerminalPosition.TOP_LEFT_CORNER).getRow();
+        int maxShiftUp = interactable.toBasePane(TerminalPosition.OF_0x0).getRow();
         maxShiftUp = Math.max(maxShiftUp, 0);
-        int maxShiftDown = interactable.toBasePane(new TerminalPosition(0, interactable.getSize().getRows() - 1)).getRow();
+        int maxShiftDown = interactable.toBasePane(TerminalPosition.of(0, interactable.getSize().getRows() - 1)).getRow();
         maxShiftDown = Math.min(maxShiftDown, size.getRows() - 1);
         int maxShift = Math.max(startPosition.getRow() - maxShiftUp, maxShiftDown - startPosition.getRow());
         for(int searchColumn = startPosition.getColumn() + directionTerm;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
index 4ae78f878..d865be856 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
@@ -229,7 +229,7 @@ private void doVerticalLayout(TerminalSize area, List<Component> components) {
         int availableHorizontalSpace = area.getColumns();
         for(Component component: components) {
             if(remainingVerticalSpace <= 0) {
-                component.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+                component.setPosition(TerminalPosition.OF_0x0);
                 component.setSize(TerminalSize.ZERO);
             }
             else {
@@ -381,7 +381,7 @@ private void doHorizontalLayout(TerminalSize area, List<Component> components) {
         int availableVerticalSpace = area.getRows();
         for(Component component: components) {
             if(remainingHorizontalSpace <= 0) {
-                component.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+                component.setPosition(TerminalPosition.OF_0x0);
                 component.setSize(TerminalSize.ZERO);
             }
             else {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/MenuPopupWindow.java b/src/main/java/com/googlecode/lanterna/gui2/MenuPopupWindow.java
index ef00dbb90..7e80651d3 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/MenuPopupWindow.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/MenuPopupWindow.java
@@ -38,7 +38,7 @@ public class MenuPopupWindow extends AbstractWindow {
     public MenuPopupWindow(Component parent) {
         setHints(Arrays.asList(Hint.MODAL, Hint.MENU_POPUP, Hint.FIXED_POSITION));
         if (parent != null) {
-            TerminalPosition menuPositionGlobal = parent.toGlobal(TerminalPosition.TOP_LEFT_CORNER);
+            TerminalPosition menuPositionGlobal = parent.toGlobal(TerminalPosition.OF_0x0);
             setPosition(menuPositionGlobal.withRelative(0, 1));
         }
         menuItemPanel = new Panel(new LinearLayout(Direction.VERTICAL));
diff --git a/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java b/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
index 4463d83f8..6c884987c 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
@@ -265,7 +265,7 @@ protected synchronized void drawGUI(TextGUIGraphics graphics) {
                 }
                 TextGUIGraphics windowGraphics = new DefaultTextGUIGraphics(this, textImage.newTextGraphics());
                 TextGUIGraphics insideWindowDecorationsGraphics = windowGraphics;
-                TerminalPosition contentOffset = TerminalPosition.TOP_LEFT_CORNER;
+                TerminalPosition contentOffset = TerminalPosition.OF_0x0;
                 if (!window.getHints().contains(Window.Hint.NO_DECORATIONS)) {
                     WindowDecorationRenderer decorationRenderer = windowManager.getWindowDecorationRenderer(window);
                     insideWindowDecorationsGraphics = decorationRenderer.draw(this, windowGraphics, window);
@@ -439,7 +439,7 @@ protected void ifMouseDragPossiblyMoveWindow(KeyStroke keyStroke) {
             int dx = mp.getColumn() - dragStart.getColumn();
             int dy = mp.getRow() - dragStart.getRow();
             changeWindowHintsForDragged(titleBarDragWindow);
-            titleBarDragWindow.setPosition(new TerminalPosition(wp.getColumn() + dx, wp.getRow() + dy));
+            titleBarDragWindow.setPosition(TerminalPosition.of(wp.getColumn() + dx, wp.getRow() + dy));
             // TODO ? any additional children popups (shown menus, etc) should also be moved (or just closed)
         }
         
diff --git a/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java b/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
index d94c99868..69a772004 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
@@ -207,9 +207,9 @@ public void doLayout(TerminalSize area, List<Component> components) {
                 thumb.setSize(thumb.getPreferredSize());
                 compB.setSize(new TerminalSize(rightWidth, rightHeight));
 
-                compA.setPosition(new TerminalPosition(0, 0));
-                thumb.setPosition(new TerminalPosition(leftWidth, h / 2 - tHeight / 2));
-                compB.setPosition(new TerminalPosition(leftWidth + tWidth, 0));
+                compA.setPosition(TerminalPosition.of(0, 0));
+                thumb.setPosition(TerminalPosition.of(leftWidth, h / 2 - tHeight / 2));
+                compB.setPosition(TerminalPosition.of(leftWidth + tWidth, 0));
             } else {
                 int leftWidth = Math.max(0, Math.min(compA.getPreferredSize().getColumns(), w));
                 int leftHeight = Math.max(0, (int) (h * ratio));
@@ -221,9 +221,9 @@ public void doLayout(TerminalSize area, List<Component> components) {
                 thumb.setSize(thumb.getPreferredSize());
                 compB.setSize(new TerminalSize(rightWidth, rightHeight));
 
-                compA.setPosition(new TerminalPosition(0, 0));
-                thumb.setPosition(new TerminalPosition(w / 2 - tWidth / 2, leftHeight));
-                compB.setPosition(new TerminalPosition(0, leftHeight + tHeight));
+                compA.setPosition(TerminalPosition.of(0, 0));
+                thumb.setPosition(TerminalPosition.of(w / 2 - tWidth / 2, leftHeight));
+                compB.setPosition(TerminalPosition.of(0, leftHeight + tHeight));
             }
 
             hasChanged = !compAPrevPos.equals(compA.getPosition()) ||
diff --git a/src/main/java/com/googlecode/lanterna/gui2/TextBox.java b/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
index 7dc325bf9..e6227581a 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
@@ -136,7 +136,7 @@ public TextBox(TerminalSize preferredSize, String initialContent, Style style) {
         this.caretWarp = false;
         this.verticalFocusSwitching = true;
         this.horizontalFocusSwitching = (style == Style.SINGLE_LINE);
-        this.caretPosition = TerminalPosition.TOP_LEFT_CORNER;
+        this.caretPosition = TerminalPosition.OF_0x0;
         this.maxLineLength = -1;
         this.longestRow = 1;    //To fit the cursor
         this.mask = null;
@@ -145,7 +145,7 @@ public TextBox(TerminalSize preferredSize, String initialContent, Style style) {
         setText(initialContent);
 
         // Re-adjust caret position
-        this.caretPosition = TerminalPosition.TOP_LEFT_CORNER.withColumn(getLine(0).length());
+        this.caretPosition = TerminalPosition.of(getLine(0).length(), 0);
 
         if (preferredSize == null) {
             preferredSize = new TerminalSize(Math.max(10, longestRow), lines.size());
@@ -676,7 +676,7 @@ else if(verticalFocusSwitching) {
                         int maxPositionAttempt = newActiveLine.length();
                         newCaretPositionColumn = Math.max(minPositionAttempt, Math.min(newCaretPositionColumn, maxPositionAttempt));
 
-                        caretPosition = caretPosition.with(new TerminalPosition(newCaretPositionColumn, newCaretPositionRow));
+                        caretPosition = caretPosition.with(TerminalPosition.of(newCaretPositionColumn, newCaretPositionRow));
                     }
                 }
                 result = Result.HANDLED;
@@ -749,10 +749,10 @@ private Result handleKeyStrokeReadOnly(KeyStroke keyStroke) {
                 getRenderer().setViewTopLeft(getRenderer().getViewTopLeft().withRelativeRow(1));
                 return Result.HANDLED;
             case HOME:
-                getRenderer().setViewTopLeft(TerminalPosition.TOP_LEFT_CORNER);
+                getRenderer().setViewTopLeft(TerminalPosition.OF_0x0);
                 return Result.HANDLED;
             case END:
-                getRenderer().setViewTopLeft(TerminalPosition.TOP_LEFT_CORNER.withRow(getLineCount() - getSize().getRows()));
+                getRenderer().setViewTopLeft(TerminalPosition.of(0, getLineCount() - getSize().getRows()));
                 return Result.HANDLED;
             case PAGE_DOWN:
                 getRenderer().setViewTopLeft(getRenderer().getViewTopLeft().withRelativeRow(getSize().getRows()));
@@ -797,7 +797,7 @@ public static class DefaultTextBoxRenderer implements TextBoxRenderer {
          * Default constructor
          */
         public DefaultTextBoxRenderer() {
-            viewTopLeft = TerminalPosition.TOP_LEFT_CORNER;
+            viewTopLeft = TerminalPosition.OF_0x0;
             verticalScrollBar = new ScrollBar(Direction.VERTICAL);
             horizontalScrollBar = new ScrollBar(Direction.HORIZONTAL);
             hideScrollBars = false;
@@ -887,7 +887,7 @@ public void drawComponent(TextGUIGraphics graphics, TextBox component) {
                 }
             }
 
-            drawTextArea(graphics.newTextGraphics(TerminalPosition.TOP_LEFT_CORNER, realTextArea), component);
+            drawTextArea(graphics.newTextGraphics(TerminalPosition.OF_0x0, realTextArea), component);
 
             //Draw scrollbars, if any
             if(drawVerticalScrollBar) {
@@ -896,7 +896,7 @@ public void drawComponent(TextGUIGraphics graphics, TextBox component) {
                 verticalScrollBar.setScrollMaximum(textBoxLineCount);
                 verticalScrollBar.setScrollPosition(viewTopLeft.getRow());
                 verticalScrollBar.draw(graphics.newTextGraphics(
-                        new TerminalPosition(graphics.getSize().getColumns() - 1, 0),
+                        TerminalPosition.of(graphics.getSize().getColumns() - 1, 0),
                         new TerminalSize(1, graphics.getSize().getRows() - (drawHorizontalScrollBar ? 1 : 0))));
             }
             if(drawHorizontalScrollBar) {
@@ -905,7 +905,7 @@ public void drawComponent(TextGUIGraphics graphics, TextBox component) {
                 horizontalScrollBar.setScrollMaximum(component.longestRow - 1);
                 horizontalScrollBar.setScrollPosition(viewTopLeft.getColumn());
                 horizontalScrollBar.draw(graphics.newTextGraphics(
-                        new TerminalPosition(0, graphics.getSize().getRows() - 1),
+                        TerminalPosition.of(0, graphics.getSize().getRows() - 1),
                         new TerminalSize(graphics.getSize().getColumns() - (drawVerticalScrollBar ? 1 : 0), 1)));
             }
         }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
index 1d607917b..cd9f9c4b0 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
@@ -449,7 +449,7 @@ public synchronized void drawComponent(TextGUIGraphics graphics, Table<V> table)
         List<Integer> columnSizes = fitColumnsInAvailableSpace(table, areaWithoutScrollBars, visibleColumns);
         drawHeader(graphics, table, columnSizes);
         drawRows(graphics.newTextGraphics(
-                        new TerminalPosition(0, headerSizeIncludingBorder),
+                        TerminalPosition.of(0, headerSizeIncludingBorder),
                         // Can't use areaWithoutScrollBars here because we need to draw the scrollbar too!
                         area.withRelativeRows(-headerSizeIncludingBorder)),
                 table,
@@ -542,7 +542,7 @@ private void drawHeader(TextGUIGraphics graphics, Table<V> table, List<Integer>
         for(int index = viewLeftColumn; index < endColumnIndex; index++) {
             String label = headers.get(index);
             TerminalSize size = new TerminalSize(columnSizes.get(index), headerSizeInRows);
-            tableHeaderRenderer.drawHeader(table, label, index, graphics.newTextGraphics(new TerminalPosition(leftPosition, 0), size));
+            tableHeaderRenderer.drawHeader(table, label, index, graphics.newTextGraphics(TerminalPosition.of(leftPosition, 0), size));
             leftPosition += size.getColumns();
             if(headerHorizontalBorderStyle != TableCellBorderStyle.NONE && index < (endColumnIndex - 1)) {
                 graphics.applyThemeStyle(theme.getDefinition(Table.class).getNormal());
@@ -602,7 +602,7 @@ private void drawRows(
             if(needHorizontalScrollBar) {
                 scrollBarHeight--;
             }
-            verticalScrollBar.setPosition(new TerminalPosition(graphics.getSize().getColumns() - verticalScrollBarPreferredSize.getColumns(), 0));
+            verticalScrollBar.setPosition(TerminalPosition.of(graphics.getSize().getColumns() - verticalScrollBarPreferredSize.getColumns(), 0));
             verticalScrollBar.setSize(verticalScrollBarPreferredSize.withRows(scrollBarHeight));
             verticalScrollBar.setScrollMaximum(rows.size());
             verticalScrollBar.setViewSize(visibleRows);
@@ -622,12 +622,12 @@ private void drawRows(
             verticalScrollBar.draw(graphics.newTextGraphics(verticalScrollBar.getPosition(), verticalScrollBar.getSize()));
 
             // Adjust graphics object to the remaining area when the vertical scrollbar is subtracted
-            graphics = graphics.newTextGraphics(TerminalPosition.TOP_LEFT_CORNER, graphics.getSize().withRelativeColumns(-verticalScrollBarPreferredSize.getColumns()));
+            graphics = graphics.newTextGraphics(TerminalPosition.OF_0x0, graphics.getSize().withRelativeColumns(-verticalScrollBarPreferredSize.getColumns()));
         }
         if(needHorizontalScrollBar) {
             TerminalSize horizontalScrollBarPreferredSize = horizontalScrollBar.getPreferredSize();
             int scrollBarWidth = graphics.getSize().getColumns();
-            horizontalScrollBar.setPosition(new TerminalPosition(0, graphics.getSize().getRows() - horizontalScrollBarPreferredSize.getRows()));
+            horizontalScrollBar.setPosition(TerminalPosition.of(0, graphics.getSize().getRows() - horizontalScrollBarPreferredSize.getRows()));
             horizontalScrollBar.setSize(horizontalScrollBarPreferredSize.withColumns(scrollBarWidth));
             horizontalScrollBar.setScrollMaximum(tableModel.getColumnCount());
             horizontalScrollBar.setViewSize(visibleColumns);
@@ -647,7 +647,7 @@ private void drawRows(
             horizontalScrollBar.draw(graphics.newTextGraphics(horizontalScrollBar.getPosition(), horizontalScrollBar.getSize()));
 
             // Adjust graphics object to the remaining area when the horizontal scrollbar is subtracted
-            graphics = graphics.newTextGraphics(TerminalPosition.TOP_LEFT_CORNER, graphics.getSize().withRelativeRows(-horizontalScrollBarPreferredSize.getRows()));
+            graphics = graphics.newTextGraphics(TerminalPosition.OF_0x0, graphics.getSize().withRelativeRows(-horizontalScrollBarPreferredSize.getRows()));
         }
 
         int topPosition = 0;
@@ -671,7 +671,7 @@ private void drawRows(
                     leftPosition++;
                 }
                 V cell = row.get(columnIndex);
-                TerminalPosition cellPosition = new TerminalPosition(leftPosition, topPosition);
+                TerminalPosition cellPosition = TerminalPosition.of(leftPosition, topPosition);
                 TerminalSize cellArea = new TerminalSize(columnSizes.get(columnIndex), preferredRowSizes.get(rowIndex));
                 tableCellRenderer.drawCell(table, cell, columnIndex, rowIndex, graphics.newTextGraphics(cellPosition, cellArea));
                 leftPosition += cellArea.getColumns();
diff --git a/src/main/java/com/googlecode/lanterna/input/MouseCharacterPattern.java b/src/main/java/com/googlecode/lanterna/input/MouseCharacterPattern.java
index e1e854323..a52bf9774 100644
--- a/src/main/java/com/googlecode/lanterna/input/MouseCharacterPattern.java
+++ b/src/main/java/com/googlecode/lanterna/input/MouseCharacterPattern.java
@@ -112,7 +112,7 @@ public Matching match(List<Character> seq) {
         // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
         
         
-        TerminalPosition pos = new TerminalPosition( seq.get(4) - 33, seq.get(5) - 33 );
+        TerminalPosition pos = TerminalPosition.of( seq.get(4) - 33, seq.get(5) - 33 );
 
         MouseAction ma = new MouseAction(actionType, button, pos );
         return new Matching( ma ); // yep
diff --git a/src/main/java/com/googlecode/lanterna/input/ScreenInfoCharacterPattern.java b/src/main/java/com/googlecode/lanterna/input/ScreenInfoCharacterPattern.java
index 8c399b374..4f5f874e7 100644
--- a/src/main/java/com/googlecode/lanterna/input/ScreenInfoCharacterPattern.java
+++ b/src/main/java/com/googlecode/lanterna/input/ScreenInfoCharacterPattern.java
@@ -38,7 +38,7 @@ protected KeyStroke getKeyStrokeRaw(char first,int num1,int num2,char last,boole
         if (num1 == 1 && num2 <= 8) {
             return null; // nope: much more likely it's an F3 with modifiers
         }
-        TerminalPosition pos = new TerminalPosition(num2, num1);
+        TerminalPosition pos = TerminalPosition.of(num2, num1);
         return new ScreenInfoAction(pos); // yep
     }
 
@@ -53,7 +53,7 @@ public static ScreenInfoAction tryToAdopt(KeyStroke ks) {
             int col = 1 + (ks.isAltDown()  ? ALT  : 0)
                         + (ks.isCtrlDown() ? CTRL : 0)
                         + (ks.isShiftDown()? SHIFT: 0);
-            TerminalPosition pos = new TerminalPosition(col,1);
+            TerminalPosition pos = TerminalPosition.of(col,1);
             return new ScreenInfoAction(pos);
         default:  return null;
         }
diff --git a/src/main/java/com/googlecode/lanterna/screen/AbstractScreen.java b/src/main/java/com/googlecode/lanterna/screen/AbstractScreen.java
index b8b6f03e4..4f0d82461 100644
--- a/src/main/java/com/googlecode/lanterna/screen/AbstractScreen.java
+++ b/src/main/java/com/googlecode/lanterna/screen/AbstractScreen.java
@@ -65,7 +65,7 @@ public AbstractScreen(TerminalSize initialSize, TextCharacter defaultCharacter)
         this.frontBuffer = new ScreenBuffer(initialSize, defaultCharacter);
         this.backBuffer = new ScreenBuffer(initialSize, defaultCharacter);
         this.defaultCharacter = defaultCharacter;
-        this.cursorPosition = new TerminalPosition(0, 0);
+        this.cursorPosition = TerminalPosition.OF_0x0;
         this.tabBehaviour = TabBehaviour.ALIGN_TO_COLUMN_4;
         this.terminalSize = initialSize;
         this.latestResizeRequest = null;
diff --git a/src/main/java/com/googlecode/lanterna/screen/Screen.java b/src/main/java/com/googlecode/lanterna/screen/Screen.java
index c5a2ed5f1..ca62c2dce 100644
--- a/src/main/java/com/googlecode/lanterna/screen/Screen.java
+++ b/src/main/java/com/googlecode/lanterna/screen/Screen.java
@@ -80,7 +80,7 @@ public interface Screen extends InputProvider, Scrollable, Closeable {
     /**
      * Erases all the characters on the screen, effectively giving you a blank area. The default background color will
      * be used. This is effectively the same as calling 
-     * <pre>fill(TerminalPosition.TOP_LEFT_CORNER, getSize(), TextColor.ANSI.Default)</pre>.
+     * <pre>fill(TerminalPosition.of(0, 0), getSize(), TextColor.ANSI.Default)</pre>.
      * <p>
      * Please note that calling this method will only affect the back buffer, you need to call refresh to make the 
      * change visible.
diff --git a/src/main/java/com/googlecode/lanterna/screen/TerminalScreen.java b/src/main/java/com/googlecode/lanterna/screen/TerminalScreen.java
index fddb470e9..be4f025aa 100644
--- a/src/main/java/com/googlecode/lanterna/screen/TerminalScreen.java
+++ b/src/main/java/com/googlecode/lanterna/screen/TerminalScreen.java
@@ -198,13 +198,13 @@ private void refreshByDelta() throws IOException {
                 TextCharacter backBufferCharacter = getBackBuffer().getCharacterAt(x, y);
                 TextCharacter frontBufferCharacter = getFrontBuffer().getCharacterAt(x, y);
                 if(!backBufferCharacter.equals(frontBufferCharacter)) {
-                    updateMap.put(new TerminalPosition(x, y), backBufferCharacter);
+                    updateMap.put(TerminalPosition.of(x, y), backBufferCharacter);
                 }
                 if(backBufferCharacter.isDoubleWidth()) {
                     x++;    //Skip the trailing padding
                 } else if (frontBufferCharacter.isDoubleWidth()) {
                     if (x+1 < terminalSize.getColumns()) {
-                        updateMap.put(new TerminalPosition(x+1, y), frontBufferCharacter.withCharacter(' '));
+                        updateMap.put(TerminalPosition.of(x+1, y), frontBufferCharacter.withCharacter(' '));
                     }
                 }
             }
diff --git a/src/main/java/com/googlecode/lanterna/screen/VirtualScreen.java b/src/main/java/com/googlecode/lanterna/screen/VirtualScreen.java
index 9be458cfe..8496f588b 100644
--- a/src/main/java/com/googlecode/lanterna/screen/VirtualScreen.java
+++ b/src/main/java/com/googlecode/lanterna/screen/VirtualScreen.java
@@ -56,7 +56,7 @@ public VirtualScreen(Screen screen) {
         this.frameRenderer = new DefaultFrameRenderer();
         this.realScreen = screen;
         this.minimumSize = screen.getTerminalSize();
-        this.viewportTopLeft = TerminalPosition.TOP_LEFT_CORNER;
+        this.viewportTopLeft = TerminalPosition.OF_0x0;
         this.viewportSize = minimumSize;
         this.scrollWithCTRL = false;
     }
@@ -163,7 +163,7 @@ private TerminalSize calculateViewport(TerminalSize realTerminalSize) {
         TerminalSize newVirtualSize = minimumSize.max(realTerminalSize);
         if(newVirtualSize.equals(realTerminalSize)) {
             viewportSize = realTerminalSize;
-            viewportTopLeft = TerminalPosition.TOP_LEFT_CORNER;
+            viewportTopLeft = TerminalPosition.OF_0x0;
         }
         else {
             TerminalSize newViewportSize = frameRenderer.getViewportSize(realTerminalSize, newVirtualSize);
@@ -324,7 +324,7 @@ public interface FrameRenderer {
 
         /**
          * Where in the virtual screen should the top-left position of the viewport be? To draw the viewport from the
-         * top-left position of the screen, return 0x0 (or TerminalPosition.TOP_LEFT_CORNER) here.
+         * top-left position of the screen, return 0x0 (or TerminalPosition.OF_0x0) here.
          * @return Position of the top-left corner of the viewport inside the screen
          */
         TerminalPosition getViewportOffset();
@@ -357,7 +357,7 @@ public TerminalSize getViewportSize(TerminalSize realSize, TerminalSize virtualS
 
         @Override
         public TerminalPosition getViewportOffset() {
-            return TerminalPosition.TOP_LEFT_CORNER;
+            return TerminalPosition.OF_0x0;
         }
 
         @Override
@@ -381,16 +381,16 @@ public void drawFrame(
             int scrollable = viewportSize.getColumns() - horizontalSize - 1;
             int horizontalPosition = (int)((double)scrollable * ((double)virtualScrollPosition.getColumn() / (double)(virtualSize.getColumns() - viewportSize.getColumns())));
             graphics.drawLine(
-                    new TerminalPosition(horizontalPosition, graphics.getSize().getRows() - 2),
-                    new TerminalPosition(horizontalPosition + horizontalSize, graphics.getSize().getRows() - 2),
+                    TerminalPosition.of(horizontalPosition, graphics.getSize().getRows() - 2),
+                    TerminalPosition.of(horizontalPosition + horizontalSize, graphics.getSize().getRows() - 2),
                     Symbols.BLOCK_MIDDLE);
 
             int verticalSize = (int)(((double)(viewportSize.getRows()) / (double)virtualSize.getRows()) * (viewportSize.getRows()));
             scrollable = viewportSize.getRows() - verticalSize - 1;
             int verticalPosition = (int)((double)scrollable * ((double)virtualScrollPosition.getRow() / (double)(virtualSize.getRows() - viewportSize.getRows())));
             graphics.drawLine(
-                    new TerminalPosition(graphics.getSize().getColumns() - 1, verticalPosition),
-                    new TerminalPosition(graphics.getSize().getColumns() - 1, verticalPosition + verticalSize),
+                    TerminalPosition.of(graphics.getSize().getColumns() - 1, verticalPosition),
+                    TerminalPosition.of(graphics.getSize().getColumns() - 1, verticalPosition + verticalSize),
                     Symbols.BLOCK_MIDDLE);
         }
     }
diff --git a/src/main/java/com/googlecode/lanterna/terminal/TerminalTextGraphics.java b/src/main/java/com/googlecode/lanterna/terminal/TerminalTextGraphics.java
index b60e06a4f..c16aad1fb 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/TerminalTextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/TerminalTextGraphics.java
@@ -62,7 +62,7 @@ class TerminalTextGraphics extends AbstractTextGraphics {
 
     @Override
     public TextGraphics setCharacter(int columnIndex, int rowIndex, TextCharacter textCharacter) {
-        return setCharacter(new TerminalPosition(columnIndex, rowIndex), textCharacter);
+        return setCharacter(TerminalPosition.of(columnIndex, rowIndex), textCharacter);
     }
 
     @Override
@@ -96,7 +96,7 @@ public synchronized TextGraphics setCharacter(TerminalPosition position, TextCha
 
     @Override
     public TextCharacter getCharacter(int column, int row) {
-        return getCharacter(new TerminalPosition(column, row));
+        return getCharacter(TerminalPosition.of(column, row));
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java b/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
index 53ee508d8..88a4c2158 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
@@ -107,7 +107,7 @@ protected TerminalSize findTerminalSize() throws IOException {
         restoreCursorPosition();
         TerminalPosition terminalPosition = waitForCursorPositionReport();
         if (terminalPosition == null) {
-            terminalPosition = new TerminalPosition(80,24);
+            terminalPosition = TerminalPosition.of(80,24);
         }
         return new TerminalSize(terminalPosition.getColumn(), terminalPosition.getRow());
     }
@@ -270,7 +270,7 @@ public synchronized TerminalPosition getCursorPosition() throws IOException {
         // ANSI terminal positions are 1-indexed so top-left corner is 1x1 instead of 0x0, that's why we need to adjust it here
         TerminalPosition terminalPosition = waitForCursorPositionReport();
         if (terminalPosition == null) {
-            terminalPosition = TerminalPosition.OFFSET_1x1;
+            terminalPosition = TerminalPosition.OF_1x1;
         }
         return terminalPosition.withRelative(-1, -1);
     }
diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java b/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
index 91394ca69..9bea3782c 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
@@ -690,7 +690,7 @@ private void clearBackBuffer() {
 
     @Override
     public synchronized void setCursorPosition(int x, int y) {
-        setCursorPosition(new TerminalPosition(x, y));
+        setCursorPosition(TerminalPosition.of(x, y));
     }
 
     @Override
@@ -1083,4 +1083,4 @@ boolean isDirty(int row, int column) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
index 55d826ff0..8c1e2c78f 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
@@ -82,8 +82,8 @@ public DefaultVirtualTerminal(TerminalSize initialTerminalSize) {
         this.wholeBufferDirty = false;
         this.terminalSize = initialTerminalSize;
         this.cursorVisible = true;
-        this.cursorPosition = TerminalPosition.TOP_LEFT_CORNER;
-        this.savedCursorPosition = TerminalPosition.TOP_LEFT_CORNER;
+        this.cursorPosition = TerminalPosition.OF_0x0;
+        this.savedCursorPosition = TerminalPosition.OF_0x0;
         this.backlogSize = 1000;
     }
 
@@ -110,7 +110,7 @@ public synchronized void setTerminalSize(TerminalSize newSize) {
     public synchronized void enterPrivateMode() {
         currentTextBuffer = privateModeTextBuffer;
         savedCursorPosition = getCursorBufferPosition();
-        setCursorPosition(TerminalPosition.TOP_LEFT_CORNER);
+        setCursorPosition(TerminalPosition.OF_0x0);
         setWholeBufferDirty();
     }
 
@@ -125,7 +125,7 @@ public synchronized void exitPrivateMode() {
     public synchronized void clearScreen() {
         currentTextBuffer.clear();
         setWholeBufferDirty();
-        setCursorPosition(TerminalPosition.TOP_LEFT_CORNER);
+        setCursorPosition(TerminalPosition.OF_0x0);
     }
 
     @Override
@@ -368,12 +368,12 @@ synchronized void putCharacter(TextCharacter terminalCharacter) {
             // Update the buffer
             int i = currentTextBuffer.setCharacter(cursorPosition.getRow(), cursorPosition.getColumn(), terminalCharacter);
             if(!wholeBufferDirty) {
-                dirtyTerminalCells.add(new TerminalPosition(cursorPosition.getColumn(), cursorPosition.getRow()));
+                dirtyTerminalCells.add(TerminalPosition.of(cursorPosition.getColumn(), cursorPosition.getRow()));
                 if(i == 1) {
-                    dirtyTerminalCells.add(new TerminalPosition(cursorPosition.getColumn() + 1, cursorPosition.getRow()));
+                    dirtyTerminalCells.add(TerminalPosition.of(cursorPosition.getColumn() + 1, cursorPosition.getRow()));
                 }
                 else if(i == 2) {
-                    dirtyTerminalCells.add(new TerminalPosition(cursorPosition.getColumn() - 1, cursorPosition.getRow()));
+                    dirtyTerminalCells.add(TerminalPosition.of(cursorPosition.getColumn() - 1, cursorPosition.getRow()));
                 }
                 if(dirtyTerminalCells.size() > (terminalSize.getColumns() * terminalSize.getRows() * 0.9)) {
                     setWholeBufferDirty();
@@ -440,7 +440,7 @@ private void correctCursor() {
         this.cursorPosition = cursorPosition.withColumn(Math.min(cursorPosition.getColumn(), terminalSize.getColumns() - 1));
         this.cursorPosition = cursorPosition.withRow(Math.min(cursorPosition.getRow(), Math.max(terminalSize.getRows(), getBufferLineCount()) - 1));
         this.cursorPosition =
-                new TerminalPosition(
+                TerminalPosition.of(
                         Math.max(cursorPosition.getColumn(), 0),
                         Math.max(cursorPosition.getRow(), 0));
     }
diff --git a/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java b/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
index 7f35ada95..757b7cd47 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
@@ -18,6 +18,7 @@
  */
 package com.googlecode.lanterna.terminal.virtual;
 
+import com.googlecode.lanterna.TerminalRectangle;
 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.TextCharacter;
@@ -36,16 +37,14 @@ class VirtualTerminalTextGraphics extends AbstractTextGraphics {
     }
 
     @Override
-    public TextGraphics setCharacter(int columnIndex, int rowIndex, TextCharacter textCharacter) {
+    public TextGraphics setCharacter(int column, int row, TextCharacter textCharacter) {
         TerminalSize size = getSize();
-        if(columnIndex < 0 || columnIndex >= size.getColumns() ||
-                rowIndex < 0 || rowIndex >= size.getRows()) {
-            return this;
-        }
-        synchronized(virtualTerminal) {
-            virtualTerminal.setCursorPosition(new TerminalPosition(columnIndex, rowIndex));
-            virtualTerminal.putCharacter(textCharacter);
-        }
+        TerminalRectangle.whenContains(0, 0, size.columns, size.rows, column, row, () -> {
+            synchronized (virtualTerminal) {
+                virtualTerminal.setCursorPosition(TerminalPosition.of(column, row));
+                virtualTerminal.putCharacter(textCharacter);
+            }
+        });
         return this;
     }
 
@@ -56,7 +55,7 @@ public TextCharacter getCharacter(TerminalPosition position) {
 
     @Override
     public TextCharacter getCharacter(int column, int row) {
-        return getCharacter(new TerminalPosition(column, row));
+        return getCharacter(TerminalPosition.of(column, row));
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
index c323f79d0..db563305d 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
@@ -130,7 +130,7 @@ public TerminalPosition getCursorPosition() {
 		Wincon.INSTANCE.GetConsoleScreenBufferInfo(CONSOLE_OUTPUT.getHandle(), screenBufferInfo);
 		int column = screenBufferInfo.dwCursorPosition.X - screenBufferInfo.srWindow.Left;
 		int row = screenBufferInfo.dwCursorPosition.Y - screenBufferInfo.srWindow.Top;
-		return new TerminalPosition(column, row);
+		return TerminalPosition.of(column, row);
 	}
 
 	private int getConsoleInputMode() {
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
new file mode 100644
index 000000000..0c4d453d8
--- /dev/null
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of lanterna (https://github.com/mabe02/lanterna).
+ *
+ * lanterna is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2010-2020 Martin Berglund
+ */
+package com.googlecode.lanterna;
+
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * @author ginkoblongata
+ */
+public class TestTerminalPosition {
+
+    TerminalPosition tp(int x, int y) {
+        return TerminalPosition.of(x, y);
+    }
+    void assertSameSystemIdentityHashCode(Object a, Object b) {
+        assertEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    void assertNotSameSystemIdentityHashCode(Object a, Object b) {
+        assertNotEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    @Test
+    public void testSystemIdentityHashCodeSame() {
+        TerminalPosition a = TerminalPosition.of(23, 34);
+        assertSameSystemIdentityHashCode(a, a);
+    }
+    @Test
+    public void testSystemIdentityHashCodeDifferent() {
+        TerminalPosition a = TerminalPosition.of(23, 34);
+        TerminalPosition b = TerminalPosition.of(23, 34);
+        assertNotSameSystemIdentityHashCode(a, b);
+    }
+    @Test
+    public void testObjectChurnReduced_of() {
+        assertSameSystemIdentityHashCode(tp(0, 0), tp(0, 0));
+        assertSameSystemIdentityHashCode(TerminalPosition.OF_0x0, tp(0, 0));
+        assertSameSystemIdentityHashCode(TerminalPosition.OF_0x1, tp(0, 1));
+        assertSameSystemIdentityHashCode(TerminalPosition.OF_1x0, tp(1, 0));
+        assertSameSystemIdentityHashCode(TerminalPosition.OF_1x1, tp(1, 1));
+    }
+    @Test
+    public void testObjectChurnReduced_as() {
+        TerminalPosition p = tp(35, 80);
+        assertSameSystemIdentityHashCode(p, p.as(35, 80));
+    }
+    @Test
+    public void testObjectChurnReduced_plus() {
+        assertSameSystemIdentityHashCode(tp(0, 1), tp(0, 0).plus(0, 1));
+        assertSameSystemIdentityHashCode(tp(1, 1), tp(0, 0).plus(0 , 1).plus(1, 0));
+        assertSameSystemIdentityHashCode(tp(1, 1), tp(0, 0).plus(1 , 1));
+
+        TerminalPosition p = tp(35, 80);
+        assertSameSystemIdentityHashCode(p, p.plus(0, 0));
+    }
+    @Test
+    public void testObjectChurnReduced_minus() {
+        assertSameSystemIdentityHashCode(tp(0, 0), tp(1, 1).minus(1, 1));
+        assertSameSystemIdentityHashCode(tp(1, 1), tp(2, 2).minus(0, 1).minus(1, 0));
+
+        TerminalPosition p = tp(35, 80);
+        assertSameSystemIdentityHashCode(p, p.minus(0, 0));
+    }
+    @Test
+    public void testObjectChurnReduced_divide() {
+        TerminalPosition p = tp(35, 80);
+        assertSameSystemIdentityHashCode(p, p.divide(1, 1));
+    }
+    @Test
+    public void testObjectChurnReduced_multiply() {
+        TerminalPosition p = tp(35, 80);
+        assertSameSystemIdentityHashCode(p, p.multiply(1, 1));
+    }
+
+}
diff --git a/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java b/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
index 0b3c66a42..73a7c1bf3 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
@@ -90,36 +90,36 @@ private BIOS() {
             BIOSButton button14 = new BIOSButton("Exit Without Saving", "僕の事が思い出せなくても泣かないでね");
             
             button1.setSize(new TerminalSize(35, 1));
-            button1.setPosition(new TerminalPosition(3, 3));
+            button1.setPosition(TerminalPosition.of(3, 3));
             button2.setSize(new TerminalSize(35, 1));
-            button2.setPosition(new TerminalPosition(3, 5));
+            button2.setPosition(TerminalPosition.of(3, 5));
             button3.setSize(new TerminalSize(35, 1));
-            button3.setPosition(new TerminalPosition(3, 7));
+            button3.setPosition(TerminalPosition.of(3, 7));
             button4.setSize(new TerminalSize(35, 1));
-            button4.setPosition(new TerminalPosition(3, 9));
+            button4.setPosition(TerminalPosition.of(3, 9));
             button5.setSize(new TerminalSize(35, 1));
-            button5.setPosition(new TerminalPosition(3, 11));
+            button5.setPosition(TerminalPosition.of(3, 11));
             button6.setSize(new TerminalSize(35, 1));
-            button6.setPosition(new TerminalPosition(3, 13));
+            button6.setPosition(TerminalPosition.of(3, 13));
             button7.setSize(new TerminalSize(35, 1));
-            button7.setPosition(new TerminalPosition(3, 15));
+            button7.setPosition(TerminalPosition.of(3, 15));
             
             button8.setSize(new TerminalSize(35, 1));
-            button8.setPosition(new TerminalPosition(43, 3));
+            button8.setPosition(TerminalPosition.of(43, 3));
             button9.setSize(new TerminalSize(35, 1));
-            button9.setPosition(new TerminalPosition(43, 5));
+            button9.setPosition(TerminalPosition.of(43, 5));
             button10.setSize(new TerminalSize(35, 1));
-            button10.setPosition(new TerminalPosition(43, 7));
+            button10.setPosition(TerminalPosition.of(43, 7));
             button11.setSize(new TerminalSize(35, 1));
-            button11.setPosition(new TerminalPosition(43, 9));
+            button11.setPosition(TerminalPosition.of(43, 9));
             button12.setSize(new TerminalSize(35, 1));
-            button12.setPosition(new TerminalPosition(43, 11));
+            button12.setPosition(TerminalPosition.of(43, 11));
             button13.setSize(new TerminalSize(35, 1));
-            button13.setPosition(new TerminalPosition(43, 13));
+            button13.setPosition(TerminalPosition.of(43, 13));
             button14.setSize(new TerminalSize(35, 1));
-            button14.setPosition(new TerminalPosition(43, 15));
+            button14.setPosition(TerminalPosition.of(43, 15));
             
-            helpLabel.setPosition(new TerminalPosition(2, 22));
+            helpLabel.setPosition(TerminalPosition.of(2, 22));
             helpLabel.setSize(new TerminalSize(76, 1));
             addComponent(helpLabel);
             for(BIOSButton button: Arrays.asList(button1, button2, button3, button4, button5, button6, button7, button8, button9, button10, button11, button12, button13, button14)) {
@@ -184,7 +184,7 @@ public void drawComponent(TextGUIGraphics graphics, Panel component) {
                     graphics.setBackgroundColor(TextColor.ANSI.BLACK).fill(' ');
                     
                     //Draw the background image
-                    graphics.drawImage(TerminalPosition.TOP_LEFT_CORNER, background);
+                    graphics.drawImage(TerminalPosition.OF_0x0, background);
                     
                     //Then draw all the child components
                     panelRenderer.drawComponent(graphics, BIOS.this);
diff --git a/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java b/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
index ad177d76e..018608b85 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
@@ -112,7 +112,7 @@ public void drawComponent(TextGUIGraphics graphics, Component component) {
 
                         @Override
                         public TerminalPosition getCursorLocation(Component component) {
-                            return TerminalPosition.TOP_LEFT_CORNER;
+                            return TerminalPosition.OF_0x0;
                         }
                     };
                 }
diff --git a/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java b/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
index 075cad147..6c37848e7 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
@@ -68,7 +68,7 @@ protected InteractableRenderer createDefaultRenderer() {
                     @Override
                     public TerminalPosition getCursorLocation(Component component) {
                         TerminalSize adjustedSize = component.getSize().withRelative(-1, -1);
-                        return new TerminalPosition(adjustedSize.getColumns(), adjustedSize.getRows());
+                        return TerminalPosition.of(adjustedSize.getColumns(), adjustedSize.getRows());
                     }
 
                     @Override
@@ -97,4 +97,4 @@ public void drawComponent(TextGUIGraphics graphics, Component component) {
                         new Button("Close", window::close)));
         textGUI.addWindow(window);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java b/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
index ee6d175d9..e3b2de11a 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
@@ -276,12 +276,12 @@ private void runMultiThemeTest(final WindowBasedTextGUI textGUI) {
         final BasicWindow window1 = new BasicWindow("Theme: bigsnake");
         window1.setHints(Collections.singletonList(Window.Hint.FIXED_POSITION));
         window1.setTheme(LanternaThemes.getRegisteredTheme(themes.get(windowThemeIndex[0])));
-        window1.setPosition(new TerminalPosition(2, 1));
+        window1.setPosition(TerminalPosition.of(2, 1));
 
         final BasicWindow window2 = new BasicWindow("Theme: conqueror");
         window2.setHints(Collections.singletonList(Window.Hint.FIXED_POSITION));
         window2.setTheme(LanternaThemes.getRegisteredTheme(themes.get(windowThemeIndex[1])));
-        window2.setPosition(new TerminalPosition(30, 1));
+        window2.setPosition(TerminalPosition.of(30, 1));
 
         final Panel leftHolder = new Panel().setPreferredSize(new TerminalSize(15, 4));
         final Panel rightHolder = new Panel().setPreferredSize(new TerminalSize(15, 4));
diff --git a/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java b/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
index 6c8aa52b4..c25d61d58 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
@@ -40,7 +40,7 @@ protected void prepareWindow(TerminalSize screenSize, Window window) {
             super.prepareWindow(screenSize, window);
 
             window.setDecoratedSize(window.getPreferredSize().withRelative(12, 10));
-            window.setPosition(new TerminalPosition(
+            window.setPosition(TerminalPosition.of(
                     screenSize.getColumns() - window.getDecoratedSize().getColumns() - 1,
                     screenSize.getRows() - window.getDecoratedSize().getRows() - 1
             ));
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java b/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
index 8fdb7385f..d3848d353 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
@@ -55,7 +55,7 @@ public void before() {
         content = new Panel(new GridLayout(GRID_WIDTH));
         GridLayout gridLayout = (GridLayout) content.getLayoutManager();
         gridLayout.setVerticalSpacing(1);
-        window.setPosition(TerminalPosition.TOP_LEFT_CORNER);
+        window.setPosition(TerminalPosition.OF_0x0);
         window.setComponent(content);
     }
 
@@ -269,7 +269,7 @@ private void assertTablePositionSelectedAndExecuted(Table<String> table, int pos
      * Clicks at position
      */
     private MouseAction clickAt(int column, int row) {
-        return new MouseAction(MouseActionType.CLICK_DOWN, 1, new TerminalPosition(column, row));
+        return new MouseAction(MouseActionType.CLICK_DOWN, 1, TerminalPosition.of(column, row));
     }
 
     /**
@@ -312,4 +312,4 @@ public String getName() {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
index 429a9dc3d..efde34b2a 100644
--- a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
@@ -40,11 +40,11 @@ public static void main(String[] args) throws IOException {
         TextCharacter imageCharacter = new TextCharacter('X');
         TextGraphics textGraphics = image.newTextGraphics();
         textGraphics.drawRectangle(
-                TerminalPosition.TOP_LEFT_CORNER,
+                TerminalPosition.OF_0x0,
                 new TerminalSize(5, 5),
                 imageCharacter.withBackgroundColor(TextColor.ANSI.RED));
         textGraphics.drawRectangle(
-                TerminalPosition.OFFSET_1x1,
+                TerminalPosition.OF_1x1,
                 new TerminalSize(3, 3),
                 imageCharacter.withBackgroundColor(TextColor.ANSI.MAGENTA));
         textGraphics.setCharacter(2, 2,
@@ -53,25 +53,25 @@ public static void main(String[] args) throws IOException {
         TextGraphics screenGraphics = screen.newTextGraphics();
         screenGraphics.setBackgroundColor(TextColor.Indexed.fromRGB(50, 50, 50));
         screenGraphics.fill(' ');
-        screenGraphics.drawImage(TerminalPosition.OFFSET_1x1, image);
-        screenGraphics.drawImage(new TerminalPosition(8, 1), image, TerminalPosition.TOP_LEFT_CORNER, image.getSize().withRelativeColumns(-4));
-        screenGraphics.drawImage(new TerminalPosition(10, 1), image, TerminalPosition.TOP_LEFT_CORNER, image.getSize().withRelativeColumns(-3));
-        screenGraphics.drawImage(new TerminalPosition(13, 1), image, TerminalPosition.TOP_LEFT_CORNER, image.getSize().withRelativeColumns(-2));
-        screenGraphics.drawImage(new TerminalPosition(17, 1), image, TerminalPosition.TOP_LEFT_CORNER, image.getSize().withRelativeColumns(-1));
-        screenGraphics.drawImage(new TerminalPosition(22, 1), image);
-        screenGraphics.drawImage(new TerminalPosition(28, 1), image, new TerminalPosition(1, 0), image.getSize());
-        screenGraphics.drawImage(new TerminalPosition(33, 1), image, new TerminalPosition(2, 0), image.getSize());
-        screenGraphics.drawImage(new TerminalPosition(37, 1), image, new TerminalPosition(3, 0), image.getSize());
-        screenGraphics.drawImage(new TerminalPosition(40, 1), image, new TerminalPosition(4, 0), image.getSize());
+        screenGraphics.drawImage(TerminalPosition.of(1, 1), image);
+        screenGraphics.drawImage(TerminalPosition.of(8, 1), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(-4));
+        screenGraphics.drawImage(TerminalPosition.of(10, 1), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(-3));
+        screenGraphics.drawImage(TerminalPosition.of(13, 1), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(-2));
+        screenGraphics.drawImage(TerminalPosition.of(17, 1), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(-1));
+        screenGraphics.drawImage(TerminalPosition.of(22, 1), image);
+        screenGraphics.drawImage(TerminalPosition.of(28, 1), image, TerminalPosition.of(1, 0), image.getSize());
+        screenGraphics.drawImage(TerminalPosition.of(33, 1), image, TerminalPosition.of(2, 0), image.getSize());
+        screenGraphics.drawImage(TerminalPosition.of(37, 1), image, TerminalPosition.of(3, 0), image.getSize());
+        screenGraphics.drawImage(TerminalPosition.of(40, 1), image, TerminalPosition.of(4, 0), image.getSize());
 
         //Try to draw bigger than the image size, this should ignore the extra size
-        screenGraphics.drawImage(new TerminalPosition(1, 7), image, TerminalPosition.TOP_LEFT_CORNER, image.getSize().withRelativeColumns(10));
+        screenGraphics.drawImage(TerminalPosition.of(1, 7), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(10));
 
         //0 size should draw nothing
-        screenGraphics.drawImage(new TerminalPosition(8, 7), image, TerminalPosition.TOP_LEFT_CORNER, TerminalSize.ZERO);
+        screenGraphics.drawImage(TerminalPosition.of(8, 7), image, TerminalPosition.of(0, 0), TerminalSize.ZERO);
 
         //Drawing with a negative source image offset will move the target position
-        screenGraphics.drawImage(new TerminalPosition(8, 7), image, new TerminalPosition(-2, -2), image.getSize());
+        screenGraphics.drawImage(TerminalPosition.of(8, 7), image, TerminalPosition.of(-2, -2), image.getSize());
 
         screen.refresh();
         screen.readInput();
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenLineTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenLineTest.java
index ba50463c4..8d2b5462b 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenLineTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenLineTest.java
@@ -74,9 +74,9 @@ public static void main(String[] args) throws IOException, InterruptedException
             TerminalPosition p1;
             TerminalPosition p2;
             if(circle) {
-                p1 = new TerminalPosition(size.getColumns() / 2, size.getRows() / 2);
+                p1 = TerminalPosition.of(size.getColumns() / 2, size.getRows() / 2);
                 if(CIRCLE_LAST_POSITION == null) {
-                    CIRCLE_LAST_POSITION = new TerminalPosition(0, 0);
+                    CIRCLE_LAST_POSITION = TerminalPosition.of(0, 0);
                 }
                 else if(CIRCLE_LAST_POSITION.getRow() == 0) {
                     if(CIRCLE_LAST_POSITION.getColumn() < size.getColumns() - 1) {
@@ -105,8 +105,8 @@ else if(CIRCLE_LAST_POSITION.getRow() < size.getRows() - 1) {
                 p2 = CIRCLE_LAST_POSITION;
             }
             else {
-                p1 = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
-                p2 = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+                p1 = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+                p2 = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
             }
             textGraphics.setBackgroundColor(color);
             textGraphics.drawLine(p1, p2, ' ');
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
index 61689d5bf..c8a582c54 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
@@ -72,7 +72,7 @@ public static void main(String[] args) throws IOException, InterruptedException
                 color = new TextColor.Indexed(random.nextInt(256));
             }
 
-            TerminalPosition topLeft = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+            TerminalPosition topLeft = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
             TerminalSize rectangleSize = new TerminalSize(random.nextInt(size.getColumns() - topLeft.getColumn()), random.nextInt(size.getRows() - topLeft.getRow()));
 
             textGraphics.setBackgroundColor(color);
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenResizeTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenResizeTest.java
index b38b3c7ca..940aed999 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenResizeTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenResizeTest.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws InterruptedException, IOException
     public ScreenResizeTest(String[] args) throws InterruptedException, IOException {
         screen = new TestTerminalFactory(args).createScreen();
         screen.startScreen();
-        screen.setCursorPosition(new TerminalPosition(0, 0));
+        screen.setCursorPosition(TerminalPosition.of(0, 0));
         putStrings("Initial setup, please resize the window");
 
         long now = System.currentTimeMillis();
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenTabTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenTabTest.java
index 8bf3402d3..899f9a3f3 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenTabTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenTabTest.java
@@ -38,7 +38,7 @@ public static void main(String[] args) throws InterruptedException, IOException
     public ScreenTabTest(String[] args) throws InterruptedException, IOException {
         screen = new TestTerminalFactory(args).createScreen();
         screen.startScreen();
-        screen.setCursorPosition(new TerminalPosition(0, 0));
+        screen.setCursorPosition(TerminalPosition.of(0, 0));
         putStrings("Trying out some tabs!");
 
         long now = System.currentTimeMillis();
@@ -80,16 +80,16 @@ private void putStrings(String topTitle) throws IOException {
         screen.refresh();
 
         //Verify
-        if(!screen.getBackCharacter(new TerminalPosition(20, 11)).is(' ')) {
+        if(!screen.getBackCharacter(TerminalPosition.of(20, 11)).is(' ')) {
             throw new IllegalStateException("Expected tab to be replaced with space");
         }
-        if(!screen.getBackCharacter(new TerminalPosition(21, 11)).is('X')) {
+        if(!screen.getBackCharacter(TerminalPosition.of(21, 11)).is('X')) {
             throw new IllegalStateException("Expected X in back buffer");
         }
-        if(!screen.getFrontCharacter(new TerminalPosition(20, 11)).is(' ')) {
+        if(!screen.getFrontCharacter(TerminalPosition.of(20, 11)).is(' ')) {
             throw new IllegalStateException("Expected tab to be replaced with space");
         }
-        if(!screen.getFrontCharacter(new TerminalPosition(21, 11)).is('X')) {
+        if(!screen.getFrontCharacter(TerminalPosition.of(21, 11)).is('X')) {
             throw new IllegalStateException("Expected X in front buffer");
         }
     }
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenTriangleTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenTriangleTest.java
index 211523d8d..da18ad808 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenTriangleTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenTriangleTest.java
@@ -104,15 +104,15 @@ public static void main(String[] args) throws IOException, InterruptedException
                 int y1 = (size.getRows() / 2) + (int) (Math.sin(rad + oneThirdOf2PI) * triangleSize);
                 int x2 = (size.getColumns() / 2) + (int) (Math.cos(rad + twoThirdsOf2PI) * triangleSize);
                 int y2 = (size.getRows() / 2) + (int) (Math.sin(rad + twoThirdsOf2PI) * triangleSize);
-                p1 = new TerminalPosition(x0, y0);
-                p2 = new TerminalPosition(x1, y1);
-                p3 = new TerminalPosition(x2, y2);
+                p1 = TerminalPosition.of(x0, y0);
+                p2 = TerminalPosition.of(x1, y1);
+                p3 = TerminalPosition.of(x2, y2);
                 rad += Math.PI / 90.0;
             }
             else {
-                p1 = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
-                p2 = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
-                p3 = new TerminalPosition(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+                p1 = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+                p2 = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
+                p3 = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
             }
 
             graphics.setBackgroundColor(color);
diff --git a/src/test/java/com/googlecode/lanterna/screen/VirtualScreenTest.java b/src/test/java/com/googlecode/lanterna/screen/VirtualScreenTest.java
index c64b4f3ca..7085cbafb 100644
--- a/src/test/java/com/googlecode/lanterna/screen/VirtualScreenTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/VirtualScreenTest.java
@@ -44,9 +44,9 @@ public VirtualScreenTest(String[] args) throws InterruptedException, IOException
 
         TextGraphics textGraphics = screen.newTextGraphics();
         textGraphics.setBackgroundColor(TextColor.ANSI.GREEN);
-        textGraphics.fillTriangle(new TerminalPosition(40, 0), new TerminalPosition(25,19), new TerminalPosition(65, 19), ' ');
+        textGraphics.fillTriangle(TerminalPosition.of(40, 0), TerminalPosition.of(25,19), TerminalPosition.of(65, 19), ' ');
         textGraphics.setBackgroundColor(TextColor.ANSI.RED);
-        textGraphics.drawRectangle(TerminalPosition.TOP_LEFT_CORNER, screen.getTerminalSize(), ' ');
+        textGraphics.drawRectangle(TerminalPosition.OF_0x0, screen.getTerminalSize(), ' ');
         screen.refresh();
 
         while(true) {
diff --git a/src/test/java/com/googlecode/lanterna/terminal/KeyTest.java b/src/test/java/com/googlecode/lanterna/terminal/KeyTest.java
index 5150cd175..9b05236f4 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/KeyTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/KeyTest.java
@@ -32,28 +32,28 @@ public void testFromVim() {
         {
             KeyStroke k = KeyStroke.fromString("a");
             assertEquals(KeyType.CHARACTER, k.getKeyType());
-            assertEquals(new Character('a'), k.getCharacter());
+            assertEquals(Character.valueOf('a'), k.getCharacter());
             assertFalse(k.isCtrlDown());
             assertFalse(k.isAltDown());
         }
         {
             KeyStroke k = KeyStroke.fromString("<c-a>");
             assertEquals(KeyType.CHARACTER, k.getKeyType());
-            assertEquals(new Character('a'), k.getCharacter());
+            assertEquals(Character.valueOf('a'), k.getCharacter());
             assertTrue(k.isCtrlDown());
             assertFalse(k.isAltDown());
         }
         {
             KeyStroke k = KeyStroke.fromString("<a-a>");
             assertEquals(KeyType.CHARACTER, k.getKeyType());
-            assertEquals(new Character('a'), k.getCharacter());
+            assertEquals(Character.valueOf('a'), k.getCharacter());
             assertFalse(k.isCtrlDown());
             assertTrue(k.isAltDown());
         }
         {
             KeyStroke k = KeyStroke.fromString("<c-a-a>");
             assertEquals(k.getKeyType(), KeyType.CHARACTER);
-            assertEquals(new Character('a'), k.getCharacter());
+            assertEquals(Character.valueOf('a'), k.getCharacter());
             assertTrue(k.isCtrlDown());
             assertTrue(k.isAltDown());
         }
diff --git a/src/test/java/com/googlecode/lanterna/terminal/SimpleTerminalTest.java b/src/test/java/com/googlecode/lanterna/terminal/SimpleTerminalTest.java
index 84c041285..30f9b69e3 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/SimpleTerminalTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/SimpleTerminalTest.java
@@ -159,7 +159,7 @@ public static void main(String[] args) throws IOException {
     }
 
     private static TerminalPosition resetCursorPositionAfterHelp(Terminal terminal) throws IOException {
-        TerminalPosition cursorPosition = new TerminalPosition(0, 10);
+        TerminalPosition cursorPosition = TerminalPosition.of(0, 10);
         terminal.setCursorPosition(cursorPosition.getColumn(), cursorPosition.getRow());
         return cursorPosition;
     }
diff --git a/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java b/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
index 3aa90956a..16c296244 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         textGraphics.setForegroundColor(TextColor.ANSI.BLUE);
         textGraphics.putString(3, 3, "Hello World!");
         textGraphics.setForegroundColor(TextColor.ANSI.CYAN);
-        TerminalPosition lineStart = new TerminalPosition(3 + "Hello World!".length(), 3);
+        TerminalPosition lineStart = TerminalPosition.of(3 + "Hello World!".length(), 3);
         textGraphics.drawLine(lineStart, lineStart.withRelativeColumn(2).withRelativeRow(6), Symbols.BLOCK_SOLID);
         textGraphics.setForegroundColor(TextColor.ANSI.RED);
         textGraphics.drawRectangle(lineStart.withRelativeColumn(2).withRelativeRow(6), new TerminalSize(5, 3), Symbols.BULLET);
@@ -52,9 +52,9 @@ public static void main(String[] args) throws IOException, InterruptedException
                 triangleStart.withColumn(5).withRelativeRow(3),
                 Symbols.SPADES);
         textGraphics.setForegroundColor(TextColor.ANSI.YELLOW);
-        textGraphics.fillRectangle(new TerminalPosition(30, 1), new TerminalSize(8, 5), Symbols.DIAMOND);
+        textGraphics.fillRectangle(TerminalPosition.of(30, 1), new TerminalSize(8, 5), Symbols.DIAMOND);
         textGraphics.setForegroundColor(TextColor.ANSI.GREEN);
-        triangleStart = new TerminalPosition(30, 6);
+        triangleStart = TerminalPosition.of(30, 6);
         textGraphics.fillTriangle(
                 triangleStart,
                 triangleStart.withRelativeRow(5).withRelativeColumn(-2),
diff --git a/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java b/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
index 5c175a052..f77eb3bab 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
@@ -40,7 +40,7 @@ public DefaultVirtualTerminalTest() {
 
     @Test
     public void initialTerminalStateIsAsExpected() {
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         TerminalSize terminalSize = virtualTerminal.getTerminalSize();
         assertEquals(new TerminalSize(80, 24), terminalSize);
 
@@ -59,7 +59,7 @@ public void simpleTestOutputTest() {
         }
         assertLineEquals(testString, 0);
         assertLineEquals("", 1);
-        assertEquals(new TerminalPosition(testString.length(), 0), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(testString.length(), 0), virtualTerminal.getCursorPosition());
     }
 
     @Test
@@ -79,31 +79,31 @@ public void multiLineTextTest() {
         for(int i = 0; i < toPrint.length; i++) {
             assertLineEquals(toPrint[i], i);
         }
-        assertEquals(new TerminalPosition(0, toPrint.length), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, toPrint.length), virtualTerminal.getCursorPosition());
     }
 
     @Test
     public void singleLineWriteAndReadBackWorks() {
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
         virtualTerminal.putCharacter(new TextCharacter('O'));
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER.withColumn(5), virtualTerminal.getCursorPosition());
-        assertEquals('H', virtualTerminal.getCharacter(new TerminalPosition(0, 0)).getCharacterString().charAt(0));
-        assertEquals('E', virtualTerminal.getCharacter(new TerminalPosition(1, 0)).getCharacterString().charAt(0));
-        assertEquals('L', virtualTerminal.getCharacter(new TerminalPosition(2, 0)).getCharacterString().charAt(0));
-        assertEquals('L', virtualTerminal.getCharacter(new TerminalPosition(3, 0)).getCharacterString().charAt(0));
-        assertEquals('O', virtualTerminal.getCharacter(new TerminalPosition(4, 0)).getCharacterString().charAt(0));
+        assertEquals(TerminalPosition.OF_0x0.withColumn(5), virtualTerminal.getCursorPosition());
+        assertEquals('H', virtualTerminal.getCharacter(TerminalPosition.of(0, 0)).getCharacterString().charAt(0));
+        assertEquals('E', virtualTerminal.getCharacter(TerminalPosition.of(1, 0)).getCharacterString().charAt(0));
+        assertEquals('L', virtualTerminal.getCharacter(TerminalPosition.of(2, 0)).getCharacterString().charAt(0));
+        assertEquals('L', virtualTerminal.getCharacter(TerminalPosition.of(3, 0)).getCharacterString().charAt(0));
+        assertEquals('O', virtualTerminal.getCharacter(TerminalPosition.of(4, 0)).getCharacterString().charAt(0));
 
         assertFalse(virtualTerminal.isWholeBufferDirtyThenReset());
         assertEquals(new TreeSet<>(Arrays.asList(
-                new TerminalPosition(0, 0),
-                new TerminalPosition(1, 0),
-                new TerminalPosition(2, 0),
-                new TerminalPosition(3, 0),
-                new TerminalPosition(4, 0))),
+                TerminalPosition.of(0, 0),
+                TerminalPosition.of(1, 0),
+                TerminalPosition.of(2, 0),
+                TerminalPosition.of(3, 0),
+                TerminalPosition.of(4, 0))),
                 virtualTerminal.getAndResetDirtyCells());
 
         // Make sure it's reset
@@ -113,7 +113,7 @@ public void singleLineWriteAndReadBackWorks() {
     @Test
     public void clearAllMarksEverythingAsDirtyAndEverythingInTheTerminalIsReplacedWithDefaultCharacter() {
         virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
@@ -124,18 +124,18 @@ public void clearAllMarksEverythingAsDirtyAndEverythingInTheTerminalIsReplacedWi
         assertTrue(virtualTerminal.isWholeBufferDirtyThenReset());
         assertEquals(Collections.emptySet(), virtualTerminal.getAndResetDirtyCells());
 
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(0, 0)));
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(1, 0)));
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(2, 0)));
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(3, 0)));
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(4, 0)));
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(0, 0)));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(1, 0)));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(2, 0)));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(3, 0)));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(4, 0)));
     }
 
     @Test
     public void replacingAllContentTriggersWholeTerminalIsDirty() {
         virtualTerminal.setTerminalSize(new TerminalSize(5, 3));
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
@@ -158,14 +158,14 @@ public void replacingAllContentTriggersWholeTerminalIsDirty() {
     @Test
     public void tooLongLinesWrap() {
         virtualTerminal.setTerminalSize(new TerminalSize(5, 5));
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
         virtualTerminal.putCharacter(new TextCharacter('L'));
         virtualTerminal.putCharacter(new TextCharacter('O'));
         virtualTerminal.putCharacter(new TextCharacter('!'));
-        assertEquals(TerminalPosition.OFFSET_1x1, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_1x1, virtualTerminal.getCursorPosition());
 
         // Expected layout:
         // |HELLO|
@@ -176,14 +176,14 @@ public void tooLongLinesWrap() {
     @Test
     public void makeSureDoubleWidthCharactersWrapProperly() {
         virtualTerminal.setTerminalSize(new TerminalSize(9, 5));
-        assertEquals(TerminalPosition.TOP_LEFT_CORNER, virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('こ'));
         virtualTerminal.putCharacter(new TextCharacter('ん'));
         virtualTerminal.putCharacter(new TextCharacter('に'));
         virtualTerminal.putCharacter(new TextCharacter('ち'));
         virtualTerminal.putCharacter(new TextCharacter('は'));
         virtualTerminal.putCharacter(new TextCharacter('!'));
-        assertEquals(new TerminalPosition(3, 1), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(3, 1), virtualTerminal.getCursorPosition());
 
         // Expected layout:
         // |こんにち|
@@ -191,7 +191,7 @@ public void makeSureDoubleWidthCharactersWrapProperly() {
         // where the cursor is one column after the '!' (2 + 1 = 3rd column)
 
         // Make sure there's a default padding character at 8x0
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(8, 0)));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(8, 0)));
     }
 
     @Test
@@ -200,22 +200,22 @@ public void overwritingDoubleWidthCharactersEraseTheOtherHalf() {
         virtualTerminal.putCharacter(new TextCharacter('画'));
         virtualTerminal.putCharacter(new TextCharacter('面'));
 
-        assertEquals('画', virtualTerminal.getCharacter(new TerminalPosition(0, 0)).getCharacterString().charAt(0));
-        assertEquals('画', virtualTerminal.getCharacter(new TerminalPosition(1, 0)).getCharacterString().charAt(0));
-        assertEquals('面', virtualTerminal.getCharacter(new TerminalPosition(2, 0)).getCharacterString().charAt(0));
-        assertEquals('面', virtualTerminal.getCharacter(new TerminalPosition(3, 0)).getCharacterString().charAt(0));
+        assertEquals('画', virtualTerminal.getCharacter(TerminalPosition.of(0, 0)).getCharacterString().charAt(0));
+        assertEquals('画', virtualTerminal.getCharacter(TerminalPosition.of(1, 0)).getCharacterString().charAt(0));
+        assertEquals('面', virtualTerminal.getCharacter(TerminalPosition.of(2, 0)).getCharacterString().charAt(0));
+        assertEquals('面', virtualTerminal.getCharacter(TerminalPosition.of(3, 0)).getCharacterString().charAt(0));
 
-        virtualTerminal.setCursorPosition(new TerminalPosition(0, 0));
+        virtualTerminal.setCursorPosition(TerminalPosition.of(0, 0));
         virtualTerminal.putCharacter(new TextCharacter('Y'));
 
-        assertEquals('Y', virtualTerminal.getCharacter(new TerminalPosition(0, 0)).getCharacterString().charAt(0));
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(1, 0)));
+        assertEquals('Y', virtualTerminal.getCharacter(TerminalPosition.of(0, 0)).getCharacterString().charAt(0));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(1, 0)));
 
-        virtualTerminal.setCursorPosition(new TerminalPosition(3, 0));
+        virtualTerminal.setCursorPosition(TerminalPosition.of(3, 0));
         virtualTerminal.putCharacter(new TextCharacter('V'));
 
-        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(new TerminalPosition(2, 0)));
-        assertEquals('V', virtualTerminal.getCharacter(new TerminalPosition(3, 0)).getCharacterString().charAt(0));
+        assertEquals(TextCharacter.DEFAULT_CHARACTER, virtualTerminal.getCharacter(TerminalPosition.of(2, 0)));
+        assertEquals('V', virtualTerminal.getCharacter(TerminalPosition.of(3, 0)).getCharacterString().charAt(0));
     }
 
     @Test
@@ -223,31 +223,31 @@ public void testCursorPositionUpdatesWhenTerminalSizeChanges() {
         virtualTerminal.setTerminalSize(new TerminalSize(3, 3));
         virtualTerminal.putCharacter('\n');
         virtualTerminal.putCharacter('\n');
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('\n');
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('\n');
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
 
         // Shrink viewport
         virtualTerminal.setTerminalSize(new TerminalSize(3, 2));
-        assertEquals(new TerminalPosition(0, 1), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 1), virtualTerminal.getCursorPosition());
 
         // Restore
         virtualTerminal.setTerminalSize(new TerminalSize(3, 3));
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
 
         // Enlarge
         virtualTerminal.setTerminalSize(new TerminalSize(3, 4));
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorPosition());
         virtualTerminal.setTerminalSize(new TerminalSize(3, 5));
-        assertEquals(new TerminalPosition(0, 4), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
 
         // We've reached the total size of the buffer, enlarging it further shouldn't affect the cursor position
         virtualTerminal.setTerminalSize(new TerminalSize(3, 6));
-        assertEquals(new TerminalPosition(0, 4), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
         virtualTerminal.setTerminalSize(new TerminalSize(3, 7));
-        assertEquals(new TerminalPosition(0, 4), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
     }
 
     @Test
@@ -256,7 +256,7 @@ public void textScrollingOutOfTheBacklogDisappears() {
         // Backlog of 1, meaning viewport size + 1 row
         virtualTerminal.setBacklogSize(1);
         putString("Line 1\n");
-        assertEquals(new TerminalPosition(0, 1), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 1), virtualTerminal.getCursorPosition());
         assertEquals(virtualTerminal.getCursorPosition(), virtualTerminal.getCursorBufferPosition());
         putString("Line 2\n");
         putString("Line 3\n");
@@ -276,8 +276,8 @@ public void textScrollingOutOfTheBacklogDisappears() {
         assertLineEquals("Line 3", 0);
         assertLineEquals("Line 4", 1);
         assertLineEquals("", 2);
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorBufferPosition());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorBufferPosition());
 
         // Make terminal bigger
         virtualTerminal.setTerminalSize(new TerminalSize(10, 4));
@@ -287,8 +287,8 @@ public void textScrollingOutOfTheBacklogDisappears() {
         assertLineEquals("Line 3", 1);
         assertLineEquals("Line 4", 2);
         assertLineEquals("", 3);
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorPosition());
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorBufferPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorBufferPosition());
 
         // Make it even bigger
         virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
@@ -300,8 +300,8 @@ public void textScrollingOutOfTheBacklogDisappears() {
         assertLineEquals("Line 4", 2);
         assertLineEquals("", 3);
         assertLineEquals("", 4);
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorPosition());
-        assertEquals(new TerminalPosition(0, 3), virtualTerminal.getCursorBufferPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorBufferPosition());
     }
 
     @Test
@@ -309,9 +309,9 @@ public void backlogTrimmingAdjustsCursorPositionAndDirtyCells() {
         virtualTerminal.setTerminalSize(new TerminalSize(80, 3));
         virtualTerminal.setBacklogSize(0);
         virtualTerminal.putCharacter(fromChar('A'));
-        virtualTerminal.setCursorPosition(new TerminalPosition(1, 1));
+        virtualTerminal.setCursorPosition(TerminalPosition.of(1, 1));
         virtualTerminal.putCharacter(fromChar('B'));
-        virtualTerminal.setCursorPosition(new TerminalPosition(2, 2));
+        virtualTerminal.setCursorPosition(TerminalPosition.of(2, 2));
         virtualTerminal.putCharacter(fromChar('C'));
 
         assertLineEquals("A", 0);
@@ -320,19 +320,19 @@ public void backlogTrimmingAdjustsCursorPositionAndDirtyCells() {
 
         // Dirty positions should now be these
         assertEquals(new TreeSet<>(Arrays.asList(
-                new TerminalPosition(0, 0),
-                new TerminalPosition(1, 1),
-                new TerminalPosition(2, 2))), virtualTerminal.getDirtyCells());
-        assertEquals(new TerminalPosition(3, 2), virtualTerminal.getCursorPosition());
+                TerminalPosition.of(0, 0),
+                TerminalPosition.of(1, 1),
+                TerminalPosition.of(2, 2))), virtualTerminal.getDirtyCells());
+        assertEquals(TerminalPosition.of(3, 2), virtualTerminal.getCursorPosition());
 
         // Add one more row to shift out the first line
         virtualTerminal.putCharacter('\n');
 
         // Dirty positions should now be adjusted
         assertEquals(new TreeSet<>(Arrays.asList(
-                new TerminalPosition(1, 0),
-                new TerminalPosition(2, 1))), virtualTerminal.getDirtyCells());
-        assertEquals(new TerminalPosition(0, 2), virtualTerminal.getCursorPosition());
+                TerminalPosition.of(1, 0),
+                TerminalPosition.of(2, 1))), virtualTerminal.getDirtyCells());
+        assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
     }
 
     @Test
@@ -342,12 +342,12 @@ public void testPrivateMode() {
         for(int i = 1; i <= ROWS + 2; i++) {
             putString("Line " + i + "\n");
         }
-        assertEquals(new TerminalPosition(0, ROWS - 1), virtualTerminal.getCursorPosition());
-        assertEquals(new TerminalPosition(0, ROWS + 2), virtualTerminal.getCursorBufferPosition());
+        assertEquals(TerminalPosition.of(0, ROWS - 1), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, ROWS + 2), virtualTerminal.getCursorBufferPosition());
 
         virtualTerminal.enterPrivateMode();
-        assertEquals(new TerminalPosition(0, 0), virtualTerminal.getCursorPosition());
-        assertEquals(new TerminalPosition(0, 0), virtualTerminal.getCursorBufferPosition());
+        assertEquals(TerminalPosition.of(0, 0), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 0), virtualTerminal.getCursorBufferPosition());
         for(int i = 0; i < ROWS; i++) {
             assertLineEquals("", i);
         }
@@ -519,26 +519,26 @@ public void onClose() {
     public void settingCursorOutsideOfTerminalWindowWillBeAdjusted() {
         virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
         virtualTerminal.setCursorPosition(20, 10);
-        assertEquals(new TerminalPosition(9, 4), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(9, 4), virtualTerminal.getCursorPosition());
 
         virtualTerminal.setCursorPosition(0, 10);
-        assertEquals(new TerminalPosition(0, 4), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
 
         virtualTerminal.setCursorPosition(20, 0);
-        assertEquals(new TerminalPosition(9, 0), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(9, 0), virtualTerminal.getCursorPosition());
     }
 
     @Test
     public void puttingCharacterInLastColumnDoesntMoveCursorToNextLine() {
         virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
         virtualTerminal.setCursorPosition(8, 2);
-        assertEquals(new TerminalPosition(8, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(8, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('A');
-        assertEquals(new TerminalPosition(9, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(9, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('B');
-        assertEquals(new TerminalPosition(10, 2), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(10, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('C');
-        assertEquals(new TerminalPosition(1, 3), virtualTerminal.getCursorPosition());
+        assertEquals(TerminalPosition.of(1, 3), virtualTerminal.getCursorPosition());
         assertEquals(DEFAULT_CHARACTER.withCharacter('C'), virtualTerminal.getCharacter(0, 3));
     }
 
@@ -568,7 +568,7 @@ private void assertLineEquals(String expectedLineContent, int rowNumber) {
     private void assertBufferLineEquals(String expectedBufferLineContent, int rowNumber) {
         int column = 0;
         for(char c: expectedBufferLineContent.toCharArray()) {
-            assertEquals(DEFAULT_CHARACTER.withCharacter(c), virtualTerminal.getBufferCharacter(new TerminalPosition(column++, rowNumber)));
+            assertEquals(DEFAULT_CHARACTER.withCharacter(c), virtualTerminal.getBufferCharacter(TerminalPosition.of(column++, rowNumber)));
             if(TerminalTextUtils.isCharDoubleWidth(c)) {
                 column++;
             }
diff --git a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
index fd00a0ebb..1e8175f67 100644
--- a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
+++ b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
@@ -124,7 +124,7 @@ resized since last time it was called (or since the screen was created if this i
                     /*
                     We pick a random location
                      */
-                        TerminalPosition cellToModify = new TerminalPosition(
+                        TerminalPosition cellToModify = TerminalPosition.of(
                                 random.nextInt(terminalSize.getColumns()),
                                 random.nextInt(terminalSize.getRows()));
 
@@ -149,7 +149,7 @@ objects are immutable so the withBackgroundColor(..) call below returns a copy w
                 box with information on the size of the terminal window
                  */
                 String sizeLabel = "Terminal Size: " + terminalSize;
-                TerminalPosition labelBoxTopLeft = new TerminalPosition(1, 1);
+                TerminalPosition labelBoxTopLeft = TerminalPosition.of(1, 1);
                 TerminalSize labelBoxSize = new TerminalSize(sizeLabel.length() + 2, 3);
                 TerminalPosition labelBoxTopRightCorner = labelBoxTopLeft.withRelativeColumn(labelBoxSize.getColumns() - 1);
                 TextGraphics textGraphics = screen.newTextGraphics();

From cd568b5ceefda309c0215782f4d64187bf8b7c2f Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Tue, 5 Mar 2024 04:15:14 -0600
Subject: [PATCH 02/11] LANTERNA-fix split panel cleanup TerminalPosition

---
 .../googlecode/lanterna/TerminalPosition.java | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index f0d3d1e1e..333383d08 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -40,18 +40,18 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
     /**
      * @return a new TerminalPosition instance with the supplied column and row
      */
-		public static final TerminalPosition of(int column, int row) {
-			if(column == 0 && row == 0) {
-          return OF_0x0;
-      } else if(column == 0 && row == 1) {
-          return OF_0x1;
-      } else if(column == 1 && row == 0) {
-          return OF_1x0;
-      } else if(column == 1 && row == 1) {
-          return OF_1x1;
-      }
-			return new TerminalPosition(column, row);
-		}
+    public static final TerminalPosition of(int column, int row) {
+        if(column == 0 && row == 0) {
+            return OF_0x0;
+        } else if(column == 0 && row == 1) {
+            return OF_0x1;
+        } else if(column == 1 && row == 0) {
+            return OF_1x0;
+        } else if(column == 1 && row == 1) {
+              return OF_1x1;
+        }
+        return new TerminalPosition(column, row);
+    }
 		/**
      * Returns a TerminalPositoin with the column and row supplied.
      * If either the column or row supplied is different than this instances column or row, then a new instance is returned.

From f85490bbcc53a86ed5fbcfb6b46a420e752172fd Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Tue, 5 Mar 2024 04:17:09 -0600
Subject: [PATCH 03/11] LANTERNA-fix split panel cleanup TerminalPosition

---
 src/main/java/com/googlecode/lanterna/TerminalPosition.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index 333383d08..28bc5c056 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -52,13 +52,13 @@ public static final TerminalPosition of(int column, int row) {
         }
         return new TerminalPosition(column, row);
     }
-		/**
+    /**
      * Returns a TerminalPositoin with the column and row supplied.
      * If either the column or row supplied is different than this instances column or row, then a new instance is returned.
      * If both column and row are the same as this instance's column and row, then this instance is returned.
      * @return Either this instance, or a new instance if column/row are different than this instance's column/row.
      */
-		public TerminalPosition as(int column, int row) {
+    public TerminalPosition as(int column, int row) {
         return (column != this.column || row != this.row) ? of(column, row) : this;
     }
     /**

From c5e8794ff9f300b90fe59cc5efe149d49e2d2ff6 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Thu, 7 Mar 2024 02:34:39 -0600
Subject: [PATCH 04/11] LANTERNA-fix split panel cleanup TerminalPosition

---
 .../googlecode/lanterna/TerminalPosition.java |  30 +--
 .../lanterna/TestTerminalPosition.java        | 173 +++++++++++++++++-
 2 files changed, 182 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index 28bc5c056..550e85af7 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -35,8 +35,8 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
     public static final TerminalPosition OF_1x0 = new TerminalPosition(1, 0);
     public static final TerminalPosition OF_1x1 = new TerminalPosition(1, 1);
 
-    private final int column;
-    private final int row;
+    public final int column;
+    public final int row;
     /**
      * @return a new TerminalPosition instance with the supplied column and row
      */
@@ -53,7 +53,7 @@ public static final TerminalPosition of(int column, int row) {
         return new TerminalPosition(column, row);
     }
     /**
-     * Returns a TerminalPositoin with the column and row supplied.
+     * Returns a TerminalPosition with the column and row supplied.
      * If either the column or row supplied is different than this instances column or row, then a new instance is returned.
      * If both column and row are the same as this instance's column and row, then this instance is returned.
      * @return Either this instance, or a new instance if column/row are different than this instance's column/row.
@@ -97,15 +97,6 @@ public int getColumn() {
     public int getRow() {
         return row;
     }
-    /**
-     * Creates a new TerminalPosition object representing a position with the same column index as this but with a
-     * supplied row index.
-     * @param row Index of the row for the new position
-     * @return A TerminalPosition object with the same column as this but with a specified row index
-     */
-    public TerminalPosition withRow(int row) {
-        return as(column, row);
-    }
     /**
      * Creates a new TerminalPosition object representing a position with the same row index as this but with a
      * supplied column index.
@@ -115,6 +106,15 @@ public TerminalPosition withRow(int row) {
     public TerminalPosition withColumn(int column) {
         return as(column, row);
     }
+    /**
+     * Creates a new TerminalPosition object representing a position with the same column index as this but with a
+     * supplied row index.
+     * @param row Index of the row for the new position
+     * @return A TerminalPosition object with the same column as this but with a specified row index
+     */
+    public TerminalPosition withRow(int row) {
+        return as(column, row);
+    }
     /**
      * Creates a new TerminalPosition object representing a position on the same row, but with a column offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
@@ -221,13 +221,13 @@ public String toString() {
     @Override
     public int hashCode() {
         int hash = 3;
-        hash = 23 * hash + this.row;
         hash = 23 * hash + this.column;
+        hash = 23 * hash + this.row;
         return hash;
     }
 
-    public boolean equals(int columnIndex, int rowIndex) {
-        return column == columnIndex && row == rowIndex;
+    public boolean equals(int column, int row) {
+        return this.column == column && this.row == row;
     }
 
     @Override
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
index 0c4d453d8..f2d77bc82 100644
--- a/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
@@ -20,6 +20,8 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
@@ -37,6 +39,14 @@ void assertSameSystemIdentityHashCode(Object a, Object b) {
     void assertNotSameSystemIdentityHashCode(Object a, Object b) {
         assertNotEquals(System.identityHashCode(a), System.identityHashCode(b));
     }
+    
+    @Test
+    public void test_instantiation() {
+        assertTrue(tp(12, 14).getColumn() == 12);
+        assertTrue(tp(12, 14).getRow() == 14);
+        assertTrue(tp(12, 14).column == 12);
+        assertTrue(tp(12, 14).row == 14);
+    }
     @Test
     public void testSystemIdentityHashCodeSame() {
         TerminalPosition a = TerminalPosition.of(23, 34);
@@ -58,8 +68,9 @@ public void testObjectChurnReduced_of() {
     }
     @Test
     public void testObjectChurnReduced_as() {
-        TerminalPosition p = tp(35, 80);
-        assertSameSystemIdentityHashCode(p, p.as(35, 80));
+        TerminalPosition p = tp(35, 40);
+        assertSameSystemIdentityHashCode(p, p.as(35, 40));
+        assertSameSystemIdentityHashCode(p, p.as(tp(35, 40)));
     }
     @Test
     public void testObjectChurnReduced_plus() {
@@ -67,7 +78,7 @@ public void testObjectChurnReduced_plus() {
         assertSameSystemIdentityHashCode(tp(1, 1), tp(0, 0).plus(0 , 1).plus(1, 0));
         assertSameSystemIdentityHashCode(tp(1, 1), tp(0, 0).plus(1 , 1));
 
-        TerminalPosition p = tp(35, 80);
+        TerminalPosition p = tp(35, 40);
         assertSameSystemIdentityHashCode(p, p.plus(0, 0));
     }
     @Test
@@ -75,18 +86,168 @@ public void testObjectChurnReduced_minus() {
         assertSameSystemIdentityHashCode(tp(0, 0), tp(1, 1).minus(1, 1));
         assertSameSystemIdentityHashCode(tp(1, 1), tp(2, 2).minus(0, 1).minus(1, 0));
 
-        TerminalPosition p = tp(35, 80);
+        TerminalPosition p = tp(35, 40);
         assertSameSystemIdentityHashCode(p, p.minus(0, 0));
     }
     @Test
     public void testObjectChurnReduced_divide() {
-        TerminalPosition p = tp(35, 80);
+        TerminalPosition p = tp(35, 40);
         assertSameSystemIdentityHashCode(p, p.divide(1, 1));
     }
     @Test
     public void testObjectChurnReduced_multiply() {
-        TerminalPosition p = tp(35, 80);
+        TerminalPosition p = tp(35, 40);
         assertSameSystemIdentityHashCode(p, p.multiply(1, 1));
     }
+    // ------------------------------------------------------
+    
+    @Test
+    public void test_withColumn() {
+        TerminalPosition a = tp(35, 40);
+        assertTrue(a.getColumn() == 35);
+        assertTrue(a.withColumn(20).equals(20, 40));
+    }
+    @Test
+    public void test_withRow() {
+        TerminalPosition a = tp(35, 40);
+        assertTrue(a.getRow() == 40);
+        assertTrue(a.withRow(15).equals(35, 15));
+    }
+    @Test
+    public void test_withRelativeColumn() {
+        TerminalPosition a = tp(35, 40);
+        assertTrue(a.getColumn() == 35);
+        assertTrue(a.withRelativeColumn(5).equals(40, 40));
+    }
+    @Test
+    public void test_withRelativeRow() {
+        TerminalPosition a = tp(35, 40);
+        assertTrue(a.getRow() == 40);
+        assertTrue(a.withRelativeRow(-21).equals(35, 19));
+    }
+    
+    @Test
+    public void test_withRelative() {
+        assertTrue(tp(33, 40).withRelative(tp(2, 3)).equals(35, 43));
+        assertTrue(tp(33, 40).withRelative(tp(-2, -3)).equals(31, 37));
+        assertTrue(tp(33, 40).withRelative(2, 3).equals(35, 43));
+        assertTrue(tp(33, 40).withRelative(-2, -3).equals(31, 37));
+    }
+    
+    @Test
+    public void testObjectChurnReduced_with() {
+        TerminalPosition p = tp(35, 40);
+        assertSameSystemIdentityHashCode(p, p.with(p));
+    }
+    
+    @Test
+    public void test_plus() {
+        assertTrue(tp(3, 5).plus(2).equals(5, 7));
+        assertTrue(tp(0, 0).plus(1).equals(1, 1));
+        assertTrue(tp(3, 2).plus(0).equals(3, 2));
+        assertTrue(tp(3, 5).plus(-1).equals(2, 4));
+        assertTrue(tp(3, 5).plus(-2).equals(1, 3));
+        
+        assertTrue(tp(11, 22).plus(3, 5).equals(14, 27));
+        assertTrue(tp(0, 0).plus(1, 2).equals(1, 2));
+        assertTrue(tp(3, 5).plus(-4, 3).equals(-1, 8));
+        assertTrue(tp(3, 5).plus(0, 5).equals(3, 10));
+        
+        assertTrue(tp(11, 22).plus(tp(3, 5)).equals(14, 27));
+        assertTrue(tp(0, 0).plus(tp(1, 2)).equals(1, 2));
+        assertTrue(tp(3, 5).plus(tp(-4, 3)).equals(-1, 8));
+        assertTrue(tp(3, 5).plus(tp(0, 5)).equals(3, 10));
+    }
+    @Test
+    public void test_minus() {
+        assertTrue(tp(3, 5).minus(2).equals(1, 3));
+        assertTrue(tp(0, 0).minus(1).equals(-1, -1));
+        assertTrue(tp(3, 2).minus(0).equals(3, 2));
+        assertTrue(tp(3, 5).minus(-1).equals(4, 6));
+        assertTrue(tp(3, 5).minus(-2).equals(5, 7));
+
+        assertTrue(tp(11, 22).minus(3, 2).equals(8, 20));
+        assertTrue(tp(11, 22).minus(-3, -2).equals(14, 24));
+        assertTrue(tp(11, 22).minus(0, 5).equals(11, 17));
+        assertTrue(tp(11, 22).minus(1, 0).equals(10, 22));
+        
+        assertTrue(tp(11, 22).minus(tp(3, 2)).equals(8, 20));
+        assertTrue(tp(11, 22).minus(tp(-3, -2)).equals(14, 24));
+        assertTrue(tp(11, 22).minus(tp(0, 5)).equals(11, 17));
+        assertTrue(tp(11, 22).minus(tp(1, 0)).equals(10, 22));
+    }
+    @Test
+    public void test_multiply() {
+        assertTrue(tp(11, 22).multiply(-3).equals(-33, -66));
+        assertTrue(tp(11, 22).multiply(-1).equals(-11, -22));
+        assertTrue(tp(11, 22).multiply(-0).equals(0, 0));
+        assertTrue(tp(11, 22).multiply(0).equals(0, 0));
+        assertTrue(tp(11, 22).multiply(1).equals(11, 22));
+        assertTrue(tp(11, 22).multiply(3).equals(33, 66));
+        
+        assertTrue(tp(11, 22).multiply(1, 2).equals(11, 44));
+        assertTrue(tp(11, 22).multiply(-3, -2).equals(-33, -44));
+        assertTrue(tp(11, 22).multiply(0, 5).equals(0, 110));
+        assertTrue(tp(11, 22).multiply(1, 0).equals(11, 0));
+        
+        assertTrue(tp(11, 22).multiply(1, 2).equals(11, 44));
+        assertTrue(tp(11, 22).multiply(-3, -2).equals(-33, -44));
+        assertTrue(tp(11, 22).multiply(0, 5).equals(0, 110));
+        assertTrue(tp(11, 22).multiply(1, 0).equals(11, 0));
+    }
+    @Test
+    public void test_divide() {
+        assertTrue(tp(11, 22).divide(1, 2).equals(11, 11));
+        assertTrue(tp(11, 22).divide(1, 5).equals(11, 4));
+        assertTrue(tp(20, 22).divide(4, 1).equals(5, 22));
+        assertTrue(tp(20, 30).divide(1, 4).equals(20, 7));
+    }
+    @Test
+    public void test_abs() {
+        assertTrue(tp(-5, 7).abs().equals(5, 7));
+        assertTrue(tp(-7, -9).abs().equals(7, 9));
+        assertTrue(tp(11, -11).abs().equals(11, 11));
+    }
+    @Test
+    public void test_min() {
+        assertTrue(tp(5, 8).min(tp(9, 7)).equals(5, 7));
+        assertTrue(tp(5, 8).min(tp(4, 9)).equals(4, 8));
+        assertTrue(tp(0, 0).min(tp(-4, 9)).equals(-4, 0));
+    }
+    @Test
+    public void test_max() {
+        assertTrue(tp(5, 8).min(tp(9, 7)).equals(5, 7));
+        assertTrue(tp(5, 8).min(tp(4, 9)).equals(4, 8));
+        assertTrue(tp(0, 0).min(tp(4, 9)).equals(0, 0));
+    }
+    @Test
+    public void test_compareTo() {
+        assertTrue(tp(5, 6).compareTo(tp(5, 7)) < 0);
+        assertTrue(tp(5, 6).compareTo(tp(5, 6)) == 0);
+        assertTrue(tp(5, 6).compareTo(tp(5, 5)) > 0);
+        
+        assertTrue(tp(5, 6).compareTo(tp(6, 6)) < 0);
+        assertTrue(tp(5, 6).compareTo(tp(5, 6)) == 0);
+        assertTrue(tp(5, 6).compareTo(tp(4, 6)) > 0);
+    }
+    @Test
+    public void test_hashCode() {
+        TerminalPosition a = tp(7, 7);
+        TerminalPosition b = tp(7, 7);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.hashCode() == b.hashCode());
+        assertFalse(tp(7, 7).hashCode() == tp(3, 7).hashCode());
+    }
+    @Test
+    public void test_equals() {
+        TerminalPosition a = tp(8, 9);
+        TerminalPosition b = tp(8, 9);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.equals(b));
+        assertTrue(a.equals(8, 9));
+        TerminalPosition c = tp(4, 9);
+        assertFalse(c.equals(a));
+        assertFalse(c.equals(5, 9));
+    }
 
 }

From 94eebe9bdc045fcab39fbff8f82529793a8d8ef7 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Fri, 8 Mar 2024 18:42:21 -0600
Subject: [PATCH 05/11] LANTERNA-add TestTerminalSize

---
 .../googlecode/lanterna/TerminalPosition.java |  45 ++--
 .../com/googlecode/lanterna/TerminalSize.java | 166 ++++++------
 .../lanterna/gui2/AbsoluteLayout.java         |   2 +-
 .../lanterna/gui2/AbstractBasePane.java       |   2 +-
 .../lanterna/gui2/AbstractComponent.java      |   2 +-
 .../lanterna/gui2/AnimatedLabel.java          |   2 +-
 .../lanterna/gui2/BorderLayout.java           |   2 +-
 .../com/googlecode/lanterna/gui2/Borders.java |   2 +-
 .../googlecode/lanterna/gui2/ComboBox.java    |   2 +-
 .../googlecode/lanterna/gui2/EmptySpace.java  |   4 +-
 .../googlecode/lanterna/gui2/GUIBackdrop.java |   2 +-
 .../googlecode/lanterna/gui2/GridLayout.java  |   4 +-
 .../lanterna/gui2/InteractableLookupMap.java  |   2 +-
 .../com/googlecode/lanterna/gui2/Label.java   |   4 +-
 .../lanterna/gui2/LinearLayout.java           |   4 +-
 .../lanterna/gui2/MultiWindowTextGUI.java     |   4 +-
 .../googlecode/lanterna/gui2/ScrollBar.java   |   2 +-
 .../googlecode/lanterna/gui2/Separator.java   |   2 +-
 .../gui2/dialogs/ActionListDialog.java        |   4 +-
 .../lanterna/gui2/dialogs/FileDialog.java     |   2 +-
 .../gui2/dialogs/ListSelectDialog.java        |   4 +-
 .../lanterna/gui2/dialogs/MessageDialog.java  |   2 +-
 .../gui2/dialogs/TextInputDialog.java         |   4 +-
 .../lanterna/gui2/menu/MenuItem.java          |   4 +-
 .../table/DefaultTableHeaderRenderer.java     |   2 +-
 .../gui2/table/DefaultTableRenderer.java      |   2 +-
 .../googlecode/lanterna/TestTerminalSize.java | 241 ++++++++++++++++++
 .../lanterna/gui2/ComboBoxTest.java           |   8 +-
 .../gui2/DialogsTextGUIBasicTest.java         |   2 +-
 .../lanterna/gui2/DynamicGridLayoutTest.java  |  14 +-
 .../lanterna/gui2/GridLayoutTest.java         |   4 +-
 .../lanterna/gui2/MultiWindowManagerTest.java |   8 +-
 .../lanterna/gui2/ScrollBarTest.java          |   4 +-
 .../lanterna/gui2/WelcomeSplashTest.java      |   2 +-
 .../lanterna/gui2/WindowManagerTest.java      |   2 +-
 .../lanterna/screen/DrawImageTest.java        |   2 +-
 36 files changed, 395 insertions(+), 169 deletions(-)
 create mode 100644 src/test/java/com/googlecode/lanterna/TestTerminalSize.java

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index 550e85af7..ec4f3cb3a 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -38,7 +38,7 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
     public final int column;
     public final int row;
     /**
-     * @return a new TerminalPosition instance with the supplied column and row
+     * @return a TerminalPosition instance with the supplied column and row
      */
     public static final TerminalPosition of(int column, int row) {
         if(column == 0 && row == 0) {
@@ -59,7 +59,7 @@ public static final TerminalPosition of(int column, int row) {
      * @return Either this instance, or a new instance if column/row are different than this instance's column/row.
      */
     public TerminalPosition as(int column, int row) {
-        return (column != this.column || row != this.row) ? of(column, row) : this;
+        return (column == this.column && row == this.row) ? this : of(column, row);
     }
     /**
      * Returns itself if it is equal to the supplied position, otherwise the supplied position. You can use this if you
@@ -98,60 +98,59 @@ public int getRow() {
         return row;
     }
     /**
-     * Creates a new TerminalPosition object representing a position with the same row index as this but with a
-     * supplied column index.
-     * @param column Index of the column for the new position
-     * @return A TerminalPosition object with the same row as this but with a specified column index
+     * Obtain a TerminalPosition with the supplied column and the same row as this instance.
+     * @param column Index of the column for the resulting TerminalPosition
+     * @return a TerminalPosition object with the same row as this but with a specified column index
      */
     public TerminalPosition withColumn(int column) {
         return as(column, row);
     }
     /**
-     * Creates a new TerminalPosition object representing a position with the same column index as this but with a
-     * supplied row index.
+     * Obtain a TerminalPosition object with this instance's column and the supplied row.
      * @param row Index of the row for the new position
-     * @return A TerminalPosition object with the same column as this but with a specified row index
+     * @return a TerminalPosition object with the same column as this but with a specified row index
      */
     public TerminalPosition withRow(int row) {
         return as(column, row);
     }
     /**
-     * Creates a new TerminalPosition object representing a position on the same row, but with a column offset by a
-     * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
-     * a terminal position <i>delta</i> number of columns to the right and for negative numbers the same to the left.
+     * Obtain a TerminalPosition with a column offset by the supplied delta and the same row as this instance.
+     * Calling this method with delta 0 will return this, calling it with a positive delta will return
+     * a TerminalPosition <i>delta</i> number of columns to the right and for negative numbers the same to the left.
      * @param delta Column offset
-     * @return New terminal position based off this one but with an applied offset
+     * @return a TerminalPosition based off this one but with an applied offset
      */
     public TerminalPosition withRelativeColumn(int delta) {
         return plus(delta, 0);
     }
     /**
-     * Creates a new TerminalPosition object representing a position on the same column, but with a row offset by a
-     * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
-     * a terminal position <i>delta</i> number of rows to the down and for negative numbers the same up.
+     * Obtain a TerminalPosition with the same column as this instance and a row which is this instance's row offset
+     * by the supplied delta.
+     * Calling this method with delta 0 will return this, calling it with a positive delta will return
+     * a TerminalPosition <i>delta</i> number of rows to the down and for negative numbers the same up.
      * @param delta Row offset
-     * @return New terminal position based off this one but with an applied offset
+     * @return a TerminalPosition based off this one but with an applied offset
      */
     public TerminalPosition withRelativeRow(int delta) {
         return plus(0, delta);
     }
     /**
-     * Creates a new TerminalPosition object that is 'translated' by an amount of rows and columns specified by another
+     * Obtain a TerminalPosition that is 'translated' by an amount of rows and columns specified by another
      * TerminalPosition. Same as calling
      * <code>withRelativeRow(translate.getRow()).withRelativeColumn(translate.getColumn())</code>
      * @param translate How many columns and rows to translate
-     * @return New TerminalPosition that is the result of the original with added translation
+     * @return a TerminalPosition that is the result of the original with added translation
      */
     public TerminalPosition withRelative(TerminalPosition translate) {
         return plus(translate);
     }
     /**
-     * Creates a new TerminalPosition object that is 'translated' by an amount of rows and columns specified by the two
+     * Obtain a TerminalPosition that is 'translated' by an amount of rows and columns specified by the two
      * parameters. Same as calling
      * <code>withRelativeRow(deltaRow).withRelativeColumn(deltaColumn)</code>
-     * @param deltaColumn How many columns to move from the current position in the new TerminalPosition
-     * @param deltaRow How many rows to move from the current position in the new TerminalPosition
-     * @return New TerminalPosition that is the result of the original position with added translation
+     * @param deltaColumn How many columns to move from the current position in the resulting TerminalPosition
+     * @param deltaRow How many rows to move from the current position in the resulting TerminalPosition
+     * @return a TerminalPosition that is the result of the original position with added translation
      */
     public TerminalPosition withRelative(int deltaColumn, int deltaRow) {
         return plus(deltaColumn, deltaRow);
diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 1d905613c..2eb570f53 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -24,149 +24,134 @@
  *
  * @author Martin
  */
-public class TerminalSize {
-    public static final TerminalSize ZERO = new TerminalSize(0, 0);
-    public static final TerminalSize ONE = new TerminalSize(1, 1);
+public class TerminalSize implements Comparable<TerminalSize> {
+
+    public static final TerminalSize OF_0x0 = new TerminalSize(0, 0);
+    public static final TerminalSize OF_0x1 = new TerminalSize(0, 1);
+    public static final TerminalSize OF_1x0 = new TerminalSize(1, 0);
+    public static final TerminalSize OF_1x1 = new TerminalSize(1, 1);
 
     public final int columns;
     public final int rows;
 
     public static final TerminalSize of(int columns, int rows) {
+        if(columns == 0 && rows == 0) {
+            return OF_0x0;
+        } else if(columns == 0 && rows == 1) {
+            return OF_0x1;
+        } else if(columns == 1 && rows == 0) {
+            return OF_1x0;
+        } else if(columns == 1 && rows == 1) {
+              return OF_1x1;
+        }
         return new TerminalSize(columns, rows);
     }
-
+    public TerminalSize as(int columns, int rows) {
+        return (columns == this.columns && rows == this.rows) ? this : of(columns, rows);
+    }
+    public TerminalSize as(TerminalSize size) {
+        return size == null ? null : as(size.columns, size.rows);
+    }
     /**
      * Creates a new terminal size representation with a given width (columns) and height (rows)
-     * @param columns Width, in number of columns
-     * @param rows Height, in number of columns
+     * @param columns Width as number of columns
+     * @param rows Height as number or rows
      */
     public TerminalSize(int columns, int rows) {
         if (columns < 0 || rows < 0) {
             throw new IllegalArgumentException("TerminalSize dimensions cannot be less than 0: [columns: " + columns + ", rows: " + rows + "]");
         }
-        
         this.columns = columns;
         this.rows = rows;
     }
-
     /**
-     * @return Returns the width of this size representation, in number of columns
+     * @return Width, number of columns, of this size representation
      */
     public int getColumns() {
         return columns;
     }
-
     /**
-     * Creates a new size based on this size, but with a different width
-     * @param columns Width of the new size, in columns
-     * @return New size based on this one, but with a new width
+     * @return Height, number of rows, of this size representation
      */
-    public TerminalSize withColumns(int columns) {
-        if(this.columns == columns) {
-            return this;
-        }
-        if(columns == 0 && this.rows == 0) {
-            return ZERO;
-        }
-        return new TerminalSize(columns, this.rows);
+    public int getRows() {
+        return rows;
     }
-
-
     /**
-     * @return Returns the height of this size representation, in number of rows
+     * Obtain a TerminalSize with the supplied number of columns and this instance's number of rows
+     * @param columns Width as number of columns for the resulting TerminalSize
+     * @return a TerminalSize with the supplied number of columns and this instance's number of rows
      */
-    public int getRows() {
-        return rows;
+    public TerminalSize withColumns(int columns) {
+        return as(columns, rows);
     }
-
     /**
-     * Creates a new size based on this size, but with a different height
-     * @param rows Height of the new size, in rows
-     * @return New size based on this one, but with a new height
+     * Obtain a TerminalSize with this instance's number of columns and the supplied number of rows
+     * @param rows Height as number of rows for the resulting TerminalSize
+     * @return a TerminalSize with this instance's number of columns and the supplied number of rows
      */
     public TerminalSize withRows(int rows) {
-        if(this.rows == rows) {
-            return this;
-        }
-        if(rows == 0 && this.columns == 0) {
-            return ZERO;
-        }
-        return new TerminalSize(this.columns, rows);
+        return as(columns, rows);
     }
-
     /**
-     * Creates a new TerminalSize object representing a size with the same number of rows, but with a column size offset by a
+     * Obtain a TerminalSize with the same number of rows, but with a columns size offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
      * a terminal size <i>delta</i> number of columns wider and for negative numbers shorter.
      * @param delta Column offset
-     * @return New terminal size based off this one but with an applied transformation
+     * @return a TerminalSize based off this one but with an applied transformation
      */
     public TerminalSize withRelativeColumns(int delta) {
-        if(delta == 0) {
-            return this;
-        }
         // Prevent going below 0 (which would throw an exception)
         return withColumns(Math.max(0, columns + delta));
     }
-
     /**
-     * Creates a new TerminalSize object representing a size with the same number of columns, but with a row size offset by a
+     * Obtain a TerminalSize with the same number of columns, but with a row size offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
      * a terminal size <i>delta</i> number of rows longer and for negative numbers shorter.
      * @param delta Row offset
-     * @return New terminal size based off this one but with an applied transformation
+     * @return a TerminalSize based off this one but with an applied transformation
      */
     public TerminalSize withRelativeRows(int delta) {
-        if(delta == 0) {
-            return this;
-        }
         // Prevent going below 0 (which would throw an exception)
         return withRows(Math.max(0, rows + delta));
     }
-
     /**
-     * Creates a new TerminalSize object representing a size based on this object's size but with a delta applied.
+     * Obtain a TerminalSize based on this object's size but with a delta applied.
      * This is the same as calling
      * <code>withRelativeColumns(delta.getColumns()).withRelativeRows(delta.getRows())</code>
      * @param delta Column and row offset
-     * @return New terminal size based off this one but with an applied resize
+     * @return a TerminalSize based off this one but with an applied resize
      */
     public TerminalSize withRelative(TerminalSize delta) {
-        return withRelative(delta.getColumns(), delta.getRows());
+        return plus(delta);
     }
-
     /**
-     * Creates a new TerminalSize object representing a size based on this object's size but with a delta applied.
+     * Obtain a TerminalSize based on this object's size but with a delta applied.
      * This is the same as calling
      * <code>withRelativeColumns(deltaColumns).withRelativeRows(deltaRows)</code>
-     * @param deltaColumns How many extra columns the new TerminalSize will have (negative values are allowed)
-     * @param deltaRows How many extra rows the new TerminalSize will have (negative values are allowed)
+     * @param deltaColumns How many extra columns the new TerminalSize will have (negative delta values are allowed)
+     * @param deltaRows How many extra rows the new TerminalSize will have (negative delta values are allowed)
      * @return New terminal size based off this one but with an applied resize
      */
     public TerminalSize withRelative(int deltaColumns, int deltaRows) {
-        return withRelativeRows(deltaRows).withRelativeColumns(deltaColumns);
+        return plus(deltaColumns, deltaRows);
     }
-
     /**
-     * Takes a different TerminalSize and returns a new TerminalSize that has the largest dimensions of the two,
-     * measured separately. So calling 3x5 on a 5x3 will return 5x5.
-     * @param other Other TerminalSize to compare with
-     * @return TerminalSize that combines the maximum width between the two and the maximum height
+     * Obtain a TerminalSize having the max columns and max rows of this instance and the supplied one.
+     * Example: calling 3x5 on a 5x3 will return 5x5.
+     * @param other TerminalSize to compare with
+     * @return a TerminalSize that combines the maximum width and maximum height between the two
      */
     public TerminalSize max(TerminalSize other) {
-        return withColumns(Math.max(columns, other.columns))
-                .withRows(Math.max(rows, other.rows));
+        return as(Math.max(columns, other.columns), Math.max(rows, other.rows));
     }
-
     /**
-     * Takes a different TerminalSize and returns a new TerminalSize that has the smallest dimensions of the two,
-     * measured separately. So calling 3x5 on a 5x3 will return 3x3.
-     * @param other Other TerminalSize to compare with
-     * @return TerminalSize that combines the minimum width between the two and the minimum height
+     * Obtain a TerminalSize having the min columns and min rows of this instance and the supplied one.
+     * Example: calling 3x5 on a 5x3 will return 3x3.
+     * @param other TerminalSize to compare with
+     * @return a TerminalSize that combines the minimum width and minimum height between the two
      */
     public TerminalSize min(TerminalSize other) {
-        return withColumns(Math.min(columns, other.columns))
-                .withRows(Math.min(rows, other.rows));
+        return as(Math.min(columns, other.columns), Math.min(rows, other.rows));
     }
 
     public TerminalSize plus(TerminalSize other) {
@@ -182,16 +167,16 @@ public TerminalSize divide(TerminalSize denominator) {
         return divide(denominator.columns, denominator.rows);
     }
     public TerminalSize plus(int columns, int rows) {
-        return of(this.columns + columns, this.rows + rows);
+        return as(this.columns + columns, this.rows + rows);
     }
     public TerminalSize minus(int columns, int rows) {
-        return of(this.columns - columns, this.rows - rows);
+        return as(this.columns - columns, this.rows - rows);
     }
     public TerminalSize multiply(int columns, int rows) {
-        return of(this.columns * columns, this.rows * rows);
+        return as(this.columns * columns, this.rows * rows);
     }
     public TerminalSize divide(int columnsDenominator, int rowsDenominator) {
-        return of(columns / columnsDenominator, rows / rowsDenominator);
+        return as(columns / columnsDenominator, rows / rowsDenominator);
     }
     public TerminalSize plus(int amount)        { return plus(amount, amount); }
     public TerminalSize minus(int amount)       { return minus(amount, amount); }
@@ -206,10 +191,7 @@ public TerminalSize divide(int columnsDenominator, int rowsDenominator) {
      * @return Itself if this size equals the size passed in, otherwise the size passed in
      */
     public TerminalSize with(TerminalSize size) {
-        if(equals(size)) {
-            return this;
-        }
-        return size;
+        return as(size);
     }
 
     /**
@@ -221,6 +203,15 @@ public TerminalSize with(TerminalSize size) {
     public int getDimension(int d) {
         return d == 0 ? getColumns() : getRows();
     }
+    
+    @Override
+    public int compareTo(TerminalSize other) {
+        return Integer.compare(columns * rows, other.columns * other.rows);
+    }
+
+    public boolean equals(int columns, int rows) {
+        return this.columns == columns && this.rows == rows;
+    }
 
     @Override
     public String toString() {
@@ -229,16 +220,11 @@ public String toString() {
 
     @Override
     public boolean equals(Object obj) {
-        if(this == obj) {
-            return true;
-        }
-        if (!(obj instanceof TerminalSize)) {
-            return false;
-        }
-
-        TerminalSize other = (TerminalSize) obj;
-        return columns == other.columns
-                && rows == other.rows;
+        return obj != null
+            && obj.getClass() == getClass()
+            && ((TerminalSize) obj).columns == columns
+            && ((TerminalSize) obj).rows == rows
+            ;
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java b/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
index a4a87b414..590669179 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
@@ -32,7 +32,7 @@
 public class AbsoluteLayout implements LayoutManager {
     @Override
     public TerminalSize getPreferredSize(List<Component> components) {
-        TerminalSize size = TerminalSize.ZERO;
+        TerminalSize size = TerminalSize.OF_0x0;
         for(Component component: components) {
             size = size.max(
                     new TerminalSize(
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
index 32b3630e9..1373ea6c5 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
@@ -452,7 +452,7 @@ protected ComponentRenderer<Container> createDefaultRenderer() {
                 public TerminalSize getPreferredSize(Container component) {
                     Component subComponent = getComponent();
                     if(subComponent == null) {
-                        return TerminalSize.ZERO;
+                        return TerminalSize.OF_0x0;
                     }
                     return subComponent.getPreferredSize();
                 }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
index c74f4c878..33283d70b 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractComponent.java
@@ -76,7 +76,7 @@ public abstract class AbstractComponent<T extends Component> implements Componen
      * Default constructor
      */
     public AbstractComponent() {
-        size = TerminalSize.ZERO;
+        size = TerminalSize.OF_0x0;
         position = TerminalPosition.OF_0x0;
         explicitPreferredSize = null;
         layoutData = null;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AnimatedLabel.java b/src/main/java/com/googlecode/lanterna/gui2/AnimatedLabel.java
index 31bbdd37b..7eef79726 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AnimatedLabel.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AnimatedLabel.java
@@ -68,7 +68,7 @@ public AnimatedLabel(String firstFrameText) {
         super(firstFrameText);
         frames = new ArrayList<>();
         currentFrame = 0;
-        combinedMaximumPreferredSize = TerminalSize.ZERO;
+        combinedMaximumPreferredSize = TerminalSize.OF_0x0;
 
         String[] lines = splitIntoMultipleLines(firstFrameText);
         frames.add(lines);
diff --git a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
index 29ef2ee20..2be6287b5 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
@@ -154,7 +154,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
         for(Component component: components) {
             if(component.isVisible() && !layout.containsValue(component)) {
                 component.setPosition(TerminalPosition.OF_0x0);
-                component.setSize(TerminalSize.ZERO);
+                component.setSize(TerminalSize.OF_0x0);
             }
         }
     }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Borders.java b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
index b8d298373..54e1daa34 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Borders.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
@@ -186,7 +186,7 @@ public TerminalSize getPreferredSize(Border component) {
             Component wrappedComponent = border.getComponent();
             TerminalSize preferredSize;
             if (wrappedComponent == null) {
-                preferredSize = TerminalSize.ZERO;
+                preferredSize = TerminalSize.OF_0x0;
             } else {
                 preferredSize = wrappedComponent.getPreferredSize();
             }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
index 495f2fb04..83356cdd9 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
@@ -642,7 +642,7 @@ public TerminalPosition getCursorLocation(ComboBox<V> comboBox) {
 
         @Override
         public TerminalSize getPreferredSize(final ComboBox<V> comboBox) {
-            TerminalSize size = TerminalSize.ONE.withColumns(
+            TerminalSize size = TerminalSize.OF_1x1.withColumns(
                     (comboBox.getItemCount() == 0 ? TerminalTextUtils.getColumnWidth(comboBox.getText()) : 0) + 2);
             //noinspection SynchronizationOnLocalVariableOrMethodParameter
             synchronized(comboBox) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/EmptySpace.java b/src/main/java/com/googlecode/lanterna/gui2/EmptySpace.java
index f13694b94..5cfaaa617 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/EmptySpace.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/EmptySpace.java
@@ -35,7 +35,7 @@ public class EmptySpace extends AbstractComponent<EmptySpace> {
      * Creates an EmptySpace with size 1x1 and a default color chosen from the theme
      */
     public EmptySpace() {
-        this(null, TerminalSize.ONE);
+        this(null, TerminalSize.OF_1x1);
     }
 
     /**
@@ -43,7 +43,7 @@ public EmptySpace() {
      * @param color Color to use (null will make it use the theme)
      */
     public EmptySpace(TextColor color) {
-        this(color, TerminalSize.ONE);
+        this(color, TerminalSize.OF_1x1);
     }
 
     /**
diff --git a/src/main/java/com/googlecode/lanterna/gui2/GUIBackdrop.java b/src/main/java/com/googlecode/lanterna/gui2/GUIBackdrop.java
index cbf12f1e2..d66bd7e5f 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/GUIBackdrop.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/GUIBackdrop.java
@@ -32,7 +32,7 @@ protected ComponentRenderer<EmptySpace> createDefaultRenderer() {
 
             @Override
             public TerminalSize getPreferredSize(EmptySpace component) {
-                return TerminalSize.ONE;
+                return TerminalSize.OF_1x1;
             }
 
             @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java b/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
index 725237b5c..8f524537b 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/GridLayout.java
@@ -386,7 +386,7 @@ public boolean hasChanged() {
 
     @Override
     public TerminalSize getPreferredSize(List<Component> components) {
-        TerminalSize preferredSize = TerminalSize.ZERO;
+        TerminalSize preferredSize = TerminalSize.OF_0x0;
         if(components.isEmpty()) {
             return preferredSize.withRelative(
                     leftMarginSize + rightMarginSize,
@@ -417,7 +417,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
         Component[][] table = buildTable(components);
         table = eliminateUnusedRowsAndColumns(table);
 
-        if(area.equals(TerminalSize.ZERO) ||
+        if(area.equals(TerminalSize.OF_0x0) ||
                 table.length == 0 ||
                 area.getColumns() <= leftMarginSize + rightMarginSize + ((table[0].length - 1) * horizontalSpacing) ||
                 area.getRows() <= bottomMarginSize + topMarginSize + ((table.length - 1) * verticalSpacing)) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
index d2df9da8d..3aa254d3a 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
@@ -48,7 +48,7 @@ void reset() {
     }
 
     TerminalSize getSize() {
-        if (lookupMap.length==0) { return TerminalSize.ZERO; }
+        if (lookupMap.length==0) { return TerminalSize.OF_0x0; }
         return new TerminalSize(lookupMap[0].length, lookupMap.length);
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Label.java b/src/main/java/com/googlecode/lanterna/gui2/Label.java
index 1a0450407..ae461d219 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Label.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Label.java
@@ -45,7 +45,7 @@ public class Label extends AbstractComponent<Label> {
      */
     public Label(String text) {
         this.lines = null;
-        this.labelSize = TerminalSize.ZERO;
+        this.labelSize = TerminalSize.OF_0x0;
         this.labelWidth = 0;
         this.foregroundColor = null;
         this.backgroundColor = null;
@@ -109,7 +109,7 @@ protected String[] splitIntoMultipleLines(String text) {
      */
     protected TerminalSize getBounds(String[] lines, TerminalSize currentBounds) {
         if(currentBounds == null) {
-            currentBounds = TerminalSize.ZERO;
+            currentBounds = TerminalSize.OF_0x0;
         }
         currentBounds = currentBounds.withRows(lines.length);
         if(labelWidth == null || labelWidth == 0) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
index d865be856..e91b0fd8f 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
@@ -230,7 +230,7 @@ private void doVerticalLayout(TerminalSize area, List<Component> components) {
         for(Component component: components) {
             if(remainingVerticalSpace <= 0) {
                 component.setPosition(TerminalPosition.OF_0x0);
-                component.setSize(TerminalSize.ZERO);
+                component.setSize(TerminalSize.OF_0x0);
             }
             else {
                 Alignment alignment = Alignment.BEGINNING;
@@ -382,7 +382,7 @@ private void doHorizontalLayout(TerminalSize area, List<Component> components) {
         for(Component component: components) {
             if(remainingHorizontalSpace <= 0) {
                 component.setPosition(TerminalPosition.OF_0x0);
-                component.setSize(TerminalSize.ZERO);
+                component.setSize(TerminalSize.OF_0x0);
             }
             else {
                 Alignment alignment = Alignment.BEGINNING;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java b/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
index 6c884987c..07f27ebe8 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/MultiWindowTextGUI.java
@@ -214,7 +214,7 @@ public synchronized void updateScreen() throws IOException {
         if (getScreen() instanceof VirtualScreen) {
             // If the user has passed in a virtual screen, we should calculate the minimum size required and tell it.
             // Previously the constructor always wrapped the screen in a VirtualScreen, but now we need to check.
-            TerminalSize minimumTerminalSize = TerminalSize.ZERO;
+            TerminalSize minimumTerminalSize = TerminalSize.OF_0x0;
             for (Window window : getWindows()) {
                 if (window.isVisible()) {
                     if (window.getHints().contains(Window.Hint.FULL_SCREEN) ||
@@ -464,7 +464,7 @@ public WindowManager getWindowManager() {
     public synchronized WindowBasedTextGUI addWindow(Window window) {
         //To protect against NPE if the user forgot to set a content component
         if(window.getComponent() == null) {
-            window.setComponent(new EmptySpace(TerminalSize.ONE));
+            window.setComponent(new EmptySpace(TerminalSize.OF_1x1));
         }
 
         if(window.getTextGUI() != null) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ScrollBar.java b/src/main/java/com/googlecode/lanterna/gui2/ScrollBar.java
index 11f383c8d..fab515783 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ScrollBar.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ScrollBar.java
@@ -152,7 +152,7 @@ protected ComponentRenderer<ScrollBar> createDefaultRenderer() {
     public static abstract class ScrollBarRenderer implements ComponentRenderer<ScrollBar> {
         @Override
         public TerminalSize getPreferredSize(ScrollBar component) {
-            return TerminalSize.ONE;
+            return TerminalSize.OF_1x1;
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Separator.java b/src/main/java/com/googlecode/lanterna/gui2/Separator.java
index dfee378ea..3e35311a1 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Separator.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Separator.java
@@ -73,7 +73,7 @@ public static abstract class SeparatorRenderer implements ComponentRenderer<Sepa
     public static class DefaultSeparatorRenderer extends SeparatorRenderer {
         @Override
         public TerminalSize getPreferredSize(Separator component) {
-            return TerminalSize.ONE;
+            return TerminalSize.OF_1x1;
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ActionListDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ActionListDialog.java
index 7ef688102..2d28cd649 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ActionListDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ActionListDialog.java
@@ -56,7 +56,7 @@ public class ActionListDialog extends DialogWindow {
                         .setRightMarginSize(1));
         if(description != null) {
             mainPanel.addComponent(new Label(description));
-            mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+            mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         }
         listBox.setLayoutData(
                 GridLayout.createLayoutData(
@@ -65,7 +65,7 @@ public class ActionListDialog extends DialogWindow {
                         true,
                         false))
                 .addTo(mainPanel);
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
 
         if(canCancel) {
             Panel buttonPanel = new Panel();
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
index e245acf90..a10b65f28 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
@@ -237,7 +237,7 @@ private void reloadViews(final File directory) {
     private class FileSystemLocationLabel extends Label {
         public FileSystemLocationLabel() {
             super("");
-            setPreferredSize(TerminalSize.ONE);
+            setPreferredSize(TerminalSize.OF_1x1);
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
index a0df8ba27..46438966c 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
@@ -58,7 +58,7 @@ public class ListSelectDialog<T> extends DialogWindow {
                         .setRightMarginSize(1));
         if(description != null) {
             mainPanel.addComponent(new Label(description));
-            mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+            mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         }
         listBox.setLayoutData(
                 GridLayout.createLayoutData(
@@ -67,7 +67,7 @@ public class ListSelectDialog<T> extends DialogWindow {
                         true,
                         false))
                 .addTo(mainPanel);
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
 
         if(canCancel) {
             Panel buttonPanel = new Panel();
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/MessageDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/MessageDialog.java
index d9d9d08b7..c62fce78c 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/MessageDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/MessageDialog.java
@@ -56,7 +56,7 @@ public class MessageDialog extends DialogWindow {
                         .setLeftMarginSize(1)
                         .setRightMarginSize(1));
         mainPanel.addComponent(new Label(text));
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         buttonPanel.setLayoutData(
                 GridLayout.createLayoutData(
                         GridLayout.Alignment.END,
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
index 81f05416f..5954f487b 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
@@ -65,7 +65,7 @@ public class TextInputDialog extends DialogWindow {
         if(description != null) {
             mainPanel.addComponent(new Label(description));
         }
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         textBox.setLayoutData(
                 GridLayout.createLayoutData(
                         GridLayout.Alignment.FILL,
@@ -73,7 +73,7 @@ public class TextInputDialog extends DialogWindow {
                         true,
                         false))
                 .addTo(mainPanel);
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         buttonPanel.setLayoutData(
                 GridLayout.createLayoutData(
                         GridLayout.Alignment.END,
diff --git a/src/main/java/com/googlecode/lanterna/gui2/menu/MenuItem.java b/src/main/java/com/googlecode/lanterna/gui2/menu/MenuItem.java
index 0b75fa1e8..9afb33b88 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/menu/MenuItem.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/menu/MenuItem.java
@@ -125,7 +125,7 @@ public TerminalSize getPreferredSize(MenuItem component) {
             if (component instanceof Menu && !(component.getParent() instanceof MenuBar)) {
                 preferredWidth += 2;
             }
-            return TerminalSize.ONE.withColumns(preferredWidth);
+            return TerminalSize.OF_1x1.withColumns(preferredWidth);
         }
 
         @Override
@@ -157,4 +157,4 @@ public void drawComponent(TextGUIGraphics graphics, MenuItem menuItem) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
index 7ba2f1d4f..2aa9847fa 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
@@ -31,7 +31,7 @@ public class DefaultTableHeaderRenderer<V> implements TableHeaderRenderer<V> {
     @Override
     public TerminalSize getPreferredSize(Table<V> table, String label, int columnIndex) {
         if(label == null) {
-            return TerminalSize.ZERO;
+            return TerminalSize.OF_0x0;
         }
         return new TerminalSize(TerminalTextUtils.getColumnWidth(label), 1);
     }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
index cd9f9c4b0..1349717de 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
@@ -221,7 +221,7 @@ public synchronized TerminalSize getPreferredSize(Table<V> table) {
         preferredRowSizes.clear();
 
         if(tableModel.getColumnCount() == 0) {
-            return TerminalSize.ZERO;
+            return TerminalSize.OF_0x0;
         }
 
         // Adjust view port if necessary (although this is only for the preferred size calculation, we don't actually
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalSize.java b/src/test/java/com/googlecode/lanterna/TestTerminalSize.java
new file mode 100644
index 000000000..977744250
--- /dev/null
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalSize.java
@@ -0,0 +1,241 @@
+/*
+ * This file is part of lanterna (https://github.com/mabe02/lanterna).
+ *
+ * lanterna is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2010-2020 Martin Berglund
+ */
+package com.googlecode.lanterna;
+
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * @author ginkoblongata
+ */
+public class TestTerminalSize {
+
+    TerminalSize ts(int x, int y) {
+        return TerminalSize.of(x, y);
+    }
+    void assertSameSystemIdentityHashCode(Object a, Object b) {
+        assertEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    void assertNotSameSystemIdentityHashCode(Object a, Object b) {
+        assertNotEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    
+    @Test
+    public void test_instantiation() {
+        assertTrue(ts(12, 14).getColumns() == 12);
+        assertTrue(ts(12, 14).getRows() == 14);
+        assertTrue(ts(12, 14).columns == 12);
+        assertTrue(ts(12, 14).rows == 14);
+    }
+    @Test
+    public void testSystemIdentityHashCodeSame() {
+        TerminalSize a = TerminalSize.of(23, 34);
+        assertSameSystemIdentityHashCode(a, a);
+    }
+    @Test
+    public void testSystemIdentityHashCodeDifferent() {
+        TerminalSize a = TerminalSize.of(23, 34);
+        TerminalSize b = TerminalSize.of(23, 34);
+        assertNotSameSystemIdentityHashCode(a, b);
+    }
+    @Test
+    public void testObjectChurnReduced_of() {
+        assertSameSystemIdentityHashCode(ts(0, 0), ts(0, 0));
+        assertSameSystemIdentityHashCode(TerminalSize.OF_0x0, ts(0, 0));
+        assertSameSystemIdentityHashCode(TerminalSize.OF_0x1, ts(0, 1));
+        assertSameSystemIdentityHashCode(TerminalSize.OF_1x0, ts(1, 0));
+        assertSameSystemIdentityHashCode(TerminalSize.OF_1x1, ts(1, 1));
+    }
+    @Test
+    public void testObjectChurnReduced_as() {
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.as(35, 40));
+        assertSameSystemIdentityHashCode(p, p.as(ts(35, 40)));
+    }
+    @Test
+    public void testObjectChurnReduced_plus() {
+        assertSameSystemIdentityHashCode(ts(0, 1), ts(0, 0).plus(0, 1));
+        assertSameSystemIdentityHashCode(ts(1, 1), ts(0, 0).plus(0 , 1).plus(1, 0));
+        assertSameSystemIdentityHashCode(ts(1, 1), ts(0, 0).plus(1 , 1));
+
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.plus(0, 0));
+    }
+    @Test
+    public void testObjectChurnReduced_minus() {
+        assertSameSystemIdentityHashCode(ts(0, 0), ts(1, 1).minus(1, 1));
+        assertSameSystemIdentityHashCode(ts(1, 1), ts(2, 2).minus(0, 1).minus(1, 0));
+
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.minus(0, 0));
+    }
+    @Test
+    public void testObjectChurnReduced_divide() {
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.divide(1, 1));
+    }
+    @Test
+    public void testObjectChurnReduced_multiply() {
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.multiply(1, 1));
+    }
+    // ------------------------------------------------------
+    
+    @Test
+    public void test_withColumn() {
+        TerminalSize a = ts(35, 40);
+        assertTrue(a.getColumns() == 35);
+        assertTrue(a.withColumns(20).equals(20, 40));
+    }
+    @Test
+    public void test_withRow() {
+        TerminalSize a = ts(35, 40);
+        assertTrue(a.getRows() == 40);
+        assertTrue(a.withRows(15).equals(35, 15));
+    }
+    @Test
+    public void test_withRelativeColumn() {
+        TerminalSize a = ts(35, 40);
+        assertTrue(a.getColumns() == 35);
+        assertTrue(a.withRelativeColumns(5).equals(40, 40));
+    }
+    @Test
+    public void test_withRelativeRow() {
+        TerminalSize a = ts(35, 40);
+        assertTrue(a.getRows() == 40);
+        assertTrue(a.withRelativeRows(-21).equals(35, 19));
+    }
+    
+    @Test
+    public void test_withRelative() {
+        assertTrue(ts(33, 40).withRelative(ts(2, 3)).equals(35, 43));
+        
+        assertTrue(ts(33, 40).withRelative(2, 3).equals(35, 43));
+        assertTrue(ts(33, 40).withRelative(-2, -3).equals(31, 37));
+    }
+    
+    @Test
+    public void testObjectChurnReduced_with() {
+        TerminalSize p = ts(35, 40);
+        assertSameSystemIdentityHashCode(p, p.with(p));
+    }
+    
+    @Test
+    public void test_plus() {
+        assertTrue(ts(3, 5).plus(2).equals(5, 7));
+        assertTrue(ts(0, 0).plus(1).equals(1, 1));
+        assertTrue(ts(3, 2).plus(0).equals(3, 2));
+        assertTrue(ts(3, 5).plus(-1).equals(2, 4));
+        assertTrue(ts(3, 5).plus(-2).equals(1, 3));
+        
+        assertTrue(ts(11, 22).plus(3, 5).equals(14, 27));
+        assertTrue(ts(0, 0).plus(1, 2).equals(1, 2));
+        assertTrue(ts(3, 5).plus(-3, 3).equals(0, 8));
+        assertTrue(ts(3, 5).plus(0, 5).equals(3, 10));
+        
+        assertTrue(ts(11, 22).plus(ts(3, 5)).equals(14, 27));
+        assertTrue(ts(0, 0).plus(ts(1, 2)).equals(1, 2));
+        assertTrue(ts(3, 5).plus(ts(3, 3)).equals(6, 8));
+        assertTrue(ts(3, 5).plus(ts(0, 5)).equals(3, 10));
+    }
+    @Test
+    public void test_minus() {
+        assertTrue(ts(3, 5).minus(2).equals(1, 3));
+        assertTrue(ts(3, 2).minus(0).equals(3, 2));
+        assertTrue(ts(3, 5).minus(-1).equals(4, 6));
+        assertTrue(ts(3, 5).minus(-2).equals(5, 7));
+
+        assertTrue(ts(11, 22).minus(3, 2).equals(8, 20));
+        assertTrue(ts(11, 22).minus(-3, -2).equals(14, 24));
+        assertTrue(ts(11, 22).minus(0, 5).equals(11, 17));
+        assertTrue(ts(11, 22).minus(1, 0).equals(10, 22));
+        
+        assertTrue(ts(11, 22).minus(ts(3, 2)).equals(8, 20));
+        assertTrue(ts(11, 22).minus(ts(0, 5)).equals(11, 17));
+        assertTrue(ts(11, 22).minus(ts(1, 0)).equals(10, 22));
+    }
+    @Test
+    public void test_multiply() {
+        assertTrue(ts(11, 22).multiply(0).equals(0, 0));
+        assertTrue(ts(11, 22).multiply(-0).equals(0, 0));
+        assertTrue(ts(11, 22).multiply(0).equals(0, 0));
+        assertTrue(ts(11, 22).multiply(1).equals(11, 22));
+        assertTrue(ts(11, 22).multiply(3).equals(33, 66));
+        
+        assertTrue(ts(11, 22).multiply(1, 2).equals(11, 44));
+        assertTrue(ts(11, 22).multiply(0, 5).equals(0, 110));
+        assertTrue(ts(11, 22).multiply(1, 0).equals(11, 0));
+        
+        assertTrue(ts(11, 22).multiply(ts(1, 2)).equals(11, 44));
+        assertTrue(ts(11, 22).multiply(ts(0, 5)).equals(0, 110));
+        assertTrue(ts(11, 22).multiply(ts(1, 0)).equals(11, 0));
+    }
+    @Test
+    public void test_divide() {
+        assertTrue(ts(11, 22).divide(1, 2).equals(11, 11));
+        assertTrue(ts(11, 22).divide(1, 5).equals(11, 4));
+        assertTrue(ts(20, 22).divide(4, 1).equals(5, 22));
+        assertTrue(ts(20, 30).divide(1, 4).equals(20, 7));
+    }
+    @Test
+    public void test_min() {
+        assertTrue(ts(5, 8).min(ts(9, 7)).equals(5, 7));
+        assertTrue(ts(5, 8).min(ts(4, 9)).equals(4, 8));
+    }
+    @Test
+    public void test_max() {
+        assertTrue(ts(5, 8).min(ts(9, 7)).equals(5, 7));
+        assertTrue(ts(5, 8).min(ts(4, 9)).equals(4, 8));
+        assertTrue(ts(0, 0).min(ts(4, 9)).equals(0, 0));
+    }
+    @Test
+    public void test_compareTo() {
+        assertTrue(ts(5, 6).compareTo(ts(5, 7)) < 0);
+        assertTrue(ts(5, 6).compareTo(ts(5, 6)) == 0);
+        assertTrue(ts(5, 6).compareTo(ts(5, 5)) > 0);
+        
+        assertTrue(ts(5, 6).compareTo(ts(6, 6)) < 0);
+        assertTrue(ts(5, 6).compareTo(ts(5, 6)) == 0);
+        assertTrue(ts(5, 6).compareTo(ts(4, 6)) > 0);
+    }
+    @Test
+    public void test_hashCode() {
+        TerminalSize a = ts(7, 7);
+        TerminalSize b = ts(7, 7);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.hashCode() == b.hashCode());
+        assertFalse(ts(7, 7).hashCode() == ts(3, 7).hashCode());
+    }
+    @Test
+    public void test_equals() {
+        TerminalSize a = ts(8, 9);
+        TerminalSize b = ts(8, 9);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.equals(b));
+        assertTrue(a.equals(8, 9));
+        TerminalSize c = ts(4, 9);
+        assertFalse(c.equals(a));
+        assertFalse(c.equals(5, 9));
+    }
+
+}
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java b/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
index a8c0cb33e..35ffbae13 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
@@ -59,7 +59,7 @@ public void init(final WindowBasedTextGUI textGUI) {
                 comboBoxReadOnly.withBorder(Borders.singleLine("Read-only")),
                 comboBoxEditable.withBorder(Borders.singleLine("Editable")),
                 comboBoxCJK.withBorder(Borders.singleLine("CJK"))));
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
 
         final TextBox textBoxNewItem = new TextBox(new TerminalSize(20, 1));
         Button buttonAddItem = new Button("Add", () -> {
@@ -96,12 +96,12 @@ public void init(final WindowBasedTextGUI textGUI) {
                         Panels.horizontal(textBoxSetSelectedItem, buttonSetSelectedItem))
                     .withBorder(Borders.singleLineBevel("Modify Content")));
 
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         mainPanel.addComponent(comboBoxTimeZones.withBorder(Borders.singleLine("Large ComboBox")));
-        mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         mainPanel.addComponent(new Separator(Direction.HORIZONTAL).setLayoutData(LinearLayout.createLayoutData(LinearLayout.Alignment.FILL)));
         mainPanel.addComponent(new Button("OK", window::close));
         window.setComponent(mainPanel);
         textGUI.addWindow(window);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java b/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
index 0bdf999a9..b693e5a06 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
@@ -94,7 +94,7 @@ public static void main(String[] args) throws IOException {
                     .showDialog(textGUI));
 
             mainPanel.addComponent(dialogsListBox);
-            mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+            mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
             mainPanel.addComponent(new Button("Exit", window::close));
             window.setComponent(mainPanel);
 
diff --git a/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java b/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
index 5ef6f0ab4..02539a146 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
@@ -208,11 +208,11 @@ public GridLayoutEditor(final GridLayout gridLayout) {
             contentPane.addComponent(textBoxBottomMargin);
 
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
             contentPane.addComponent(
                     new Separator(Direction.HORIZONTAL).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
 
             Button okButton = new Button("OK", () -> {
                 gridLayout.setHorizontalSpacing(Integer.parseInt(textBoxHorizontalSpacing.getTextOrDefault("0")));
@@ -255,7 +255,7 @@ public GridLayoutDataEditor(final Component component) {
             contentPane.addComponent(radioBoxesHorizontalAlignment);
 
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
 
             contentPane.addComponent(new Label("Vertical alignment:"));
             final RadioBoxList<GridLayout.Alignment> radioBoxesVerticalAlignment = new RadioBoxList<>();
@@ -267,7 +267,7 @@ public GridLayoutDataEditor(final Component component) {
             contentPane.addComponent(radioBoxesVerticalAlignment);
 
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
 
             contentPane.addComponent(new Label("Grab extra horizontal space:"));
             final CheckBox checkBoxGrabExtraHorizontalSpace = new CheckBox("");
@@ -280,7 +280,7 @@ public GridLayoutDataEditor(final Component component) {
             contentPane.addComponent(checkBoxGrabExtraVerticalSpace);
 
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
 
             Pattern numberPattern = Pattern.compile("[1-9][0-9]*");
 
@@ -295,11 +295,11 @@ public GridLayoutDataEditor(final Component component) {
             contentPane.addComponent(textBoxVerticalSpan);
 
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
             contentPane.addComponent(
                     new Separator(Direction.HORIZONTAL).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
             contentPane.addComponent(
-                    new EmptySpace(TerminalSize.ONE).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
+                    new EmptySpace(TerminalSize.OF_1x1).setLayoutData(GridLayout.createHorizontallyFilledLayoutData(2)));
 
             Button okButton = new Button("OK", () -> {
                 component.setLayoutData(
diff --git a/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java b/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
index 1c8f1ab88..c82b1e817 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
@@ -66,8 +66,8 @@ public void init(WindowBasedTextGUI textGUI) {
 
         Panel contentPanel = new Panel();
         contentPanel.setLayoutManager(new LinearLayout(Direction.VERTICAL));
-        contentPanel.addComponent(Panels.horizontal(leftGridPanel, new EmptySpace(TerminalSize.ONE), rightGridPanel));
-        contentPanel.addComponent(new EmptySpace(TerminalSize.ONE));
+        contentPanel.addComponent(Panels.horizontal(leftGridPanel, new EmptySpace(TerminalSize.OF_1x1), rightGridPanel));
+        contentPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         contentPanel.addComponent(Panels.horizontal(
                 new Button("Toggle Visible Component", () -> visibilityToggleableComponent.setVisible(!visibilityToggleableComponent.isVisible())),
                 new Button("Close", window::close)
diff --git a/src/test/java/com/googlecode/lanterna/gui2/MultiWindowManagerTest.java b/src/test/java/com/googlecode/lanterna/gui2/MultiWindowManagerTest.java
index ae2641da1..c5c2d6e3d 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/MultiWindowManagerTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/MultiWindowManagerTest.java
@@ -52,7 +52,7 @@ public void init(final WindowBasedTextGUI textGUI) {
             buttonToggleVirtualScreen.setLabel("Virtual Screen: " + (virtualScreenEnabled ? "Enabled" : "Disabled"));
         });
         contentArea.addComponent(buttonToggleVirtualScreen);
-        contentArea.addComponent(new EmptySpace(TerminalSize.ONE));
+        contentArea.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         contentArea.addComponent(new Button("Close", mainWindow::close));
         mainWindow.setComponent(contentArea);
         textGUI.addListener((textGUI1, keyStroke) -> {
@@ -121,12 +121,12 @@ public void onMoved(Window window, TerminalPosition oldPosition, TerminalPositio
             Panel contentArea = new Panel();
             contentArea.setLayoutManager(new GridLayout(1));
             contentArea.addComponent(statsTableContainer);
-            contentArea.addComponent(new EmptySpace(TerminalSize.ONE));
+            contentArea.addComponent(new EmptySpace(TerminalSize.OF_1x1));
             contentArea.addComponent(
                     new Label(
                             "Move window with ALT+Arrow\n" +
                             "Resize window with CTRL+Arrow"));
-            contentArea.addComponent(new EmptySpace(TerminalSize.ONE).setLayoutData(
+            contentArea.addComponent(new EmptySpace(TerminalSize.OF_1x1).setLayoutData(
                     GridLayout.createLayoutData(GridLayout.Alignment.FILL, GridLayout.Alignment.FILL, true, true)));
             contentArea.addComponent(
                     Panels.horizontal(
@@ -204,7 +204,7 @@ protected ComponentRenderer<EmptySpace> createDefaultRenderer() {
             return new ComponentRenderer<EmptySpace>() {
                 @Override
                 public TerminalSize getPreferredSize(EmptySpace component) {
-                    return TerminalSize.ONE;
+                    return TerminalSize.OF_1x1;
                 }
 
                 @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ScrollBarTest.java b/src/test/java/com/googlecode/lanterna/gui2/ScrollBarTest.java
index af899a42d..17f17ea54 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ScrollBarTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ScrollBarTest.java
@@ -70,12 +70,12 @@ public void init(WindowBasedTextGUI textGUI) {
         controlPanel.addComponent(new Label("Vertical view size:")).addComponent(textBoxVerticalSize);
         controlPanel.addComponent(new Label("Vertical scroll position:")).addComponent(textBoxVerticalPosition);
         controlPanel.addComponent(new Label("Vertical scroll max:")).addComponent(textBoxVerticalMax);
-        controlPanel.addComponent(new EmptySpace(TerminalSize.ONE)).addComponent(new EmptySpace(TerminalSize.ONE));
+        controlPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1)).addComponent(new EmptySpace(TerminalSize.OF_1x1));
         controlPanel.addComponent(new Label("Horizontal tracker grows:")).addComponent(checkHorizontalTrackerGrow);
         controlPanel.addComponent(new Label("Horizontal view size:")).addComponent(textBoxHorizontalSize);
         controlPanel.addComponent(new Label("Horizontal scroll position:")).addComponent(textBoxHorizontalPosition);
         controlPanel.addComponent(new Label("Horizontal scroll max:")).addComponent(textBoxHorizontalMax);
-        controlPanel.addComponent(new EmptySpace(TerminalSize.ONE)).addComponent(new EmptySpace(TerminalSize.ONE));
+        controlPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1)).addComponent(new EmptySpace(TerminalSize.OF_1x1));
         controlPanel.addComponent(buttonRefresh);
         contentPanel.addComponent(closeButton);
 
diff --git a/src/test/java/com/googlecode/lanterna/gui2/WelcomeSplashTest.java b/src/test/java/com/googlecode/lanterna/gui2/WelcomeSplashTest.java
index 09a81f1ae..ccb20c7bc 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/WelcomeSplashTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/WelcomeSplashTest.java
@@ -43,7 +43,7 @@ protected ComponentRenderer<EmptySpace> createDefaultRenderer() {
                 return new ComponentRenderer<EmptySpace>() {
                     @Override
                     public TerminalSize getPreferredSize(EmptySpace component) {
-                        return TerminalSize.ONE;
+                        return TerminalSize.OF_1x1;
                     }
 
                     @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java b/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
index c25d61d58..eaf80de04 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/WindowManagerTest.java
@@ -23,7 +23,7 @@ public void init(WindowBasedTextGUI textGUI) {
         final Window mainWindow = new BasicWindow("Window Manager Test");
         Panel contentArea = new Panel();
         contentArea.setLayoutManager(new LinearLayout(Direction.VERTICAL));
-        contentArea.addComponent(new EmptySpace(TerminalSize.ONE));
+        contentArea.addComponent(new EmptySpace(TerminalSize.OF_1x1));
         contentArea.addComponent(new Button("Close", new Runnable() {
             @Override
             public void run() {
diff --git a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
index efde34b2a..b479f43b4 100644
--- a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
@@ -68,7 +68,7 @@ public static void main(String[] args) throws IOException {
         screenGraphics.drawImage(TerminalPosition.of(1, 7), image, TerminalPosition.of(0, 0), image.getSize().withRelativeColumns(10));
 
         //0 size should draw nothing
-        screenGraphics.drawImage(TerminalPosition.of(8, 7), image, TerminalPosition.of(0, 0), TerminalSize.ZERO);
+        screenGraphics.drawImage(TerminalPosition.of(8, 7), image, TerminalPosition.of(0, 0), TerminalSize.OF_0x0);
 
         //Drawing with a negative source image offset will move the target position
         screenGraphics.drawImage(TerminalPosition.of(8, 7), image, TerminalPosition.of(-2, -2), image.getSize());

From 4d71717609cb3042422301baa69de27b2283fa39 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Fri, 8 Mar 2024 19:39:32 -0600
Subject: [PATCH 06/11] LANTERNA-using TerminalSize.of() rather than new
 TerminalSize()

---
 .../googlecode/lanterna/TerminalPosition.java |  1 +
 .../lanterna/TerminalRectangle.java           |  2 +-
 .../com/googlecode/lanterna/TerminalSize.java | 23 ++++-----
 .../lanterna/graphics/BasicTextImage.java     |  2 +-
 .../lanterna/gui2/AbsoluteLayout.java         |  3 +-
 .../lanterna/gui2/AbstractBasePane.java       |  2 +-
 .../lanterna/gui2/AbstractListBox.java        |  4 +-
 .../lanterna/gui2/BorderLayout.java           | 12 ++---
 .../com/googlecode/lanterna/gui2/Borders.java |  2 +-
 .../com/googlecode/lanterna/gui2/Button.java  |  6 +--
 .../googlecode/lanterna/gui2/CheckBox.java    |  2 +-
 .../googlecode/lanterna/gui2/ComboBox.java    |  2 +-
 .../gui2/DefaultWindowDecorationRenderer.java |  2 +-
 .../lanterna/gui2/DefaultWindowManager.java   |  2 +-
 .../gui2/FatWindowDecorationRenderer.java     |  4 +-
 .../lanterna/gui2/InteractableLookupMap.java  |  2 +-
 .../lanterna/gui2/LinearLayout.java           | 12 ++---
 .../googlecode/lanterna/gui2/ProgressBar.java | 10 ++--
 .../googlecode/lanterna/gui2/SplitPanel.java  | 16 +++----
 .../com/googlecode/lanterna/gui2/TextBox.java | 10 ++--
 .../gui2/dialogs/DirectoryDialog.java         |  4 +-
 .../gui2/dialogs/DirectoryDialogBuilder.java  |  2 +-
 .../lanterna/gui2/dialogs/FileDialog.java     |  4 +-
 .../gui2/dialogs/FileDialogBuilder.java       |  2 +-
 .../gui2/dialogs/ListSelectDialog.java        |  2 +-
 .../gui2/dialogs/TextInputDialogBuilder.java  |  2 +-
 .../lanterna/gui2/menu/MenuBar.java           |  2 +-
 .../gui2/table/DefaultTableCellRenderer.java  |  2 +-
 .../table/DefaultTableHeaderRenderer.java     |  2 +-
 .../gui2/table/DefaultTableRenderer.java      |  6 +--
 .../lanterna/terminal/AbstractTerminal.java   |  2 +-
 .../lanterna/terminal/ansi/ANSITerminal.java  |  2 +-
 .../terminal/ansi/CygwinTerminal.java         |  6 +--
 .../GraphicalTerminalImplementation.java      |  2 +-
 .../virtual/DefaultVirtualTerminal.java       |  2 +-
 .../terminal/win32/WindowsTerminal.java       |  2 +-
 .../lanterna/gui2/ComboBoxTest.java           |  8 ++--
 .../gui2/DialogsTextGUIBasicTest.java         |  2 +-
 .../lanterna/gui2/DynamicGridLayoutTest.java  | 10 ++--
 .../lanterna/gui2/FullScreenTextGUITest.java  | 36 +++++++-------
 .../lanterna/gui2/GUIOverTelnet.java          |  4 +-
 .../lanterna/gui2/GridLayoutTest.java         | 32 ++++++-------
 .../lanterna/gui2/ImageComponentTest.java     |  2 +-
 .../googlecode/lanterna/gui2/InputUITest.java |  2 +-
 .../lanterna/gui2/LineWrappingLabelTest.java  |  2 +-
 .../googlecode/lanterna/gui2/ListBoxTest.java |  4 +-
 .../googlecode/lanterna/gui2/MenuTest.java    |  2 +-
 .../lanterna/gui2/MiscComponentTest.java      |  6 +--
 .../lanterna/gui2/MultiButtonTest.java        |  2 +-
 .../lanterna/gui2/MultiLabelTest.java         |  4 +-
 .../lanterna/gui2/SplitPanelTest.java         |  6 +--
 .../lanterna/gui2/TableUnitTests.java         |  2 +-
 .../googlecode/lanterna/gui2/TextBoxTest.java |  4 +-
 .../googlecode/lanterna/gui2/ThemeTest.java   | 40 ++++++++--------
 .../googlecode/lanterna/issue/Issue190.java   |  2 +-
 .../googlecode/lanterna/issue/Issue216.java   |  2 +-
 .../googlecode/lanterna/issue/Issue261.java   |  4 +-
 .../googlecode/lanterna/issue/Issue274.java   |  2 +-
 .../googlecode/lanterna/issue/Issue384.java   |  2 +-
 .../googlecode/lanterna/issue/Issue387.java   |  4 +-
 .../googlecode/lanterna/issue/Issue409.java   |  2 +-
 .../googlecode/lanterna/issue/Issue452.java   |  4 +-
 .../lanterna/issue/Issue452Test.java          |  2 +-
 .../lanterna/screen/DrawImageTest.java        |  4 +-
 .../lanterna/screen/ScreenRectangleTest.java  |  2 +-
 .../terminal/TerminalTextGraphicsTest.java    |  4 +-
 .../virtual/DefaultVirtualTerminalTest.java   | 48 +++++++++----------
 .../lanterna/tutorial/Tutorial03.java         |  2 +-
 .../lanterna/tutorial/Tutorial04.java         |  2 +-
 69 files changed, 209 insertions(+), 208 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index ec4f3cb3a..ebb545c99 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -35,6 +35,7 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
     public static final TerminalPosition OF_1x0 = new TerminalPosition(1, 0);
     public static final TerminalPosition OF_1x1 = new TerminalPosition(1, 1);
 
+    // one of the benefits of immutable: ease of usage
     public final int column;
     public final int row;
     /**
diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index 78d576cad..bb45dc217 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -48,7 +48,7 @@ public class TerminalRectangle {
      */
     public TerminalRectangle(int x, int y, int width, int height) {
         position = TerminalPosition.of(x, y);
-        size = new TerminalSize(width, height);
+        size = TerminalSize.of(width, height);
         
         this.x = x;
         this.y = y;
diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 2eb570f53..9647e5d34 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -31,6 +31,7 @@ public class TerminalSize implements Comparable<TerminalSize> {
     public static final TerminalSize OF_1x0 = new TerminalSize(1, 0);
     public static final TerminalSize OF_1x1 = new TerminalSize(1, 1);
 
+    // one of the benefits of immutable: ease of usage
     public final int columns;
     public final int rows;
 
@@ -65,20 +66,20 @@ public TerminalSize(int columns, int rows) {
         this.rows = rows;
     }
     /**
-     * @return Width, number of columns, of this size representation
+     * @return Width, the number of columns of this TerminalSize
      */
     public int getColumns() {
         return columns;
     }
     /**
-     * @return Height, number of rows, of this size representation
+     * @return Height, the number of rows of this TerminalSize
      */
     public int getRows() {
         return rows;
     }
     /**
      * Obtain a TerminalSize with the supplied number of columns and this instance's number of rows
-     * @param columns Width as number of columns for the resulting TerminalSize
+     * @param columns, the number of columns, or Width, of the resulting TerminalSize
      * @return a TerminalSize with the supplied number of columns and this instance's number of rows
      */
     public TerminalSize withColumns(int columns) {
@@ -86,7 +87,7 @@ public TerminalSize withColumns(int columns) {
     }
     /**
      * Obtain a TerminalSize with this instance's number of columns and the supplied number of rows
-     * @param rows Height as number of rows for the resulting TerminalSize
+     * @param rows, the number or rows, or Height, of the resulting TerminalSize
      * @return a TerminalSize with this instance's number of columns and the supplied number of rows
      */
     public TerminalSize withRows(int rows) {
@@ -95,9 +96,9 @@ public TerminalSize withRows(int rows) {
     /**
      * Obtain a TerminalSize with the same number of rows, but with a columns size offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
-     * a terminal size <i>delta</i> number of columns wider and for negative numbers shorter.
+     * a TerminalSize <i>delta</i> number of columns wider and for negative numbers shorter.
      * @param delta Column offset
-     * @return a TerminalSize based off this one but with an applied transformation
+     * @return a TerminalSize based off this one but with an applied translation
      */
     public TerminalSize withRelativeColumns(int delta) {
         // Prevent going below 0 (which would throw an exception)
@@ -106,9 +107,9 @@ public TerminalSize withRelativeColumns(int delta) {
     /**
      * Obtain a TerminalSize with the same number of columns, but with a row size offset by a
      * supplied value. Calling this method with delta 0 will return this, calling it with a positive delta will return
-     * a terminal size <i>delta</i> number of rows longer and for negative numbers shorter.
+     * a TerminalSize <i>delta</i> number of rows longer and for negative numbers shorter.
      * @param delta Row offset
-     * @return a TerminalSize based off this one but with an applied transformation
+     * @return a TerminalSize resulting from translating this instance by the supplied delta rows
      */
     public TerminalSize withRelativeRows(int delta) {
         // Prevent going below 0 (which would throw an exception)
@@ -128,9 +129,9 @@ public TerminalSize withRelative(TerminalSize delta) {
      * Obtain a TerminalSize based on this object's size but with a delta applied.
      * This is the same as calling
      * <code>withRelativeColumns(deltaColumns).withRelativeRows(deltaRows)</code>
-     * @param deltaColumns How many extra columns the new TerminalSize will have (negative delta values are allowed)
-     * @param deltaRows How many extra rows the new TerminalSize will have (negative delta values are allowed)
-     * @return New terminal size based off this one but with an applied resize
+     * @param deltaColumns How many extra columns the resulting TerminalSize will have (negative delta values are allowed)
+     * @param deltaRows How many extra rows the resulting TerminalSize will have (negative delta values are allowed)
+     * @return a TerminalSize based off this one but with an applied resize
      */
     public TerminalSize withRelative(int deltaColumns, int deltaRows) {
         return plus(deltaColumns, deltaRows);
diff --git a/src/main/java/com/googlecode/lanterna/graphics/BasicTextImage.java b/src/main/java/com/googlecode/lanterna/graphics/BasicTextImage.java
index 79febeff0..ea6889a7c 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/BasicTextImage.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/BasicTextImage.java
@@ -42,7 +42,7 @@ public class BasicTextImage implements TextImage {
      * @param rows Size of the image in number of rows
      */
     public BasicTextImage(int columns, int rows) {
-        this(new TerminalSize(columns, rows));
+        this(TerminalSize.of(columns, rows));
     }
     
     /**
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java b/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
index 590669179..5810f9729 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbsoluteLayout.java
@@ -34,8 +34,7 @@ public class AbsoluteLayout implements LayoutManager {
     public TerminalSize getPreferredSize(List<Component> components) {
         TerminalSize size = TerminalSize.OF_0x0;
         for(Component component: components) {
-            size = size.max(
-                    new TerminalSize(
+            size = size.max(TerminalSize.of(
                             component.getPosition().getColumn() + component.getSize().getColumns(),
                             component.getPosition().getRow() + component.getSize().getRows()));
                     
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
index 1373ea6c5..1251f76e5 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractBasePane.java
@@ -50,7 +50,7 @@ public abstract class AbstractBasePane<T extends BasePane> implements BasePane {
     protected AbstractBasePane() {
         this.contentHolder = new ContentHolder();
         this.listeners = new CopyOnWriteArrayList<>();
-        this.interactableLookupMap = new InteractableLookupMap(new TerminalSize(80, 25));
+        this.interactableLookupMap = new InteractableLookupMap(TerminalSize.of(80, 25));
         this.invalid = false;
         this.strictFocusChange = false;
         this.enableDirectionBasedMovements = true;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
index f8d08a95f..17b0b4753 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractListBox.java
@@ -417,7 +417,7 @@ public TerminalSize getPreferredSize(T listBox) {
                     maxWidth = stringLengthInColumns;
                 }
             }
-            return new TerminalSize(maxWidth + 1, listBox.getItemCount());
+            return TerminalSize.of(maxWidth + 1, listBox.getItemCount());
         }
 
         @Override
@@ -472,7 +472,7 @@ else if(selectedIndex >= componentHeight + scrollTopIndex)
                 verticalScrollBar.setScrollPosition(scrollTopIndex);
                 verticalScrollBar.draw(graphics.newTextGraphics(
                         TerminalPosition.of(graphics.getSize().getColumns() - 1, 0),
-                        new TerminalSize(1, graphics.getSize().getRows())));
+                        TerminalSize.of(1, graphics.getSize().getRows())));
             }
         }
     }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
index 2be6287b5..cc6f32379 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/BorderLayout.java
@@ -98,7 +98,7 @@ public TerminalSize getPreferredSize(List<Component> components) {
                     Math.max(
                         layout.containsKey(Location.TOP) ? layout.get(Location.TOP).getPreferredSize().getColumns() : 0,
                         layout.containsKey(Location.BOTTOM) ? layout.get(Location.BOTTOM).getPreferredSize().getColumns() : 0));
-        return new TerminalSize(preferredWidth, preferredHeight);
+        return TerminalSize.of(preferredWidth, preferredHeight);
     }
 
     @Override
@@ -116,7 +116,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
             Component topComponent = layout.get(Location.TOP);
             topComponentHeight = Math.min(topComponent.getPreferredSize().getRows(), availableVerticalSpace);
             topComponent.setPosition(TerminalPosition.OF_0x0);
-            topComponent.setSize(new TerminalSize(availableHorizontalSpace, topComponentHeight));
+            topComponent.setSize(TerminalSize.of(availableHorizontalSpace, topComponentHeight));
             availableVerticalSpace -= topComponentHeight;
         }
 
@@ -125,7 +125,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
             Component bottomComponent = layout.get(Location.BOTTOM);
             int bottomComponentHeight = Math.min(bottomComponent.getPreferredSize().getRows(), availableVerticalSpace);
             bottomComponent.setPosition(TerminalPosition.of(0, area.getRows() - bottomComponentHeight));
-            bottomComponent.setSize(new TerminalSize(availableHorizontalSpace, bottomComponentHeight));
+            bottomComponent.setSize(TerminalSize.of(availableHorizontalSpace, bottomComponentHeight));
             availableVerticalSpace -= bottomComponentHeight;
         }
 
@@ -134,20 +134,20 @@ public void doLayout(TerminalSize area, List<Component> components) {
             Component leftComponent = layout.get(Location.LEFT);
             leftComponentWidth = Math.min(leftComponent.getPreferredSize().getColumns(), availableHorizontalSpace);
             leftComponent.setPosition(TerminalPosition.of(0, topComponentHeight));
-            leftComponent.setSize(new TerminalSize(leftComponentWidth, availableVerticalSpace));
+            leftComponent.setSize(TerminalSize.of(leftComponentWidth, availableVerticalSpace));
             availableHorizontalSpace -= leftComponentWidth;
         }
         if(layout.containsKey(Location.RIGHT)) {
             Component rightComponent = layout.get(Location.RIGHT);
             int rightComponentWidth = Math.min(rightComponent.getPreferredSize().getColumns(), availableHorizontalSpace);
             rightComponent.setPosition(TerminalPosition.of(area.getColumns() - rightComponentWidth, topComponentHeight));
-            rightComponent.setSize(new TerminalSize(rightComponentWidth, availableVerticalSpace));
+            rightComponent.setSize(TerminalSize.of(rightComponentWidth, availableVerticalSpace));
             availableHorizontalSpace -= rightComponentWidth;
         }
         if(layout.containsKey(Location.CENTER)) {
             Component centerComponent = layout.get(Location.CENTER);
             centerComponent.setPosition(TerminalPosition.of(leftComponentWidth, topComponentHeight));
-            centerComponent.setSize(new TerminalSize(availableHorizontalSpace, availableVerticalSpace));
+            centerComponent.setSize(TerminalSize.of(availableHorizontalSpace, availableVerticalSpace));
         }
         
         //Set the remaining components to 0x0
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Borders.java b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
index 54e1daa34..05822eabd 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Borders.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Borders.java
@@ -192,7 +192,7 @@ public TerminalSize getPreferredSize(Border component) {
             }
             preferredSize = preferredSize.withRelativeColumns(2).withRelativeRows(2);
             String borderTitle = border.getTitle();
-            return preferredSize.max(new TerminalSize((borderTitle.isEmpty() ? 2 : TerminalTextUtils.getColumnWidth(borderTitle) + 4), 2));
+            return preferredSize.max(TerminalSize.of((borderTitle.isEmpty() ? 2 : TerminalTextUtils.getColumnWidth(borderTitle) + 4), 2));
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Button.java b/src/main/java/com/googlecode/lanterna/gui2/Button.java
index 501f0e514..d2e9a4ea7 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Button.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Button.java
@@ -169,7 +169,7 @@ public TerminalPosition getCursorLocation(Button button) {
 
         @Override
         public TerminalSize getPreferredSize(Button button) {
-            return new TerminalSize(Math.max(8, TerminalTextUtils.getColumnWidth(button.getLabel()) + 2), 1);
+            return TerminalSize.of(Math.max(8, TerminalTextUtils.getColumnWidth(button.getLabel()) + 2), 1);
         }
 
         @Override
@@ -231,7 +231,7 @@ public TerminalPosition getCursorLocation(Button component) {
 
         @Override
         public TerminalSize getPreferredSize(Button component) {
-            return new TerminalSize(TerminalTextUtils.getColumnWidth(component.getLabel()), 1);
+            return TerminalSize.of(TerminalTextUtils.getColumnWidth(component.getLabel()), 1);
         }
 
         @Override
@@ -262,7 +262,7 @@ public TerminalPosition getCursorLocation(Button component) {
 
         @Override
         public TerminalSize getPreferredSize(Button component) {
-            return new TerminalSize(TerminalTextUtils.getColumnWidth(component.getLabel()) + 5, 4);
+            return TerminalSize.of(TerminalTextUtils.getColumnWidth(component.getLabel()) + 5, 4);
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java b/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
index 71f8e2567..df56a00aa 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/CheckBox.java
@@ -192,7 +192,7 @@ public TerminalSize getPreferredSize(CheckBox component) {
             if(!component.label.isEmpty()) {
                 width += 1 + TerminalTextUtils.getColumnWidth(component.label);
             }
-            return new TerminalSize(width, 1);
+            return TerminalSize.of(width, 1);
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
index 83356cdd9..3838ae236 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ComboBox.java
@@ -648,7 +648,7 @@ public TerminalSize getPreferredSize(final ComboBox<V> comboBox) {
             synchronized(comboBox) {
                 for(int i = 0; i < comboBox.getItemCount(); i++) {
                     V item = comboBox.getItem(i);
-                    size = size.max(new TerminalSize(TerminalTextUtils.getColumnWidth(item.toString()) + 2 + 1, 1));   // +1 to add a single column of space
+                    size = size.max(TerminalSize.of(TerminalTextUtils.getColumnWidth(item.toString()) + 2 + 1, 1));   // +1 to add a single column of space
                 }
             }
             return size;
diff --git a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
index 816638738..f1ebbd5c0 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowDecorationRenderer.java
@@ -130,7 +130,7 @@ public TerminalSize getDecoratedSize(Window window, TerminalSize contentAreaSize
         return contentAreaSize
                 .withRelativeColumns(2)
                 .withRelativeRows(2)
-                .max(new TerminalSize(titleWidth + minPadding, 1));  //Make sure the title fits!
+                .max(TerminalSize.of(titleWidth + minPadding, 1));  //Make sure the title fits!
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
index ee59c26c4..797110000 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/DefaultWindowManager.java
@@ -72,7 +72,7 @@ public DefaultWindowManager(WindowDecorationRenderer windowDecorationRenderer, T
             this.lastKnownScreenSize = initialScreenSize;
         }
         else {
-            this.lastKnownScreenSize = new TerminalSize(80, 24);
+            this.lastKnownScreenSize = TerminalSize.of(80, 24);
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
index aeec06116..cb0182ac3 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/FatWindowDecorationRenderer.java
@@ -109,13 +109,13 @@ public TerminalSize getDecoratedSize(Window window, TerminalSize contentAreaSize
             return contentAreaSize
                     .withRelativeColumns(2)
                     .withRelativeRows(4)
-                    .max(new TerminalSize(TerminalTextUtils.getColumnWidth(window.getTitle()) + 4, 1));  //Make sure the title fits!
+                    .max(TerminalSize.of(TerminalTextUtils.getColumnWidth(window.getTitle()) + 4, 1));  //Make sure the title fits!
         }
         else {
             return contentAreaSize
                     .withRelativeColumns(2)
                     .withRelativeRows(2)
-                    .max(new TerminalSize(3, 1));
+                    .max(TerminalSize.of(3, 1));
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
index 3aa254d3a..f8af12029 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/InteractableLookupMap.java
@@ -49,7 +49,7 @@ void reset() {
 
     TerminalSize getSize() {
         if (lookupMap.length==0) { return TerminalSize.OF_0x0; }
-        return new TerminalSize(lookupMap[0].length, lookupMap.length);
+        return TerminalSize.of(lookupMap[0].length, lookupMap.length);
     }
 
     /**
diff --git a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
index e91b0fd8f..306cecba0 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/LinearLayout.java
@@ -177,7 +177,7 @@ private TerminalSize getPreferredSizeVertically(List<Component> components) {
             height += preferredSize.getRows();
         }
         height += spacing * (components.size() - 1);
-        return new TerminalSize(maxWidth, Math.max(0, height));
+        return TerminalSize.of(maxWidth, Math.max(0, height));
     }
 
     private TerminalSize getPreferredSizeHorizontally(List<Component> components) {
@@ -191,7 +191,7 @@ private TerminalSize getPreferredSizeHorizontally(List<Component> components) {
             width += preferredSize.getColumns();
         }
         width += spacing * (components.size() - 1);
-        return new TerminalSize(Math.max(0,width), maxHeight);
+        return TerminalSize.of(Math.max(0,width), maxHeight);
     }
 
     @Override
@@ -240,7 +240,7 @@ private void doVerticalLayout(TerminalSize area, List<Component> components) {
                 }
 
                 TerminalSize preferredSize = component.getPreferredSize();
-                TerminalSize decidedSize = new TerminalSize(
+                TerminalSize decidedSize = TerminalSize.of(
                         Math.min(availableHorizontalSpace, preferredSize.getColumns()),
                         Math.min(remainingVerticalSpace, preferredSize.getRows()));
                 if(alignment == Alignment.FILL) {
@@ -283,7 +283,7 @@ private void doFlexibleVerticalLayout(TerminalSize area, List<Component> compone
             }
 
             TerminalSize preferredSize = component.getPreferredSize();
-            TerminalSize fittingSize = new TerminalSize(
+            TerminalSize fittingSize = TerminalSize.of(
                     Math.min(availableHorizontalSpace, preferredSize.getColumns()),
                     preferredSize.getRows());
             if(alignment == Alignment.FILL) {
@@ -392,7 +392,7 @@ private void doHorizontalLayout(TerminalSize area, List<Component> components) {
                 }
 
                 TerminalSize preferredSize = component.getPreferredSize();
-                TerminalSize decidedSize = new TerminalSize(
+                TerminalSize decidedSize = TerminalSize.of(
                         Math.min(remainingHorizontalSpace, preferredSize.getColumns()),
                         Math.min(availableVerticalSpace, preferredSize.getRows()));
                 if(alignment == Alignment.FILL) {
@@ -435,7 +435,7 @@ private void doFlexibleHorizontalLayout(TerminalSize area, List<Component> compo
             }
 
             TerminalSize preferredSize = component.getPreferredSize();
-            TerminalSize fittingSize = new TerminalSize(
+            TerminalSize fittingSize = TerminalSize.of(
                     preferredSize.getColumns(),
                     Math.min(availableVerticalSpace, preferredSize.getRows()));
             if(alignment == Alignment.FILL) {
diff --git a/src/main/java/com/googlecode/lanterna/gui2/ProgressBar.java b/src/main/java/com/googlecode/lanterna/gui2/ProgressBar.java
index 09844ed30..e0c39e4d5 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/ProgressBar.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/ProgressBar.java
@@ -248,13 +248,13 @@ public static class DefaultProgressBarRenderer implements ComponentRenderer<Prog
         public TerminalSize getPreferredSize(ProgressBar component) {
             int preferredWidth = component.getPreferredWidth();
             if(preferredWidth > 0) {
-                return new TerminalSize(preferredWidth, 1);
+                return TerminalSize.of(preferredWidth, 1);
             }
             else if(component.getLabelFormat() != null && !component.getLabelFormat().trim().isEmpty()) {
-                return new TerminalSize(TerminalTextUtils.getColumnWidth(String.format(component.getLabelFormat(), 100.0f)) + 2, 1);
+                return TerminalSize.of(TerminalTextUtils.getColumnWidth(String.format(component.getLabelFormat(), 100.0f)) + 2, 1);
             }
             else {
-                return new TerminalSize(10, 1);
+                return TerminalSize.of(10, 1);
             }
         }
 
@@ -322,10 +322,10 @@ public static class LargeProgressBarRenderer implements ComponentRenderer<Progre
         public TerminalSize getPreferredSize(ProgressBar component) {
             int preferredWidth = component.getPreferredWidth();
             if(preferredWidth > 0) {
-                return new TerminalSize(preferredWidth, 3);
+                return TerminalSize.of(preferredWidth, 3);
             }
             else {
-                return new TerminalSize(42, 3);
+                return TerminalSize.of(42, 3);
             }
         }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java b/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
index 69a772004..25bdca4c4 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/SplitPanel.java
@@ -146,9 +146,9 @@ public TerminalSize getPreferredSize(List<Component> components) {
             int tHeight = thumb.getPreferredSize().getRows();
 
             if (isHorizontal) {
-                return new TerminalSize(aWidth + tWidth + bWidth, Math.max(aHeight, Math.max(tHeight, bHeight)));
+                return TerminalSize.of(aWidth + tWidth + bWidth, Math.max(aHeight, Math.max(tHeight, bHeight)));
             } else {
-                return new TerminalSize(Math.max(aWidth, Math.max(tWidth, bWidth)), aHeight + tHeight + bHeight);
+                return TerminalSize.of(Math.max(aWidth, Math.max(tWidth, bWidth)), aHeight + tHeight + bHeight);
             }
         }
 
@@ -159,7 +159,7 @@ public void doLayout(TerminalSize area, List<Component> components) {
             // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             // TODO: themed
             int length = isHorizontal ? size.getRows() : size.getColumns();
-            TerminalSize tsize = new TerminalSize(isHorizontal ? 1 : length, !isHorizontal ? 1 : length);
+            TerminalSize tsize = TerminalSize.of(isHorizontal ? 1 : length, !isHorizontal ? 1 : length);
             TextImage textImage = new BasicTextImage(tsize);
             Theme theme = getTheme();
             ThemeDefinition themeDefinition = theme.getDefaultDefinition();
@@ -203,9 +203,9 @@ public void doLayout(TerminalSize area, List<Component> components) {
                 int rightWidth = Math.max(0, w - leftWidth);
                 int rightHeight = Math.max(0, Math.min(compB.getPreferredSize().getRows(), h));
 
-                compA.setSize(new TerminalSize(leftWidth, leftHeight));
+                compA.setSize(TerminalSize.of(leftWidth, leftHeight));
                 thumb.setSize(thumb.getPreferredSize());
-                compB.setSize(new TerminalSize(rightWidth, rightHeight));
+                compB.setSize(TerminalSize.of(rightWidth, rightHeight));
 
                 compA.setPosition(TerminalPosition.of(0, 0));
                 thumb.setPosition(TerminalPosition.of(leftWidth, h / 2 - tHeight / 2));
@@ -217,9 +217,9 @@ public void doLayout(TerminalSize area, List<Component> components) {
                 int rightWidth = Math.max(0, Math.min(compB.getPreferredSize().getColumns(), w));
                 int rightHeight = Math.max(0, h - leftHeight);
 
-                compA.setSize(new TerminalSize(leftWidth, leftHeight));
+                compA.setSize(TerminalSize.of(leftWidth, leftHeight));
                 thumb.setSize(thumb.getPreferredSize());
-                compB.setSize(new TerminalSize(rightWidth, rightHeight));
+                compB.setSize(TerminalSize.of(rightWidth, rightHeight));
 
                 compA.setPosition(TerminalPosition.of(0, 0));
                 thumb.setPosition(TerminalPosition.of(w / 2 - tWidth / 2, leftHeight));
@@ -261,7 +261,7 @@ public void setThumbVisible(boolean visible) {
         if (visible) {
             this.setPreferredSize(null);
         } else {
-            thumb.setPreferredSize(new TerminalSize(1, 1));
+            thumb.setPreferredSize(TerminalSize.of(1, 1));
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/TextBox.java b/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
index e6227581a..5407b58a4 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/TextBox.java
@@ -74,7 +74,7 @@ public enum Style {
      * Default constructor, this creates a single-line {@code TextBox} of size 10 which is initially empty
      */
     public TextBox() {
-        this(new TerminalSize(10, 1), "", Style.SINGLE_LINE);
+        this(TerminalSize.of(10, 1), "", Style.SINGLE_LINE);
     }
 
     /**
@@ -148,7 +148,7 @@ public TextBox(TerminalSize preferredSize, String initialContent, Style style) {
         this.caretPosition = TerminalPosition.of(getLine(0).length(), 0);
 
         if (preferredSize == null) {
-            preferredSize = new TerminalSize(Math.max(10, longestRow), lines.size());
+            preferredSize = TerminalSize.of(Math.max(10, longestRow), lines.size());
         }
         setPreferredSize(preferredSize);
     }
@@ -852,7 +852,7 @@ public TerminalPosition getCursorLocation(TextBox component) {
 
         @Override
         public TerminalSize getPreferredSize(TextBox component) {
-            return new TerminalSize(component.longestRow, component.lines.size());
+            return TerminalSize.of(component.longestRow, component.lines.size());
         }
 
         /**
@@ -897,7 +897,7 @@ public void drawComponent(TextGUIGraphics graphics, TextBox component) {
                 verticalScrollBar.setScrollPosition(viewTopLeft.getRow());
                 verticalScrollBar.draw(graphics.newTextGraphics(
                         TerminalPosition.of(graphics.getSize().getColumns() - 1, 0),
-                        new TerminalSize(1, graphics.getSize().getRows() - (drawHorizontalScrollBar ? 1 : 0))));
+                        TerminalSize.of(1, graphics.getSize().getRows() - (drawHorizontalScrollBar ? 1 : 0))));
             }
             if(drawHorizontalScrollBar) {
                 horizontalScrollBar.onAdded(component.getParent());
@@ -906,7 +906,7 @@ public void drawComponent(TextGUIGraphics graphics, TextBox component) {
                 horizontalScrollBar.setScrollPosition(viewTopLeft.getColumn());
                 horizontalScrollBar.draw(graphics.newTextGraphics(
                         TerminalPosition.of(0, graphics.getSize().getRows() - 1),
-                        new TerminalSize(graphics.getSize().getColumns() - (drawVerticalScrollBar ? 1 : 0), 1)));
+                        TerminalSize.of(graphics.getSize().getColumns() - (drawVerticalScrollBar ? 1 : 0), 1)));
             }
         }
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialog.java
index d496edbf7..4d154e05e 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialog.java
@@ -93,10 +93,10 @@ public DirectoryDialog(
 
         int unitHeight = dialogSize.getRows();
 
-        dirListBox = new ActionListBox(new TerminalSize(dialogSize.getColumns(), unitHeight));
+        dirListBox = new ActionListBox(TerminalSize.of(dialogSize.getColumns(), unitHeight));
         dirsPane.addComponent(dirListBox.withBorder(Borders.singleLine()), Location.CENTER);
 
-        dirBox = new TextBox(new TerminalSize(dialogSize.getColumns(), 1));
+        dirBox = new TextBox(TerminalSize.of(dialogSize.getColumns(), 1));
         dirsPane.addComponent(dirBox.withBorder(Borders.singleLine()), Location.BOTTOM);
 
         Panel panelButtons = new Panel(new GridLayout(2));
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialogBuilder.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialogBuilder.java
index 31c1c9684..3952570cb 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialogBuilder.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/DirectoryDialogBuilder.java
@@ -48,7 +48,7 @@ public class DirectoryDialogBuilder extends AbstractDialogBuilder<DirectoryDialo
     public DirectoryDialogBuilder() {
         super("DirectoryDialog");
         actionLabel = LocalizedString.OK.toString();
-        suggestedSize = new TerminalSize(45, 10);
+        suggestedSize = TerminalSize.of(45, 10);
         showHiddenDirectories = false;
         selectedDir = null;
     }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
index a10b65f28..e573528a7 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialog.java
@@ -96,7 +96,7 @@ public FileDialog(
                         1))
                 .addTo(contentPane);
 
-        fileListBox = new ActionListBox(new TerminalSize(unitWidth * 2, unitHeight));
+        fileListBox = new ActionListBox(TerminalSize.of(unitWidth * 2, unitHeight));
         fileListBox.withBorder(Borders.singleLine())
                 .setLayoutData(GridLayout.createLayoutData(
                         GridLayout.Alignment.BEGINNING,
@@ -104,7 +104,7 @@ public FileDialog(
                         false,
                         false))
                 .addTo(contentPane);
-        directoryListBox = new ActionListBox(new TerminalSize(unitWidth, unitHeight));
+        directoryListBox = new ActionListBox(TerminalSize.of(unitWidth, unitHeight));
         directoryListBox.withBorder(Borders.singleLine())
                 .addTo(contentPane);
 
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialogBuilder.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialogBuilder.java
index 0ec635dab..dc304dfb7 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialogBuilder.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/FileDialogBuilder.java
@@ -41,7 +41,7 @@ public class FileDialogBuilder extends AbstractDialogBuilder<FileDialogBuilder,
     public FileDialogBuilder() {
         super("FileDialog");
         actionLabel = LocalizedString.OK.toString();
-        suggestedSize = new TerminalSize(45, 10);
+        suggestedSize = TerminalSize.of(45, 10);
         showHiddenDirectories = false;
         selectedFile = null;
     }
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
index 46438966c..4a509104e 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/ListSelectDialog.java
@@ -137,7 +137,7 @@ public static <T> T showDialog(WindowBasedTextGUI textGUI, String title, String
             width = Math.max(width, TerminalTextUtils.getColumnWidth(item.toString()));
         }
         width += 2;
-        return showDialog(textGUI, title, description, new TerminalSize(width, listBoxHeight), items);
+        return showDialog(textGUI, title, description, TerminalSize.of(width, listBoxHeight), items);
     }
 
     /**
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialogBuilder.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialogBuilder.java
index 0877e9b0d..3d1cc61d7 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialogBuilder.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialogBuilder.java
@@ -53,7 +53,7 @@ protected TextInputDialogBuilder self() {
     protected TextInputDialog buildDialog() {
         TerminalSize size = textBoxSize;
         if ((initialContent == null || initialContent.trim().equals("")) && size == null) {
-            size = new TerminalSize(40, 1);
+            size = TerminalSize.of(40, 1);
         }
         return new TextInputDialog(
                 title,
diff --git a/src/main/java/com/googlecode/lanterna/gui2/menu/MenuBar.java b/src/main/java/com/googlecode/lanterna/gui2/menu/MenuBar.java
index 8d9afddb1..eaf9bb372 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/menu/MenuBar.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/menu/MenuBar.java
@@ -189,7 +189,7 @@ public TerminalSize getPreferredSize(MenuBar menuBar) {
                 totalWidth += preferredSize.getColumns();
             }
             totalWidth += EXTRA_PADDING;
-            return new TerminalSize(totalWidth, maxHeight);
+            return TerminalSize.of(totalWidth, maxHeight);
         }
 
         @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableCellRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableCellRenderer.java
index 1b1b8c666..58bd39947 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableCellRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableCellRenderer.java
@@ -39,7 +39,7 @@ public TerminalSize getPreferredSize(Table<V> table, V cell, int columnIndex, in
                 maxWidth = length;
             }
         }
-        return new TerminalSize(maxWidth, lines.length);
+        return TerminalSize.of(maxWidth, lines.length);
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
index 2aa9847fa..e35322f43 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableHeaderRenderer.java
@@ -33,7 +33,7 @@ public TerminalSize getPreferredSize(Table<V> table, String label, int columnInd
         if(label == null) {
             return TerminalSize.OF_0x0;
         }
-        return new TerminalSize(TerminalTextUtils.getColumnWidth(label), 1);
+        return TerminalSize.of(TerminalTextUtils.getColumnWidth(label), 1);
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
index 1349717de..dc0b9e8d3 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/table/DefaultTableRenderer.java
@@ -358,7 +358,7 @@ else if(viewTopRow <= selectedRow - visibleRows) {
             }
         }
 
-        cachedSize = new TerminalSize(preferredColumnSize, preferredRowSize);
+        cachedSize = TerminalSize.of(preferredColumnSize, preferredRowSize);
         return cachedSize;
     }
 
@@ -541,7 +541,7 @@ private void drawHeader(TextGUIGraphics graphics, Table<V> table, List<Integer>
         int endColumnIndex = Math.min(headers.size(), viewLeftColumn + visibleColumns);
         for(int index = viewLeftColumn; index < endColumnIndex; index++) {
             String label = headers.get(index);
-            TerminalSize size = new TerminalSize(columnSizes.get(index), headerSizeInRows);
+            TerminalSize size = TerminalSize.of(columnSizes.get(index), headerSizeInRows);
             tableHeaderRenderer.drawHeader(table, label, index, graphics.newTextGraphics(TerminalPosition.of(leftPosition, 0), size));
             leftPosition += size.getColumns();
             if(headerHorizontalBorderStyle != TableCellBorderStyle.NONE && index < (endColumnIndex - 1)) {
@@ -672,7 +672,7 @@ private void drawRows(
                 }
                 V cell = row.get(columnIndex);
                 TerminalPosition cellPosition = TerminalPosition.of(leftPosition, topPosition);
-                TerminalSize cellArea = new TerminalSize(columnSizes.get(columnIndex), preferredRowSizes.get(rowIndex));
+                TerminalSize cellArea = TerminalSize.of(columnSizes.get(columnIndex), preferredRowSizes.get(rowIndex));
                 tableCellRenderer.drawCell(table, cell, columnIndex, rowIndex, graphics.newTextGraphics(cellPosition, cellArea));
                 leftPosition += cellArea.getColumns();
 
diff --git a/src/main/java/com/googlecode/lanterna/terminal/AbstractTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/AbstractTerminal.java
index ebf396a03..ba7590384 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/AbstractTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/AbstractTerminal.java
@@ -63,7 +63,7 @@ public void removeResizeListener(TerminalResizeListener listener) {
      * @param rows Number of rows in the new size
      */
     protected synchronized void onResized(int columns, int rows) {
-        onResized(new TerminalSize(columns, rows));
+        onResized(TerminalSize.of(columns, rows));
     }
 
     /**
diff --git a/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java b/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
index 88a4c2158..1d5bf68fe 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/ansi/ANSITerminal.java
@@ -109,7 +109,7 @@ protected TerminalSize findTerminalSize() throws IOException {
         if (terminalPosition == null) {
             terminalPosition = TerminalPosition.of(80,24);
         }
-        return new TerminalSize(terminalPosition.getColumn(), terminalPosition.getRow());
+        return TerminalSize.of(terminalPosition.getColumn(), terminalPosition.getRow());
     }
 
     @Override
diff --git a/src/main/java/com/googlecode/lanterna/terminal/ansi/CygwinTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/ansi/CygwinTerminal.java
index 516aa9a48..adbbe4ea6 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/ansi/CygwinTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/ansi/CygwinTerminal.java
@@ -73,14 +73,14 @@ protected TerminalSize findTerminalSize() {
             String stty = runSTTYCommand("-a");
             Matcher matcher = STTY_SIZE_PATTERN.matcher(stty);
             if(matcher.matches()) {
-                return new TerminalSize(Integer.parseInt(matcher.group(2)), Integer.parseInt(matcher.group(1)));
+                return TerminalSize.of(Integer.parseInt(matcher.group(2)), Integer.parseInt(matcher.group(1)));
             }
             else {
-                return new TerminalSize(80, 24);
+                return TerminalSize.of(80, 24);
             }
         }
         catch(Throwable e) {
-            return new TerminalSize(80, 24);
+            return TerminalSize.of(80, 24);
         }
     }
 
diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java b/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
index 9bea3782c..8afd2b66f 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
@@ -104,7 +104,7 @@ abstract class GraphicalTerminalImplementation implements IOSafeTerminal {
         //This is kind of meaningless since we don't know how large the
         //component is at this point, but we should set it to something
         if(initialTerminalSize == null) {
-            initialTerminalSize = new TerminalSize(80, 24);
+            initialTerminalSize = TerminalSize.of(80, 24);
         }
         this.virtualTerminal = new DefaultVirtualTerminal(initialTerminalSize);
         this.keyQueue = new LinkedBlockingQueue<>();
diff --git a/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
index 8c1e2c78f..9edcdb78a 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminal.java
@@ -58,7 +58,7 @@ public class DefaultVirtualTerminal extends AbstractTerminal implements VirtualT
      * Creates a new virtual terminal with an initial size set
      */
     public DefaultVirtualTerminal() {
-        this(new TerminalSize(80, 24));
+        this(TerminalSize.of(80, 24));
     }
 
     /**
diff --git a/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
index db563305d..7635afda5 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/win32/WindowsTerminal.java
@@ -117,7 +117,7 @@ protected TerminalSize findTerminalSize() {
 		Wincon.INSTANCE.GetConsoleScreenBufferInfo(CONSOLE_OUTPUT.getHandle(), screenBufferInfo);
 		int columns = screenBufferInfo.srWindow.Right - screenBufferInfo.srWindow.Left + 1;
 		int rows = screenBufferInfo.srWindow.Bottom - screenBufferInfo.srWindow.Top + 1;
-		return new TerminalSize(columns, rows);
+		return TerminalSize.of(columns, rows);
 	}
 
 	@Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java b/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
index 35ffbae13..54e4c8f77 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ComboBoxTest.java
@@ -53,7 +53,7 @@ public void init(final WindowBasedTextGUI textGUI) {
         comboBoxCJK.addItem("ウィキペディアは誰でも編集できるフリー百科事典です");
         comboBoxCJK.addItem("위키백과는 전 세계 여러 언어로 만들어 나가는 자유 백과사전으로, 누구나 참여하실 수 있습니다.");
         comboBoxCJK.addItem("This is a string without double-width characters");
-        comboBoxCJK.setPreferredSize(new TerminalSize(13, 1));
+        comboBoxCJK.setPreferredSize(TerminalSize.of(13, 1));
 
         mainPanel.addComponent(Panels.horizontal(
                 comboBoxReadOnly.withBorder(Borders.singleLine("Read-only")),
@@ -61,14 +61,14 @@ public void init(final WindowBasedTextGUI textGUI) {
                 comboBoxCJK.withBorder(Borders.singleLine("CJK"))));
         mainPanel.addComponent(new EmptySpace(TerminalSize.OF_1x1));
 
-        final TextBox textBoxNewItem = new TextBox(new TerminalSize(20, 1));
+        final TextBox textBoxNewItem = new TextBox(TerminalSize.of(20, 1));
         Button buttonAddItem = new Button("Add", () -> {
             comboBoxEditable.addItem(textBoxNewItem.getText());
             comboBoxReadOnly.addItem(textBoxNewItem.getText());
             textBoxNewItem.setText("");
             window.setFocusedInteractable(textBoxNewItem);
         });
-        final TextBox textBoxSetSelectedIndex = new TextBox(new TerminalSize(20, 1), "0");
+        final TextBox textBoxSetSelectedIndex = new TextBox(TerminalSize.of(20, 1), "0");
         textBoxSetSelectedIndex.setValidationPattern(Pattern.compile("-?[0-9]+"));
         Button buttonSetSelectedIndex = new Button("Set Selected Index", () -> {
             try {
@@ -79,7 +79,7 @@ public void init(final WindowBasedTextGUI textGUI) {
                 MessageDialog.showMessageDialog(textGUI, e.getClass().getName(), e.getMessage(), MessageDialogButton.OK);
             }
         });
-        final TextBox textBoxSetSelectedItem = new TextBox(new TerminalSize(20, 1));
+        final TextBox textBoxSetSelectedItem = new TextBox(TerminalSize.of(20, 1));
         Button buttonSetSelectedItem = new Button("Set Selected Item", () -> {
             try {
                 comboBoxEditable.setSelectedItem(textBoxSetSelectedItem.getText());
diff --git a/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java b/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
index b693e5a06..8f1f38472 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/DialogsTextGUIBasicTest.java
@@ -52,7 +52,7 @@ public static void main(String[] args) throws IOException {
             dialogsListBox.addItem("Multi-line input", () -> {
                 String result = new TextInputDialogBuilder()
                         .setTitle("Multi-line editor")
-                        .setTextBoxSize(new TerminalSize(35, 5))
+                        .setTextBoxSize(TerminalSize.of(35, 5))
                         .build()
                         .showDialog(textGUI);
                 System.out.println("Result was: " + result);
diff --git a/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java b/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
index 02539a146..7ca470095 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/DynamicGridLayoutTest.java
@@ -53,7 +53,7 @@ public void init(final WindowBasedTextGUI textGUI) {
         gridPanel.setLayoutManager(gridLayout);
 
         for(int i = 0; i < 16; i++) {
-            gridPanel.addComponent(new EmptySpace(getRandomColor(), new TerminalSize(4, 1)));
+            gridPanel.addComponent(new EmptySpace(getRandomColor(), TerminalSize.of(4, 1)));
         }
 
         Panel controlPanel = new Panel();
@@ -103,7 +103,7 @@ private void onAddComponent(WindowBasedTextGUI textGUI, Panel gridPanel) {
                 if(sizeString == null) {
                     return;
                 }
-                TerminalSize size = new TerminalSize(Integer.parseInt(sizeString.split("x")[0]), Integer.parseInt(sizeString.split("x")[1]));
+                TerminalSize size = TerminalSize.of(Integer.parseInt(sizeString.split("x")[0]), Integer.parseInt(sizeString.split("x")[1]));
                 component = componentType == SelectableComponentType.Block ? new EmptySpace(getRandomColor(), size) : new TextBox(size);
                 break;
 
@@ -141,7 +141,7 @@ private void onResetGrid(WindowBasedTextGUI textGUI, Panel gridPanel) {
         gridPanel.setLayoutManager(newGridLayout(columns.intValue()));
         //noinspection ConstantConditions
         for(int i = 0; i < prepopulate.intValue(); i++) {
-            gridPanel.addComponent(new EmptySpace(getRandomColor(), new TerminalSize(4, 1)));
+            gridPanel.addComponent(new EmptySpace(getRandomColor(), TerminalSize.of(4, 1)));
         }
     }
 
@@ -285,12 +285,12 @@ public GridLayoutDataEditor(final Component component) {
             Pattern numberPattern = Pattern.compile("[1-9][0-9]*");
 
             contentPane.addComponent(new Label("Horizontal span:"));
-            final TextBox textBoxHorizontalSpan = new TextBox(new TerminalSize(5, 1), gridLayoutData.horizontalSpan + "");
+            final TextBox textBoxHorizontalSpan = new TextBox(TerminalSize.of(5, 1), gridLayoutData.horizontalSpan + "");
             textBoxHorizontalSpan.setValidationPattern(numberPattern);
             contentPane.addComponent(textBoxHorizontalSpan);
 
             contentPane.addComponent(new Label("Vertical span:"));
-            final TextBox textBoxVerticalSpan = new TextBox(new TerminalSize(5, 1), gridLayoutData.verticalSpan + "");
+            final TextBox textBoxVerticalSpan = new TextBox(TerminalSize.of(5, 1), gridLayoutData.verticalSpan + "");
             textBoxVerticalSpan.setValidationPattern(numberPattern);
             contentPane.addComponent(textBoxVerticalSpan);
 
diff --git a/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java b/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
index 73a7c1bf3..a55dbaf25 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/FullScreenTextGUITest.java
@@ -33,7 +33,7 @@
 
 public class FullScreenTextGUITest {
     public static void main(String[] args) throws IOException, InterruptedException {
-        Screen screen = new TestTerminalFactory(args).setInitialTerminalSize(new TerminalSize(80, 25)).createScreen();
+        Screen screen = new TestTerminalFactory(args).setInitialTerminalSize(TerminalSize.of(80, 25)).createScreen();
         screen.startScreen();
 
         final AtomicBoolean stop = new AtomicBoolean(false);
@@ -89,38 +89,38 @@ private BIOS() {
             BIOSButton button13 = new BIOSButton("Save & Exit Setup", "...and then you can have some cake!");
             BIOSButton button14 = new BIOSButton("Exit Without Saving", "僕の事が思い出せなくても泣かないでね");
             
-            button1.setSize(new TerminalSize(35, 1));
+            button1.setSize(TerminalSize.of(35, 1));
             button1.setPosition(TerminalPosition.of(3, 3));
-            button2.setSize(new TerminalSize(35, 1));
+            button2.setSize(TerminalSize.of(35, 1));
             button2.setPosition(TerminalPosition.of(3, 5));
-            button3.setSize(new TerminalSize(35, 1));
+            button3.setSize(TerminalSize.of(35, 1));
             button3.setPosition(TerminalPosition.of(3, 7));
-            button4.setSize(new TerminalSize(35, 1));
+            button4.setSize(TerminalSize.of(35, 1));
             button4.setPosition(TerminalPosition.of(3, 9));
-            button5.setSize(new TerminalSize(35, 1));
+            button5.setSize(TerminalSize.of(35, 1));
             button5.setPosition(TerminalPosition.of(3, 11));
-            button6.setSize(new TerminalSize(35, 1));
+            button6.setSize(TerminalSize.of(35, 1));
             button6.setPosition(TerminalPosition.of(3, 13));
-            button7.setSize(new TerminalSize(35, 1));
+            button7.setSize(TerminalSize.of(35, 1));
             button7.setPosition(TerminalPosition.of(3, 15));
             
-            button8.setSize(new TerminalSize(35, 1));
+            button8.setSize(TerminalSize.of(35, 1));
             button8.setPosition(TerminalPosition.of(43, 3));
-            button9.setSize(new TerminalSize(35, 1));
+            button9.setSize(TerminalSize.of(35, 1));
             button9.setPosition(TerminalPosition.of(43, 5));
-            button10.setSize(new TerminalSize(35, 1));
+            button10.setSize(TerminalSize.of(35, 1));
             button10.setPosition(TerminalPosition.of(43, 7));
-            button11.setSize(new TerminalSize(35, 1));
+            button11.setSize(TerminalSize.of(35, 1));
             button11.setPosition(TerminalPosition.of(43, 9));
-            button12.setSize(new TerminalSize(35, 1));
+            button12.setSize(TerminalSize.of(35, 1));
             button12.setPosition(TerminalPosition.of(43, 11));
-            button13.setSize(new TerminalSize(35, 1));
+            button13.setSize(TerminalSize.of(35, 1));
             button13.setPosition(TerminalPosition.of(43, 13));
-            button14.setSize(new TerminalSize(35, 1));
+            button14.setSize(TerminalSize.of(35, 1));
             button14.setPosition(TerminalPosition.of(43, 15));
             
             helpLabel.setPosition(TerminalPosition.of(2, 22));
-            helpLabel.setSize(new TerminalSize(76, 1));
+            helpLabel.setSize(TerminalSize.of(76, 1));
             addComponent(helpLabel);
             for(BIOSButton button: Arrays.asList(button1, button2, button3, button4, button5, button6, button7, button8, button9, button10, button11, button12, button13, button14)) {
                 addComponent(button);
@@ -175,7 +175,7 @@ protected ComponentRenderer<Panel> createDefaultRenderer() {
             return new ComponentRenderer<Panel>() {
                 @Override
                 public TerminalSize getPreferredSize(Panel component) {
-                    return new TerminalSize(80, 24);
+                    return TerminalSize.of(80, 24);
                 }
 
                 @Override
@@ -215,7 +215,7 @@ public TerminalPosition getCursorLocation(Button component) {
 
                     @Override
                     public TerminalSize getPreferredSize(Button component) {
-                        return new TerminalSize(TerminalTextUtils.getColumnWidth(getLabel()), 1);
+                        return TerminalSize.of(TerminalTextUtils.getColumnWidth(getLabel()), 1);
                     }
 
                     @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java b/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
index 018608b85..9e352479c 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/GUIOverTelnet.java
@@ -78,7 +78,7 @@ private static void runGUI(final TelnetTerminal telnetTerminal) throws IOExcepti
             }).withBorder(Borders.singleLine("This is a button")));
 
 
-            final TextBox textBox = new TextBox(new TerminalSize(20, 4)) {
+            final TextBox textBox = new TextBox(TerminalSize.of(20, 4)) {
                 @Override
                 public Result handleKeyStroke(KeyStroke keyStroke) {
                     try {
@@ -102,7 +102,7 @@ protected InteractableRenderer createDefaultRenderer() {
                     return new InteractableRenderer() {
                         @Override
                         public TerminalSize getPreferredSize(Component component) {
-                            return new TerminalSize(30, 1);
+                            return TerminalSize.of(30, 1);
                         }
 
                         @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java b/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
index c82b1e817..ac7fcc107 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/GridLayoutTest.java
@@ -34,35 +34,35 @@ public void init(WindowBasedTextGUI textGUI) {
 
         Panel leftGridPanel = new Panel();
         leftGridPanel.setLayoutManager(new GridLayout(4));
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, new TerminalSize(4, 2)));
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLUE, new TerminalSize(4, 2)));
-        EmptySpace visibilityToggleableComponent = new EmptySpace(TextColor.ANSI.CYAN, new TerminalSize(4, 2));
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, TerminalSize.of(4, 2)));
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLUE, TerminalSize.of(4, 2)));
+        EmptySpace visibilityToggleableComponent = new EmptySpace(TextColor.ANSI.CYAN, TerminalSize.of(4, 2));
         leftGridPanel.addComponent(visibilityToggleableComponent);
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.GREEN, new TerminalSize(4, 2)));
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.GREEN, TerminalSize.of(4, 2)));
 
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.MAGENTA, new TerminalSize(4, 2))
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.MAGENTA, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.BEGINNING, GridLayout.Alignment.CENTER, true, false, 4, 1)));
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.RED, new TerminalSize(4, 2))
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.RED, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.CENTER, GridLayout.Alignment.CENTER, true, false, 4, 1)));
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.YELLOW, new TerminalSize(4, 2))
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.YELLOW, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.END, GridLayout.Alignment.CENTER, true, false, 4, 1)));
-        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, new TerminalSize(4, 2))
+        leftGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.FILL, GridLayout.Alignment.CENTER, true, false, 4, 1)));
 
         Panel rightGridPanel = new Panel();
         rightGridPanel.setLayoutManager(new GridLayout(5));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, new TerminalSize(4, 2)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.MAGENTA, new TerminalSize(4, 2))
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, TerminalSize.of(4, 2)));
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.MAGENTA, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.CENTER, GridLayout.Alignment.BEGINNING, false, true, 1, 4)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.RED, new TerminalSize(4, 2))
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.RED, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.CENTER, GridLayout.Alignment.CENTER, false, true, 1, 4)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.YELLOW, new TerminalSize(4, 2))
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.YELLOW, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.CENTER, GridLayout.Alignment.END, false, true, 1, 4)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, new TerminalSize(4, 2))
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLACK, TerminalSize.of(4, 2))
                 .setLayoutData(GridLayout.createLayoutData(GridLayout.Alignment.CENTER, GridLayout.Alignment.FILL, false, true, 1, 4)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLUE, new TerminalSize(4, 2)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.CYAN, new TerminalSize(4, 2)));
-        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.GREEN, new TerminalSize(4, 2)));
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.BLUE, TerminalSize.of(4, 2)));
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.CYAN, TerminalSize.of(4, 2)));
+        rightGridPanel.addComponent(new EmptySpace(TextColor.ANSI.GREEN, TerminalSize.of(4, 2)));
 
         Panel contentPanel = new Panel();
         contentPanel.setLayoutManager(new LinearLayout(Direction.VERTICAL));
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ImageComponentTest.java b/src/test/java/com/googlecode/lanterna/gui2/ImageComponentTest.java
index 9cd336534..c2e24821c 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ImageComponentTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ImageComponentTest.java
@@ -197,7 +197,7 @@ public void init(WindowBasedTextGUI textGUI) {
     
     
     ImageComponent makeImageComponent(ExampleController controller, String[] image) {
-        TerminalSize imageSize = new TerminalSize(image[0].length(), image.length);
+        TerminalSize imageSize = TerminalSize.of(image[0].length(), image.length);
         TextImage textImage = new BasicTextImage(imageSize);
         for (int row = 0; row < image.length; row++) {
             fillImageLine(textImage, row, image[row]);
diff --git a/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java b/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
index 6c37848e7..d715c018b 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/InputUITest.java
@@ -73,7 +73,7 @@ public TerminalPosition getCursorLocation(Component component) {
 
                     @Override
                     public TerminalSize getPreferredSize(Component component) {
-                        return new TerminalSize(70, 5);
+                        return TerminalSize.of(70, 5);
                     }
 
                     @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/LineWrappingLabelTest.java b/src/test/java/com/googlecode/lanterna/gui2/LineWrappingLabelTest.java
index 0cd16348a..a955568fa 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/LineWrappingLabelTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/LineWrappingLabelTest.java
@@ -48,7 +48,7 @@ public static void main(String[] args) throws IOException, InterruptedException
     private TerminalSize windowSize;
 
     public LineWrappingLabelTest() {
-        windowSize = new TerminalSize(70, 15);
+        windowSize = TerminalSize.of(70, 15);
     }
 
     @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ListBoxTest.java b/src/test/java/com/googlecode/lanterna/gui2/ListBoxTest.java
index f8695b2fc..a85b0cbf3 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ListBoxTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ListBoxTest.java
@@ -38,7 +38,7 @@ public void init(WindowBasedTextGUI textGUI) {
         Panel horizontalPanel = new Panel();
         horizontalPanel.setLayoutManager(new LinearLayout(Direction.HORIZONTAL));
 
-        TerminalSize size = new TerminalSize(14, 10);
+        TerminalSize size = TerminalSize.of(14, 10);
         CheckBoxList<String> checkBoxList = new CheckBoxList<>(size);
         RadioBoxList<String> radioBoxList = new RadioBoxList<>(size);
         ActionListBox actionListBox = new ActionListBox(size);
@@ -58,4 +58,4 @@ public void init(WindowBasedTextGUI textGUI) {
                         new Button("OK", window::close)));
         textGUI.addWindow(window);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/googlecode/lanterna/gui2/MenuTest.java b/src/test/java/com/googlecode/lanterna/gui2/MenuTest.java
index bfecf96e9..a8678d648 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/MenuTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/MenuTest.java
@@ -109,7 +109,7 @@ protected ComponentRenderer<MultiColorComponent> createDefaultRenderer() {
             return new ComponentRenderer<MultiColorComponent>() {
                 @Override
                 public TerminalSize getPreferredSize(MultiColorComponent component) {
-                    return new TerminalSize(40, 15);
+                    return TerminalSize.of(40, 15);
                 }
 
                 @Override
diff --git a/src/test/java/com/googlecode/lanterna/gui2/MiscComponentTest.java b/src/test/java/com/googlecode/lanterna/gui2/MiscComponentTest.java
index 3c59ce64b..780c31c33 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/MiscComponentTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/MiscComponentTest.java
@@ -41,8 +41,8 @@ public void init(WindowBasedTextGUI textGUI) {
         }
 
         Panel textBoxPanel = new Panel();
-        textBoxPanel.addComponent(Panels.horizontal(new Label("Normal:   "), new TextBox(new TerminalSize(12, 1), "Text")));
-        textBoxPanel.addComponent(Panels.horizontal(new Label("Password: "), new TextBox(new TerminalSize(12, 1), "Text").setMask('*')));
+        textBoxPanel.addComponent(Panels.horizontal(new Label("Normal:   "), new TextBox(TerminalSize.of(12, 1), "Text")));
+        textBoxPanel.addComponent(Panels.horizontal(new Label("Password: "), new TextBox(TerminalSize.of(12, 1), "Text").setMask('*')));
 
         Panel buttonPanel = new Panel();
         buttonPanel.addComponent(new Button("Enable spacing", () -> {
@@ -56,7 +56,7 @@ public void init(WindowBasedTextGUI textGUI) {
 
         Panel rightPanel = new Panel();
         textBoxPanel = new Panel();
-        TextBox readOnlyTextArea = new TextBox(new TerminalSize(16, 8));
+        TextBox readOnlyTextArea = new TextBox(TerminalSize.of(16, 8));
         readOnlyTextArea.setReadOnly(true);
         readOnlyTextArea.setText(TestUtils.downloadGPL());
         textBoxPanel.addComponent(readOnlyTextArea);
diff --git a/src/test/java/com/googlecode/lanterna/gui2/MultiButtonTest.java b/src/test/java/com/googlecode/lanterna/gui2/MultiButtonTest.java
index d3218d481..f3c65b543 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/MultiButtonTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/MultiButtonTest.java
@@ -38,7 +38,7 @@ public static void main(String[] args) throws IOException {
             contentArea.addComponent(new Button("TRE"));
             contentArea.addComponent(new Button("Button"));
             contentArea.addComponent(new Button("Another button"));
-            contentArea.addComponent(new EmptySpace(new TerminalSize(5, 1)));
+            contentArea.addComponent(new EmptySpace(TerminalSize.of(5, 1)));
             //contentArea.addComponent(new Button("Here is a\nmulti-line\ntext segment that is using \\n"));
             contentArea.addComponent(new Button("OK", window::close));
 
diff --git a/src/test/java/com/googlecode/lanterna/gui2/MultiLabelTest.java b/src/test/java/com/googlecode/lanterna/gui2/MultiLabelTest.java
index 20775b018..69936c649 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/MultiLabelTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/MultiLabelTest.java
@@ -37,7 +37,7 @@ public static void main(String[] args) throws IOException, InterruptedException
             contentArea.setLayoutManager(new LinearLayout(Direction.VERTICAL));
             contentArea.addComponent(new Label("This is a single line label"));
             contentArea.addComponent(new Label("This is another label on the second line"));
-            contentArea.addComponent(new EmptySpace(new TerminalSize(5, 1)));
+            contentArea.addComponent(new EmptySpace(TerminalSize.of(5, 1)));
             contentArea.addComponent(new Label("Here is a\nmulti-line\ntext segment that is using \\n"));
             Label label = new Label("We can change foreground color...");
             label.setForegroundColor(TextColor.ANSI.BLUE);
@@ -49,7 +49,7 @@ public static void main(String[] args) throws IOException, InterruptedException
             label.addStyle(SGR.BOLD);
             label.addStyle(SGR.UNDERLINE);
             contentArea.addComponent(label);
-            contentArea.addComponent(new EmptySpace(new TerminalSize(5, 1)));
+            contentArea.addComponent(new EmptySpace(TerminalSize.of(5, 1)));
             contentArea.addComponent(new Label("Here is an animated label:"));
             contentArea.addComponent(AnimatedLabel.createClassicSpinningLine());
             contentArea.addComponent(new EmptySpace());
diff --git a/src/test/java/com/googlecode/lanterna/gui2/SplitPanelTest.java b/src/test/java/com/googlecode/lanterna/gui2/SplitPanelTest.java
index d797daa78..0cb0816c6 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/SplitPanelTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/SplitPanelTest.java
@@ -122,14 +122,14 @@ public void init(WindowBasedTextGUI textGUI) {
         ImageComponent right = makeImageComponent(IMAGE_Y);
         //SplitPanel splitH = SplitPanel.ofHorizontal(left.withBorder(Borders.singleLine("left")), right.withBorder(Borders.singleLine("right")));
         SplitPanel splitH = SplitPanel.ofHorizontal(left, right);
-        splitH.setPreferredSize(new TerminalSize(40, 40));
+        splitH.setPreferredSize(TerminalSize.of(40, 40));
         splitH.setRatio(45, 35);
         
         ImageComponent top = makeImageComponent(IMAGE_Y);
         ImageComponent bottom = makeImageComponent(IMAGE_Z);
         //SplitPanel splitV = SplitPanel.ofVertical(top.withBorder(Borders.singleLine("top")), bottom.withBorder(Borders.singleLine("bottom")));
         SplitPanel splitV = SplitPanel.ofVertical(top, bottom);
-        splitV.setPreferredSize(new TerminalSize(40, 40));
+        splitV.setPreferredSize(TerminalSize.of(40, 40));
         splitV.setRatio(20, 80);
         
         Panel mainPanel = new Panel();
@@ -143,7 +143,7 @@ public void init(WindowBasedTextGUI textGUI) {
     
     ImageComponent makeImageComponent(String[] image) {
         ImageComponent imageComponent = new ImageComponent();
-        TerminalSize imageSize = new TerminalSize(image[0].length(), image.length);
+        TerminalSize imageSize = TerminalSize.of(image[0].length(), image.length);
         TextImage textImage = new BasicTextImage(imageSize);
         
         for (int row = 0; row < image.length; row++) {
diff --git a/src/test/java/com/googlecode/lanterna/gui2/TableUnitTests.java b/src/test/java/com/googlecode/lanterna/gui2/TableUnitTests.java
index f27bc7108..d452ef389 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/TableUnitTests.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/TableUnitTests.java
@@ -24,7 +24,7 @@ public class TableUnitTests {
 
     @Before
     public void setUp() throws IOException {
-        TerminalSize size = new TerminalSize(30, 24);
+        TerminalSize size = TerminalSize.of(30, 24);
         terminal = new DefaultVirtualTerminal(size);
         TerminalScreen screen = new TerminalScreen(terminal);
         screen.startScreen();
diff --git a/src/test/java/com/googlecode/lanterna/gui2/TextBoxTest.java b/src/test/java/com/googlecode/lanterna/gui2/TextBoxTest.java
index 7f1854702..ee18ccb19 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/TextBoxTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/TextBoxTest.java
@@ -37,10 +37,10 @@ public void init(WindowBasedTextGUI textGUI) {
 
         leftPanel.addComponent(new TextBox().withBorder(Borders.singleLine("Default")));
         leftPanel.addComponent(new TextBox("Some text").withBorder(Borders.singleLine("With init")));
-        leftPanel.addComponent(new TextBox(new TerminalSize(10, 1), "Here is some text that is too long to fit in the text box").withBorder(Borders.singleLine("Long text")));
+        leftPanel.addComponent(new TextBox(TerminalSize.of(10, 1), "Here is some text that is too long to fit in the text box").withBorder(Borders.singleLine("Long text")));
         leftPanel.addComponent(new TextBox("password").setMask('*').withBorder(Borders.singleLine("Password")));
 
-        rightPanel.addComponent(new TextBox(new TerminalSize(15, 5),
+        rightPanel.addComponent(new TextBox(TerminalSize.of(15, 5),
                 "Well here we are again\n" +
                 "It's always such a pleasure\n" +
                 "Remember when you tried\n" +
diff --git a/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java b/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
index e3b2de11a..77aa5ff4e 100644
--- a/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
+++ b/src/test/java/com/googlecode/lanterna/gui2/ThemeTest.java
@@ -63,7 +63,7 @@ private void runComponentTest(WindowBasedTextGUI textGUI) {
         mainPanel.addComponent(new EmptySpace());
         ThemedComponentTestDialog[] componentTestDialogs = new ThemedComponentTestDialog[]{
                 new ThemedComponentTestDialog(textGUI, "ActionListBox",
-                        new ActionListBox(new TerminalSize(15, 5))
+                        new ActionListBox(TerminalSize.of(15, 5))
                                 .addItem(new NullRunnable("Item #1"))
                                 .addItem(new NullRunnable("Item #2"))
                                 .addItem(new NullRunnable("Item #3"))
@@ -80,16 +80,16 @@ private void runComponentTest(WindowBasedTextGUI textGUI) {
                 new ThemedComponentTestDialog(textGUI, "Borders",
                         new Panel()
                                 .setLayoutManager(new GridLayout(4))
-                                .addComponent(new EmptySpace(new TerminalSize(4, 2)).withBorder(Borders.singleLine()))
-                                .addComponent(new EmptySpace(new TerminalSize(4, 2)).withBorder(Borders.singleLineBevel()))
-                                .addComponent(new EmptySpace(new TerminalSize(4, 2)).withBorder(Borders.doubleLine()))
-                                .addComponent(new EmptySpace(new TerminalSize(4, 2)).withBorder(Borders.doubleLineBevel()))),
+                                .addComponent(new EmptySpace(TerminalSize.of(4, 2)).withBorder(Borders.singleLine()))
+                                .addComponent(new EmptySpace(TerminalSize.of(4, 2)).withBorder(Borders.singleLineBevel()))
+                                .addComponent(new EmptySpace(TerminalSize.of(4, 2)).withBorder(Borders.doubleLine()))
+                                .addComponent(new EmptySpace(TerminalSize.of(4, 2)).withBorder(Borders.doubleLineBevel()))),
                 new ThemedComponentTestDialog(textGUI, "Button",
                         new Button("This is a button")),
                 new ThemedComponentTestDialog(textGUI, "CheckBox",
                         new CheckBox("This is a checkbox")),
                 new ThemedComponentTestDialog(textGUI, "CheckBoxList",
-                        new CheckBoxList<String>(new TerminalSize(15, 5))
+                        new CheckBoxList<String>(TerminalSize.of(15, 5))
                                 .addItem("Item #1")
                                 .addItem("Item #2")
                                 .addItem("Item #3")
@@ -102,15 +102,15 @@ private void runComponentTest(WindowBasedTextGUI textGUI) {
                         new Panel()
                                 .addComponent(new ComboBox<>("Editable", "Item #2", "Item #3", "Item #4", "Item #5", "Item #6", "Item #7")
                                         .setReadOnly(false)
-                                        .setPreferredSize(new TerminalSize(12, 1)))
+                                        .setPreferredSize(TerminalSize.of(12, 1)))
                                 .addComponent(new EmptySpace())
                                 .addComponent(new ComboBox<>("Read-only", "Item #2", "Item #3", "Item #4", "Item #5", "Item #6", "Item #7")
                                         .setReadOnly(true)
-                                        .setPreferredSize(new TerminalSize(12, 1)))),
+                                        .setPreferredSize(TerminalSize.of(12, 1)))),
                 new ThemedComponentTestDialog(textGUI, "Label",
                         new Label("This is a label")),
                 new ThemedComponentTestDialog(textGUI, "RadioBoxList",
-                        new RadioBoxList<String>(new TerminalSize(15, 5))
+                        new RadioBoxList<String>(TerminalSize.of(15, 5))
                                 .addItem("Item #1")
                                 .addItem("Item #2")
                                 .addItem("Item #3")
@@ -126,13 +126,13 @@ private void runComponentTest(WindowBasedTextGUI textGUI) {
                 new ThemedComponentTestDialog(textGUI, "ScrollBar",
                         new Panel()
                                 .setLayoutManager(new GridLayout(2))
-                                .addComponent(new ScrollBar(Direction.HORIZONTAL).setPreferredSize(new TerminalSize(6, 1)))
-                                .addComponent(new ScrollBar(Direction.VERTICAL).setPreferredSize(new TerminalSize(1, 6)))),
+                                .addComponent(new ScrollBar(Direction.HORIZONTAL).setPreferredSize(TerminalSize.of(6, 1)))
+                                .addComponent(new ScrollBar(Direction.VERTICAL).setPreferredSize(TerminalSize.of(1, 6)))),
                 new ThemedComponentTestDialog(textGUI, "Separator",
                         new Panel()
                                 .setLayoutManager(new GridLayout(2))
-                                .addComponent(new Separator(Direction.HORIZONTAL).setPreferredSize(new TerminalSize(6, 1)))
-                                .addComponent(new Separator(Direction.VERTICAL).setPreferredSize(new TerminalSize(1, 6)))),
+                                .addComponent(new Separator(Direction.HORIZONTAL).setPreferredSize(TerminalSize.of(6, 1)))
+                                .addComponent(new Separator(Direction.VERTICAL).setPreferredSize(TerminalSize.of(1, 6)))),
                 new ThemedComponentTestDialog(textGUI, "Table",
                         new Table<String>("Column #1", "Column #2", "Column #3")
                                 .setTableModel(
@@ -146,20 +146,20 @@ private void runComponentTest(WindowBasedTextGUI textGUI) {
                                 .addComponent(
                                         Panels.horizontal(
                                                 new TextBox("Single-line text box")
-                                                        .setPreferredSize(new TerminalSize(15, 1)),
+                                                        .setPreferredSize(TerminalSize.of(15, 1)),
                                                 new TextBox("Single-line read-only")
-                                                        .setPreferredSize(new TerminalSize(15, 1))
+                                                        .setPreferredSize(TerminalSize.of(15, 1))
                                                         .setReadOnly(true)))
                                 .addComponent(new EmptySpace())
                                 .addComponent(
                                         Panels.horizontal(
-                                            new TextBox(new TerminalSize(15, 5), "Multi\nline\ntext\nbox\nHere is a very long line that doesn't fit")
+                                            new TextBox(TerminalSize.of(15, 5), "Multi\nline\ntext\nbox\nHere is a very long line that doesn't fit")
                                                     .setVerticalFocusSwitching(false),
-                                            new TextBox(new TerminalSize(15, 5), "Multi\nline\nread-only\ntext\nbox\n" +
+                                            new TextBox(TerminalSize.of(15, 5), "Multi\nline\nread-only\ntext\nbox\n" +
                                                     "Here is a very long line that doesn't fit")
                                                     .setReadOnly(true))))
         };
-        ActionListBox listBox = new ActionListBox(new TerminalSize(15, 7)).setLayoutData(LinearLayout.createLayoutData(LinearLayout.Alignment.CENTER));
+        ActionListBox listBox = new ActionListBox(TerminalSize.of(15, 7)).setLayoutData(LinearLayout.createLayoutData(LinearLayout.Alignment.CENTER));
         for(ThemedComponentTestDialog themedComponentTestDialog: componentTestDialogs) {
             listBox.addItem(themedComponentTestDialog);
         }
@@ -283,8 +283,8 @@ private void runMultiThemeTest(final WindowBasedTextGUI textGUI) {
         window2.setTheme(LanternaThemes.getRegisteredTheme(themes.get(windowThemeIndex[1])));
         window2.setPosition(TerminalPosition.of(30, 1));
 
-        final Panel leftHolder = new Panel().setPreferredSize(new TerminalSize(15, 4));
-        final Panel rightHolder = new Panel().setPreferredSize(new TerminalSize(15, 4));
+        final Panel leftHolder = new Panel().setPreferredSize(TerminalSize.of(15, 4));
+        final Panel rightHolder = new Panel().setPreferredSize(TerminalSize.of(15, 4));
         GridLayout layoutManager = new GridLayout(1);
         leftHolder.setLayoutManager(layoutManager);
         rightHolder.setLayoutManager(layoutManager);
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue190.java b/src/test/java/com/googlecode/lanterna/issue/Issue190.java
index cc0f13255..9522e04f8 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue190.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue190.java
@@ -30,7 +30,7 @@
 public class Issue190 {
     public static void main(String[] args) throws IOException {
         DefaultTerminalFactory factory = new DefaultTerminalFactory();
-        factory.setInitialTerminalSize(new TerminalSize(150,50));
+        factory.setInitialTerminalSize(TerminalSize.of(150,50));
         factory.setTerminalEmulatorTitle("name");
         Terminal terminal = factory.createTerminal();
         TerminalScreen screen = new TerminalScreen(terminal);
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue216.java b/src/test/java/com/googlecode/lanterna/issue/Issue216.java
index 687739d2a..0e7bda9ea 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue216.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue216.java
@@ -52,7 +52,7 @@ public static void main(String[] args) throws IOException {
         tableModel.addRow("hi");
         panel.addComponent(table);
 
-        panel.addComponent(new EmptySpace(new TerminalSize(0,0))); // Empty space underneath labels
+        panel.addComponent(new EmptySpace(TerminalSize.of(0,0))); // Empty space underneath labels
         panel.addComponent(new Button("Submit", () -> {
             tableModel.addRow("haiiii");
             //table.invalidate();
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue261.java b/src/test/java/com/googlecode/lanterna/issue/Issue261.java
index 8b98070a3..2823be277 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue261.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue261.java
@@ -47,7 +47,7 @@ public static void main(String[] args) throws IOException {
         panel.addComponent(new Label("Surname"));
         panel.addComponent(new TextBox());
 
-        panel.addComponent(new EmptySpace(new TerminalSize(0,0))); // Empty space underneath labels
+        panel.addComponent(new EmptySpace(TerminalSize.of(0,0))); // Empty space underneath labels
         panel.addComponent(new Button("Submit"));
 
         // Create gui and start gui
@@ -55,7 +55,7 @@ public static void main(String[] args) throws IOException {
 
         // Create window to hold the panel
         BasicWindow window = new BasicWindow();
-        window.setFixedSize(new TerminalSize(500, 700));
+        window.setFixedSize(TerminalSize.of(500, 700));
         window.setComponent(panel);
 
         gui.addWindowAndWait(window);
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue274.java b/src/test/java/com/googlecode/lanterna/issue/Issue274.java
index 0f93f6621..098754aec 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue274.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue274.java
@@ -36,7 +36,7 @@ public static void main(String[] args) throws IOException {
         Panel menubar = new Panel();
         menubar.setLayoutManager(new LinearLayout(Direction.HORIZONTAL).setSpacing(1));
 
-        TextBox text = new TextBox(new TerminalSize(10,10),TextBox.Style.MULTI_LINE);
+        TextBox text = new TextBox(TerminalSize.of(10,10),TextBox.Style.MULTI_LINE);
         menubar.addComponent(text);
 
         menubar.addComponent(new Button("Open", () -> {
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue384.java b/src/test/java/com/googlecode/lanterna/issue/Issue384.java
index 4dfd15456..1fa50e907 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue384.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue384.java
@@ -23,7 +23,7 @@ public static void main(String[] args) throws IOException {
         final MultiWindowTextGUI textGUI = new MultiWindowTextGUI(screen);
         final Window window = new BasicWindow("Table container test");
         window.setHints(Collections.singletonList(Window.Hint.FIXED_SIZE));
-        window.setFixedSize(new TerminalSize(60, 14));
+        window.setFixedSize(TerminalSize.of(60, 14));
 
         final Table<String> table = new Table<>("Column", "Expanded Column", "Column");
         table.setCellSelection(true);
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue387.java b/src/test/java/com/googlecode/lanterna/issue/Issue387.java
index 2703f19b2..3479a43c7 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue387.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue387.java
@@ -30,9 +30,9 @@ public static void main(String[] args) {
 
             Panel panel = new Panel();
             panel.addComponent(new TextBox());
-            panel.addComponent(new EmptySpace(new TerminalSize(15, 1)));
+            panel.addComponent(new EmptySpace(TerminalSize.of(15, 1)));
             panel.addComponent(table);
-            panel.addComponent(new EmptySpace(new TerminalSize(15, 1)));
+            panel.addComponent(new EmptySpace(TerminalSize.of(15, 1)));
             panel.addComponent(new TextBox());
 
             window.setComponent(panel);
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue409.java b/src/test/java/com/googlecode/lanterna/issue/Issue409.java
index 0483b886e..ea0bf954e 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue409.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue409.java
@@ -93,7 +93,7 @@ private static class CyclingThemesTextBox extends TextBox {
 
         public CyclingThemesTextBox() {
             super("Cycling themes: default");
-            setPreferredSize(new TerminalSize(40, 1));
+            setPreferredSize(TerminalSize.of(40, 1));
             systemThemes = new ArrayList<>(LanternaThemes.getRegisteredThemes());
             index = 0;
         }
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue452.java b/src/test/java/com/googlecode/lanterna/issue/Issue452.java
index 517fe6c5d..871581ca4 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue452.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue452.java
@@ -66,7 +66,7 @@ public class Issue452 {
 
     public static void main(String[] args) throws IOException {
         try (Screen screen = new DefaultTerminalFactory().setTelnetPort(23000)
-                .setMouseCaptureMode(MouseCaptureMode.CLICK_RELEASE_DRAG_MOVE).setInitialTerminalSize(new TerminalSize(100, 100))
+                .setMouseCaptureMode(MouseCaptureMode.CLICK_RELEASE_DRAG_MOVE).setInitialTerminalSize(TerminalSize.of(100, 100))
                 .createScreen()) {
             screen.startScreen();
             WindowBasedTextGUI gui = new MultiWindowTextGUI(screen);
@@ -185,4 +185,4 @@ public void run() {
         window.setMenuBar(menuBar);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java b/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
index d3848d353..650e8e6d2 100644
--- a/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
+++ b/src/test/java/com/googlecode/lanterna/issue/Issue452Test.java
@@ -65,7 +65,7 @@ public void before() {
     void displayForRenderering(Component component) throws Exception {
         // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
         // making use of the drawing routines in the renderer to know the size this thing is
-        Terminal terminal = new DefaultVirtualTerminal(new TerminalSize(100, 100));
+        Terminal terminal = new DefaultVirtualTerminal(TerminalSize.of(100, 100));
         TerminalScreen screen = new TerminalScreen(terminal);
         screen.startScreen();
         WindowBasedTextGUI textGUI = new MultiWindowTextGUI(screen);
diff --git a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
index b479f43b4..1e4bc1a45 100644
--- a/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/DrawImageTest.java
@@ -41,11 +41,11 @@ public static void main(String[] args) throws IOException {
         TextGraphics textGraphics = image.newTextGraphics();
         textGraphics.drawRectangle(
                 TerminalPosition.OF_0x0,
-                new TerminalSize(5, 5),
+                TerminalSize.of(5, 5),
                 imageCharacter.withBackgroundColor(TextColor.ANSI.RED));
         textGraphics.drawRectangle(
                 TerminalPosition.OF_1x1,
-                new TerminalSize(3, 3),
+                TerminalSize.of(3, 3),
                 imageCharacter.withBackgroundColor(TextColor.ANSI.MAGENTA));
         textGraphics.setCharacter(2, 2,
                 imageCharacter.withBackgroundColor(TextColor.ANSI.CYAN));
diff --git a/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java b/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
index c8a582c54..ee521293f 100644
--- a/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
+++ b/src/test/java/com/googlecode/lanterna/screen/ScreenRectangleTest.java
@@ -73,7 +73,7 @@ public static void main(String[] args) throws IOException, InterruptedException
             }
 
             TerminalPosition topLeft = TerminalPosition.of(random.nextInt(size.getColumns()), random.nextInt(size.getRows()));
-            TerminalSize rectangleSize = new TerminalSize(random.nextInt(size.getColumns() - topLeft.getColumn()), random.nextInt(size.getRows() - topLeft.getRow()));
+            TerminalSize rectangleSize = TerminalSize.of(random.nextInt(size.getColumns() - topLeft.getColumn()), random.nextInt(size.getRows() - topLeft.getRow()));
 
             textGraphics.setBackgroundColor(color);
             if(useFilled) {
diff --git a/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java b/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
index 16c296244..e8ceee105 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/TerminalTextGraphicsTest.java
@@ -43,7 +43,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         TerminalPosition lineStart = TerminalPosition.of(3 + "Hello World!".length(), 3);
         textGraphics.drawLine(lineStart, lineStart.withRelativeColumn(2).withRelativeRow(6), Symbols.BLOCK_SOLID);
         textGraphics.setForegroundColor(TextColor.ANSI.RED);
-        textGraphics.drawRectangle(lineStart.withRelativeColumn(2).withRelativeRow(6), new TerminalSize(5, 3), Symbols.BULLET);
+        textGraphics.drawRectangle(lineStart.withRelativeColumn(2).withRelativeRow(6), TerminalSize.of(5, 3), Symbols.BULLET);
         textGraphics.setForegroundColor(TextColor.ANSI.MAGENTA);
         TerminalPosition triangleStart = lineStart.withRelativeColumn(7).withRelativeRow(9);
         textGraphics.drawTriangle(
@@ -52,7 +52,7 @@ public static void main(String[] args) throws IOException, InterruptedException
                 triangleStart.withColumn(5).withRelativeRow(3),
                 Symbols.SPADES);
         textGraphics.setForegroundColor(TextColor.ANSI.YELLOW);
-        textGraphics.fillRectangle(TerminalPosition.of(30, 1), new TerminalSize(8, 5), Symbols.DIAMOND);
+        textGraphics.fillRectangle(TerminalPosition.of(30, 1), TerminalSize.of(8, 5), Symbols.DIAMOND);
         textGraphics.setForegroundColor(TextColor.ANSI.GREEN);
         triangleStart = TerminalPosition.of(30, 6);
         textGraphics.fillTriangle(
diff --git a/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java b/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
index f77eb3bab..c93bd9eaa 100644
--- a/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
+++ b/src/test/java/com/googlecode/lanterna/terminal/virtual/DefaultVirtualTerminalTest.java
@@ -42,7 +42,7 @@ public DefaultVirtualTerminalTest() {
     public void initialTerminalStateIsAsExpected() {
         assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         TerminalSize terminalSize = virtualTerminal.getTerminalSize();
-        assertEquals(new TerminalSize(80, 24), terminalSize);
+        assertEquals(TerminalSize.of(80, 24), terminalSize);
 
         for(int row = 0; row < terminalSize.getRows(); row++) {
             for(int column = 0; column < terminalSize.getColumns(); column++) {
@@ -112,7 +112,7 @@ public void singleLineWriteAndReadBackWorks() {
 
     @Test
     public void clearAllMarksEverythingAsDirtyAndEverythingInTheTerminalIsReplacedWithDefaultCharacter() {
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 5));
         assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
@@ -134,7 +134,7 @@ public void clearAllMarksEverythingAsDirtyAndEverythingInTheTerminalIsReplacedWi
 
     @Test
     public void replacingAllContentTriggersWholeTerminalIsDirty() {
-        virtualTerminal.setTerminalSize(new TerminalSize(5, 3));
+        virtualTerminal.setTerminalSize(TerminalSize.of(5, 3));
         assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
@@ -157,7 +157,7 @@ public void replacingAllContentTriggersWholeTerminalIsDirty() {
 
     @Test
     public void tooLongLinesWrap() {
-        virtualTerminal.setTerminalSize(new TerminalSize(5, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(5, 5));
         assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('H'));
         virtualTerminal.putCharacter(new TextCharacter('E'));
@@ -175,7 +175,7 @@ public void tooLongLinesWrap() {
 
     @Test
     public void makeSureDoubleWidthCharactersWrapProperly() {
-        virtualTerminal.setTerminalSize(new TerminalSize(9, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(9, 5));
         assertEquals(TerminalPosition.OF_0x0, virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter(new TextCharacter('こ'));
         virtualTerminal.putCharacter(new TextCharacter('ん'));
@@ -196,7 +196,7 @@ public void makeSureDoubleWidthCharactersWrapProperly() {
 
     @Test
     public void overwritingDoubleWidthCharactersEraseTheOtherHalf() {
-        virtualTerminal.setTerminalSize(new TerminalSize(5, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(5, 5));
         virtualTerminal.putCharacter(new TextCharacter('画'));
         virtualTerminal.putCharacter(new TextCharacter('面'));
 
@@ -220,7 +220,7 @@ public void overwritingDoubleWidthCharactersEraseTheOtherHalf() {
 
     @Test
     public void testCursorPositionUpdatesWhenTerminalSizeChanges() {
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 3));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 3));
         virtualTerminal.putCharacter('\n');
         virtualTerminal.putCharacter('\n');
         assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
@@ -230,29 +230,29 @@ public void testCursorPositionUpdatesWhenTerminalSizeChanges() {
         assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
 
         // Shrink viewport
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 2));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 2));
         assertEquals(TerminalPosition.of(0, 1), virtualTerminal.getCursorPosition());
 
         // Restore
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 3));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 3));
         assertEquals(TerminalPosition.of(0, 2), virtualTerminal.getCursorPosition());
 
         // Enlarge
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 4));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 4));
         assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorPosition());
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 5));
         assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
 
         // We've reached the total size of the buffer, enlarging it further shouldn't affect the cursor position
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 6));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 6));
         assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
-        virtualTerminal.setTerminalSize(new TerminalSize(3, 7));
+        virtualTerminal.setTerminalSize(TerminalSize.of(3, 7));
         assertEquals(TerminalPosition.of(0, 4), virtualTerminal.getCursorPosition());
     }
 
     @Test
     public void textScrollingOutOfTheBacklogDisappears() {
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 3));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 3));
         // Backlog of 1, meaning viewport size + 1 row
         virtualTerminal.setBacklogSize(1);
         putString("Line 1\n");
@@ -280,7 +280,7 @@ public void textScrollingOutOfTheBacklogDisappears() {
         assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorBufferPosition());
 
         // Make terminal bigger
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 4));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 4));
 
         // Now "Line 2" should be the top row
         assertLineEquals("Line 2", 0);
@@ -291,7 +291,7 @@ public void textScrollingOutOfTheBacklogDisappears() {
         assertEquals(TerminalPosition.of(0, 3), virtualTerminal.getCursorBufferPosition());
 
         // Make it even bigger
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 5));
 
         // Should make no difference, the viewport will add an empty row at the end, because there is nothing in the
         // backlog to insert at the top
@@ -306,7 +306,7 @@ public void textScrollingOutOfTheBacklogDisappears() {
 
     @Test
     public void backlogTrimmingAdjustsCursorPositionAndDirtyCells() {
-        virtualTerminal.setTerminalSize(new TerminalSize(80, 3));
+        virtualTerminal.setTerminalSize(TerminalSize.of(80, 3));
         virtualTerminal.setBacklogSize(0);
         virtualTerminal.putCharacter(fromChar('A'));
         virtualTerminal.setCursorPosition(TerminalPosition.of(1, 1));
@@ -338,7 +338,7 @@ public void backlogTrimmingAdjustsCursorPositionAndDirtyCells() {
     @Test
     public void testPrivateMode() {
         final int ROWS = 5;
-        virtualTerminal.setTerminalSize(new TerminalSize(20, ROWS));
+        virtualTerminal.setTerminalSize(TerminalSize.of(20, ROWS));
         for(int i = 1; i <= ROWS + 2; i++) {
             putString("Line " + i + "\n");
         }
@@ -372,7 +372,7 @@ public void testPrivateMode() {
     @Test
     public void testForEachLine() {
         final int ROWS = 40;
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 5));
         for(int i = 1; i <= ROWS; i++) {
             putString("Line " + i + "\n");
         }
@@ -486,7 +486,7 @@ public void onClose() {
 
         virtualTerminal.flush();
         virtualTerminal.bell();
-        virtualTerminal.setTerminalSize(new TerminalSize(40, 10));
+        virtualTerminal.setTerminalSize(TerminalSize.of(40, 10));
         assertEquals(0, flushCounter.get());
         assertEquals(0, bellCounter.get());
         assertEquals(0, resizeCounter.get());
@@ -495,7 +495,7 @@ public void onClose() {
         virtualTerminal.addVirtualTerminalListener(listener);
         virtualTerminal.flush();
         virtualTerminal.bell();
-        virtualTerminal.setTerminalSize(new TerminalSize(80, 20));
+        virtualTerminal.setTerminalSize(TerminalSize.of(80, 20));
         assertEquals(1, flushCounter.get());
         assertEquals(1, bellCounter.get());
         assertEquals(1, resizeCounter.get());
@@ -507,7 +507,7 @@ public void onClose() {
         virtualTerminal.removeVirtualTerminalListener(listener);
         virtualTerminal.flush();
         virtualTerminal.bell();
-        virtualTerminal.setTerminalSize(new TerminalSize(40, 10));
+        virtualTerminal.setTerminalSize(TerminalSize.of(40, 10));
         virtualTerminal.close();
         assertEquals(1, flushCounter.get());
         assertEquals(1, bellCounter.get());
@@ -517,7 +517,7 @@ public void onClose() {
 
     @Test
     public void settingCursorOutsideOfTerminalWindowWillBeAdjusted() {
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 5));
         virtualTerminal.setCursorPosition(20, 10);
         assertEquals(TerminalPosition.of(9, 4), virtualTerminal.getCursorPosition());
 
@@ -530,7 +530,7 @@ public void settingCursorOutsideOfTerminalWindowWillBeAdjusted() {
 
     @Test
     public void puttingCharacterInLastColumnDoesntMoveCursorToNextLine() {
-        virtualTerminal.setTerminalSize(new TerminalSize(10, 5));
+        virtualTerminal.setTerminalSize(TerminalSize.of(10, 5));
         virtualTerminal.setCursorPosition(8, 2);
         assertEquals(TerminalPosition.of(8, 2), virtualTerminal.getCursorPosition());
         virtualTerminal.putCharacter('A');
diff --git a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
index 1e8175f67..d775c1f11 100644
--- a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
+++ b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial03.java
@@ -150,7 +150,7 @@ objects are immutable so the withBackgroundColor(..) call below returns a copy w
                  */
                 String sizeLabel = "Terminal Size: " + terminalSize;
                 TerminalPosition labelBoxTopLeft = TerminalPosition.of(1, 1);
-                TerminalSize labelBoxSize = new TerminalSize(sizeLabel.length() + 2, 3);
+                TerminalSize labelBoxSize = TerminalSize.of(sizeLabel.length() + 2, 3);
                 TerminalPosition labelBoxTopRightCorner = labelBoxTopLeft.withRelativeColumn(labelBoxSize.getColumns() - 1);
                 TextGraphics textGraphics = screen.newTextGraphics();
                 //This isn't really needed as we are overwriting everything below anyway, but just for demonstrative purpose
diff --git a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial04.java b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial04.java
index 4b723c10a..096222f29 100644
--- a/src/test/java/com/googlecode/lanterna/tutorial/Tutorial04.java
+++ b/src/test/java/com/googlecode/lanterna/tutorial/Tutorial04.java
@@ -120,7 +120,7 @@ public static void main(String[] args) {
             List<String> timezonesAsStrings = new ArrayList<>(Arrays.asList(TimeZone.getAvailableIDs()));
             ComboBox<String> readOnlyComboBox = new ComboBox<>(timezonesAsStrings);
             readOnlyComboBox.setReadOnly(true);
-            readOnlyComboBox.setPreferredSize(new TerminalSize(20, 1));
+            readOnlyComboBox.setPreferredSize(TerminalSize.of(20, 1));
             contentPanel.addComponent(readOnlyComboBox);
 
             contentPanel.addComponent(new Label("Editable Combo Box (filled)"));

From 240004014087e665c135f934e8b61139b27e80a8 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Fri, 8 Mar 2024 23:58:37 -0600
Subject: [PATCH 07/11] LANTERNA-using TerminalSize.of() rather than new
 TerminalSize()

---
 src/main/java/com/googlecode/lanterna/TerminalRectangle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index bb45dc217..89a8efaee 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -107,7 +107,7 @@ public boolean whenContains(TerminalPosition p, Runnable op) {
     public boolean whenContains(int x, int y, Runnable op) {
         return whenContains(this.x, this.y, width, height, x, y, op);
     }
-		public static final boolean whenContains(int rx, int ry, int rw, int rh, int x, int y, Runnable op) {
+    public static final boolean whenContains(int rx, int ry, int rw, int rh, int x, int y, Runnable op) {
         if (rx <= x && x < (rx + rw) && ry <= y && y < (ry + rh)) {
             op.run();
             return true;

From a8d33fa21de339c8984f0ac8638ac70955a7324d Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Sat, 9 Mar 2024 00:25:35 -0600
Subject: [PATCH 08/11] LANTERNA remove unused getDimension() from TerminalSize

---
 .../java/com/googlecode/lanterna/TerminalSize.java     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 9647e5d34..94da088c1 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -194,16 +194,6 @@ public TerminalSize divide(int columnsDenominator, int rowsDenominator) {
     public TerminalSize with(TerminalSize size) {
         return as(size);
     }
-
-    /**
-     * x dimension, when d is zero
-     * y dimension, when d is not zero
-     *
-     * @return either getColumns() for x dimension or getRows() for y dimension
-    */
-    public int getDimension(int d) {
-        return d == 0 ? getColumns() : getRows();
-    }
     
     @Override
     public int compareTo(TerminalSize other) {

From 969b6dff542cee3dee266a9cef740aebe5cacc16 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Sun, 10 Mar 2024 01:05:00 -0600
Subject: [PATCH 09/11] LANTERNA TestTerminalRectangle

---
 .../googlecode/lanterna/TerminalPosition.java |  18 ++-
 .../lanterna/TerminalRectangle.java           | 119 +++++++++---------
 .../com/googlecode/lanterna/TerminalSize.java |  16 +--
 .../googlecode/lanterna/gui2/Component.java   |   2 +-
 .../com/googlecode/lanterna/gui2/Window.java  |   4 +-
 .../gui2/WindowDecorationRenderer.java        |   2 +-
 .../lanterna/TestTerminalRectangle.java       | 111 ++++++++++++++++
 7 files changed, 184 insertions(+), 88 deletions(-)
 create mode 100644 src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index ebb545c99..b22cb9f13 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -42,15 +42,11 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
      * @return a TerminalPosition instance with the supplied column and row
      */
     public static final TerminalPosition of(int column, int row) {
-        if(column == 0 && row == 0) {
-            return OF_0x0;
-        } else if(column == 0 && row == 1) {
-            return OF_0x1;
-        } else if(column == 1 && row == 0) {
-            return OF_1x0;
-        } else if(column == 1 && row == 1) {
-              return OF_1x1;
-        }
+        if (OF_0x0.equals(column, row)) { return OF_0x0; }
+        if (OF_0x1.equals(column, row)) { return OF_0x1; }
+        if (OF_1x0.equals(column, row)) { return OF_1x0; }
+        if (OF_1x1.equals(column, row)) { return OF_1x1; }
+        
         return new TerminalPosition(column, row);
     }
     /**
@@ -60,7 +56,7 @@ public static final TerminalPosition of(int column, int row) {
      * @return Either this instance, or a new instance if column/row are different than this instance's column/row.
      */
     public TerminalPosition as(int column, int row) {
-        return (column == this.column && row == this.row) ? this : of(column, row);
+        return equals(column, row) ? this : of(column, row);
     }
     /**
      * Returns itself if it is equal to the supplied position, otherwise the supplied position. You can use this if you
@@ -70,7 +66,7 @@ public TerminalPosition as(int column, int row) {
      * @return Itself if this position equals the position passed in, otherwise the position passed in
      */
     public TerminalPosition as(TerminalPosition position) {
-        return position == null ? this : as(position.column, position.row);
+        return position == null ? null : as(position.column, position.row);
     }
     /**
      * Creates a new TerminalPosition object, which represents a location on the screen. There is no check to verify
diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index 89a8efaee..c78f09ce1 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -27,85 +27,78 @@
  */
 public class TerminalRectangle {
     
-    // one of the benefits of immutable: ease of usage
-    public final TerminalPosition position;
-    public final TerminalSize size;
-    public final int x;
-    public final int y;
-    public final int width;
-    public final int height;
+    /**
+     * Constants for less objects memory churn, these are from the top-left corner (column x row)
+     */
+    public static final TerminalRectangle OF_0x0 = new TerminalRectangle(TerminalPosition.of(0, 0), TerminalSize.of(0, 0));
+    public static final TerminalRectangle OF_0x1 = new TerminalRectangle(TerminalPosition.of(0, 0), TerminalSize.of(0, 1));
+    public static final TerminalRectangle OF_1x0 = new TerminalRectangle(TerminalPosition.of(0, 0), TerminalSize.of(1, 0));
+    public static final TerminalRectangle OF_1x1 = new TerminalRectangle(TerminalPosition.of(0, 0), TerminalSize.of(1, 1));
     
-    public final int xAndWidth;
-    public final int yAndHeight;
+    private final TerminalPosition position;
+    private final TerminalSize size;
+    
+    public TerminalPosition position() { return position; }
+    public TerminalSize size()         { return size; }
+    public int x()                     { return position.getColumn(); }
+    public int y()                     { return position.getRow(); }
+    public int width()                 { return size.getColumns(); }
+    public int height()                { return size.getRows(); }
     
     /**
-     * Creates a new terminal rect representation at the supplied x y position with the supplied width and height.
+     * Obtain a TerminalRectangle with the supplied x y position and the supplied width and height.
      *
      * Both width and height must be at least zero (non negative) as checked in TerminalSize.
-     *
+     * @param x column index of top left corner of the TerminalRectangle
+     * @param y row index of the top left corner of the TerminalRectangle
      * @param width number of columns
      * @param height number of rows
      */
-    public TerminalRectangle(int x, int y, int width, int height) {
-        position = TerminalPosition.of(x, y);
-        size = TerminalSize.of(width, height);
+    public static final TerminalRectangle of(int x, int y, int width, int height) {
+        return of(TerminalPosition.of(x, y), TerminalSize.of(width, height));
+    }
+    public static final TerminalRectangle of(TerminalPosition position, TerminalSize size) {
+        if (OF_0x0.equals(position, size)) { return OF_0x0; }
+        if (OF_0x1.equals(position, size)) { return OF_0x1; }
+        if (OF_1x0.equals(position, size)) { return OF_1x0; }
+        if (OF_1x1.equals(position, size)) { return OF_1x1; }
         
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-        this.xAndWidth = x + width;
-        this.yAndHeight = y + height;
-    }
-    public TerminalRectangle(TerminalPosition position, TerminalSize size) {
-        this.position = position;
-        this.size = size;
-
-        this.x = position.getColumn();
-        this.y = position.getRow();
-        this.width = size.getColumns();
-        this.height = size.getRows();
-        this.xAndWidth = x + width;
-        this.yAndHeight = y + height;
+        return new TerminalRectangle(position, size);
     }
-    
-    /**
-     * @return Returns the width of this rect, in number of columns
-     */
-    public int getColumns() {
-        return width;
+    public TerminalRectangle as(int x, int y, int width, int height) {
+        return equals(x, y, width, height) ? this : of(x, y, width, height);
     }
-    
-    /**
-     * @return Returns the height of this rect representation, in number of rows
-     */
-    public int getRows() {
-        return height;
+    public TerminalRectangle as(TerminalPosition position, TerminalSize size) {
+        return equals(position, size) ? this : of(position, size);
+    }
+    public TerminalRectangle as(TerminalRectangle rectangle) {
+        return rectangle == null ? null : as(rectangle.position, rectangle.size);
+    }
+    protected TerminalRectangle(TerminalPosition position, TerminalSize size) {
+        this.position = position;
+        this.size = size;
     }
-    
     /**
-     * Creates a new rect based on this rect, but with a different width
-     * @param columns Width of the new rect, in columns
-     * @return New rect based on this one, but with a new width
+     * Obtain a TerminalRectangle based on this rect, but with the supplied width
+     * @param Width of the resulting rect, in columns
+     * @return a TerminalRectangle based on this one, but with the supplied width
      */
-    public TerminalRectangle withColumns(int columns) {
-        return new TerminalRectangle(x, y, columns, height);
+    public TerminalRectangle withWidth(int width) {
+        return TerminalRectangle.of(position, size.withColumns(width));
     }
-    
     /**
-     * Creates a new rect based on this rect, but with a different height
-     * @param rows Height of the new rect, in rows
-     * @return New rect based on this one, but with a new height
+     * Obtain a TerminalRectangle based on this rect, but with the supplied height
+     * @param Height of the resulting rect, in rows
+     * @return a TerminalRectangle based on this one, but with the supplied height
      */
-    public TerminalRectangle withRows(int rows) {
-        return new TerminalRectangle(x, y, width, rows);
+    public TerminalRectangle withHeight(int height) {
+        return TerminalRectangle.of(position, size.withRows(height));
     }
-
     public boolean whenContains(TerminalPosition p, Runnable op) {
         return whenContains(p.getColumn(), p.getRow(), op);
     }
     public boolean whenContains(int x, int y, Runnable op) {
-        return whenContains(this.x, this.y, width, height, x, y, op);
+        return whenContains(x(), y(), width(), height(), x, y, op);
     }
     public static final boolean whenContains(int rx, int ry, int rw, int rh, int x, int y, Runnable op) {
         if (rx <= x && x < (rx + rw) && ry <= y && y < (ry + rh)) {
@@ -114,13 +107,16 @@ public static final boolean whenContains(int rx, int ry, int rw, int rh, int x,
         }
         return false;
     }
-
-
     @Override
     public String toString() {
-        return "{x: " + x + ", y: " + y + ", width: " + width + ", height: " + height + "}";
+        return "{x: " + x() + ", y: " + y() + ", width: " + width() + ", height: " + height() + "}";
+    }
+    public boolean equals(int x, int y, int width, int height) {
+        return position.equals(x, y) && size.equals(width, height);
+    }
+    public boolean equals(TerminalPosition position, TerminalSize size) {
+        return this.position.equals(position) && this.size.equals(size);
     }
-
     @Override
     public boolean equals(Object obj) {
         return obj != null
@@ -128,7 +124,6 @@ public boolean equals(Object obj) {
             && Objects.equals(position, ((TerminalRectangle)obj).position)
             && Objects.equals(size, ((TerminalRectangle)obj).size);
     }
-
     @Override
     public int hashCode() {
         return Objects.hash(position, size);
diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 94da088c1..573427fe4 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -36,19 +36,15 @@ public class TerminalSize implements Comparable<TerminalSize> {
     public final int rows;
 
     public static final TerminalSize of(int columns, int rows) {
-        if(columns == 0 && rows == 0) {
-            return OF_0x0;
-        } else if(columns == 0 && rows == 1) {
-            return OF_0x1;
-        } else if(columns == 1 && rows == 0) {
-            return OF_1x0;
-        } else if(columns == 1 && rows == 1) {
-              return OF_1x1;
-        }
+        if (OF_0x0.equals(columns, rows)) { return OF_0x0; }
+        if (OF_0x1.equals(columns, rows)) { return OF_0x1; }
+        if (OF_1x0.equals(columns, rows)) { return OF_1x0; }
+        if (OF_1x1.equals(columns, rows)) { return OF_1x1; }
+        
         return new TerminalSize(columns, rows);
     }
     public TerminalSize as(int columns, int rows) {
-        return (columns == this.columns && rows == this.rows) ? this : of(columns, rows);
+        return equals(columns, rows) ? this : of(columns, rows);
     }
     public TerminalSize as(TerminalSize size) {
         return size == null ? null : as(size.columns, size.rows);
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Component.java b/src/main/java/com/googlecode/lanterna/gui2/Component.java
index 94a9bca2d..27d3d24fe 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Component.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Component.java
@@ -37,7 +37,7 @@ public interface Component extends TextGUIElement {
      * @return the TerminalPosition and TerminalSize as a TerminalRectangle
      */
     default TerminalRectangle getBounds() {
-        return new TerminalRectangle(getPosition(), getSize());
+        return TerminalRectangle.of(getPosition(), getSize());
     }
     /**
      * Returns the top-left corner of this component, measured from its parent.
diff --git a/src/main/java/com/googlecode/lanterna/gui2/Window.java b/src/main/java/com/googlecode/lanterna/gui2/Window.java
index 740c2aff8..9d8e33755 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/Window.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/Window.java
@@ -187,9 +187,7 @@ public String toString() {
      * @return the decorated size and position of the window
      */
     default TerminalRectangle getBounds() {
-        TerminalPosition position = getPosition();
-        TerminalSize size = getDecoratedSize();
-        return new TerminalRectangle(position.getColumn(), position.getRow(), size.getColumns(), size.getRows());
+        return TerminalRectangle.of(getPosition(), getDecoratedSize());
     }
     
     /**
diff --git a/src/main/java/com/googlecode/lanterna/gui2/WindowDecorationRenderer.java b/src/main/java/com/googlecode/lanterna/gui2/WindowDecorationRenderer.java
index 5b3a36604..9a3e7e0f1 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/WindowDecorationRenderer.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/WindowDecorationRenderer.java
@@ -55,6 +55,6 @@ public interface WindowDecorationRenderer {
     
     
     default TerminalRectangle getTitleBarRectangle(Window window) {
-        return new TerminalRectangle(0, 0, window.getDecoratedSize().getColumns(), getOffset(window).getRow());
+        return TerminalRectangle.of(0, 0, window.getDecoratedSize().getColumns(), getOffset(window).getRow());
     }
 }
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java b/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java
new file mode 100644
index 000000000..ada351801
--- /dev/null
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java
@@ -0,0 +1,111 @@
+/*
+ * This file is part of lanterna (https://github.com/mabe02/lanterna).
+ *
+ * lanterna is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2010-2020 Martin Berglund
+ */
+package com.googlecode.lanterna;
+
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * @author ginkoblongata
+ */
+public class TestTerminalRectangle {
+
+    TerminalRectangle tr(int x, int y, int w, int h) {
+        return TerminalRectangle.of(x, y, w, h);
+    }
+    void assertSameSystemIdentityHashCode(Object a, Object b) {
+        assertEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    void assertNotSameSystemIdentityHashCode(Object a, Object b) {
+        assertNotEquals(System.identityHashCode(a), System.identityHashCode(b));
+    }
+    
+    @Test
+    public void test_instantiation() {
+        assertTrue(tr(12, 14, 20, 40).x() == 12);
+        assertTrue(tr(12, 14, 20, 40).y() == 14);
+        assertTrue(tr(12, 14, 20, 40).width() == 20);
+        assertTrue(tr(12, 14, 20, 40).height() == 40);
+    }
+    @Test
+    public void testSystemIdentityHashCodeSame() {
+        TerminalRectangle a = TerminalRectangle.of(23, 34, 4, 8);
+        assertSameSystemIdentityHashCode(a, a);
+    }
+    @Test
+    public void testSystemIdentityHashCodeDifferent() {
+        TerminalRectangle a = TerminalRectangle.of(23, 34, 4, 8);
+        TerminalRectangle b = TerminalRectangle.of(23, 34, 4, 8);
+        assertNotSameSystemIdentityHashCode(a, b);
+    }
+    @Test
+    public void testObjectChurnReduced_of() {
+        assertSameSystemIdentityHashCode(tr(0, 0, 1, 1), tr(0, 0, 1, 1));
+        assertSameSystemIdentityHashCode(TerminalRectangle.OF_0x0, tr(0, 0, 0, 0));
+        assertSameSystemIdentityHashCode(TerminalRectangle.OF_0x1, tr(0, 0, 0, 1));
+        assertSameSystemIdentityHashCode(TerminalRectangle.OF_1x0, tr(0, 0, 1, 0));
+        assertSameSystemIdentityHashCode(TerminalRectangle.OF_1x1, tr(0, 0, 1, 1));
+    }
+    @Test
+    public void testObjectChurnReduced_as() {
+        TerminalRectangle r = tr(35, 40, 20, 30);
+        assertSameSystemIdentityHashCode(r, r.as(35, 40, 20, 30));
+        assertSameSystemIdentityHashCode(r, r.as(TerminalPosition.of(35, 40), TerminalSize.of(20, 30)));
+        assertSameSystemIdentityHashCode(r, r.as(tr(35, 40, 20, 30)));
+    }
+    
+    @Test
+    public void test_withWidth() {
+        TerminalRectangle a = tr(0, 0, 35, 40);
+        assertTrue(a.width() == 35);
+        assertTrue(a.withWidth(20).equals(0, 0, 20, 40));
+    }
+    @Test
+    public void test_withHeight() {
+        TerminalRectangle a = tr(0, 0, 35, 40);
+        assertTrue(a.height() == 40);
+        assertTrue(a.withHeight(15).equals(0, 0, 35, 15));
+    }
+    
+    
+    @Test
+    public void test_hashCode() {
+        TerminalRectangle a = tr(0, 0, 7, 7);
+        TerminalRectangle b = tr(0, 0, 7, 7);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.hashCode() == b.hashCode());
+        assertFalse(tr(0, 0, 7, 7).hashCode() == tr(0, 0, 3, 7).hashCode());
+    }
+    @Test
+    public void test_equals() {
+        TerminalRectangle a = tr(0, 0, 8, 9);
+        TerminalRectangle b = tr(0, 0, 8, 9);
+        assertNotSameSystemIdentityHashCode(a, b);
+        assertTrue(a.equals(b));
+        assertTrue(a.equals(0, 0, 8, 9));
+        TerminalRectangle c = tr(0,0, 4, 9);
+        assertFalse(c.equals(a));
+        assertFalse(c.equals(0, 0, 5, 9));
+    }
+
+}

From d1381ab3bfdb40e2c17b959db8a866c644d46723 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Sun, 10 Mar 2024 05:22:08 -0500
Subject: [PATCH 10/11] LANTERNA TestTerminalRectangle

---
 .../lanterna/TerminalRectangle.java           | 56 +++++++++++++-
 .../lanterna/TestTerminalRectangle.java       | 73 +++++++++++++++++--
 2 files changed, 120 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index c78f09ce1..a5582d038 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -79,8 +79,25 @@ protected TerminalRectangle(TerminalPosition position, TerminalSize size) {
         this.size = size;
     }
     /**
-     * Obtain a TerminalRectangle based on this rect, but with the supplied width
-     * @param Width of the resulting rect, in columns
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied x position
+     * @param x position of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied x position
+     */
+    public TerminalRectangle withX(int x) {
+        return TerminalRectangle.of(position.withColumn(x), size);
+    }
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied y position
+     * @param y position of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied y position
+     */
+    public TerminalRectangle withY(int y) {
+        return TerminalRectangle.of(position.withRow(y), size);
+    }
+
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied width
+     * @param Width of the resulting TerminalRectangle, in columns
      * @return a TerminalRectangle based on this one, but with the supplied width
      */
     public TerminalRectangle withWidth(int width) {
@@ -94,6 +111,41 @@ public TerminalRectangle withWidth(int width) {
     public TerminalRectangle withHeight(int height) {
         return TerminalRectangle.of(position, size.withRows(height));
     }
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied position
+     * @param position of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied position
+     */
+    public TerminalRectangle withPosition(TerminalPosition position) {
+        return TerminalRectangle.of(position, size);
+    }
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied position
+     * @param x position of the resulting TerminalRectangle
+     * @param y position of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied position
+     */
+    public TerminalRectangle withPosition(int x, int y) {
+        return TerminalRectangle.of(x, y, size.getColumns(), size.getRows());
+    }
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied size
+     * @param size of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied size
+     */
+    public TerminalRectangle withSize(TerminalSize size) {
+        return TerminalRectangle.of(position, size);
+    }
+    /**
+     * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied size
+     * @param columns size of the resulting TerminalRectangle
+     * @param rows size of the resulting TerminalRectangle
+     * @return a TerminalRectangle based on this one, but with the supplied size
+     */
+    public TerminalRectangle withSize(int columns, int rows) {
+        return TerminalRectangle.of(position.getColumn(), position.getRow(), columns, rows);
+    }
+
     public boolean whenContains(TerminalPosition p, Runnable op) {
         return whenContains(p.getColumn(), p.getRow(), op);
     }
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java b/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java
index ada351801..824efb700 100644
--- a/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalRectangle.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 
 /**
  * @author ginkoblongata
@@ -74,19 +75,75 @@ public void testObjectChurnReduced_as() {
         assertSameSystemIdentityHashCode(r, r.as(tr(35, 40, 20, 30)));
     }
     
+    @Test
+    public void test_withX() {
+        assertTrue(tr(0, 0, 12, 13).withX(3).equals(3, 0, 12, 13));
+        assertTrue(tr(0, 0, 12, 13).withX(-3).equals(-3, 0, 12, 13));
+    }
+    @Test
+    public void test_withY() {
+        assertTrue(tr(0, 0, 12, 13).withY(5).equals(0, 5, 12, 13));
+        assertTrue(tr(0, 0, 12, 13).withY(-5).equals(0, -5, 12, 13));
+    }
     @Test
     public void test_withWidth() {
-        TerminalRectangle a = tr(0, 0, 35, 40);
-        assertTrue(a.width() == 35);
-        assertTrue(a.withWidth(20).equals(0, 0, 20, 40));
+        assertTrue(tr(0, 0, 35, 40).withWidth(20).equals(0, 0, 20, 40));
+        // TerminalSize cannot be negative
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withWidth(-100));
     }
     @Test
     public void test_withHeight() {
-        TerminalRectangle a = tr(0, 0, 35, 40);
-        assertTrue(a.height() == 40);
-        assertTrue(a.withHeight(15).equals(0, 0, 35, 15));
+        assertTrue(tr(0, 0, 35, 40).withHeight(15).equals(0, 0, 35, 15));
+        // TerminalSize cannot be negative
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withHeight(-100));
+    }
+    @Test
+    public void test_withPosition() {
+        assertTrue(tr(0, 0, 35, 40).withPosition(15, 13).equals(15, 13, 35, 40));
+        assertTrue(tr(0, 0, 35, 40).withPosition(TerminalPosition.of(15, 13)).equals(15, 13, 35, 40));
+    }
+    @Test
+    public void test_withSize() {
+        assertTrue(tr(1, 2, 35, 40).withSize(15, 16).equals(1, 2, 15, 16));
+        assertTrue(tr(1, 2, 35, 40).withSize(TerminalSize.of(15, 16)).equals(1, 2, 15, 16));
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withSize(5, -5));
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withSize(-5, 5));
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withSize(TerminalSize.of(4, -4)));
+        assertThrows(Exception.class, () -> tr(0, 0, 35, 40).withSize(TerminalSize.of(-4, 4)));
     }
     
+    @Test
+    public void test_whenContains() {
+        String[] text = new String[1];
+
+        text[0] = "";
+        assertTrue(tr(10, 10, 5, 5).whenContains(12, 12, () -> text[0] = "inside"));
+        assertEquals(text[0], "inside");
+
+        text[0] = "";
+        assertTrue(tr(10, 10, 5, 5).whenContains(10, 10, () -> text[0] = "inside"));
+        assertEquals(text[0], "inside");
+
+        text[0] = "";
+        assertFalse(tr(10, 10, 5, 5).whenContains(15, 15, () -> text[0] = "<-outside->"));
+        assertEquals(text[0], "");
+
+        text[0] = "";
+        assertFalse(tr(10, 10, 5, 5).whenContains(9, 12, () -> text[0] = "<-left->"));
+        assertEquals(text[0], "");
+
+        text[0] = "";
+        assertFalse(tr(10, 10, 5, 5).whenContains(15, 12, () -> text[0] = "<-right->"));
+        assertEquals(text[0], "");
+
+        text[0] = "";
+        assertFalse(tr(10, 10, 5, 5).whenContains(12, 9, () -> text[0] = "<-above->"));
+        assertEquals(text[0], "");
+
+        text[0] = "";
+        assertFalse(tr(10, 10, 5, 5).whenContains(12, 15, () -> text[0] = "<-below->"));
+        assertEquals(text[0], "");
+    }
     
     @Test
     public void test_hashCode() {
@@ -103,9 +160,11 @@ public void test_equals() {
         assertNotSameSystemIdentityHashCode(a, b);
         assertTrue(a.equals(b));
         assertTrue(a.equals(0, 0, 8, 9));
-        TerminalRectangle c = tr(0,0, 4, 9);
+        assertTrue(a.equals(TerminalPosition.of(0, 0), TerminalSize.of(8, 9)));
+        TerminalRectangle c = tr(0, 0, 4, 9);
         assertFalse(c.equals(a));
         assertFalse(c.equals(0, 0, 5, 9));
+        assertFalse(c.equals(TerminalPosition.of(0, 0), TerminalSize.of(5, 9)));
     }
 
 }

From af2078e7b0bfaa3cb160d767e0d96700845a54e4 Mon Sep 17 00:00:00 2001
From: levi yourchuck <levi.yourchuck@gmail.com>
Date: Sun, 10 Mar 2024 06:53:34 -0500
Subject: [PATCH 11/11] LANTERNA added x() y() width() height() across
 TerminalPosition TerminalSize TerminalRectangle

---
 .../googlecode/lanterna/TerminalPosition.java |  9 ++++++---
 .../lanterna/TerminalRectangle.java           | 20 +++++++++----------
 .../com/googlecode/lanterna/TerminalSize.java |  8 +++++---
 .../virtual/VirtualTerminalTextGraphics.java  |  2 +-
 .../lanterna/TestTerminalPosition.java        |  4 ++--
 .../googlecode/lanterna/TestTerminalSize.java |  4 ++--
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/googlecode/lanterna/TerminalPosition.java b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
index b22cb9f13..4c63fae86 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalPosition.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalPosition.java
@@ -35,9 +35,12 @@ public class TerminalPosition implements Comparable<TerminalPosition> {
     public static final TerminalPosition OF_1x0 = new TerminalPosition(1, 0);
     public static final TerminalPosition OF_1x1 = new TerminalPosition(1, 1);
 
-    // one of the benefits of immutable: ease of usage
-    public final int column;
-    public final int row;
+    private final int column;
+    private final int row;
+    
+    public int x() { return column; }
+    public int y() { return row; }
+    
     /**
      * @return a TerminalPosition instance with the supplied column and row
      */
diff --git a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
index a5582d038..c775f88e7 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalRectangle.java
@@ -40,10 +40,10 @@ public class TerminalRectangle {
     
     public TerminalPosition position() { return position; }
     public TerminalSize size()         { return size; }
-    public int x()                     { return position.getColumn(); }
-    public int y()                     { return position.getRow(); }
-    public int width()                 { return size.getColumns(); }
-    public int height()                { return size.getRows(); }
+    public int x()                     { return position.x(); }
+    public int y()                     { return position.y(); }
+    public int width()                 { return size.width(); }
+    public int height()                { return size.height(); }
     
     /**
      * Obtain a TerminalRectangle with the supplied x y position and the supplied width and height.
@@ -126,7 +126,7 @@ public TerminalRectangle withPosition(TerminalPosition position) {
      * @return a TerminalRectangle based on this one, but with the supplied position
      */
     public TerminalRectangle withPosition(int x, int y) {
-        return TerminalRectangle.of(x, y, size.getColumns(), size.getRows());
+        return TerminalRectangle.of(x, y, size.width(), size.height());
     }
     /**
      * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied size
@@ -138,16 +138,16 @@ public TerminalRectangle withSize(TerminalSize size) {
     }
     /**
      * Obtain a TerminalRectangle based on this TerminalRectangle, but with the supplied size
-     * @param columns size of the resulting TerminalRectangle
-     * @param rows size of the resulting TerminalRectangle
+     * @param width number of columns of the resulting TerminalRectangle
+     * @param height number of rows of the resulting TerminalRectangle
      * @return a TerminalRectangle based on this one, but with the supplied size
      */
-    public TerminalRectangle withSize(int columns, int rows) {
-        return TerminalRectangle.of(position.getColumn(), position.getRow(), columns, rows);
+    public TerminalRectangle withSize(int width, int height) {
+        return TerminalRectangle.of(position.x(), position.y(), width, height);
     }
 
     public boolean whenContains(TerminalPosition p, Runnable op) {
-        return whenContains(p.getColumn(), p.getRow(), op);
+        return whenContains(p.x(), p.y(), op);
     }
     public boolean whenContains(int x, int y, Runnable op) {
         return whenContains(x(), y(), width(), height(), x, y, op);
diff --git a/src/main/java/com/googlecode/lanterna/TerminalSize.java b/src/main/java/com/googlecode/lanterna/TerminalSize.java
index 573427fe4..319bd2a73 100644
--- a/src/main/java/com/googlecode/lanterna/TerminalSize.java
+++ b/src/main/java/com/googlecode/lanterna/TerminalSize.java
@@ -31,9 +31,11 @@ public class TerminalSize implements Comparable<TerminalSize> {
     public static final TerminalSize OF_1x0 = new TerminalSize(1, 0);
     public static final TerminalSize OF_1x1 = new TerminalSize(1, 1);
 
-    // one of the benefits of immutable: ease of usage
-    public final int columns;
-    public final int rows;
+    private final int columns;
+    private final int rows;
+    
+    public int width() { return columns; }
+    public int height() { return rows; }
 
     public static final TerminalSize of(int columns, int rows) {
         if (OF_0x0.equals(columns, rows)) { return OF_0x0; }
diff --git a/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java b/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
index 757b7cd47..96f66ef85 100644
--- a/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/terminal/virtual/VirtualTerminalTextGraphics.java
@@ -39,7 +39,7 @@ class VirtualTerminalTextGraphics extends AbstractTextGraphics {
     @Override
     public TextGraphics setCharacter(int column, int row, TextCharacter textCharacter) {
         TerminalSize size = getSize();
-        TerminalRectangle.whenContains(0, 0, size.columns, size.rows, column, row, () -> {
+        TerminalRectangle.whenContains(0, 0, size.width(), size.height(), column, row, () -> {
             synchronized (virtualTerminal) {
                 virtualTerminal.setCursorPosition(TerminalPosition.of(column, row));
                 virtualTerminal.putCharacter(textCharacter);
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
index f2d77bc82..4a62b865a 100644
--- a/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalPosition.java
@@ -44,8 +44,8 @@ void assertNotSameSystemIdentityHashCode(Object a, Object b) {
     public void test_instantiation() {
         assertTrue(tp(12, 14).getColumn() == 12);
         assertTrue(tp(12, 14).getRow() == 14);
-        assertTrue(tp(12, 14).column == 12);
-        assertTrue(tp(12, 14).row == 14);
+        assertTrue(tp(12, 14).x() == 12);
+        assertTrue(tp(12, 14).y() == 14);
     }
     @Test
     public void testSystemIdentityHashCodeSame() {
diff --git a/src/test/java/com/googlecode/lanterna/TestTerminalSize.java b/src/test/java/com/googlecode/lanterna/TestTerminalSize.java
index 977744250..4cc529ebb 100644
--- a/src/test/java/com/googlecode/lanterna/TestTerminalSize.java
+++ b/src/test/java/com/googlecode/lanterna/TestTerminalSize.java
@@ -44,8 +44,8 @@ void assertNotSameSystemIdentityHashCode(Object a, Object b) {
     public void test_instantiation() {
         assertTrue(ts(12, 14).getColumns() == 12);
         assertTrue(ts(12, 14).getRows() == 14);
-        assertTrue(ts(12, 14).columns == 12);
-        assertTrue(ts(12, 14).rows == 14);
+        assertTrue(ts(12, 14).width() == 12);
+        assertTrue(ts(12, 14).height() == 14);
     }
     @Test
     public void testSystemIdentityHashCodeSame() {