Remove display_raster.h; merged with display.h

Remove unused R__* functions
Rename remaining R_* functions to D_*



git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38015 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.barscale/draw_scale.c

@@ -6,7 +6,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "options.h"
 
 #define NUMSCALES	16
@@ -74,7 +73,7 @@ int draw_scale(int toptext)
 
     /* Establish text size */
     size = 14;
-    R_text_size(size, size);
+    D_text_size(size, size);
 
     D_setup_unity(0);
     D_get_src(&t, &b, &l, &r);
@@ -117,7 +116,7 @@ int draw_scale(int toptext)
 
 	/* actual text width is 81% of size? from d.legend */
 	D_pos_abs(pl + w / 2 - 7 * .81, pt + 14);
-	R_text("N");
+	D_text("N");
 
 	return 0;
     }
@@ -248,11 +247,11 @@ int draw_scale(int toptext)
 	D_pos_abs(x_pos + 25 - draw * 10 + line_len / 2.
 		  - strlen(scales[incr].name) * size * 0.81 / 2,
 		  y_pos);
-	R_text(scales[incr].name);
+	D_text(scales[incr].name);
     }
     else {
 	D_pos_abs(x_pos + 35 - draw * 10 + line_len, y_pos + 20);
-	R_text(scales[incr].name);
+	D_text(scales[incr].name);
     }
 
     return (0);

display/d.barscale/main.c

@@ -26,7 +26,6 @@
 
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "options.h"
 #include <grass/glocale.h>
 
@@ -115,7 +114,7 @@ int main(int argc, char **argv)
     sscanf(opt3->answers[1], "%lf", &north);
 
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup(0);
@@ -131,7 +130,7 @@ int main(int argc, char **argv)
     /* Draw the scale */
     draw_scale(top->answer);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.colors/get_info.c

@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include "colors.h"
 

display/d.colors/interact.c

@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "graphics.h"
 #include "colors.h"
 

display/d.colors/main.c

@@ -20,7 +20,6 @@
 #include <grass/gis.h>
 #include <grass/glocale.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "colors.h"
 
 int main(int argc, char **argv)

display/d.colortable/main.c

@@ -25,7 +25,6 @@
 #include <grass/display.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char **argv)
@@ -133,7 +132,7 @@ int main(int argc, char **argv)
 	G_fatal_error(_("Color file for <%s> not available"), map_name);
     if (Rast_read_fp_range(map_name, "", &fp_range) == -1)
 	G_fatal_error(_("Range file for <%s> not available"), map_name);
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup_unity(0);
@@ -261,7 +260,7 @@ int main(int argc, char **argv)
 	}
     }
 
-    R_close_driver();
+    D_close_driver();
 
     return 0;
 }

display/d.erase/main.c

@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])
@@ -47,7 +46,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(1);
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup_unity(0);
@@ -55,9 +54,9 @@ int main(int argc, char *argv[])
     D_erase(color->answer);
 
     if (eraseframe->answer)
-	R_erase();
+	D__erase();
 
-    R_close_driver();
+    D_close_driver();
 
     exit(0);
 }

display/d.extract/extract.c

@@ -4,7 +4,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

display/d.extract/main.c

@@ -20,7 +20,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>

display/d.font/main.c

@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 static char **fonts;
@@ -82,18 +81,18 @@ int main(int argc, char **argv)
 	exit(EXIT_FAILURE);
 
     /* load the font */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     if (flag1->answer) {	/* List font names */
 	print_font_list(stdout, 0);
-	R_close_driver();
+	D_close_driver();
 	exit(EXIT_SUCCESS);
     }
 
     if (flag2->answer) {	/* List fonts verbosely */
 	print_font_list(stdout, 1);
-	R_close_driver();
+	D_close_driver();
 	exit(EXIT_SUCCESS);
     }
 
@@ -108,7 +107,7 @@ int main(int argc, char **argv)
 	if (!S_ISREG(info.st_mode))
 	    G_fatal_error(_("Font path %s is not a file"), opt2->answer);
 	else
-	    R_font(opt2->answer);
+	    D_font(opt2->answer);
     }
     else if (opt1->answer) {	/* Font name from fontcap */
 	int i = 0;
@@ -117,7 +116,7 @@ int main(int argc, char **argv)
 	read_freetype_fonts(0);
 	while (i < num_fonts) {
 	    if (strcmp(opt1->answer, fonts[i]) == 0) {
-		R_font(opt1->answer);
+		D_font(opt1->answer);
 		break;
 	    }
 	    i++;
@@ -128,10 +127,10 @@ int main(int argc, char **argv)
     }
 
     if (opt3->answer)		/* Set character encoding */
-	R_encoding(opt3->answer);
+	D_encoding(opt3->answer);
 
     /* add this command to the list */
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }
@@ -143,9 +142,9 @@ static void read_freetype_fonts(int verbose)
     int i;
 
     if (verbose)
-	R_font_info(&list, &count);
+	D_font_info(&list, &count);
     else
-	R_font_list(&list, &count);
+	D_font_list(&list, &count);
 
     if (max_fonts < num_fonts + count) {
 	max_fonts = num_fonts + count;

display/d.fontlist/main.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 
 int main(int argc, char **argv)
@@ -49,18 +49,18 @@ int main(int argc, char **argv)
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     if (flagL->answer)
-	R_font_info(&list, &count);
+	D_font_info(&list, &count);
     else
-	R_font_list(&list, &count);
+	D_font_list(&list, &count);
 
     for (i = 0; i < count; i++)
 	fprintf(stdout, "%s\n", list[i]);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.geodesic/main.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 
@@ -92,7 +91,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
 
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     line_color = D_translate_color(parm.lcolor->answer);
@@ -114,7 +113,7 @@ int main(int argc, char *argv[])
 
     plot(lon1, lat1, lon2, lat2, line_color, text_color);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.geodesic/plot.c

@@ -1,6 +1,5 @@
 #include <string.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/gis.h>
 #include <stdio.h>
 #include "local_proto.h"
@@ -56,7 +55,7 @@ void plot(double lon1, double lat1, double lon2, double lat2,
 	double t, b, l, r;
 	char buf[100];
 
-	R_text_size(10, 10);
+	D_text_size(10, 10);
 
 	distance = G_geodesic_distance(lon1, lat1, lon2, lat2);
 	sprintf(buf, "%.0f miles", METERS_TO_MILES(distance));
@@ -76,6 +75,6 @@ void plot(double lon1, double lat1, double lon2, double lat2,
 	D_use_color(text_color);
 
 	D_pos_abs(text_x, text_y);
-	R_text(buf);
+	D_text(buf);
     }
 }

display/d.graph/do_graph.c

@@ -3,7 +3,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include <grass/glocale.h>
 
@@ -50,7 +49,7 @@ int set_graph_stuff(void)
 int set_text_size(void)
 {
     if (hsize >= 0. && vsize >= 0. && hsize <= 100. && vsize <= 100.) {
-	R_text_size(hsize * xincr, vsize * yincr);
+	D_text_size(hsize * xincr, vsize * yincr);
 	G_debug(3, "text size initialized to [%.1f,%.1f]",
 		hsize * xincr, vsize * yincr);
     }
@@ -203,7 +202,7 @@ int do_size(const char *str)
     if (xper < 0. || yper < 0. || xper > 100. || yper > 100.)
 	return (-1);
 
-    R_text_size(xper * xincr, yper * yincr);
+    D_text_size(xper * xincr, yper * yincr);
     G_debug(3, "text size set to [%.1f,%.1f]",
 	    xper * xincr, yper * yincr);
 
@@ -217,7 +216,7 @@ int do_rotate(const char *str)
 	return (-1);
     }
 
-    R_text_rotation(rotation);
+    D_text_rotation(rotation);
     G_debug(3, "rotation set to %.1f degrees", rotation);
 
     return (0);
@@ -232,7 +231,7 @@ int do_text(const char *str)
 	;
     for (; *ptr == ' '; ptr++)
 	;
-    R_text(ptr);
+    D_text(ptr);
 
     return 0;
 }

display/d.graph/main.c

@@ -33,7 +33,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 #include "options.h"
@@ -96,7 +95,7 @@ int main(int argc, char **argv)
 	infile = stdin;
 
     /* open graphics window */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     /* Parse and select color */
@@ -128,7 +127,7 @@ int main(int argc, char **argv)
     set_text_size();
     graphics(infile);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.grid/main.c

@@ -23,7 +23,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 
@@ -207,7 +206,7 @@ int main(int argc, char **argv)
     }
 
     /* Setup driver and check important information */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
 
@@ -245,7 +244,7 @@ int main(int argc, char **argv)
 	plot_border(size, east, north);
     }
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.grid/plot.c

@@ -4,7 +4,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 
@@ -45,8 +44,8 @@ int plot_grid(double grid_size, double east, double north, int do_text,
 	if (do_text) {
 	    D_use_color(tcolor);
 	    G_format_easting(x, text, G_projection());
-	    R_text_rotation(270.0);
-	    R_text_size(fontsize, fontsize);
+	    D_text_rotation(270.0);
+	    D_text_size(fontsize, fontsize);
 
 	    /* Positioning -
 	       x: 4 pixels to the right of the grid line, + 0.5 rounding factor.
@@ -57,11 +56,11 @@ int plot_grid(double grid_size, double east, double north, int do_text,
 		       D_get_u_south()
 		       - D_get_d_to_u_yconv() * (strlen(text) * fontsize * 0.81) - 7.5);
 
-	    R_text(text);
+	    D_text(text);
 	}
 	x += grid_size;
     }
-    R_text_rotation(0.0);	/* reset */
+    D_text_rotation(0.0);	/* reset */
 
 
     /* Draw horizontal grids
@@ -89,7 +88,7 @@ int plot_grid(double grid_size, double east, double north, int do_text,
 	if (do_text) {
 	    D_use_color(tcolor);
 	    G_format_northing(y, text, G_projection());
-	    R_text_size(fontsize, fontsize);
+	    D_text_size(fontsize, fontsize);
 
 	    /* Positioning -
 	       x: End of text is 7 pixels left from right edge of screen, +.5 rounding.
@@ -101,7 +100,7 @@ int plot_grid(double grid_size, double east, double north, int do_text,
 		- D_get_d_to_u_xconv() * (strlen(text) * fontsize * 0.81 - 7.5),
 		y + D_get_d_to_u_yconv() * 4.5);
 
-	    R_text(text);
+	    D_text(text);
 	}
 	y += grid_size;
     }
@@ -209,11 +208,11 @@ int plot_geogrid(double size, struct pj_info info_in, struct pj_info info_out,
 	    D_use_color(tcolor);
 
 	    G_format_northing(g, text, PROJECTION_LL);
-	    R_text_rotation(font_angle);
-	    R_text_size(fontsize, fontsize);
+	    D_text_rotation(font_angle);
+	    D_text_size(fontsize, fontsize);
 	    D_pos_abs(D_get_u_west() + D_get_d_to_u_xconv() * border_off,
 		      start_coord - D_get_d_to_u_yconv() * grid_off);
-	    R_text(text);
+	    D_text(text);
 	}
     }
 
@@ -261,15 +260,15 @@ int plot_geogrid(double size, struct pj_info info_in, struct pj_info info_out,
 	    D_use_color(tcolor);
 
 	    G_format_easting(g, text, PROJECTION_LL);
-	    R_text_rotation(font_angle);
-	    R_text_size(fontsize, fontsize);
+	    D_text_rotation(font_angle);
+	    D_text_size(fontsize, fontsize);
 	    D_pos_abs(start_coord + D_get_d_to_u_xconv() * (grid_off + 1.5),
 		      D_get_u_north() + D_get_d_to_u_yconv() * border_off);
-	    R_text(text);
+	    D_text(text);
 	}
     }
 
-    R_text_rotation(0.0);	/* reset */
+    D_text_rotation(0.0);	/* reset */
 
     return 0;
 

display/d.his/main.c

@@ -25,7 +25,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "his.h"
 
@@ -111,7 +110,7 @@ int main(int argc, char **argv)
 
     /* Do screen initializing stuff */
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     /* Prepare the raster cell drawing functions */
@@ -244,7 +243,7 @@ int main(int argc, char **argv)
     D_cell_draw_end();
 
     /* Close down connection to display driver */
-    R_close_driver();
+    D_close_driver();
 
     /* Close the raster maps */
     Rast_close_cell(hue_file);

display/d.histogram/bar.c

@@ -30,7 +30,6 @@
 
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 
 #include "bar.h"
 
@@ -317,17 +316,17 @@ int bar(struct stat_list *dist_stats,	/* list of distribution statistics */
 		sprintf(txt, "%d", (int)(i / tic_unit));
 	    text_height = (b - t) * TEXT_HEIGHT;
 	    text_width = (r - l) * TEXT_WIDTH;
-	    R_text_size(text_width, text_height);
+	    D_text_size(text_width, text_height);
 	    D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    while ((tr - tl) > XTIC_DIST) {
 		text_width *= 0.75;
 		text_height *= 0.75;
-		R_text_size(text_width, text_height);
+		D_text_size(text_width, text_height);
 		D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    }
 	    D_pos_abs(xoffset + (i - dist_stats->mincat) * xscale - 0.5 * xscale - (tr - tl) / 2,
 		      b - XNUMS_Y * (b - t));
-	    R_text(txt);
+	    D_text(txt);
 	}
 	else if (rem(i, tic_unit) == 0.0) {
 	    /* draw a tic-mark */
@@ -348,12 +347,12 @@ int bar(struct stat_list *dist_stats,	/* list of distribution statistics */
 	sprintf(xlabel, "X-AXIS: Cell Values");
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
     D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
 	       b - LABEL_1 * (b - t));
     D_use_color(color);
-    R_text(xlabel);
+    D_text(xlabel);
 
     /* DRAW Y-AXIS TIC-MARKS AND NUMBERS
      * 
@@ -393,17 +392,17 @@ int bar(struct stat_list *dist_stats,	/* list of distribution statistics */
 	    sprintf(txt, "%d", (int)(i / tic_unit));
 	    text_height = (b - t) * TEXT_HEIGHT;
 	    text_width = (r - l) * TEXT_WIDTH;
-	    R_text_size(text_width, text_height);
+	    D_text_size(text_width, text_height);
 	    D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    while ((tt - tb) > YTIC_DIST) {
 		text_width *= 0.75;
 		text_height *= 0.75;
-		R_text_size(text_width, text_height);
+		D_text_size(text_width, text_height);
 		D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    }
 	    D_pos_abs(l + (r - l) * YNUMS_X - (tr - tl) / 2,
 		      yoffset - (yscale * i + 0.5 * (tt - tb)));
-	    R_text(txt);
+	    D_text(txt);
 	}
 	else if (rem(i, tic_unit) == 0.0) {
 	    /* draw a tic-mark */
@@ -431,12 +430,12 @@ int bar(struct stat_list *dist_stats,	/* list of distribution statistics */
 
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(ylabel, &tt, &tb, &tl, &tr);
     D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
 	      b - LABEL_2 * (b - t));
     D_use_color(color);
-    R_text(ylabel);
+    D_text(ylabel);
 
     /* draw x and y axis lines */
     D_use_color(color);

display/d.histogram/draw_slice.c

@@ -1,5 +1,4 @@
 #include <math.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
@@ -80,7 +79,7 @@ int draw_slice(struct Colors *colors, int fill_flag, DCELL fill_color1, DCELL fi
 	ly = y[0] - (r + 0.03) * (height) * sin(arc / 57.296) + (tb - tt) / 2;
 	D_pos_abs(lx, ly);
 	D_use_color(txt_color);
-	R_text(txt);
+	D_text(txt);
     }
 
     return 0;

display/d.histogram/main.c

@@ -36,7 +36,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 #include "options.h"
@@ -185,7 +184,7 @@ int main(int argc, char **argv)
 
     /* set up the graphics driver and initialize its color-table */
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup_unity(0);			/* 0 = don't clear frame */
@@ -199,12 +198,12 @@ int main(int argc, char **argv)
     sprintf(title, "%s", map_name);
     text_height = (b - t) * 0.05;
     text_width = (r - l) * 0.05 * 0.50;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(title, &tt, &tb, &tl, &tr);
     D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
 	      t + (b - t) * 0.07);
     D_use_color(color);
-    R_text(title);
+    D_text(title);
 
     /* plot the distributrion statistics */
     if (style == PIE)
@@ -212,7 +211,7 @@ int main(int argc, char **argv)
     else
 	bar(&dist_stats, &pcolors);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.histogram/pie.c

@@ -32,7 +32,6 @@
 
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 
 #include "pie.h"
 
@@ -150,7 +149,7 @@ int pie(struct stat_list *dist_stats,	/* list of distribution statistics */
     for (i = dist_stats->mincat; i <= dist_stats->maxcat; i++) {
 	text_height = height * 0.7 * TEXT_HEIGHT;
 	text_width = width * 0.7 * TEXT_WIDTH;
-	R_text_size(text_width, text_height);
+	D_text_size(text_width, text_height);
 	draw = NO;
 	/* figure color and height of the slice of pie 
 	 *
@@ -346,12 +345,12 @@ int pie(struct stat_list *dist_stats,	/* list of distribution statistics */
 		sprintf(txt, "%d", (int)(i / tic_unit));
 	    text_height = height * TEXT_HEIGHT;
 	    text_width = width * TEXT_WIDTH;
-	    R_text_size(text_width, text_height);
+	    D_text_size(text_width, text_height);
 	    D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    while ((tr - tl) > XTIC_DIST) {
 		text_width *= 0.95;
 		text_height *= 0.95;
-		R_text_size(text_width, text_height);
+		D_text_size(text_width, text_height);
 		D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    }
 	    D_pos_abs(xoffset
@@ -359,7 +358,7 @@ int pie(struct stat_list *dist_stats,	/* list of distribution statistics */
 		      - 0.5 * xscale
 		      - (tr - tl) / 2,
 		      b - XNUMS_Y * height);
-	    R_text(txt);
+	    D_text(txt);
 	}
 	else if (rem(i, tic_unit) == 0.0) {
 	    /* draw a tic-mark */
@@ -390,12 +389,12 @@ int pie(struct stat_list *dist_stats,	/* list of distribution statistics */
 	sprintf(xlabel, "Cell Values");
     text_height = height * TEXT_HEIGHT;
     text_width = width * TEXT_WIDTH;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
     D_pos_abs(l + width / 2 - (tr - tl) / 2,
 	      b - LABEL * height);
     D_use_color(color);
-    R_text(xlabel);
+    D_text(xlabel);
 
     return 0;
 }

display/d.info/main.c

@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 
@@ -64,12 +63,12 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
     }
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
 
     if (rflag->answer || dflag->answer || fflag->answer)
-	R_get_window(&t, &b, &l, &r);
+	D_get_window(&t, &b, &l, &r);
 
 
     if (rflag->answer)
@@ -109,7 +108,7 @@ int main(int argc, char *argv[])
 	fprintf(stdout, "nsres=%.15g\n", (n-s)/(b-t) );
     }
 
-    R_close_driver();
+    D_close_driver();
 
     return EXIT_SUCCESS;
 }

display/d.labels/do_labels.c

@@ -5,7 +5,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 
@@ -185,7 +184,7 @@ int show_it(void)
     Y0 = north;
 
     /* Set font */
-    R_font(font);
+    D_font(font);
 
     /* Set text size */
     if (fontsize) {
@@ -199,7 +198,7 @@ int show_it(void)
 
     line_size = text_size * 1.2;
 
-    R_text_size(d_text_size, d_text_size);
+    D_text_size(d_text_size, d_text_size);
 
     /* Find extent of all text (assume ref point is upper left) */
     T = -1e300;
@@ -238,7 +237,7 @@ int show_it(void)
 
 	Y = north - (line_size * 1.2) - ((n_lines - 1) * line_size);
 	D_pos_abs(X, Y);
-	R_text_rotation(0.0);	/* reset */
+	D_text_rotation(0.0);	/* reset */
 	D_get_text_box(line, &t, &b, &l, &r);
 
 	if (T < t)
@@ -339,7 +338,7 @@ int show_it(void)
     }
 
     /* Set font rotation */
-    R_text_rotation(rotation);
+    D_text_rotation(rotation);
     G_debug(3, "  rotation = %.2f", rotation);
 
     /**** draw highlighted text background ****/
@@ -373,22 +372,22 @@ int show_it(void)
 	    for (j = 1; j <= highlight_width; j++) {
 		/* smear it around. probably a better way (knight's move? rand?) */
 		D_pos_abs(text_x + Xoffset, text_y + Yoffset + j);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset, text_y + Yoffset - j);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset + j, text_y + Yoffset);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset - j, text_y + Yoffset);
-		R_text(line);
+		D_text(line);
 
 		D_pos_abs(text_x + Xoffset + j, text_y + Yoffset + j);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset - j, text_y + Yoffset - j);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset + j, text_y + Yoffset - j);
-		R_text(line);
+		D_text(line);
 		D_pos_abs(text_x + Xoffset - j, text_y + Yoffset + j);
-		R_text(line);
+		D_text(line);
 	    }
 
 	    if ((*tptr == '\0') || (*tptr == NL))
@@ -427,7 +426,7 @@ int show_it(void)
 	G_rotate_around_point(X, Y0, &text_x, &text_y, -1 * rotation);
 
 	D_pos_abs(text_x + Xoffset, text_y + Yoffset);
-	R_text(line);
+	D_text(line);
 
 	if ((*tptr == '\0') || (*tptr == NL))
 	    break;

display/d.labels/main.c

@@ -21,7 +21,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 
@@ -96,7 +95,7 @@ int main(int argc, char **argv)
 	minreg = atof(minreg_opt->answer);
 	if (reg < minreg) {
 	    G_warning(_("Region size is lower than minreg, nothing displayed."));
-	    R_close_driver();
+	    D_close_driver();
 	    exit(0);
 	}
     }
@@ -104,7 +103,7 @@ int main(int argc, char **argv)
 	maxreg = atof(maxreg_opt->answer);
 	if (reg > maxreg) {
 	    G_warning(_("Region size is greater than maxreg, nothing displayed."));
-	    R_close_driver();
+	    D_close_driver();
 	    exit(0);
 	}
     }
@@ -114,7 +113,7 @@ int main(int argc, char **argv)
     if (infile == NULL)
 	G_fatal_error(_("Unable to open label file <%s>"), label_name);
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup(0);
@@ -122,7 +121,7 @@ int main(int argc, char **argv)
     /* Go draw the raster map */
     do_labels(infile, !horiz_flag->answer);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(0);
 }

display/d.legend/main.c

@@ -30,7 +30,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
@@ -259,7 +258,7 @@ int main(int argc, char **argv)
 
     Rast_set_c_null_value(&null_cell, 1);
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     white = D_translate_color(DEFAULT_FG_COLOR);
@@ -464,7 +463,7 @@ int main(int argc, char **argv)
 		    y0 = ((b - t) - (dots_per_line * lines)) / 2;
 	}
 
-	/*      R_text_size((int)(dots_per_line*4/5), (int)(dots_per_line*4/5)) ;    redundant */
+	/*      D_text_size((int)(dots_per_line*4/5), (int)(dots_per_line*4/5)) ;    redundant */
 	/* if(Rast_is_c_null_value(&min_ind) && Rast_is_c_null_value(&max_ind))
 	   {
 	   min_ind = 1;
@@ -656,7 +655,7 @@ int main(int argc, char **argv)
 	    if (txsiz < 0)
 		txsiz = 0;	/* keep it sane */
 
-	    R_text_size(txsiz, txsiz);
+	    D_text_size(txsiz, txsiz);
 	    D_use_color(color);
 
 	    ppl = (lleg) / (steps - 1);
@@ -671,7 +670,7 @@ int main(int argc, char **argv)
 	    }
 	    else {
 		/* text width is 0.81 of text height? so even though we set width 
-		   to txsiz with R_text_size(), we still have to reduce.. hmmm */
+		   to txsiz with D_text_size(), we still have to reduce.. hmmm */
 		if (!k)		/* first  */
 		    D_pos_abs(x0 - (strlen(buff) * txsiz * .81 / 2),
 			       y1 + 4 + txsiz);
@@ -684,7 +683,7 @@ int main(int argc, char **argv)
 			       y1 + 4 + txsiz);
 	    }
 
-	    R_text(buff);
+	    D_text(buff);
 
 	}			/*for */
 
@@ -751,7 +750,7 @@ int main(int argc, char **argv)
 	if (dots_per_line < txsiz)
 	    txsiz = dots_per_line;
 
-	R_text_size(txsiz, txsiz);
+	D_text_size(txsiz, txsiz);
 
 
 	/* Set up box arrays */
@@ -863,7 +862,7 @@ int main(int argc, char **argv)
 	    }
 
 	    D_pos_abs((l + 3 + dots_per_line), (cur_dot_row) - 3);
-	    R_text(buff);
+	    D_text(buff);
 	}
 
 	if (0 == k)
@@ -881,14 +880,14 @@ int main(int argc, char **argv)
 	    ScaleFactor = ((true_r - true_l) / (MaxLabelLen * txsiz * 0.81));	/* ?? txsiz*.81=actual text width. */
 	    if (ScaleFactor < 1.0) {
 		txsiz = (int)floor(txsiz * ScaleFactor);
-		R_text_size(txsiz, txsiz);
+		D_text_size(txsiz, txsiz);
 	    }
 	    D_use_color(white);
 	    D_pos_abs((l + 3 + dots_per_line), (cur_dot_row));
-	    R_text(buff);
+	    D_text(buff);
 	}
     }
 
-    R_close_driver();
+    D_close_driver();
     exit(EXIT_SUCCESS);
 }

display/d.linegraph/main.c

@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>
@@ -254,7 +253,7 @@ int main(int argc, char **argv)
     }
 
     /* get coordinates of current screen window, in pixels */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
     D_setup_unity(0);
     D_get_src(&t, &b, &l, &r);
@@ -268,7 +267,7 @@ int main(int argc, char **argv)
     y_line[1] = y_line[2] = b - (ORIGIN_Y * height);
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
 
     /* read thru each data file in turn, find max and min values for
        each, count lines, find x min and max, find overall y min and
@@ -340,7 +339,7 @@ int main(int argc, char **argv)
 
     for (i = 0; i <= num_y_files; i++) {
 	if ((in[i].fp = fopen(in[i].full_name, "r")) == NULL) {
-	    R_close_driver();
+	    D_close_driver();
 	    G_fatal_error(_("Unable to open input file <%s>"), in[i].full_name);
 	}
     }
@@ -359,7 +358,7 @@ int main(int argc, char **argv)
 
 	/* didn't find a number or hit EOF before our time */
 	if ((err != 1) || (err == EOF)) {
-	    R_close_driver();
+	    D_close_driver();
 	    G_fatal_error(_("Problem reading X data file at line %d"), line);
 	}
 
@@ -369,7 +368,7 @@ int main(int argc, char **argv)
 	    if (line < in[i].num_pnts) {
 		err = fscanf(in[i].fp, "%f", &in[i].value);
 		if ((in[i].num_pnts >= line) && (err != 1)) {
-		    R_close_driver();
+		    D_close_driver();
 		    G_fatal_error(_("Problem reading <%s> data file at line %d"),
 				  in[i].name, line);
 		}
@@ -432,17 +431,17 @@ int main(int argc, char **argv)
 		sprintf(txt, "%.2f", (in[0].value));
 	    text_height = (b - t) * TEXT_HEIGHT;
 	    text_width = (r - l) * TEXT_WIDTH;
-	    R_text_size(text_width, text_height);
+	    D_text_size(text_width, text_height);
 	    D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    while ((tr - tl) > XTIC_DIST) {
 		text_width *= 0.75;
 		text_height *= 0.75;
-		R_text_size(text_width, text_height);
+		D_text_size(text_width, text_height);
 		D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    }
 	    D_pos_abs((xoffset + (line * xscale - (tr - tl) / 2)),
 		       (b - XNUMS_Y * (b - t)));
-	    R_text(txt);
+	    D_text(txt);
 	}
 	else if (rem(line, tic_unit) == 0.0) {
 
@@ -470,12 +469,12 @@ int main(int argc, char **argv)
 	sprintf(xlabel, "X: %s %s", title[0]->answer, tic_name);
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH * 1.5;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
     D_pos_abs((l + (r - l) / 2 - (tr - tl) / 2),
 	      (b - LABEL_1 * (b - t)));
     D_use_color(title_color);
-    R_text(xlabel);
+    D_text(xlabel);
 
     /* DRAW Y-AXIS TIC-MARKS AND NUMBERS
        first, figure tic_every and tic_units for the x-axis of the bar-chart.
@@ -514,17 +513,17 @@ int main(int argc, char **argv)
 	    sprintf(txt, "%d", (i / tic_unit));
 	    text_height = (b - t) * TEXT_HEIGHT;
 	    text_width = (r - l) * TEXT_WIDTH;
-	    R_text_size(text_width, text_height);
+	    D_text_size(text_width, text_height);
 	    D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    while ((tt - tb) > YTIC_DIST) {
 		text_width *= 0.75;
 		text_height *= 0.75;
-		R_text_size(text_width, text_height);
+		D_text_size(text_width, text_height);
 		D_get_text_box(txt, &tt, &tb, &tl, &tr);
 	    }
 	    D_pos_abs(l + (r - l) * YNUMS_X - (tr - tl) / 2,
 		      yoffset - (yscale * (i - min_y) + 0.5 * (tt - tb)));
-	    R_text(txt);
+	    D_text(txt);
 	}
 	else if (rem(i, tic_unit) == 0.0) {
 	    /* draw a tic-mark */
@@ -543,31 +542,31 @@ int main(int argc, char **argv)
 	sprintf(xlabel, "Y: %s %s", title[1]->answer, tic_name);
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH * 1.5;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
     D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2, b - LABEL_2 * (b - t));
     D_use_color(title_color);
-    R_text(xlabel);
+    D_text(xlabel);
 
     /* top label */
     sprintf(xlabel, title[2]->answer);
     text_height = (b - t) * TEXT_HEIGHT;
     text_width = (r - l) * TEXT_WIDTH * 2.0;
-    R_text_size(text_width, text_height);
+    D_text_size(text_width, text_height);
     D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
     /*
-       R_move_abs((int)(((r-l)/2)-(tr-tl)/2),
+       D_move_abs((int)(((r-l)/2)-(tr-tl)/2),
        (int) (t+ (b-t)*.07) );
      */
     D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2, t + (b - t) * .07);
     D_use_color(title_color);
-    R_text(xlabel);
+    D_text(xlabel);
 
     /* draw x and y axis lines */
     D_use_color(title_color);
     D_polyline_abs(x_line, y_line, 3);
 
-    R_close_driver();
+    D_close_driver();
     exit(EXIT_SUCCESS);
 }
 

display/d.measure/draw_line.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "local_proto.h"
 
 int

display/d.measure/main.c

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.measure/msurements.c

@@ -1,6 +1,5 @@
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 

display/d.nviz/main.c

@@ -26,7 +26,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local.h"
 #include <grass/glocale.h>
 

display/d.path/main.c

@@ -21,7 +21,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>
@@ -149,7 +148,7 @@ int main(int argc, char **argv)
 	G_fatal_error(_("%s - illegal y value"), coor_opt->answers[3]);
 
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     color = G_standard_color_rgb(BLACK);
@@ -192,7 +191,7 @@ int main(int argc, char **argv)
     coor_path(&Map, &hcolor, bold_f->answer, x1, y1, x2, y2);
 
 
-    R_close_driver();
+    D_close_driver();
 
     Vect_close(&Map);
 

display/d.path/select.c

@@ -4,7 +4,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>

display/d.profile/main.c

@@ -24,7 +24,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 
@@ -101,19 +100,19 @@ static void plot_axes(void)
 
     /* set text size for y-axis labels */
     scale = fabs(D_get_u_to_d_yconv());
-    R_text_size(scale * 0.04, scale * 0.05);
+    D_text_size(scale * 0.04, scale * 0.05);
 
     /* plot y-axis label (bottom) */
     sprintf(str, "%.1f", min);
     D_get_text_box(str, &t, &b, &l, &r);
     D_pos_abs(-0.02 - (r - l), 0 - (t - b) / 2);
-    R_text(str);
+    D_text(str);
 
     /* plot y-axis label (top) */
     sprintf(str, "%.1f", max);
     D_get_text_box(str, &t, &b, &l, &r);
     D_pos_abs(-0.02 - (r - l), 1 - (t - b) / 2);
-    R_text(str);
+    D_text(str);
 }
 
 static int get_cell(DCELL *result, int fd, double x, double y)
@@ -259,7 +258,7 @@ int main(int argc, char **argv)
 	G_fatal_error(_("At least two points are required"));
 
     /* establish connection with graphics driver */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup2(1, 0, 1.05, -0.05, -0.15, 1.05);
@@ -314,7 +313,7 @@ int main(int argc, char **argv)
     D_end();
     D_stroke();
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.rast.arrow/main.c

@@ -39,7 +39,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>
@@ -221,7 +220,7 @@ int main(int argc, char **argv)
 
 
     /* Setup driver and check important information */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup(0);
@@ -506,7 +505,7 @@ int main(int argc, char **argv)
     if (opt7->answer)
 	Rast_close_cell(mag_fd);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(0);
 }

display/d.rast.num/main.c

@@ -39,7 +39,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>
@@ -192,7 +191,7 @@ int main(int argc, char **argv)
 
     /* Setup driver and check important information */
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup2(0, 0, t, b, l, r);
@@ -244,7 +243,7 @@ int main(int argc, char **argv)
 
     Rast_close_cell(layer_fd);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }
@@ -288,14 +287,14 @@ int draw_number(int row, int col, double number, int prec, RASTER_MAP_TYPE map_t
 	rite = text_size * len;
     }
 
-    R_text_size(text_size, text_size);
+    D_text_size(text_size, text_size);
 
     D_pos_abs(col, row + 0.7);
     D_get_text_box(no, &tt, &tb, &tl, &tr);
 
     dx = (tr + tl) / 2 - (col + 0.5);
     D_pos_abs(col - dx, row + 0.7);
-    R_text(no);
+    D_text(no);
 
     return 0;
 }

display/d.rast/display.c

@@ -2,7 +2,6 @@
 
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 

display/d.rast/main.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 #include "mask.h"
 #include "local_proto.h"
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
     overlay = !flag_n->answer;
     invert = flag_i->answer;
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     fp = Rast_raster_map_is_fp(name, "");
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
     else
 	display(name, overlay, bg->answer, CELL_TYPE, invert);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.rgb/main.c

@@ -23,7 +23,6 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 struct band
@@ -79,7 +78,7 @@ int main(int argc, char **argv)
 	exit(EXIT_FAILURE);
 
     /* Do screen initializing stuff */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     D_setup(0);
@@ -129,7 +128,7 @@ int main(int argc, char **argv)
     G_percent(window.rows, window.rows, 5);
     D_cell_draw_end();
 
-    R_close_driver();
+    D_close_driver();
 
     /* Close the raster maps */
     for (i = 0; i < 3; i++)

display/d.rhumbline/main.c

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 
@@ -92,7 +91,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
 
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     line_color = D_translate_color(parm.lcolor->answer);
@@ -115,7 +114,7 @@ int main(int argc, char *argv[])
 
     plot(lon1, lat1, lon2, lat2, line_color, text_color);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.rhumbline/plot.c

@@ -2,7 +2,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 void plot(double lon1, double lat1, double lon2, double lat2,

display/d.text/main.c

@@ -58,7 +58,6 @@
 #include <unistd.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>
 
@@ -276,17 +275,17 @@ int main(int argc, char **argv)
 
     bold = flag.b->answer;
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
 
     if (opt.font->answer)
-	R_font(opt.font->answer);
+	D_font(opt.font->answer);
     else if (opt.path->answer)
-	R_font(opt.path->answer);
+	D_font(opt.path->answer);
 
     if (opt.charset->answer)
-	R_encoding(opt.charset->answer);
+	D_encoding(opt.charset->answer);
 
     D_setup_unity(0);
 
@@ -322,8 +321,8 @@ int main(int argc, char **argv)
     prev_x = x;
     prev_y = y;
 
-    R_text_size(size, size);
-    R_text_rotation(rotation * 180.0 / M_PI);
+    D_text_size(size, size);
+    D_text_rotation(rotation * 180.0 / M_PI);
 
     if (text) {
 	double x2, y2;
@@ -335,10 +334,10 @@ int main(int argc, char **argv)
 	    draw_text(text, &x2, &y2, size, align, rotation, bold);
 
 	/* reset */
-	R_text_size(5, 5);
-	R_text_rotation(0.0);
+	D_text_size(5, 5);
+	D_text_rotation(0.0);
 
-	R_close_driver();
+	D_close_driver();
 
 	exit(EXIT_SUCCESS);
     }
@@ -380,9 +379,9 @@ int main(int argc, char **argv)
 		/* font */
 		if ((ptr = strchr(buf_ptr, ':')))
 		    *ptr = 0;
-		R_font(buf_ptr);
+		D_font(buf_ptr);
 		if (ptr)
-		    R_encoding(ptr + 1);
+		    D_encoding(ptr + 1);
 		break;
 	    case 'C':
 		/* color */
@@ -401,7 +400,7 @@ int main(int argc, char **argv)
 		    d *= (win.b - win.t) / 100.0;
 #endif
 		size = d + (i ? size : 0);
-		R_text_size(size, size);
+		D_text_size(size, size);
 		break;
 	    case 'B':
 		/* bold */
@@ -423,7 +422,7 @@ int main(int argc, char **argv)
 		rotation = fmod(d, 2.0 * M_PI);
 		if (rotation < 0.0)
 		    rotation += 2.0 * M_PI;
-		R_text_rotation(rotation * 180.0 / M_PI);
+		D_text_rotation(rotation * 180.0 / M_PI);
 		break;
 	    case 'I':
 		/* linespacing */
@@ -517,10 +516,10 @@ int main(int argc, char **argv)
 	fclose(cmd_fp);
 
     /* reset */
-    R_text_size(5, 5);
-    R_text_rotation(0.0);
+    D_text_size(5, 5);
+    D_text_rotation(0.0);
 
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }
@@ -598,23 +597,23 @@ static void draw_text(char *text, double *x, double *y, double size, char *align
     /* R_get_text_box() does not work with rotation and returns a little bit
      * bigger dimension than actual text size */
     if (rotation != 0.0)
-	R_text_rotation(0.0);
+	D_text_rotation(0.0);
 
     D_get_text_box(text, &t, &b, &l, &r);
 
     if (rotation != 0.0)
-	R_text_rotation(rotation * 180.0 / M_PI);
+	D_text_rotation(rotation * 180.0 / M_PI);
     w = r - l;
     h = b - t;
     if (w > 0)
 	w += 0.2 * size;
     else
-	/* R_text() does not draw " ". */
+	/* D_text() does not draw " ". */
 	w = 0.8 * size;
     if (h > 0)
 	h += 0.2 * size;
     else
-	/* R_text() does not draw " ". */
+	/* D_text() does not draw " ". */
 	h = 0.8 * size;
 
     c = cos(rotation);
@@ -649,13 +648,13 @@ static void draw_text(char *text, double *x, double *y, double size, char *align
     }
 
     D_pos_abs(*x, *y);
-    R_text(text);
+    D_text(text);
 
     if (bold) {
 	D_pos_abs(*x, *y + 1);
-	R_text(text);
+	D_text(text);
 	D_pos_abs(*x + 1, *y);
-	R_text(text);
+	D_text(text);
     }
 
     *x += w * c;

display/d.thematic.area/area.c

@@ -7,7 +7,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.thematic.area/main.c

@@ -20,7 +20,6 @@
 #include <grass/config.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>
@@ -362,7 +361,7 @@ int main(int argc, char **argv)
 
     if (!nodraw_flag->answer) {
 	/* Now's let's prepare the actual plotting */
-	if (R_open_driver() != 0)
+	if (D_open_driver() != 0)
 	    G_fatal_error(_("No graphics device selected"));
 
 	D_setup(0);
@@ -407,7 +406,7 @@ int main(int argc, char **argv)
 
 	}			/* end window check if */
 
-	R_close_driver();
+	D_close_driver();
 
     }				/* end of nodraw_flag condition */
 

display/d.thematic.area/plot1.c

@@ -5,7 +5,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "plot.h"
 #include "local_proto.h"
 #include <grass/symbol.h>

display/d.title/main.c

@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>

display/d.vect.chart/bar.c

@@ -3,7 +3,6 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include "global.h"
 

display/d.vect.chart/main.c

@@ -19,7 +19,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>
@@ -249,7 +248,7 @@ int main(int argc, char **argv)
     if (ctype_opt->answer[0] == 'b')
 	ctype = CTYPE_BAR;
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     /* should we plot the maximum reference on bar plots? */
@@ -272,7 +271,7 @@ int main(int argc, char **argv)
 	       sizecol_opt->answer, size, scale,
 	       &ocolor, colors, y_center, max_reference);
 
-    R_close_driver();
+    D_close_driver();
 
     Vect_close(&Map);
 

display/d.vect.chart/pie.c

@@ -4,7 +4,6 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include "global.h"
 

display/d.vect.chart/plot.c

@@ -3,7 +3,6 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include <grass/glocale.h>
 

display/d.vect/area.c

@@ -7,7 +7,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.vect/attr.c

@@ -3,7 +3,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
@@ -60,11 +59,11 @@ int attr(struct Map_info *Map, int type, char *attrcol,
 	    continue;		/* used for both lines and labels */
 
 	D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
-	R_text_size(lattr->size, lattr->size);
+	D_text_size(lattr->size, lattr->size);
 	if (lattr->font)
-	    R_font(lattr->font);
+	    D_font(lattr->font);
 	if (lattr->enc)
-	    R_encoding(lattr->enc);
+	    D_encoding(lattr->enc);
 
 	if (chcat) {
 	    int found = 0;

display/d.vect/dir.c

@@ -2,7 +2,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "plot.h"
 

display/d.vect/label.c

@@ -2,7 +2,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"
@@ -34,11 +33,11 @@ int label(struct Map_info *Map, int type, int do_area,
 	    continue;		/* used for both lines and labels */
 
 	D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
-	R_text_size(lattr->size, lattr->size);
+	D_text_size(lattr->size, lattr->size);
 	if (lattr->font)
-	    R_font(lattr->font);
+	    D_font(lattr->font);
 	if (lattr->enc)
-	    R_encoding(lattr->enc);
+	    D_encoding(lattr->enc);
 
 	if (chcat) {
 	    int found = 0;

display/d.vect/main.c

@@ -19,7 +19,6 @@
 #include <dirent.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>
@@ -355,7 +354,7 @@ int main(int argc, char **argv)
 
     G_get_set_window(&window);
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
 
     /* Read map options */
@@ -675,7 +674,7 @@ int main(int argc, char **argv)
 	}
     }
 
-    R_close_driver();
+    D_close_driver();
 
     if (verbose)
 	G_done_msg(" ");

display/d.vect/plot1.c

@@ -5,7 +5,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "plot.h"
 #include "local_proto.h"
 #include <grass/symbol.h>

display/d.vect/topo.c

@@ -2,7 +2,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"
@@ -22,11 +21,11 @@ int topo(struct Map_info *Map, int type, int do_area, LATTR *lattr)
     Cats = Vect_new_cats_struct();
 
     D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
-    R_text_size(lattr->size, lattr->size);
+    D_text_size(lattr->size, lattr->size);
     if (lattr->font)
-	R_font(lattr->font);
+	D_font(lattr->font);
     if (lattr->enc)
-	R_encoding(lattr->enc);
+	D_encoding(lattr->enc);
 
     Vect_rewind(Map);
 

display/d.vect/utils.c

@@ -2,7 +2,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"
@@ -58,7 +57,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
     }
 
     D_pos_abs(X + Xoffset, Y + Yoffset);
-    R_text(text);
+    D_text(text);
 }
 
 void show_label_line(const struct line_pnts *Points, int ltype, LATTR *lattr, const char *text)

display/d.vect/zcoor.c

@@ -4,7 +4,6 @@
 #include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include "plot.h"
 
@@ -21,11 +20,11 @@ int zcoor(struct Map_info *Map, int type, LATTR *lattr)
     Cats = Vect_new_cats_struct();
 
     D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
-    R_text_size(lattr->size, lattr->size);
+    D_text_size(lattr->size, lattr->size);
     if (lattr->font)
-	R_font(lattr->font);
+	D_font(lattr->font);
     if (lattr->enc)
-	R_encoding(lattr->enc);
+	D_encoding(lattr->enc);
 
     Vect_rewind(Map);
 

display/d.what.rast/main.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "what.h"
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.what.rast/what.c

@@ -1,5 +1,4 @@
 #include <string.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "what.h"

display/d.what.vect/main.c

@@ -30,7 +30,6 @@
 #include <grass/gis.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
-#include <grass/display_raster.h>
 #include "what.h"
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.what.vect/what.c

@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>

display/d.where/main.c

@@ -23,7 +23,6 @@
 #include <grass/gis.h>
 #include <grass/gprojects.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 
@@ -164,11 +163,11 @@ int main(int argc, char **argv)
     else
 	fp = stdin;
 
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));
     D_setup(0);
     where_am_i(coords->answers, fp, have_spheroid, decimal->answer, dcoord->answer);
-    R_close_driver();
+    D_close_driver();
 
     exit(EXIT_SUCCESS);
 }

display/d.zoom/box.c

@@ -3,7 +3,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int make_window_box(struct Cell_head *window, double magnify, int full,

display/d.zoom/center.c

@@ -1,6 +1,5 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include "local_proto.h"
 

display/d.zoom/main.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include <grass/Vect.h>
 
 #include "local_proto.h"

display/d.zoom/pan.c

@@ -2,7 +2,6 @@
 
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.zoom/print.c

@@ -1,7 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static int max(int a, int b)

display/d.zoom/quit.c

@@ -3,7 +3,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.zoom/redraw.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

display/d.zoom/set.c

@@ -3,7 +3,6 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static double round_to(double in, int sd)

display/d.zoom/zoom.c

@@ -1,6 +1,5 @@
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

imagery/i.class/add_point.c

@@ -6,7 +6,7 @@ returns: TRUE (1) point added ok, FALSE (0) could not add, list full
 *************************************************************/
 
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 
 

imagery/i.class/del_point.c

@@ -1,6 +1,6 @@
 
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 
 

imagery/i.class/draw_cell.c

@@ -2,7 +2,6 @@
 #include <grass/gis.h>
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int draw_cell(View * view, int overlay)

imagery/i.class/draw_reg.c

@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.class/graphics.c

@@ -1,6 +1,5 @@
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static View *makeview(double bottom, double top, double left, double right)

imagery/i.class/histograms.c

@@ -1,6 +1,6 @@
 #include <math.h>
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "local_proto.h"
 
 #define MU	'l'		/* these are the characters that are printed as  */

imagery/i.class/input.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "local_proto.h"
 
 static int active = 0;

imagery/i.class/main.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.class/mouse.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 static int first = 1;
 static int curx, cury;

imagery/i.class/redisplay.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

imagery/i.class/title.c

@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.class/view.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.class/zoom_box.c

@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.points/analyze.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.points/ask.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include "globals.h"
 #include "local_proto.h"
 #define NLINES 18

imagery/i.points/ask_mag.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 struct box
 {

imagery/i.points/call.c

@@ -8,7 +8,7 @@
 #endif
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 /*
  * call a subroutine, but as a child process
  * allowing interrupts for the child

imagery/i.points/debug.c

@@ -1,7 +1,7 @@
 
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 int debug(char *msg)
 {
     R_stabilize();

imagery/i.points/dot.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 int dot(int x, int y)
 {
     double vx[5], vy[5];

imagery/i.points/drawcell.c

@@ -2,7 +2,6 @@
 #include <grass/gis.h>
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int drawcell(View * view)

imagery/i.points/graphics.c

@@ -1,7 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
 #include <grass/display.h>
-#include <grass/display_raster.h>
 
 static View *makeview(double bottom, double top, double left, double right)
 {

imagery/i.points/input.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 static int active = 0;
 static int replot;

imagery/i.points/main.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
 #include <grass/glocale.h>
 
 #include "globals.h"

imagery/i.points/mark.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 static int get_point2(double *, double *);
 static int keyboard(void);

imagery/i.points/mouse.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 static int first = 1;
 static int curx, cury;

imagery/i.points/points.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
 
 int display_points(int in_color)
 {