--- rxvt-unicode/src/screen.C	2007/08/15 22:41:52	1.275
+++ rxvt-unicode/src/screen.C	2007/10/15 14:56:06	1.280
@@ -32,7 +32,7 @@
 
 #include "salloc.C" // HACK, should be a seperate compile!
 
-inline void fill_text (text_t *start, text_t value, int len)
+static inline void fill_text (text_t *start, text_t value, int len)
 {
   while (len--)
     *start++ = value;
@@ -407,7 +407,7 @@
   prev_nrow = nrow;
   prev_ncol = ncol;
 
-  tabs = (char *)rxvt_malloc (ncol * sizeof (char));
+  tabs = (char *)rxvt_malloc (ncol);
 
   for (int col = ncol; --col; )
     tabs [col] = col % TABSIZE == 0;
@@ -1623,7 +1623,7 @@
 rxvt_term::scr_set_tab (int mode) NOTHROW
 {
   if (mode < 0)
-    memset (tabs, 0, ncol * sizeof (char));
+    memset (tabs, 0, ncol);
   else if (screen.cur.col < ncol)
     tabs [screen.cur.col] = !!mode;
 }
@@ -1887,16 +1887,14 @@
 #  endif
     XMapWindow (dpy, parent[0]);
 # endif
+
 # if ENABLE_FRILLS
   if (option (Opt_urgentOnBell))
     {
-      XWMHints *h;
-
-      h = XGetWMHints(dpy, parent[0]);
-      if (h != NULL)
+      if (XWMHints *h = XGetWMHints(dpy, parent[0]))
         {
           h->flags |= XUrgencyHint;
-          XSetWMHints(dpy, parent[0], h);
+          XSetWMHints (dpy, parent[0], h);
         }
     }
 # endif
@@ -2488,11 +2486,11 @@
      scrollbar_show (0);
    }
 # endif
-#endif
-  
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
+#endif
+  
 }
 
 /* ------------------------------------------------------------------------- */
@@ -3666,18 +3664,6 @@
  *                              MOUSE ROUTINES                               *
  * ------------------------------------------------------------------------- */
 
-/*
- * return col/row values corresponding to x/y pixel values
- */
-void
-rxvt_term::pixel_position (int *x, int *y) NOTHROW
-{
-  *x = Pixel2Col (*x);
-  /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
-  *y = Pixel2Row (*y);
-  /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
-}
-
 /* ------------------------------------------------------------------------- */
 #ifdef USE_XIM
 void