consolidate naming of environmental rendering-related variables

            (merge https://trac.osgeo.org/grass/changeset/62422 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@62577 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.barscale/thumbnails/README

@@ -4,15 +4,15 @@ Expects North Carolina dataset. The thumbnail height should be 24 px.
 
 
 export GRASS_RENDER_IMMEDIATE=png
-export GRASS_TRUECOLOR=TRUE
-export GRASS_WIDTH=300
-export GRASS_HEIGHT=300
+export GRASS_RENDER_TRUECOLOR=TRUE
+export GRASS_RENDER_WIDTH=300
+export GRASS_RENDER_HEIGHT=300
 g.region rast=elevation
 
 for STYLE in classic line solid hollow full_checker part_checker mixed_checker tail_checker up_ticks down_ticks both_ticks arrow_ends
 do
 	echo ${STYLE}
-	export GRASS_PNGFILE=${STYLE}.png
+	export GRASS_RENDER_FILE=${STYLE}.png
 	d.barscale style=${STYLE} at=20,20
 	mogrify -trim ${STYLE}.png
 	identify -format "%[fx:w]x%[fx:h]" ${STYLE}.png

display/d.mon/main.c

@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
 
     width_opt = G_define_option();
     width_opt->key = "width";
-    width_opt->label = _("Width for display monitor if not set by GRASS_WIDTH");
+    width_opt->label = _("Width for display monitor if not set by GRASS_RENDER_WIDTH");
     width_opt->description = _("Default value: 640");
     width_opt->type = TYPE_INTEGER;
     width_opt->key_desc = "value";
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 
     height_opt = G_define_option();
     height_opt->key = "height";
-    height_opt->label = _("Height for display monitor if not set by GRASS_HEIGHT");
+    height_opt->label = _("Height for display monitor if not set by GRASS_RENDER_HEIGHT");
     height_opt->description = _("Default value: 480");
     height_opt->type = TYPE_INTEGER;
     height_opt->key_desc = "value";

display/d.mon/start.c

@@ -85,25 +85,25 @@ int start_mon(const char *name, const char *output, int select,
     if (env_fd < 0)
 	G_fatal_error(_("Unable to create file '%s'"), env_value);
 
-    sprintf(buf, "GRASS_PNG_READ=TRUE\n");
+    sprintf(buf, "GRASS_RENDER_FILE_READ=TRUE\n");
     write(env_fd, buf, strlen(buf));
     if (width) {
-	sprintf(buf, "GRASS_WIDTH=%d\n", width);
+	sprintf(buf, "GRASS_RENDER_WIDTH=%d\n", width);
 	write(env_fd, buf, strlen(buf));
     }
     if (height) {
-	sprintf(buf, "GRASS_HEIGHT=%d\n", height);
+	sprintf(buf, "GRASS_RENDER_HEIGHT=%d\n", height);
 	write(env_fd, buf, strlen(buf));
     }
     if (bgcolor) {
 	if (strcmp(bgcolor, "none") == 0)
-	    sprintf(buf, "GRASS_TRANSPARENT=TRUE\n");
+	    sprintf(buf, "GRASS_RENDER_TRANSPARENT=TRUE\n");
 	else
-	    sprintf(buf, "GRASS_BACKGROUNDCOLOR=%s\n", bgcolor);
+	    sprintf(buf, "GRASS_RENDER_BACKGROUNDCOLOR=%s\n", bgcolor);
 	write(env_fd, buf, strlen(buf));
     }
     if (truecolor) {
-	sprintf(buf, "GRASS_TRUECOLOR=TRUE\n");
+	sprintf(buf, "GRASS_RENDER_TRUECOLOR=TRUE\n");
 	write(env_fd, buf, strlen(buf));
     }
     close(env_fd);

general/g.cairocomp/main.c

@@ -91,7 +91,7 @@ static void init_xlib(const char *scr, const char *vis)
     if (scr)
 	scrn = atoi(scr);
     else {
-	const char *p = getenv("GRASS_CAIRO_SCREEN");
+	const char *p = getenv("GRASS_RENDER_CAIRO_SCREEN");
 	if (!p || sscanf(p, "%i", &scrn) != 1)
 	    scrn = DefaultScreen(dpy);
     }
@@ -101,7 +101,7 @@ static void init_xlib(const char *scr, const char *vis)
     if (vis)
 	visid = strtoul(vis, NULL, 0);
     else {
-	const char *p = getenv("GRASS_CAIRO_VISUAL");
+	const char *p = getenv("GRASS_RENDER_CAIRO_VISUAL");
 	if (!p || sscanf(p, "%li", &visid) != 1)
 	    visid = DefaultVisual(dpy, scrn)->visualid;
     }

gui/scripts/d.wms.py

@@ -203,7 +203,7 @@ def main():
         wms = WMSGdalDrv()
     
     temp_map = wms.GetMap(options, flags) 
-    os.rename(temp_map, os.environ["GRASS_PNGFILE"])
+    os.rename(temp_map, os.environ["GRASS_RENDER_FILE"])
 
     return 0
 

gui/wxpython/animation/provider.py

@@ -691,19 +691,19 @@ def _setEnvironment(width, height, filename, transparent, bgcolor):
                                                                      t=transparent,
                                                                      b=bgcolor))
 
-    os.environ['GRASS_WIDTH'] = str(width)
-    os.environ['GRASS_HEIGHT'] = str(height)
+    os.environ['GRASS_RENDER_WIDTH'] = str(width)
+    os.environ['GRASS_RENDER_HEIGHT'] = str(height)
     driver = UserSettings.Get(group='display', key='driver', subkey='type')
     os.environ['GRASS_RENDER_IMMEDIATE'] = driver
-    os.environ['GRASS_BACKGROUNDCOLOR'] = '{r:02x}{g:02x}{b:02x}'.format(r=bgcolor[0],
+    os.environ['GRASS_RENDER_BACKGROUNDCOLOR'] = '{r:02x}{g:02x}{b:02x}'.format(r=bgcolor[0],
                                                                          g=bgcolor[1],
                                                                          b=bgcolor[2])
-    os.environ['GRASS_TRUECOLOR'] = "TRUE"
+    os.environ['GRASS_RENDER_TRUECOLOR'] = "TRUE"
     if transparent:
-        os.environ['GRASS_TRANSPARENT'] = "TRUE"
+        os.environ['GRASS_RENDER_TRANSPARENT'] = "TRUE"
     else:
-        os.environ['GRASS_TRANSPARENT'] = "FALSE"
-    os.environ['GRASS_PNGFILE'] = str(filename)
+        os.environ['GRASS_RENDER_TRANSPARENT'] = "FALSE"
+    os.environ['GRASS_RENDER_FILE'] = str(filename)
 
 
 def createNoDataBitmap(imageWidth, imageHeight, text="No data"):

gui/wxpython/core/render.py

@@ -141,7 +141,7 @@ class Layer(object):
                                  {'type' : self.type, 'name' : self.name})
         
         if self.mapfile:
-            self.environ["GRASS_PNGFILE"] = self.mapfile
+            self.environ["GRASS_RENDER_FILE"] = self.mapfile
         
         # execute command
         try:
@@ -152,9 +152,9 @@ class Layer(object):
                     if ret != 0:
                         break
                     if not read:
-                        self.environ["GRASS_PNG_READ"] = "TRUE"
+                        self.environ["GRASS_RENDER_FILE_READ"] = "TRUE"
                 
-                self.environ["GRASS_PNG_READ"] = "FALSE"
+                self.environ["GRASS_RENDER_FILE_READ"] = "FALSE"
             else:
                 ret, msg = self._runCommand(self.cmd)
             if ret != 0:
@@ -407,10 +407,10 @@ class Map(object):
         self.progressInfo = None
 
         # GRASS environment variable (for rendering)
-        self.default_env = {"GRASS_BACKGROUNDCOLOR" : "000000",
-                            "GRASS_PNG_COMPRESSION" : "0",
-                            "GRASS_TRUECOLOR"       : "TRUE",
-                            "GRASS_TRANSPARENT"     : "TRUE"
+        self.default_env = {"GRASS_RENDER_BACKGROUNDCOLOR" : "000000",
+                            "GRASS_RENDER_FILE_COMPRESSION" : "0",
+                            "GRASS_RENDER_TRUECOLOR"       : "TRUE",
+                            "GRASS_RENDER_TRANSPARENT"     : "TRUE"
                             }
 
         # projection info
@@ -926,8 +926,8 @@ class Map(object):
         if self.gisrc:
             env['GISRC'] = self.gisrc
         env['GRASS_REGION'] = self.SetRegion(windres)
-        env['GRASS_WIDTH'] = str(self.width)
-        env['GRASS_HEIGHT'] = str(self.height)
+        env['GRASS_RENDER_WIDTH'] = str(self.width)
+        env['GRASS_RENDER_HEIGHT'] = str(self.height)
         driver = UserSettings.Get(group = 'display', key = 'driver', subkey = 'type')
         if driver == 'png':
             env['GRASS_RENDER_IMMEDIATE'] = 'png'

gui/wxpython/core/ws.py

@@ -87,8 +87,8 @@ class RenderWMSMgr(wx.EvtHandler):
             return
 
         env = copy.copy(env)
-        self.dstSize['cols'] = int(env["GRASS_WIDTH"])
-        self.dstSize['rows'] = int(env["GRASS_HEIGHT"])
+        self.dstSize['cols'] = int(env["GRASS_RENDER_WIDTH"])
+        self.dstSize['rows'] = int(env["GRASS_RENDER_HEIGHT"])
 
         region = self._getRegionDict(env)
         self._fitAspect(region, self.dstSize)
@@ -130,7 +130,7 @@ class RenderWMSMgr(wx.EvtHandler):
             if Debug.GetLevel() < 3:
                 cmdList.append('--quiet')
 
-            env["GRASS_PNGFILE"] = self.tempMap
+            env["GRASS_RENDER_FILE"] = self.tempMap
             env["GRASS_REGION"] = self._createRegionStr(region)
 
             self.thread.RunCmd(cmdList, env=env, stderr=self.cmdStdErr)

lib/cairodriver/cairodriver.html

@@ -28,25 +28,25 @@ export GRASS_RENDER_IMMEDIATE=cairo
 Several environment variables affect the operation of the Cairo driver:
 
 <ul>
-  <li><b>GRASS_WIDTH=xxx</b><br>
+  <li><b>GRASS_RENDER_WIDTH=xxx</b><br>
     the width of the image map (default is 640).
   </li>
-  <li><b>GRASS_HEIGHT=yyy</b><br>
+  <li><b>GRASS_RENDER_HEIGHT=yyy</b><br>
     the height of the image map (default is 480).
   </li>
-  <li><b>GRASS_BACKGROUNDCOLOR=RRGGBB</b><br>
+  <li><b>GRASS_RENDER_BACKGROUNDCOLOR=RRGGBB</b><br>
     specifies the background color to use in RGB notation (hex or
     R:G:B values). Named colors are also supported. Default
     is <b>FFFFFF</b> (white).
   </li>
-  <li><b>GRASS_TRANSPARENT=[TRUE|FALSE]</b><br>
+  <li><b>GRASS_RENDER_TRANSPARENT=[TRUE|FALSE]</b><br>
     sets transparent background on (TRUE) or off (FALSE, default).
   </li>
-  <li><b>GRASS_ANTIALIAS</b><br> can be <em>default</em>,
+  <li><b>GRASS_RENDER_ANTIALIAS</b><br> can be <em>default</em>,
     <em>none</em>, <em>gray</em>, or <em>subpixel</em>, corresponding to
     <a href="http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a>
   </li>
-  <li><b>GRASS_PNGFILE=filename</b><br>
+  <li><b>GRASS_RENDER_FILE=filename</b><br>
      the name and format of the resulting image file, default is
      <tt>map.png</tt>.<br>
      The image format is determined from the file extension.<br>
@@ -66,20 +66,20 @@ Several environment variables affect the operation of the Cairo driver:
      (Note: Some formats may not be available, depending on your platform and
      the Cairo library that GRASS was built with.)
   </li> 
-  <li><b>GRASS_PNG_READ</b><br>
+  <li><b>GRASS_RENDER_FILE_READ</b><br>
      if <tt>TRUE</tt>, the Cairo driver will initialize the image from
-    the contents of GRASS_PNGFILE.<br>
+    the contents of GRASS_RENDER_FILE.<br>
     (<em>Note: This is only supported for bitmap formats</em>)
   </li>
-  <li><b>GRASS_PNG_MAPPED</b><br>
-    if <tt>TRUE</tt>, the Cairo driver will map GRASS_PNGFILE as its framebuffer,
+  <li><b>GRASS_RENDER_FILE_MAPPED</b><br>
+    if <tt>TRUE</tt>, the Cairo driver will map GRASS_RENDER_FILE as its framebuffer,
     rather than using memory.<br>
     (<em>Note: This only works with BMP files.</em>)
   </li>
-  <li><b>GRASS_CAIRO_SCREEN</b><br>
+  <li><b>GRASS_RENDER_CAIRO_SCREEN</b><br>
     defines Cairo screen
   </li>
-  <li><b>GRASS_CAIRO_VISUAL</b><br>
+  <li><b>GRASS_RENDER_CAIRO_VISUAL</b><br>
     defines Cairo visual
   </li>
 </ul>
@@ -90,10 +90,10 @@ Example: using the driver to generate a PNG file (bash-syntax):
 
 <div class="code"><pre>
 export GRASS_RENDER_IMMEDIATE=cairo
-export GRASS_PNGFILE=nc_spm.png
-export GRASS_WIDTH=800
-export GRASS_HEIGHT=800
-export GRASS_PNG_READ=TRUE
+export GRASS_RENDER_FILE=nc_spm.png
+export GRASS_RENDER_WIDTH=800
+export GRASS_RENDER_HEIGHT=800
+export GRASS_RENDER_FILE_READ=TRUE
 
 g.region rast=elevation
 d.rast map=elevation
@@ -107,9 +107,9 @@ Example: using the driver to generate a PDF file with a vector map (bash-syntax)
 
 <div class="code"><pre>
 export GRASS_RENDER_IMMEDIATE=cairo
-export GRASS_PNGFILE=nc_spm.pdf
-export GRASS_WIDTH=800
-export GRASS_HEIGHT=800
+export GRASS_RENDER_FILE=nc_spm.pdf
+export GRASS_RENDER_WIDTH=800
+export GRASS_RENDER_HEIGHT=800
 
 g.region vect=roadsmajor
 # activate vector font
@@ -122,9 +122,9 @@ Example: using the driver to generate a PDF file with a raster map (bash-syntax)
 
 <div class="code"><pre>
 export GRASS_RENDER_IMMEDIATE=cairo
-export GRASS_PNGFILE=nc_spm.pdf
-export GRASS_WIDTH=800
-export GRASS_HEIGHT=800
+export GRASS_RENDER_FILE=nc_spm.pdf
+export GRASS_RENDER_WIDTH=800
+export GRASS_RENDER_HEIGHT=800
 
 g.region rast=elevation
 d.rast map=elevation

lib/cairodriver/graph.c

@@ -66,11 +66,11 @@ static void init_xlib(void)
     if (!ca.dpy)
 	G_fatal_error(_("Unable to open display"));
 
-    p = getenv("GRASS_CAIRO_SCREEN");
+    p = getenv("GRASS_RENDER_CAIRO_SCREEN");
     if (!p || sscanf(p, "%i", &scrn) != 1)
 	scrn = DefaultScreen(ca.dpy);
 
-    p = getenv("GRASS_CAIRO_VISUAL");
+    p = getenv("GRASS_RENDER_CAIRO_VISUAL");
     if (!p || sscanf(p, "%li", &xid) != 1)
 	xid = DefaultVisual(ca.dpy, scrn)->visualid;
 
@@ -121,7 +121,7 @@ static void init_file(void)
     ca.stride = ca.width * 4;
 
     /* get file name */
-    p = getenv("GRASS_PNGFILE");
+    p = getenv("GRASS_RENDER_FILE");
     if (!p || strlen(p) == 0)
 	p = DEFAULT_FILE_NAME;
 
@@ -167,10 +167,10 @@ static void init_file(void)
 	break;
     }
 
-    p = getenv("GRASS_PNG_MAPPED");
+    p = getenv("GRASS_RENDER_FILE_MAPPED");
     do_map = p && strcmp(p, "TRUE") == 0 && ends_with(ca.file_name, ".bmp");
 
-    p = getenv("GRASS_PNG_READ");
+    p = getenv("GRASS_RENDER_FILE_READ");
     do_read = p && strcmp(p, "TRUE") == 0;
 
     if (is_vector) {
@@ -236,7 +236,7 @@ int Cairo_Graph_set(void)
     G_debug(1, "Cairo_Graph_set");
 
     /* get background color */
-    p = getenv("GRASS_BACKGROUNDCOLOR");
+    p = getenv("GRASS_RENDER_BACKGROUNDCOLOR");
     if (p && *p) {
 	unsigned int red, green, blue;
 
@@ -253,14 +253,14 @@ int Cairo_Graph_set(void)
 	ca.bgcolor_r = ca.bgcolor_g = ca.bgcolor_b = 1.0;
 
     /* get background transparency setting */
-    p = getenv("GRASS_TRANSPARENT");
+    p = getenv("GRASS_RENDER_TRANSPARENT");
     if (p && strcmp(p, "TRUE") == 0)
 	ca.bgcolor_a = 0.0;
     else
 	ca.bgcolor_a = 1.0;
 
     antialias = CAIRO_ANTIALIAS_DEFAULT;
-    p = getenv("GRASS_ANTIALIAS");
+    p = getenv("GRASS_RENDER_ANTIALIAS");
     if (p && G_strcasecmp(p, "default") == 0)
 	antialias = CAIRO_ANTIALIAS_DEFAULT;
     if (p && G_strcasecmp(p, "none") == 0)

lib/display/r_raster.c

@@ -40,9 +40,9 @@ static void init(void)
 {
     const char *fenc = getenv("GRASS_ENCODING");
     const char *font = getenv("GRASS_FONT");
-    const char *line_width = getenv("GRASS_LINE_WIDTH");
-    const char *text_size = getenv("GRASS_TEXT_SIZE");
-    const char *frame = getenv("GRASS_FRAME");
+    const char *line_width = getenv("GRASS_RENDER_LINE_WIDTH");
+    const char *text_size = getenv("GRASS_RENDER_TEXT_SIZE");
+    const char *frame = getenv("GRASS_RENDER_FRAME");
 
     D_font(font ? font : "romans");
 
@@ -125,13 +125,9 @@ int D_open_driver(void)
 	v = G__getenv(env);
 	p = m;
 
-	if (v) {
-	    if (G_strcasecmp(p, "ps") == 0)
-		G_putenv("GRASS_PSFILE", v);
-	    else
-		G_putenv("GRASS_PNGFILE", v);
-	}
-	
+	if (v)
+            G_putenv("GRASS_RENDER_FILE", v);
+        
 	G_asprintf(&env, "MONITOR_%s_ENVFILE", u_m);
 	v = G__getenv(env);
 	if (v) 

lib/driver/init.c

@@ -52,10 +52,10 @@ void LIB_init(const struct driver *drv)
     ftcap = parse_fontcap();
 
     /* initialize graphics */
-    p = getenv("GRASS_WIDTH");
+    p = getenv("GRASS_RENDER_WIDTH");
     screen_width = (p && atoi(p)) ? atoi(p) : DEF_WIDTH;
 
-    p = getenv("GRASS_HEIGHT");
+    p = getenv("GRASS_RENDER_HEIGHT");
     screen_height = (p && atoi(p)) ? atoi(p) : DEF_HEIGHT;
 
     if (COM_Graph_set() < 0)

lib/htmldriver/README

@@ -14,7 +14,7 @@ at all!)
 
   Polygons can at most have 100 vertices (this limit imposed by HTML image map 
 formats.)  The driver will attempt to trim polygons that have more that 100 
-vertices (also see GRASS_HTMLMAXPOINTS, below.)  Also, any polygon that is 
+vertices (also see GRASS_RENDER_HTMLMAXPOINTS, below.)  Also, any polygon that is 
 entirely bounded by another polygon will be discarded.
 
   Text written to the driver before polygons are used as the HREF tag for
@@ -28,15 +28,15 @@ that exists in a vector file will have the same HREF tag.
 
     0. Set environment variables:
 
-       GRASS_WIDTH=xxx   #if you want another size than the default 640
-       export GRASS_WIDTH
-       GRASS_HEIGHT=xxx  #if you want another size than the default 480
-       export GRASS_WIDTH
+       GRASS_RENDER_WIDTH=xxx   #if you want another size than the default 640
+       export GRASS_RENDER_WIDTH
+       GRASS_RENDER_HEIGHT=xxx  #if you want another size than the default 480
+       export GRASS_RENDER_WIDTH
 
        Additionally, HTMLMAP driver recognizes:
 
-       export GRASS_HTMLTYPE
-       GRASS_HTMLTYPE=xxx  
+       export GRASS_RENDER_HTMLTYPE
+       GRASS_RENDER_HTMLTYPE=xxx  
             specifies the type of Html map to create:
 	    CLIENT  - Netscape client-side image map (default).  (NAME="map")
 	    APACHE  - Apache/NCSA server-side image map
@@ -44,8 +44,8 @@ that exists in a vector file will have the same HREF tag.
                       suitable for conversion to CERN server format, or
                       any other format with user supplied conversion program.
 
-       export GRASS_HTMLFILE
-       GRASS_HTMLFILE=xxxxxx
+       export GRASS_RENDER_FILE
+       GRASS_RENDER_FILE=xxxxxx
 	    specifies the resulting file to store the html image map,
 	    default is 'htmlmap'.  Files without absolute path names are
             written in the current directory where the driver was started.
@@ -53,8 +53,8 @@ that exists in a vector file will have the same HREF tag.
             Any existing file is overwritten without warning.
 
 
-	export GRASS_HTMLMINDIST
-	GRASS_HTMLMINDIST=xx
+	export GRASS_RENDER_HTMLMINDIST
+	GRASS_RENDER_HTMLMINDIST=xx
 	    specifies the minimum distance (in pixels) that a point must
 	    change from the previous one to keep in the list of vertices
             for a polygon.  The default is '2', which means that a point's
@@ -63,8 +63,8 @@ that exists in a vector file will have the same HREF tag.
 	    to eliminate points closely spaced points.
 
 
-	export GRASS_HTMLMINBBOX
-	GRASS_HTMLMINBBOX=xx
+	export GRASS_RENDER_HTMLMINBBOX
+	GRASS_RENDER_HTMLMINBBOX=xx
 	    specifies the minimum bounding box dimenions (both width and
 	    height) in order to store a polygon.  The default is '2', which
 	    means any polygon having bounding box width or height extent
@@ -73,8 +73,8 @@ that exists in a vector file will have the same HREF tag.
 	    pixel in height or width, typically a single point or line.
 	
 
-	export GRASS_HTMLMAXPOINTS
-	GRASS_HTMLMAXPOINTS=xx
+	export GRASS_RENDER_HTMLMAXPOINTS
+	GRASS_RENDER_HTMLMAXPOINTS=xx
 	    specifies the maxiumum number of vertices that a polygon can 
 	    have.  The default is 99.  Some browser can only handle
 	    image map polygons of less that 100 vertices.
@@ -99,13 +99,13 @@ that exists in a vector file will have the same HREF tag.
          d.mon stop=HTMLMAP
 
        This will write the image map file file. A new file called 'htmlmap' 
-       (or whatever you specified with GRASS_HTMLFILE) will be created  
+       (or whatever you specified with GRASS_RENDER_FILE) will be created  
        in your current directory.  
 
     4. In practice, you'll want to create gif/jpg/png images that correspond 
        with your newly created image map:
 
-         # using previous GRASS_WIDTH & GRASS_HEIGHT
+         # using previous GRASS_RENDER_WIDTH & GRASS_RENDER_HEIGHT
          d.mon start=CELL
          d.mon select=CELL
          d.rast map=terrain

lib/htmldriver/graph_set.c

@@ -34,7 +34,7 @@ int HTML_Graph_set(void)
      * set the minimum bounding box dimensions 
      */
 
-    if (NULL != (p = getenv("GRASS_HTMLMINBBOX"))) {
+    if (NULL != (p = getenv("GRASS_RENDER_HTMLMINBBOX"))) {
 	html.BBOX_MINIMUM = atoi(p);
 	if (html.BBOX_MINIMUM <= 0) {
 	    html.BBOX_MINIMUM = DEF_MINBBOX;
@@ -48,7 +48,7 @@ int HTML_Graph_set(void)
      * set the maximum number of points
      */
 
-    if (NULL != (p = getenv("GRASS_HTMLMAXPOINTS"))) {
+    if (NULL != (p = getenv("GRASS_RENDER_HTMLMAXPOINTS"))) {
 	html.MAX_POINTS = atoi(p);
 	if (html.MAX_POINTS <= 0) {
 	    html.MAX_POINTS = DEF_MAXPTS;
@@ -62,7 +62,7 @@ int HTML_Graph_set(void)
      * set the minimum difference to keep a point
      */
 
-    if (NULL != (p = getenv("GRASS_HTMLMINDIST"))) {
+    if (NULL != (p = getenv("GRASS_RENDER_HTMLMINDIST"))) {
 	html.MINIMUM_DIST = atoi(p);
 	if (html.MINIMUM_DIST <= 0) {
 	    html.MINIMUM_DIST = DEF_MINDIST;
@@ -77,7 +77,7 @@ int HTML_Graph_set(void)
      * open the output file
      */
 
-    if (NULL != (p = getenv("GRASS_HTMLFILE"))) {
+    if (NULL != (p = getenv("GRASS_RENDER_FILE"))) {
 	if (strlen(p) == 0) {
 	    p = FILE_NAME;
 	}
@@ -102,7 +102,7 @@ int HTML_Graph_set(void)
      * check type of map wanted
      */
 
-    if (NULL == (p = getenv("GRASS_HTMLTYPE"))) {
+    if (NULL == (p = getenv("GRASS_RENDER_HTMLTYPE"))) {
 	p = "CLIENT";
     }
     

lib/htmldriver/htmldriver.html

@@ -11,7 +11,7 @@ HTML driver can create both client-side image maps embedded into HTML
 files, or server-side image maps used by web server software.
 
 <p>Polygons can at most have 100 vertices (this limit imposed by HTML
-image map formats, see <b>GRASS_HTMLMAXPOINTS</b> below.) The driver
+image map formats, see <b>GRASS_RENDER_HTMLMAXPOINTS</b> below.) The driver
 will attempt to trim polygons that have more that 100 vertices by
 removing vertices with the least amount of angle to the next
 vertice. Also, any polygon that is entirely bounded by another polygon
@@ -44,13 +44,13 @@ export GRASS_RENDER_IMMEDIATE=html
 Several environment variables affect the operation of the HTML driver:
 
 <ul>
-  <li><b>GRASS_WIDTH=xxx</b><br>
+  <li><b>GRASS_RENDER_WIDTH=xxx</b><br>
      the width of the image map (default is 640).
   </li>
-  <li><b>GRASS_HEIGHT=yyy</b><br>
+  <li><b>GRASS_RENDER_HEIGHT=yyy</b><br>
     the height of the image map (default is 480).
   </li>
-  <li><b>GRASS_HTMLTYPE=type</b><br> type of image mape to create
+  <li><b>GRASS_RENDER_HTMLTYPE=type</b><br> type of image mape to create
     (default is CLIENT):
     <dl>
       <dd><tt><b>CLIENT</b></tt> &nbsp;&nbsp; Netscape/IE client-side
@@ -64,7 +64,7 @@ Several environment variables affect the operation of the HTML driver:
 	any other format with user supplied conversion program.</dd>
     </dl>
   </li>
-  <li><b>GRASS_HTMLFILE=filename</b><br>
+  <li><b>GRASS_RENDER_FILE=filename</b><br>
     specifies the resulting file to store the html image map, default
     is <tt>htmlmap</tt>. Files without absolute path names are written
     in the current directory where the driver was started.
@@ -72,7 +72,7 @@ Several environment variables affect the operation of the HTML driver:
     <em>Any existing file of the same name is overwritten without
       warning.</em>
   </li>
-  <li><b>GRASS_HTMLMINDIST=n</b><br>
+  <li><b>GRASS_RENDER_HTMLMINDIST=n</b><br>
     specifies the minimum distance in pixels that a point must change
     from the previous point to keep in the list of vertices for a
     polygon.  The default is <tt>2</tt>, which means that a point's x
@@ -80,14 +80,14 @@ Several environment variables affect the operation of the HTML driver:
     of pixels greater than this value.  This parameter helps to
     eliminate closely spaced points.
   </li>
-  <li><b>GRASS_HTMLMINBBOX=n</b><br>
+  <li><b>GRASS_RENDER_HTMLMINBBOX=n</b><br>
     specifies the minimum bounding box dimensions to record a polygon
     as a clickable area.  The default is <tt>2</tt>, which means that a
     polygon with a bounding box of less than this value is not
     included. This parameter helps to eliminate polygons than are a
     point or line.
   </li>
-  <li><b>GRASS_HTMLMAXPOINTS=n</b><br>
+  <li><b>GRASS_RENDER_HTMLMAXPOINTS=n</b><br>
     specifies the maximum number of vertices included in a polygon's
     clickable area.  The default is <tt>99</tt>. Some browsers can only
     accommodate polygons of 100 vertices or less. The HTMLMAP driver
@@ -125,7 +125,7 @@ driver and other utilities to create .gif or .jpg files.
   available in GRASS 5.</i>
 
 <div class="code"><pre>
-# using previous GRASS_WIDTH &amp; GRASS_HEIGHT
+# using previous GRASS_RENDER_WIDTH &amp; GRASS_RENDER_HEIGHT
 d.mon start=png
 d.rast map=terrain
 d.vect map=area51  fillcolor=white  linecolor=blue

lib/init/grass.py

@@ -1379,8 +1379,8 @@ set_browser()
 #predefine monitor size for certain architectures
 if os.getenv('HOSTTYPE') == 'arm':
     # small monitor on ARM (iPAQ, zaurus... etc)
-    os.environ['GRASS_HEIGHT'] = "320"
-    os.environ['GRASS_WIDTH'] = "240"
+    os.environ['GRASS_RENDER_HEIGHT'] = "320"
+    os.environ['GRASS_RENDER_WIDTH'] = "240"
 
 # First time user - GISRC is defined in the GRASS script
 if not os.access(gisrc, os.F_OK):

lib/init/variables.html

@@ -337,19 +337,19 @@ PERMANENT
   values: <em><a href="cairodriver.html">cairo</a></em>, <em><a href="pngdriver.html">png</a></em>, <em><a href="psdriver.html">ps</a></em>
   or <em><a href="htmldriver.html">html</a></em></dd>
   
-  <dt>GRASS_WIDTH</dt>
+  <dt>GRASS_RENDER_WIDTH</dt>
   <dd>defines the width of output image (default is 640).</dd>
   
-  <dt>GRASS_HEIGHT</dt>
+  <dt>GRASS_RENDER_HEIGHT</dt>
   <dd>defines the height of output image (default is 480).</dd>
   
-  <dt>GRASS_FRAME</dt>
+  <dt>GRASS_RENDER_FRAME</dt>
   <dd>contains 4 coordinates, <em>top,bottom,left,right</em> (pixel values), defining the initial frame.</dd>
 
-  <dt>GRASS_LINE_WIDTH</dt>
+  <dt>GRASS_RENDER_LINE_WIDTH</dt>
   <dd>defines default line width.</dd>
   
-  <dt>GRASS_TEXT_SIZE</dt>
+  <dt>GRASS_RENDER_TEXT_SIZE</dt>
   <dd>defines default text size.</dd>
 
 </dl>

lib/pngdriver/graph_set.c

@@ -88,19 +88,19 @@ int PNG_Graph_set(void)
 
     G_gisinit("PNG driver");
 
-    p = getenv("GRASS_PNGFILE");
+    p = getenv("GRASS_RENDER_FILE");
     if (!p || strlen(p) == 0)
 	p = FILE_NAME;
 
     png.file_name = p;
 
-    p = getenv("GRASS_TRUECOLOR");
+    p = getenv("GRASS_RENDER_TRUECOLOR");
     png.true_color = !p || strcmp(p, "FALSE") != 0;
 
     G_verbose_message(_("png: truecolor status %s"),
 		      png.true_color ? _("enabled") : _("disabled"));
 
-    p = getenv("GRASS_PNG_MAPPED");
+    p = getenv("GRASS_RENDER_FILE_MAPPED");
     do_map = p && strcmp(p, "TRUE") == 0;
 
     if (do_map) {
@@ -110,7 +110,7 @@ int PNG_Graph_set(void)
 	    do_map = 0;
     }
 
-    p = getenv("GRASS_PNG_READ");
+    p = getenv("GRASS_RENDER_FILE_READ");
     do_read = p && strcmp(p, "TRUE") == 0;
 
     if (do_read && access(png.file_name, 0) != 0)
@@ -124,12 +124,12 @@ int PNG_Graph_set(void)
     png.clip_left = 0;
     png.clip_rite = png.width;
 
-    p = getenv("GRASS_TRANSPARENT");
+    p = getenv("GRASS_RENDER_TRANSPARENT");
     png.has_alpha = p && strcmp(p, "TRUE") == 0;
 
     png_init_color_table();
 
-    p = getenv("GRASS_BACKGROUNDCOLOR");
+    p = getenv("GRASS_RENDER_BACKGROUNDCOLOR");
     if (p && *p && 
 	(sscanf(p, "%02x%02x%02x", &red, &grn, &blu) == 3 ||
 	 G_str_to_color(p, (int *)&red, (int *)&grn, (int *)&blu) == 1)) {

lib/pngdriver/pngdriver.html

@@ -23,40 +23,40 @@ export GRASS_RENDER_IMMEDIATE=png
 Several environment variables affect the operation of the PNG driver:
 
 <ul>
-  <li><b>GRASS_WIDTH=xxx</b><br>
+  <li><b>GRASS_RENDER_WIDTH=xxx</b><br>
      the width of the image map (default is 640).
   </li>
-  <li><b>GRASS_HEIGHT=yyy</b><br>
+  <li><b>GRASS_RENDER_HEIGHT=yyy</b><br>
     the height of the image map (default is 480).
   </li>
-  <li><b>GRASS_BACKGROUNDCOLOR=RRGGBB</b><br>
+  <li><b>GRASS_RENDER_BACKGROUNDCOLOR=RRGGBB</b><br>
     specifies the background color to use in RGB notation (hex or
     R:G:B values). Named colors are also supported. Default
     is <b>FFFFFF</b> (white).
   </li>
-  <li><b>GRASS_TRANSPARENT=[TRUE|FALSE]</b><br>
+  <li><b>GRASS_RENDER_TRANSPARENT=[TRUE|FALSE]</b><br>
     sets transparent background on (TRUE) or off (FALSE, default).
   </li>
-  <li><b>GRASS_TRUECOLOR=[TRUE|FALSE]</b><br>
+  <li><b>GRASS_RENDER_TRUECOLOR=[TRUE|FALSE]</b><br>
     sets true-color support. Default is TRUE.
   </li>
-  <li><b>GRASS_PNGFILE=filename</b><br>
+  <li><b>GRASS_RENDER_FILE=filename</b><br>
      the filename to put the resulting image in, default is <tt>map.png</tt>.
-     If you set GRASS_PNGFILE to a filename which ends in ".ppm", a PPM 
+     If you set GRASS_RENDER_FILE to a filename which ends in ".ppm", a PPM 
      file will be created (with alpha channel stored in a PGM image, if applicable).
-     If you set GRASS_PNGFILE to a filename which ends in ".bmp", a 32-bpp
+     If you set GRASS_RENDER_FILE to a filename which ends in ".bmp", a 32-bpp
      BMP file will be created (these are not readable by some older viewers).
   </li>
-  <li><b>GRASS_PNG_COMPRESSION=[0|1|9]</b><br>
+  <li><b>GRASS_RENDER_FILE_COMPRESSION=[0|1|9]</b><br>
     compression level of PNG files (0 = none, 1 = fastest, 9 = best, default is 6)
   </li>
-  <li><b>GRASS_PNG_READ</b><br>
+  <li><b>GRASS_RENDER_FILE_READ</b><br>
      if <tt>TRUE</tt>, the PNG driver will initialize the image from
-     the contents of GRASS_PNGFILE.
+     the contents of GRASS_RENDER_FILE.
   </li>
-  <li><b>GRASS_PNG_MAPPED</b><br>
+  <li><b>GRASS_RENDER_FILE_MAPPED</b><br>
     if <tt>TRUE</tt>, the PNG driver
-    will map GRASS_PNGFILE as its framebuffer, rather than using
+    will map GRASS_RENDER_FILE as its framebuffer, rather than using
     memory. This only works with BMP files.
   </li>
 </ul>
@@ -65,7 +65,7 @@ Several environment variables affect the operation of the PNG driver:
 
 <div class="code"><pre>
 export GRASS_RENDER_IMMEDIATE=png
-export GRASS_TRUECOLOR=TRUE
+export GRASS_RENDER_TRUECOLOR=TRUE
 
 g.region rast=elevation
 d.rast elevation

lib/pngdriver/write_png.c

@@ -108,7 +108,7 @@ void write_png(void)
 	}
     }
 
-    str = getenv("GRASS_PNG_COMPRESSION");
+    str = getenv("GRASS_RENDER_FILE_COMPRESSION");
     if (str && sscanf(str, "%d", &compress) == 1)
 	png_set_compression_level(png_ptr, compress);
 

lib/psdriver/graph_set.c

@@ -127,7 +127,7 @@ static void swap(double *x, double *y)
 
 static void get_paper(void)
 {
-    const char *name = getenv("GRASS_PAPER");
+    const char *name = getenv("GRASS_RENDER_PS_PAPER");
     const struct paper *paper;
     int i;
 
@@ -176,7 +176,7 @@ int PS_Graph_set(void)
 
     G_gisinit("PS driver");
 
-    p = getenv("GRASS_PSFILE");
+    p = getenv("GRASS_RENDER_FILE");
     if (!p || strlen(p) == 0)
 	p = FILE_NAME;
 
@@ -184,16 +184,16 @@ int PS_Graph_set(void)
     p = file_name + strlen(file_name) - 4;
     ps.encapsulated = (G_strcasecmp(p, ".eps") == 0);
 
-    p = getenv("GRASS_TRUECOLOR");
+    p = getenv("GRASS_RENDER_TRUECOLOR");
     ps.true_color = p && strcmp(p, "TRUE") == 0;
 
-    p = getenv("GRASS_LANDSCAPE");
+    p = getenv("GRASS_RENDER_PS_LANDSCAPE");
     landscape = p && strcmp(p, "TRUE") == 0;
 
-    p = getenv("GRASS_PS_HEADER");
+    p = getenv("GRASS_RENDER_PS_HEADER");
     ps.no_header = p && strcmp(p, "FALSE") == 0;
 
-    p = getenv("GRASS_PS_TRAILER");
+    p = getenv("GRASS_RENDER_PS_TRAILER");
     ps.no_trailer = p && strcmp(p, "FALSE") == 0;
 
     G_verbose_message(_("ps: truecolor status %s"),

lib/psdriver/psdriver.html

@@ -20,33 +20,33 @@ export GRASS_RENDER_IMMEDIATE=ps
 Several environment variables affect the operation of the PS driver:
 
 <ul>
-  <li><b>GRASS_WIDTH=xxx</b><br>
+  <li><b>GRASS_RENDER_WIDTH=xxx</b><br>
      the width of the image map (default is 640).
   </li>
-  <li><b>GRASS_HEIGHT=yyy</b><br>
+  <li><b>GRASS_RENDER_HEIGHT=yyy</b><br>
     the height of the image map (default is 480).
   </li>
-  <li><b>GRASS_TRUECOLOR=[TRUE|FALSE]</b><br>
+  <li><b>GRASS_RENDER_TRUECOLOR=[TRUE|FALSE]</b><br>
     sets true-color support. Default is FALSE.
   </li>
-  <li><b>GRASS_PSFILE</b><br>
+  <li><b>GRASS_RENDER_FILE</b><br>
     name of output file. If it ends with ".eps" an EPS file
     will be created.
   </li>
-  <li><b>GRASS_PAPER</b><br>
+  <li><b>GRASS_RENDER_PS_PAPER</b><br>
     sets the screen dimensions and margins to
-    fit a standard paper size, see also GRASS_WIDTH, GRASS_HEIGHT.
+    fit a standard paper size, see also GRASS_RENDER_WIDTH, GRASS_RENDER_HEIGHT.
   </li>
-  <li><b>GRASS_LANDSCAPE</b><br>
+  <li><b>GRASS_RENDER_PS_LANDSCAPE</b><br>
     if <tt>TRUE</tt>, the screen is rotated 90 degrees
     counter-clockwise so that a "landscape" screen fits better on
     "portrait" paper.
   </li>
-  <li><b>GRASS_PS_HEADER</b><br>
+  <li><b>GRASS_RENDER_PS_HEADER</b><br>
     if <tt>FALSE</tt>, the output is appended to any existing file,
     and no prolog or setup sections are generated.
   </li>
-  <li><b>GRASS_PS_TRAILER</b><br>
+  <li><b>GRASS_RENDER_PS_TRAILER</b><br>
     if <tt>FALSE</tt>, no trailer section is generated.
   </li>
 </ul>
@@ -55,7 +55,7 @@ Several environment variables affect the operation of the PS driver:
 
 <div class="code"><pre>
 export GRASS_RENDER_IMMEDIATE=ps
-export GRASS_TRUECOLOR=TRUE
+export GRASS_RENDER_TRUECOLOR=TRUE
 
 g.region rast=elevation
 d.rast elevation
@@ -71,7 +71,7 @@ and use the environment variables to set the image size. If you would
 like a larger image, multiply both rows and cols by the same whole
 number to preserve the aspect ratio.
 
-<p>GRASS_TRUECOLOR requires either PostScript level 2 or level 1 plus the
+<p>GRASS_RENDER_TRUECOLOR requires either PostScript level 2 or level 1 plus the
 colorimage and setrgbcolor operators (this is the case for colour
 printers which pre-date level 2 PostScript).
 

locale/po/grassmods_ar.po

@@ -25317,7 +25317,7 @@ msgid "Name of monitor to select"
 msgstr "اسم الخريطة الراسترية"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25325,7 +25325,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_cs.po

@@ -25651,7 +25651,7 @@ msgid "Name of monitor to select"
 msgstr "Žádné grafické zařízení nebylo vybráno"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25659,7 +25659,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_de.po

@@ -23874,7 +23874,7 @@ msgid "Name of monitor to select"
 msgstr "Name des Grafikfensters, das selektiert werden soll."
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -23882,7 +23882,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_el.po

@@ -24290,7 +24290,7 @@ msgid "Name of monitor to select"
 msgstr "Ascii ράστερ χάρτης που θα εισαχθεί"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -24298,7 +24298,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_es.po

@@ -25815,7 +25815,7 @@ msgid "Name of monitor to select"
 msgstr "Nombre de la pantalla a seleccionar"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25823,7 +25823,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_fr.po

@@ -26952,7 +26952,7 @@ msgid "Name of monitor to select"
 msgstr "Nom du moniteur graphique à sélectionner"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -26960,7 +26960,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_it.po

@@ -25254,7 +25254,7 @@ msgid "Name of monitor to select"
 msgstr "Nome del monitor grafico da selezionare"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25262,7 +25262,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_ja.po

@@ -25170,7 +25170,7 @@ msgid "Name of monitor to select"
 msgstr "編集するベクトルマップ名"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25178,7 +25178,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_ko.po

@@ -23576,7 +23576,7 @@ msgid "Name of monitor to select"
 msgstr "출력할 격자지도"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -23584,7 +23584,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_pl.po

@@ -25166,7 +25166,7 @@ msgid "Name of monitor to select"
 msgstr "Nazwa mapy wektorowej do edycji"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25174,7 +25174,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_pt.po

@@ -26040,7 +26040,7 @@ msgid "Name of monitor to select"
 msgstr "O dispositivo gráfico não foi especificado"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -26048,7 +26048,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_pt_br.po

@@ -25926,7 +25926,7 @@ msgid "Name of monitor to select"
 msgstr "Nome do  monitor gráfico que será selecionado"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25934,7 +25934,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_ro.po

@@ -23728,7 +23728,7 @@ msgid "Name of monitor to select"
 msgstr ""
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -23736,7 +23736,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_ru.po

@@ -25709,7 +25709,7 @@ msgid "Name of monitor to select"
 msgstr "Имя векторного слоя для редактирования"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25717,7 +25717,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_sl.po

@@ -25569,7 +25569,7 @@ msgid "Name of monitor to select"
 msgstr "Nobena grafièna naprava ni izbrana"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25577,7 +25577,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_th.po

@@ -25375,7 +25375,7 @@ msgid "Name of monitor to select"
 msgstr "ชื่อของ แผนที่เชิงเส้น ที่จะแก้ไข"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25383,7 +25383,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_tr.po

@@ -24836,7 +24836,7 @@ msgid "Name of monitor to select"
 msgstr "Düzenlenecek vektör haritanın adı"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -24844,7 +24844,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_vi.po

@@ -25759,7 +25759,7 @@ msgid "Name of monitor to select"
 msgstr "Tên của bản đồ vec-tơ cần chỉnh sửa"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25767,7 +25767,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

locale/po/grassmods_zh.po

@@ -25439,7 +25439,7 @@ msgid "Name of monitor to select"
 msgstr "输入的 2D 矢量地图的名称"
 
 #: ../display/d.mon/main.c:66
-msgid "Width for display monitor if not set by GRASS_WIDTH"
+msgid "Width for display monitor if not set by GRASS_RENDER_WIDTH"
 msgstr ""
 
 #: ../display/d.mon/main.c:67
@@ -25447,7 +25447,7 @@ msgid "Default value: 640"
 msgstr ""
 
 #: ../display/d.mon/main.c:74
-msgid "Height for display monitor if not set by GRASS_HEIGHT"
+msgid "Height for display monitor if not set by GRASS_RENDER_HEIGHT"
 msgstr ""
 
 #: ../display/d.mon/main.c:75

raster/r.out.ppm/r.out.ppm.html

@@ -33,7 +33,7 @@ output to stdout, no comments are written.)
 
 You can create a PNG image with NULL values represented by a transparent 
 background by using the <a href="pngdriver.html">PNG driver</a> with 
-<a href="variables.html">GRASS_TRANSPARENT</a> set to TRUE.
+<a href="variables.html">GRASS_RENDER_TRANSPARENT</a> set to TRUE.
 Alternatively, you can use the <em>pnmtopng</em> program from 
 <a href="http://netpbm.sourceforge.net">netpbm</a> to do this:
 

scripts/d.correlate/d.correlate.py

@@ -45,7 +45,7 @@ def main():
 
     grass.write_command('d.text', color = 'black', size = 4, line = 1, stdin = "CORRELATION")
 
-    os.environ['GRASS_PNG_READ'] = 'TRUE'
+    os.environ['GRASS_RENDER_FILE_READ'] = 'TRUE'
 
     colors = "red black blue green gray violet".split()
     line = 2

scripts/d.polar/d.polar.py

@@ -87,7 +87,7 @@ def plot_dgraph():
     fb = frame_height - dy
 
     tenv = os.environ.copy()
-    tenv['GRASS_FRAME'] = '%f,%f,%f,%f' % (ft, fb, fl, fr)
+    tenv['GRASS_RENDER_FRAME'] = '%f,%f,%f,%f' % (ft, fb, fl, fr)
 
     # polyline calculations
     ring = 0.95

scripts/d.rast.leg/d.rast.leg.py

@@ -85,7 +85,7 @@ def make_frame(f, b, t, l, r):
     rl = fl + l * (fr - fl)
     rr = fl + r * (fr - fl)
     s = '%f,%f,%f,%f' % (rt, rb, rl, rr)
-    os.environ['GRASS_FRAME'] = s
+    os.environ['GRASS_RENDER_FRAME'] = s
 
 def main():
     map = options['map']
@@ -110,7 +110,7 @@ def main():
     f = tuple([float(x) for x in s.split()[1:5]])
     
     grass.run_command('d.erase')
-    os.environ['GRASS_PNG_READ'] = 'TRUE'
+    os.environ['GRASS_RENDER_FILE_READ'] = 'TRUE'
 
     #draw title
     

scripts/d.vect.thematic/d.vect.thematic

@@ -354,9 +354,9 @@ if [ "$GIS_FLAG_S" -eq 1 ] ; then
     # if running in GUI, turn off immediate mode rendering so that the
     # iterated d.vect commands will composite using the display driver
     autowrite=$GRASS_PNG_AUTO_WRITE
-    pngread=$GRASS_PNG_READ
-    GRASS_PNG_READ=TRUE
-    export GRASS_PNG_READ
+    pngread=$GRASS_RENDER_FILE_READ
+    GRASS_RENDER_FILE_READ=TRUE
+    export GRASS_RENDER_FILE_READ
     GRASS_PNG_AUTO_WRITE=FALSE
     export GRASS_PNG_AUTO_WRITE
 fi
@@ -1154,8 +1154,8 @@ fi
 
 if [ "$GIS_FLAG_S" -eq 1 ] ; then
     # reset display parameters
-    GRASS_PNG_READ=$pngread
-    export GRASS_PNG_READ
+    GRASS_RENDER_FILE_READ=$pngread
+    export GRASS_RENDER_FILE_READ
     GRASS_PNG_AUTO_WRITE=$autowrite
     export GRASS_PNG_AUTO_WRITE
 fi

scripts/d.vect.thematic/d.vect.thematic.py

@@ -296,7 +296,7 @@ def main():
         flag_l = False
         # if running in GUI, turn off immediate mode rendering so that the
         # iterated d.vect commands will composite using the display driver
-        os.environ['GRASS_PNG_READ'] = 'TRUE'
+        os.environ['GRASS_RENDER_FILE_READ'] = 'TRUE'
         os.environ['GRASS_PNG_AUTO_WRITE'] = 'FALSE'
 
     db = grass.vector_db(map)[1]

scripts/wxpyimgview/wxpyimgview.html

@@ -8,7 +8,7 @@ continually refreshed.
 <h2>NOTES</h2>
 
 The display driver must be configure to map the file, with
-<em>GRASS_PNG_MAPPED=TRUE</em>. This ensures that the file will remain
+<em>GRASS_RENDER_FILE_MAPPED=TRUE</em>. This ensures that the file will remain
 a constant size, rather than being truncated whenever it is updated.
 
 <h2>SEE ALSO</h2>

tools/thumbnails.py

@@ -170,18 +170,18 @@ def main():
     tmp_grad_rel = "tmp_grad_rel_%d" % pid
     tmp_img = grass.tempfile() + ".ppm"
 
-    os.environ['GRASS_WIDTH'] = '%d' % width
-    os.environ['GRASS_HEIGHT'] = '%d' % height
-    os.environ['GRASS_FRAME'] = '%f,%f,%f,%f' % (0,height,0,width)
-    os.environ['GRASS_PNGFILE'] = tmp_img
-    os.environ['GRASS_TRUECOLOR'] = 'TRUE'
-    os.environ['GRASS_PNG_READ'] = 'FALSE'
-    os.environ['GRASS_PNG_MAPPED'] = 'FALSE'
-    os.environ['GRASS_TRANSPARENT'] = 'FALSE'
-    os.environ['GRASS_BACKGROUNDCOLOR'] = 'ffffff'
+    os.environ['GRASS_RENDER_WIDTH'] = '%d' % width
+    os.environ['GRASS_RENDER_HEIGHT'] = '%d' % height
+    os.environ['GRASS_RENDER_FRAME'] = '%f,%f,%f,%f' % (0,height,0,width)
+    os.environ['GRASS_RENDER_FILE'] = tmp_img
+    os.environ['GRASS_RENDER_TRUECOLOR'] = 'TRUE'
+    os.environ['GRASS_RENDER_FILE_READ'] = 'FALSE'
+    os.environ['GRASS_RENDER_FILE_MAPPED'] = 'FALSE'
+    os.environ['GRASS_RENDER_TRANSPARENT'] = 'FALSE'
+    os.environ['GRASS_RENDER_BACKGROUNDCOLOR'] = 'ffffff'
     os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
 
-    for var in ['GRASS_LINE_WIDTH', 'GRASS_ANTIALIAS']:
+    for var in ['GRASS_RENDER_LINE_WIDTH', 'GRASS_RENDER_ANTIALIAS']:
         if var in os.environ:
             del os.environ[var]
 

visualization/wximgview/wximgview.html

@@ -8,7 +8,7 @@ continually refreshed.
 <h2>NOTES</h2>
 
 The display driver must be configure to map the file, with
-<em>GRASS_PNG_MAPPED=TRUE</em>. This ensures that the file will remain
+<em>GRASS_RENDER_FILE_MAPPED=TRUE</em>. This ensures that the file will remain
 a constant size, rather than being truncated whenever it is updated.
 
 
@@ -16,15 +16,15 @@ a constant size, rather than being truncated whenever it is updated.
 
 (bash shell syntax)
 <div class="code"><pre>
-export GRASS_PNGFILE=map.bmp
-export GRASS_WIDTH=640
-export GRASS_HEIGHT=480
+export GRASS_RENDER_FILE=map.bmp
+export GRASS_RENDER_WIDTH=640
+export GRASS_RENDER_HEIGHT=480
 export GRASS_RENDER_IMMEDIATE=cairo
-export GRASS_PNG_MAPPED=TRUE
-export GRASS_PNG_READ=TRUE
+export GRASS_RENDER_FILE_MAPPED=TRUE
+export GRASS_RENDER_FILE_READ=TRUE
 
 d.erase
-wximgview $GRASS_PNGFILE percent=50 &
+wximgview $GRASS_RENDER_FILE percent=50 &
 d.rast elevation.dem
 d.vect roads
 </pre></div>

visualization/ximgview/ximgview.html

@@ -8,7 +8,7 @@ continually refreshed.
 <h2>NOTES</h2>
 
 The display driver must be configure to map the file, with
-<em>GRASS_PNG_MAPPED=TRUE</em>. This ensures that the file will remain
+<em>GRASS_RENDER_FILE_MAPPED=TRUE</em>. This ensures that the file will remain
 a constant size, rather than being truncated whenever it is updated.
 
 
@@ -16,15 +16,15 @@ a constant size, rather than being truncated whenever it is updated.
 
 (bash shell syntax)
 <div class="code"><pre>
-export GRASS_PNGFILE=map.bmp
-export GRASS_WIDTH=640
-export GRASS_HEIGHT=480
+export GRASS_RENDER_FILE=map.bmp
+export GRASS_RENDER_WIDTH=640
+export GRASS_RENDER_HEIGHT=480
 export GRASS_RENDER_IMMEDIATE=PNG
-export GRASS_PNG_MAPPED=TRUE
-export GRASS_PNG_READ=TRUE
+export GRASS_RENDER_FILE_MAPPED=TRUE
+export GRASS_RENDER_FILE_READ=TRUE
 
 d.erase
-ximgview $GRASS_PNGFILE percent=50 &
+ximgview $GRASS_RENDER_FILE percent=50 &
 d.rast elevation.dem
 d.vect roads
 </pre></div>