*** empty log message ***

diff --git a/Changes b/Changes
index b1c6519febe65857a2f2e84395d21e2c755e2190..fa12bb40a7dd082f6a34a5dc233e88ee8830c342 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+TODO: !! If I resize the urxvt window to be 4 chars high (or less) it seems to 
+> crash when scrolling with the mouse wheel. Mikael Magnusson.
 TODO: do font request caching, might help rxvtd on some machines
 TODO: manpage 900mb update
 TODO: safer command: keymap processing.

diff --git a/src/init.C b/src/init.C
index e47996d8275834975aaf03d43ef75d61c4ef4754..74a17d8ba59a05038227ce1ce5c6bb15d93703ab 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -998,11 +998,11 @@ rxvt_term::create_windows (int argc, const char *const *argv)
           refresh_type = FAST_REFRESH;
           XClearWindow (disp, top);
           // TODO: make XMapNotify-event-code a function and call it
-          // TODO: how can I detetc visibility without unmpa/map?
+          // TODO: how can I detect visibility without unmap/map?
           // TODO: focusin etc.
         }
 #else
-      // it'S easiets just to unmap/map to get all state correctly set-up
+      // it's easiest just to unmap/map to get all state correctly set-up
       XUnmapWindow (disp, top);
 #endif
     }
@@ -1105,8 +1105,6 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-  pointer_unblank ();
-
 #ifdef POINTER_BLANK
   if (options & Opt_pointerBlank)
     vt_emask |= PointerMotionMask;
@@ -1185,7 +1183,13 @@ rxvt_term::create_windows (int argc, const char *const *argv)
     pix_colors = pix_colors_unfocused;
 #endif
 
+  pointer_unblank ();
   scr_recolour ();
+
+#if ENABLE_XEMBED
+  // why this is necessary, I don't know, race condition??
+  XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y);
+#endif
 }
 
 /* ------------------------------------------------------------------------- *

diff --git a/src/main.C b/src/main.C
index 7828b46db3b0d69f6ae304c20c182f48dd0986e7..775cc8a5682e74516fd3df31fa0f3d2e5849bc70 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -1252,6 +1252,7 @@ rxvt_term::set_widthheight (unsigned int width, unsigned int height)
   if (width == 0 || height == 0)
     {
       XGetWindowAttributes (display->display, display->root, &wattr);
+
       if (width == 0)
         width = wattr.width - szHint.base_width;
       if (height == 0)