From 8bf79be92127dd680aa46135697d935646dd8a75 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Wed, 27 Feb 2008 01:05:55 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes    |  4 ++++
 src/main.C | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Changes b/Changes
index 593aaa39..de34e4cd 100644
--- a/Changes
+++ b/Changes
@@ -21,8 +21,12 @@ TODO: fix perl doc for $term->ROW_t
 TODO: coloured pastebin
 TODO: maybe unlink the RXVT_SOCKET on exit?
 
+TODO: rxvt -font 10x20 -xrm "*.tabbed.font: 10x20" -pe tabbed
+      how does one affect the tab windows themselves? seems not to work anymore.
+
 	- made tabs moveable (based on a patch by Petr Machata).
         - support relative paths for RXVT_SOCKET in urxvtd.
+        - better diagnostic on 0x0 window geometries.
       	
 9.02 Tue Jan 29 11:58:36 CET 2008
 	- the "exg makes everybody happy" release.
diff --git a/src/main.C b/src/main.C
index 2cb48f81..a94cb295 100644
--- a/src/main.C
+++ b/src/main.C
@@ -524,13 +524,19 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 
       if (flags & WidthValue)
         {
-          ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
+          if (!w)
+            rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
+
+          ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
       if (flags & HeightValue)
         {
-          nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
+          if (!h)
+            rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
+
+          nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
@@ -561,9 +567,6 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
                 szHint.win_gravity = SouthWestGravity;
             }
         }
-
-      if (!szHint.width || !szHint.height)
-        rxvt_fatal ("window width or height must not be zero, aborting.\n");
     }
 
   /* TODO: BOUNDS */
-- 
2.34.1