--- rxvt-unicode/src/main.C	2005/02/13 11:07:57	1.135
+++ rxvt-unicode/src/main.C	2005/02/20 19:45:30	1.144
@@ -32,7 +32,6 @@
 
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
-#include "main.intpro"          /* PROTOS for internal routines */
 
 #include <csignal>
 #include <cstring>
@@ -588,7 +587,6 @@
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_calloc (size_t number, size_t size)
 {
@@ -600,7 +598,6 @@
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_realloc (void *ptr, size_t size)
 {
@@ -714,16 +711,19 @@
       parsed_geometry = 1;
       if (rs[Rs_geometry])
         flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
+
       if (flags & WidthValue)
         {
           TermWin.ncol = BOUND_POSITIVE_INT16 (w);
           szHint.flags |= USSize;
         }
+
       if (flags & HeightValue)
         {
           TermWin.nrow = BOUND_POSITIVE_INT16 (h);
           szHint.flags |= USSize;
         }
+
       if (flags & XValue)
         {
           szHint.x = x;
@@ -734,6 +734,7 @@
               szHint.win_gravity = NorthEastGravity;
             }
         }
+
       if (flags & YValue)
         {
           szHint.y = y;
@@ -842,7 +843,7 @@
 #if 0
   // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
-    kill (cmd_pid, SIGWINCH);
+    kill (-cmd_pid, SIGWINCH);
 #endif
 }
 
@@ -956,7 +957,7 @@
 rxvt_term::set_title (const char *str)
 {
   set_string_property (XA_WM_NAME, str);
-#if ENABLE_FRILLS
+#if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_NAME], str);
 #endif
 }
@@ -965,7 +966,7 @@
 rxvt_term::set_icon_name (const char *str)
 {
   set_string_property (XA_WM_ICON_NAME, str);
-#if ENABLE_FRILLS
+#if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
 #endif
 }
@@ -1247,6 +1248,7 @@
   if (width == 0 || height == 0)
     {
       XGetWindowAttributes (display->display, display->root, &wattr);
+
       if (width == 0)
         width = wattr.width - szHint.base_width;
       if (height == 0)