*** empty log message ***

diff --git a/Changes b/Changes
index a928477472e392750a5f8e8a2b4ba1423a848acc..51c5856770ba7325334cf48834570cf1e9d560f7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,6 +15,7 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif. or maybe use perl and an
 WISH: just for fun, do shade and tint with XRender.
 DUMB: support tex fonts
 
+TODO: move resources out of allocated
         - don't let iso14755 or mouse reporting get into the way of perl
           (could lead to global grabs never being cleared).
         - experimental OnTheSpot editing support (-pe xim-onthespot).

diff --git a/src/init.C b/src/init.C
index 66e45f83db0f78a9daafade47288cf71d60186c9..6371ffab5a33bb427bbbd65384c5ab9c7db3ef94 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -194,7 +194,6 @@ rxvt_term::init_vars ()
   options = DEFAULT_OPTIONS;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
-  focus = 0;
   ncol = 80;
   nrow = 24;
   int_bwidth = INTERNALBORDERWIDTH;
@@ -205,7 +204,6 @@ rxvt_term::init_vars ()
 
   refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
-  prev_nrow = prev_ncol = 0;
 
   oldcursor.row = oldcursor.col = -1;
 #ifdef XPM_BACKGROUND
@@ -487,15 +485,7 @@ rxvt_term::init_env ()
 
   sprintf (env_display, "DISPLAY=%s", val);
 
-  /* avoiding the math library:
-   * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
-  for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
-    ;
-  max_it (i, 1);
-  env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
-
-  sprintf (env_windowid, "WINDOWID=%u",
-           (unsigned int)parent[0]);
+  sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
 
   /* add entries to the environment:
    * @ DISPLAY:   in case we started with -display
@@ -507,6 +497,7 @@ rxvt_term::init_env ()
    */
   putenv (env_display);
   putenv (env_windowid);
+
   if (env_colorfgbg)
     putenv (env_colorfgbg);
 

diff --git a/src/main.C b/src/main.C
index 8c39b0192756998e11d8060e1b5b3b58557ad5e7..2ecb97edb1267b96d84e2f269f35ff893220172c 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -273,10 +273,8 @@ rxvt_term::~rxvt_term ()
 
   free (selection.text);
   // TODO: manage env vars in child only(!)
-  free (env_windowid);
   free (env_display);
   free (env_term);
-  free (env_colorfgbg);
   free (locale);
   free (v_buffer);
   free (incr_buf);
@@ -988,7 +986,6 @@ rxvt_term::set_colorfgbg ()
   const char *xpmb = "\0";
   char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
 
-  env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
   strcpy (fstr, "default");
   strcpy (bstr, "default");
   for (i = Color_Black; i <= Color_White; i++)

diff --git a/src/rxvt.h b/src/rxvt.h
index ea3e78f98056f130d8b3568e9024c7c8c8d9d984..610e4bc6890eb4a05f4b1a90b38bf8c4f6854c3c 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1068,15 +1068,16 @@ struct rxvt_term : zero_initialized, rxvt_vars {
 
   vector<void *> allocated;           // free these memory blocks with free()
 
-  char           *env_windowid;       /* environmental variable WINDOWID */
+  char            env_windowid[21];   /* environmental variable WINDOWID */
+  char            env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
   char           *env_display;        /* environmental variable DISPLAY  */
   char           *env_term;           /* environmental variable TERM     */
-  char           *env_colorfgbg;
+
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
-  stringvec      *argv, *envv;        /* if != 0, will be freed on destroy time */
+  stringvec      *argv, *envv;        /* if != 0, will be freed at destroy time */
 
 #ifdef KEYSYM_RESOURCE
   keyboard_manager *keyboard;