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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.361 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 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;
   // 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;
+  vt_width  = ncol * fwidth;
-  height = nrow * fheight;
+  vt_height = nrow * fheight;
 }
 /*----------------------------------------------------------------------*/
 /*
  * Tell the teletype handler what size the window is.
   struct winsize ws;
   ws.ws_col = ncol;
   ws.ws_row = nrow;
-  ws.ws_xpixel = width;
+  ws.ws_xpixel = vt_width;
-  ws.ws_ypixel = height;
+  ws.ws_ypixel = vt_height;
   ioctl (pty->pty, TIOCSWINSZ, &ws);
 #if 0
   // TIOCSWINSZ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
 /*----------------------------------------------------------------------*/
 /*
  * 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 (scrollBar.state)
         scrollBar.resize ();
       XMoveResizeWindow (dpy, vt,
                          window_vt_x, window_vt_y,
-                         width, height);
+                         vt_width, vt_height);
 #ifdef HAVE_BG_PIXMAP
       if (bg_window_size_sensitive ())
         update_background ();
 #endif
         newwidth = wattr.width - szHint.base_width;
       if (newheight == 0)
         newheight = wattr.height - szHint.base_height;
     }
-  if (newwidth != width || newheight != height)
+  if (newwidth != vt_width || newheight != vt_height)
     {
       newwidth += szHint.base_width;
       newheight += szHint.base_height;
       resize_all_windows (newwidth, newheight, 0);
     }

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.361 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs. Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.361 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 UTC