[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.365 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

   for (int i = 0; i < allocated.size (); i++)
     free (allocated [i]);
   free (selection.text);
   free (selection.clip_text);
-  // TODO: manage env vars in child only(!)
-  free (env_display);
-  free (env_term);
   free (locale);
   free (v_buffer);
   delete selection_req;
   if (recalc_y)
     szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
   ncol = width  / fwidth;
   nrow = height / fheight;
+  // When the size of the vt window is not a multiple of the cell
+  // size, i.e., when the wm does not honour our size hints, there are
+  // extra areas not covered by the terminal screen. Such gaps, when a
+  // bg pixmap is set, would have to be cleared manually to properly
+  // refresh the background. We take the simpler route and shrink the
+  // vt window so as to avoid creating gaps.
+  width  = ncol * fwidth;
+  height = nrow * fheight;
 }
 /*----------------------------------------------------------------------*/
 /*
  * Tell the teletype handler what size the window is.
 /*----------------------------------------------------------------------*/
 /*
  * find if fg/bg matches any of the normal (low-intensity) colors
  */
-void
+char *
-rxvt_term::set_colorfgbg ()
+rxvt_term::get_colorfgbg ()
 {
   unsigned int i;
   const char *xpmb = "";
   char fstr[] = "default";
   char bstr[] = "default";
+  char *env_colorfgbg;
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_fg] == pix_colors[i])
       {
         sprintf (fstr, "%d", i - Color_Black);
         xpmb = "default;";
 #endif
         break;
       }
+  env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
   sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
+  return env_colorfgbg;
 }
 /*----------------------------------------------------------------------*/
 bool
   if (update_background_ev.is_active ())
     return;
   bg_invalidate ();
+  if (!mapped)
+    return;
   ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
   if (to_wait <= 0.)
     bg_render ();
   else

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs. Revision 1.365 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.365 by sf-exg, Mon Jan 9 15:45:45 2012 UTC