Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 30916)
+++ trunk/src/board.c	(revision 30917)
@@ -179,7 +179,7 @@
 	/* copy default settings */
 	for (i = 0; i < PCB_MAX_LAYER; i++)
 		if (force || (ptr->Data->Layer[i].meta.real.color.str[0] == '\0'))
-			memcpy(&ptr->Data->Layer[i].meta.real.color, pcb_layer_default_color(i, pcb_layer_flags(ptr, i)), sizeof(pcb_color_t));
+			memcpy(&ptr->Data->Layer[i].meta.real.color, pcb_layer_default_color(i, pcb_layer_flags(ptr, i)), sizeof(rnd_color_t));
 }
 
 typedef struct {
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 30916)
+++ trunk/src/draw.c	(revision 30917)
@@ -101,9 +101,9 @@
 
 
 TODO("cleanup: this should be cached")
-void pcb_lighten_color(const pcb_color_t *orig, pcb_color_t *dst, double factor)
+void pcb_lighten_color(const rnd_color_t *orig, rnd_color_t *dst, double factor)
 {
-	pcb_color_load_int(dst, MIN(255, orig->r * factor), MIN(255, orig->g * factor), MIN(255, orig->b * factor), 255);
+	rnd_color_load_int(dst, MIN(255, orig->r * factor), MIN(255, orig->g * factor), MIN(255, orig->b * factor), 255);
 }
 
 void pcb_draw_dashed_line(pcb_draw_info_t *info, pcb_hid_gc_t GC, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, unsigned int segs, pcb_bool_t cheap)
@@ -341,7 +341,7 @@
 {
 	pcb_layergrp_id_t backsilk_gid;
 	pcb_layergrp_t *backsilk_grp;
-	pcb_color_t old_silk_color[PCB_MAX_LAYERGRP];
+	rnd_color_t old_silk_color[PCB_MAX_LAYERGRP];
 	int i, ngroups;
 	pcb_layergrp_id_t component, solder, gid, side_copper_grp;
 	/* This is the list of layer groups we will draw.  */
@@ -707,7 +707,7 @@
 	unsigned int lflg = 0;
 	int may_have_delayed = 0, restore_color = 0, current_grp;
 	pcb_xform_t xform;
-	pcb_color_t orig_color;
+	rnd_color_t orig_color;
 	pcb_layer_t *Layer = (pcb_layer_t *)Layer_; /* ugly hack until layer color is moved into info */
 
 	xform_setup(info, &xform, Layer);
@@ -729,7 +729,7 @@
 		if (!restore_color) {
 			orig_color = Layer->meta.real.color;
 			restore_color = 1;
-			Layer->meta.real.color = *pcb_color_black;
+			Layer->meta.real.color = *rnd_color_black;
 		}
 	}
 
@@ -1088,8 +1088,8 @@
 	else
 		pcb_draw_out.direct = 1;
 
-	hid->set_color(pcb_draw_out.pmGC, pcb_color_cyan);
-	hid->set_color(pcb_draw_out.drillGC, pcb_color_drill);
+	hid->set_color(pcb_draw_out.pmGC, rnd_color_cyan);
+	hid->set_color(pcb_draw_out.drillGC, rnd_color_drill);
 	hid->set_color(pcb_draw_out.padGC, &conf_core.appearance.color.pin);
 	hid->set_color(pcb_draw_out.backpadGC, &conf_core.appearance.color.invisible_objects);
 	hid->set_color(pcb_draw_out.padselGC, &conf_core.appearance.color.selected);
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 30916)
+++ trunk/src/draw.h	(revision 30917)
@@ -118,7 +118,7 @@
 extern int pcb_draw_force_termlab; /* force drawing terminal lables - useful for pinout previews */
 extern rnd_bool pcb_draw_doing_assy;
 
-void pcb_lighten_color(const pcb_color_t *orig, pcb_color_t *dst, double factor);
+void pcb_lighten_color(const rnd_color_t *orig, rnd_color_t *dst, double factor);
 
 /* Draw a series of short line segments emulating a dashed line. segs is
    the number of on/off segment pairs. It is guaranteed that the line starts
@@ -138,7 +138,7 @@
 void pcb_draw_layer_under(pcb_board_t *pcb, const pcb_layer_t *Layer, const rnd_box_t *screen, pcb_data_t *data, pcb_xform_t *xform);
 
 /* Composite draw all layer groups matching lyt/purpi/purpose */
-void pcb_draw_groups(pcb_hid_t *hid, pcb_board_t *pcb, pcb_layer_type_t lyt, int purpi, char *purpose, const rnd_box_t *screen, const pcb_color_t *default_color, pcb_layer_type_t pstk_lyt_match, int thin_draw, int invert);
+void pcb_draw_groups(pcb_hid_t *hid, pcb_board_t *pcb, pcb_layer_type_t lyt, int purpi, char *purpose, const rnd_box_t *screen, const rnd_color_t *default_color, pcb_layer_type_t pstk_lyt_match, int thin_draw, int invert);
 
 
 void pcb_erase_obj(int, void *, void *);
Index: trunk/src/draw_composite.c
===================================================================
--- trunk/src/draw_composite.c	(revision 30916)
+++ trunk/src/draw_composite.c	(revision 30917)
@@ -33,7 +33,7 @@
 	pcb_draw_info_t *info;
 	const pcb_layergrp_t *grp;
 	pcb_layergrp_id_t gid;
-	const pcb_color_t *color;
+	const rnd_color_t *color;
 
 	unsigned thin:1;
 	unsigned invert:1;
@@ -180,7 +180,7 @@
 		pcb_draw_pstks(ctx->info, ctx->gid, 0, *pstk_lyt_match);
 }
 
-void pcb_draw_groups(pcb_hid_t *hid, pcb_board_t *pcb, pcb_layer_type_t lyt, int purpi, char *purpose, const rnd_box_t *screen, const pcb_color_t *default_color, pcb_layer_type_t pstk_lyt_match, int thin_draw, int invert)
+void pcb_draw_groups(pcb_hid_t *hid, pcb_board_t *pcb, pcb_layer_type_t lyt, int purpi, char *purpose, const rnd_box_t *screen, const rnd_color_t *default_color, pcb_layer_type_t pstk_lyt_match, int thin_draw, int invert)
 {
 	pcb_draw_info_t info;
 	pcb_layergrp_id_t gid;
Index: trunk/src/layer.c
===================================================================
--- trunk/src/layer.c	(revision 30916)
+++ trunk/src/layer.c	(revision 30917)
@@ -632,13 +632,13 @@
 /*** undoable layer recolor ***/
 typedef struct {
 	pcb_layer_t *layer;
-	pcb_color_t color;
+	rnd_color_t color;
 } undo_layer_recolor_t;
 
 
 static int undo_layer_recolor_swap(void *udata)
 {
-	pcb_color_t old;
+	rnd_color_t old;
 	undo_layer_recolor_t *r = udata;
 
 	old = r->layer->meta.real.color;
@@ -666,7 +666,7 @@
 };
 
 
-int pcb_layer_recolor_(pcb_layer_t *Layer, const pcb_color_t *color, rnd_bool undoable)
+int pcb_layer_recolor_(pcb_layer_t *Layer, const rnd_color_t *color, rnd_bool undoable)
 {
 	undo_layer_recolor_t rtmp, *r = &rtmp;
 
@@ -691,8 +691,8 @@
 
 int pcb_layer_recolor(pcb_data_t *data, pcb_layer_id_t layer, const char *color, rnd_bool undoable)
 {
-	pcb_color_t clr;
-	pcb_color_load_str(&clr, color);
+	rnd_color_t clr;
+	rnd_color_load_str(&clr, color);
 	return pcb_layer_recolor_(&data->Layer[layer], &clr, undoable);
 }
 
@@ -745,7 +745,7 @@
 	}
 }
 
-const pcb_color_t *pcb_layer_default_color(int idx, pcb_layer_type_t lyt)
+const rnd_color_t *pcb_layer_default_color(int idx, pcb_layer_type_t lyt)
 {
 	const int clrs = sizeof(conf_core.appearance.color.layer) / sizeof(conf_core.appearance.color.layer[0]);
 
@@ -930,7 +930,7 @@
 	char *name;
 	pcb_layer_combining_t comb;
 	pcb_layergrp_id_t grp;
-	pcb_color_t color;
+	rnd_color_t color;
 } undo_layer_move_t;
 
 static int undo_layer_move_swap(void *udata)
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 30916)
+++ trunk/src/layer.h	(revision 30917)
@@ -138,7 +138,7 @@
 		struct { /* A real board layer */
 			pcb_layergrp_id_t grp;         /* the group this layer is in (cross-reference) */
 			rnd_bool vis;                  /* visible flag */
-			pcb_color_t color;             /* copied */
+			rnd_color_t color;             /* copied */
 			int no_drc;                    /* whether to ignore the layer when checking the design rules */
 			const char *cookie;            /* for UI layers: registration cookie; NULL for unused UI layers */
 			pcb_xform_t xform;             /* layer specified rendering transformation */
@@ -177,7 +177,7 @@
 
 typedef struct {
 	const char *name, *abbrev;
-	pcb_color_t const *force_color;
+	rnd_color_t const *force_color;
 	const char *select_name;
 	int vis_offs, sel_offs;
 } pcb_menu_layers_t;
@@ -285,7 +285,7 @@
 const char *pcb_layer_name(pcb_data_t *data, pcb_layer_id_t id);
 
 /* Return the default color for a new layer from the config */
-const pcb_color_t *pcb_layer_default_color(int idx, pcb_layer_type_t lyt);
+const rnd_color_t *pcb_layer_default_color(int idx, pcb_layer_type_t lyt);
 
 /* Rename/recolor an existing layer by idx */
 int pcb_layer_rename(pcb_data_t *data, pcb_layer_id_t layer, const char *lname, rnd_bool undoable);
@@ -295,7 +295,7 @@
 int pcb_layer_rename_(pcb_layer_t *Layer, char *Name, rnd_bool undoable);
 
 /* Low level layer color change, parsed color must be available */
-int pcb_layer_recolor_(pcb_layer_t *Layer, const pcb_color_t *color, rnd_bool undoable);
+int pcb_layer_recolor_(pcb_layer_t *Layer, const rnd_color_t *color, rnd_bool undoable);
 
 /* index is 0..PCB_MAX_LAYER-1.  If old_index is -1, a new layer is
    inserted at that index.  If new_index is -1, the specified layer is
Index: trunk/src/layer_ui.c
===================================================================
--- trunk/src/layer_ui.c	(revision 30916)
+++ trunk/src/layer_ui.c	(revision 30917)
@@ -40,7 +40,7 @@
 vtp0_t pcb_uilayers;
 
 
-pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const pcb_color_t *color)
+pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const rnd_color_t *color)
 {
 	int n;
 	pcb_layer_t *l;
Index: trunk/src/layer_ui.h
===================================================================
--- trunk/src/layer_ui.h	(revision 30916)
+++ trunk/src/layer_ui.h	(revision 30917)
@@ -39,7 +39,7 @@
 /* list of all UI layers - each item is a persistent pointer to a layer struct */
 extern vtp0_t pcb_uilayers;
 
-pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const pcb_color_t *color);
+pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const rnd_color_t *color);
 void pcb_uilayer_free(pcb_layer_t *l);
 void pcb_uilayer_free_all_cookie(const char *cookie);
 void pcb_uilayer_uninit(void);
Index: trunk/src/librnd/core/color.c
===================================================================
--- trunk/src/librnd/core/color.c	(revision 30916)
+++ trunk/src/librnd/core/color.c	(revision 30917)
@@ -68,7 +68,7 @@
 
 #define CLAMP01(c) (((c) < 0.0) ? 0.0 : (((c) > 1.0) ? 1.0 : (c)))
 
-int pcb_color_load_int(pcb_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+int rnd_color_load_int(rnd_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 {
 	dst->r = r;
 	dst->g = g;
@@ -80,7 +80,7 @@
 	return 0;
 }
 
-int pcb_color_load_packed(pcb_color_t *dst, unsigned long p)
+int rnd_color_load_packed(rnd_color_t *dst, unsigned long p)
 {
 	dst->packed = p;
 	dst->r = (p & 0xff000000UL) >> 24;
@@ -92,7 +92,7 @@
 	return 0;
 }
 
-int pcb_color_load_float(pcb_color_t *dst, float r, float g, float b, float a)
+int rnd_color_load_float(rnd_color_t *dst, float r, float g, float b, float a)
 {
 	dst->r = CLAMP01(r) * 255.0;
 	dst->g = CLAMP01(g) * 255.0;
@@ -122,7 +122,7 @@
 	dst_fld = tmp1 << 4 | tmp2; \
 } while(0)
 
-int pcb_color_load_str(pcb_color_t *dst, const char *src)
+int rnd_color_load_str(rnd_color_t *dst, const char *src)
 {
 	if (src[0] != '#')
 		return -1;
@@ -141,44 +141,44 @@
 	return 0;
 }
 
-pcb_color_t *pcb_clrdup(const pcb_color_t *src)
+rnd_color_t *rnd_clrdup(const rnd_color_t *src)
 {
-	pcb_color_t *dst = malloc(sizeof(pcb_color_t));
-	memcpy(dst, src, sizeof(pcb_color_t));
+	rnd_color_t *dst = malloc(sizeof(rnd_color_t));
+	memcpy(dst, src, sizeof(rnd_color_t));
 	return dst;
 }
 
-static pcb_color_t pcb_color_black_;
-static pcb_color_t pcb_color_white_;
-static pcb_color_t pcb_color_cyan_;
-static pcb_color_t pcb_color_red_;
-static pcb_color_t pcb_color_blue_;
-static pcb_color_t pcb_color_drill_;
-static pcb_color_t pcb_color_magenta_;
-static pcb_color_t pcb_color_golden_;
-static pcb_color_t pcb_color_grey33_;
+static rnd_color_t pcb_color_black_;
+static rnd_color_t pcb_color_white_;
+static rnd_color_t pcb_color_cyan_;
+static rnd_color_t pcb_color_red_;
+static rnd_color_t pcb_color_blue_;
+static rnd_color_t pcb_color_drill_;
+static rnd_color_t pcb_color_magenta_;
+static rnd_color_t pcb_color_golden_;
+static rnd_color_t pcb_color_grey33_;
 
-const pcb_color_t *pcb_color_black = &pcb_color_black_;
-const pcb_color_t *pcb_color_white = &pcb_color_white_;
-const pcb_color_t *pcb_color_cyan = &pcb_color_cyan_;
-const pcb_color_t *pcb_color_red = &pcb_color_red_;
-const pcb_color_t *pcb_color_blue = &pcb_color_blue_;
-const pcb_color_t *pcb_color_drill = &pcb_color_drill_;
-const pcb_color_t *pcb_color_grey33 = &pcb_color_grey33_;
-const pcb_color_t *pcb_color_magenta = &pcb_color_magenta_;
-const pcb_color_t *pcb_color_golden = &pcb_color_golden_;
+const rnd_color_t *rnd_color_black = &pcb_color_black_;
+const rnd_color_t *rnd_color_white = &pcb_color_white_;
+const rnd_color_t *rnd_color_cyan = &pcb_color_cyan_;
+const rnd_color_t *rnd_color_red = &pcb_color_red_;
+const rnd_color_t *rnd_color_blue = &pcb_color_blue_;
+const rnd_color_t *rnd_color_drill = &pcb_color_drill_;
+const rnd_color_t *rnd_color_grey33 = &pcb_color_grey33_;
+const rnd_color_t *rnd_color_magenta = &pcb_color_magenta_;
+const rnd_color_t *rnd_color_golden = &pcb_color_golden_;
 
-void pcb_color_init(void)
+void rnd_color_init(void)
 {
-	pcb_color_load_str(&pcb_color_black_, "#000000");
-	pcb_color_load_str(&pcb_color_white_, "#ffffff");
-	pcb_color_load_str(&pcb_color_cyan_, "#00ffff");
-	pcb_color_load_str(&pcb_color_red_, "#ff0000");
-	pcb_color_load_str(&pcb_color_blue_, "#0000ff");
-	pcb_color_load_str(&pcb_color_grey33_, "#333333");
-	pcb_color_load_str(&pcb_color_magenta_, "#ff00ff");
-	pcb_color_load_str(&pcb_color_golden_, "#dddd22");
-	pcb_color_load_str(&pcb_color_drill_, "#ff00ff");
+	rnd_color_load_str(&pcb_color_black_, "#000000");
+	rnd_color_load_str(&pcb_color_white_, "#ffffff");
+	rnd_color_load_str(&pcb_color_cyan_, "#00ffff");
+	rnd_color_load_str(&pcb_color_red_, "#ff0000");
+	rnd_color_load_str(&pcb_color_blue_, "#0000ff");
+	rnd_color_load_str(&pcb_color_grey33_, "#333333");
+	rnd_color_load_str(&pcb_color_magenta_, "#ff00ff");
+	rnd_color_load_str(&pcb_color_golden_, "#dddd22");
+	rnd_color_load_str(&pcb_color_drill_, "#ff00ff");
 	strcpy(pcb_color_drill_.str, "drill");
 }
 
Index: trunk/src/librnd/core/color.h
===================================================================
--- trunk/src/librnd/core/color.h	(revision 30916)
+++ trunk/src/librnd/core/color.h	(revision 30917)
@@ -24,13 +24,13 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#ifndef PCB_COLOR_H
-#define PCB_COLOR_H
+#ifndef RND_COLOR_H
+#define RND_COLOR_H
 
 #include <librnd/core/global_typedefs.h>
 #include <stddef.h>
 
-struct pcb_color_s {
+struct rnd_color_s {
 	unsigned char r, g, b, a; /* primary storage; alpha is not really supported at the moment */
 	unsigned long packed;     /* cache: 32 bit portable (byte-order-safe) packed version used for lookups */
 	float fr, fg, fb, fa;     /* cache: 0..1 version; using float to save memory^1 */
@@ -37,35 +37,35 @@
 	char str[10];             /* cache: "#rrggbb[aa]" \0 terminated string version */
 };
 
-extern const pcb_color_t *pcb_color_black;
-extern const pcb_color_t *pcb_color_white;
-extern const pcb_color_t *pcb_color_cyan;
-extern const pcb_color_t *pcb_color_red;
-extern const pcb_color_t *pcb_color_blue;
-extern const pcb_color_t *pcb_color_grey33;
-extern const pcb_color_t *pcb_color_magenta;
-extern const pcb_color_t *pcb_color_golden;
-extern const pcb_color_t *pcb_color_drill;
+extern const rnd_color_t *rnd_color_black;
+extern const rnd_color_t *rnd_color_white;
+extern const rnd_color_t *rnd_color_cyan;
+extern const rnd_color_t *rnd_color_red;
+extern const rnd_color_t *rnd_color_blue;
+extern const rnd_color_t *rnd_color_grey33;
+extern const rnd_color_t *rnd_color_magenta;
+extern const rnd_color_t *rnd_color_golden;
+extern const rnd_color_t *rnd_color_drill;
 
 /* Convert a color from various formats to a pcb color; returns 0 on success */
-int pcb_color_load_int(pcb_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-int pcb_color_load_packed(pcb_color_t *dst, unsigned long p);
-int pcb_color_load_float(pcb_color_t *dst, float r, float g, float b, float a);
-int pcb_color_load_str(pcb_color_t *dst, const char *src);
+int rnd_color_load_int(rnd_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+int rnd_color_load_packed(rnd_color_t *dst, unsigned long p);
+int rnd_color_load_float(rnd_color_t *dst, float r, float g, float b, float a);
+int rnd_color_load_str(rnd_color_t *dst, const char *src);
 
 /* Same as strdup(), but for colors */
-pcb_color_t *pcb_clrdup(const pcb_color_t *src);
+rnd_color_t *rnd_clrdup(const rnd_color_t *src);
 
-void pcb_color_init(void);
+void rnd_color_init(void);
 
 
 /* temporary hack */
-#define pcb_color_is_drill(clr) (strcmp((clr)->str, "drill") == 0)
+#define rnd_color_is_drill(clr) (strcmp((clr)->str, "drill") == 0)
 
 /*** color vector ***/
 
 #define GVT(x) vtclr_ ## x
-#define GVT_ELEM_TYPE pcb_color_t
+#define GVT_ELEM_TYPE rnd_color_t
 #define GVT_SIZE_TYPE size_t
 #define GVT_DOUBLING_THRS 512
 #define GVT_START_SIZE 16
Index: trunk/src/librnd/core/color_cache.h
===================================================================
--- trunk/src/librnd/core/color_cache.h	(revision 30916)
+++ trunk/src/librnd/core/color_cache.h	(revision 30917)
@@ -51,7 +51,7 @@
 	cache->user_data = NULL;
 }
 
-RND_INLINE void pcb_clrcache_del(pcb_clrcache_t *cache, const pcb_color_t *color)
+RND_INLINE void pcb_clrcache_del(pcb_clrcache_t *cache, const rnd_color_t *color)
 {
 	void *old = htip_get(&cache->ht, color->packed);
 	if (old == NULL)
@@ -61,7 +61,7 @@
 	free(old);
 }
 
-RND_INLINE void *pcb_clrcache_get(pcb_clrcache_t *cache, const pcb_color_t *color, int alloc)
+RND_INLINE void *pcb_clrcache_get(pcb_clrcache_t *cache, const rnd_color_t *color, int alloc)
 {
 	void *clr = htip_get(&cache->ht, color->packed);
 	if (clr != NULL)
Index: trunk/src/librnd/core/conf.c
===================================================================
--- trunk/src/librnd/core/conf.c	(revision 30916)
+++ trunk/src/librnd/core/conf.c	(revision 30917)
@@ -568,7 +568,7 @@
 				dst->unit[idx] = u;
 			break;
 		case CFN_COLOR:
-			if (pcb_color_load_str(&dst->color[idx], text) != 0) {
+			if (rnd_color_load_str(&dst->color[idx], text) != 0) {
 				pcb_hid_cfg_error(err_node, "Invalid color value: '%s'\n", text);
 				return -1;
 			}
Index: trunk/src/librnd/core/conf.h
===================================================================
--- trunk/src/librnd/core/conf.h	(revision 30916)
+++ trunk/src/librnd/core/conf.h	(revision 30917)
@@ -60,7 +60,7 @@
 typedef double        CFT_REAL;
 typedef rnd_coord_t   CFT_COORD;
 typedef pcb_unit_t *  CFT_UNIT;
-typedef pcb_color_t   CFT_COLOR;
+typedef rnd_color_t   CFT_COLOR;
 typedef pcb_conflist_t    CFT_LIST;
 typedef pcb_conflist_t    CFT_HLIST;
 
@@ -84,7 +84,7 @@
 	double *real;
 	rnd_coord_t *coord;
 	const pcb_unit_t **unit;
-	pcb_color_t *color;
+	rnd_color_t *color;
 	pcb_conflist_t *list;
 	void *any;
 };
Index: trunk/src/librnd/core/global_typedefs.h
===================================================================
--- trunk/src/librnd/core/global_typedefs.h	(revision 30916)
+++ trunk/src/librnd/core/global_typedefs.h	(revision 30917)
@@ -52,7 +52,7 @@
 typedef struct pcb_hid_cfg_s pcb_hid_cfg_t;
 
 typedef unsigned int rnd_cardinal_t;
-typedef struct pcb_color_s pcb_color_t;
+typedef struct rnd_color_s rnd_color_t;
 typedef struct pcb_clrcache_s pcb_clrcache_t;
 typedef struct pcb_pixmap_s pcb_pixmap_t;
 
Index: trunk/src/librnd/core/hid.h
===================================================================
--- trunk/src/librnd/core/hid.h	(revision 30916)
+++ trunk/src/librnd/core/hid.h	(revision 30917)
@@ -134,8 +134,8 @@
 	const char *tip;        /* tooltip */
 	const char *checked;
 	const char *update_on;
-	const pcb_color_t *foreground;
-	const pcb_color_t *background;
+	const rnd_color_t *foreground;
+	const rnd_color_t *background;
 	const char *cookie;     /* used for cookie based removal */
 } pcb_menu_prop_t;
 
@@ -286,11 +286,11 @@
 	/*** gc vs. pcb_hid_t *: pcb_core_gc_t contains ->hid, so these calls don't
 	     need to get it as first arg. ***/
 
-	/* Sets a color. Can be one of the special colors like pcb_color_drill.
+	/* Sets a color. Can be one of the special colors like rnd_color_drill.
 	   (Always use the drill color to draw holes and slots).
 	   You may assume this is cheap enough to call inside the redraw
 	   callback, but not cheap enough to call for each item drawn. */
-	void (*set_color)(pcb_hid_gc_t gc, const pcb_color_t *color);
+	void (*set_color)(pcb_hid_gc_t gc, const rnd_color_t *color);
 
 	/* Sets the line style.  While calling this is cheap, calling it with
 	   different values each time may be expensive, so grouping items by
Index: trunk/src/librnd/core/hid_attrib.h
===================================================================
--- trunk/src/librnd/core/hid_attrib.h	(revision 30916)
+++ trunk/src/librnd/core/hid_attrib.h	(revision 30917)
@@ -14,7 +14,7 @@
 	const char *str;
 	double dbl;
 	rnd_coord_t crd;
-	pcb_color_t clr;
+	rnd_color_t clr;
 	void (*func)();
 };
 
Index: trunk/src/librnd/core/hid_dad.h
===================================================================
--- trunk/src/librnd/core/hid_dad.h	(revision 30916)
+++ trunk/src/librnd/core/hid_dad.h	(revision 30917)
@@ -603,7 +603,7 @@
 			table[table ## _len - 1].field.str = (char *)val; \
 			break; \
 		case PCB_HATT_COLOR: \
-			table[table ## _len - 1].field.clr = *(pcb_color_t *)val; \
+			table[table ## _len - 1].field.clr = *(rnd_color_t *)val; \
 			break; \
 		case PCB_HATT_BEGIN_HBOX: \
 		case PCB_HATT_BEGIN_VBOX: \
@@ -703,7 +703,7 @@
 			table[table ## _len - 1].field.str = (char *)val_; \
 			break; \
 		case PCB_HATT_COLOR: \
-			table[table ## _len - 1].field.clr = *((pcb_color_t *)val_); \
+			table[table ## _len - 1].field.clr = *((rnd_color_t *)val_); \
 			break; \
 		case PCB_HATT_BEGIN_HBOX: \
 		case PCB_HATT_BEGIN_VBOX: \
Index: trunk/src/librnd/core/hid_init.c
===================================================================
--- trunk/src/librnd/core/hid_init.c	(revision 30916)
+++ trunk/src/librnd/core/hid_init.c	(revision 30917)
@@ -313,7 +313,7 @@
 	pcb_hidlib_event_init();
 	pcb_hid_dlg_init();
 	pcb_hid_init();
-	pcb_color_init();
+	rnd_color_init();
 }
 
 static vts0_t hidlib_conffile;
Index: trunk/src/librnd/core/hid_nogui.c
===================================================================
--- trunk/src/librnd/core/hid_nogui.c	(revision 30916)
+++ trunk/src/librnd/core/hid_nogui.c	(revision 30917)
@@ -110,7 +110,7 @@
 	/* the HID may decide to ignore this hook */
 }
 
-static void nogui_set_color(pcb_hid_gc_t gc, const pcb_color_t *name)
+static void nogui_set_color(pcb_hid_gc_t gc, const rnd_color_t *name)
 {
 	CRASH("set_color");
 }
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30916)
+++ trunk/src/librnd/pcb_compat.h	(revision 30917)
@@ -165,3 +165,21 @@
 #define HAVE_UNISTD_H RND_HAVE_UNISTD_H
 #define COORD_MAX RND_COORD_MAX
 #define PCB_FUNC_UNUSED RND_FUNC_UNUSED
+#define pcb_color_s rnd_color_s
+#define pcb_color_t rnd_color_t
+#define pcb_color_black rnd_color_black
+#define pcb_color_white rnd_color_white
+#define pcb_color_cyan rnd_color_cyan
+#define pcb_color_red rnd_color_red
+#define pcb_color_blue rnd_color_blue
+#define pcb_color_grey33 rnd_color_grey33
+#define pcb_color_magenta rnd_color_magenta
+#define pcb_color_golden rnd_color_golden
+#define pcb_color_drill rnd_color_drill
+#define pcb_color_load_int rnd_color_load_int
+#define pcb_color_load_packed rnd_color_load_packed
+#define pcb_color_load_float rnd_color_load_float
+#define pcb_color_load_str rnd_color_load_str
+#define pcb_clrdup rnd_clrdup
+#define pcb_color_init rnd_color_init
+#define pcb_color_is_drill rnd_color_is_drill
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 30916)
+++ trunk/src/obj_arc.c	(revision 30917)
@@ -1094,8 +1094,8 @@
 
 static void pcb_arc_draw(pcb_draw_info_t *info, pcb_arc_t *arc, int allow_term_gfx)
 {
-	const pcb_color_t *color;
-	pcb_color_t buf;
+	const rnd_color_t *color;
+	rnd_color_t buf;
 	const pcb_layer_t *layer = info->layer != NULL ? info->layer : pcb_layer_get_real(arc->parent.layer);
 
 	pcb_obj_noexport(info, arc, return);
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 30916)
+++ trunk/src/obj_common.h	(revision 30917)
@@ -231,7 +231,7 @@
 	unsigned int         noexport:1; \
 	unsigned int         noexport_named:1; \
 	unsigned int         extobj_editing:1; \
-	const pcb_color_t    *override_color
+	const rnd_color_t    *override_color
 
 /* Lines, pads, and rats all use this so they can be cross-cast.  */
 #define PCB_ANYLINEFIELDS \
Index: trunk/src/obj_gfx.c
===================================================================
--- trunk/src/obj_gfx.c	(revision 30916)
+++ trunk/src/obj_gfx.c	(revision 30917)
@@ -627,7 +627,7 @@
 	PCB_DRAW_BBOX(gfx);
 
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, gfx)) {
-		const pcb_color_t *color;
+		const rnd_color_t *color;
 		if (layer->is_bound)
 			PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
 		else
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 30916)
+++ trunk/src/obj_line.c	(revision 30917)
@@ -1202,8 +1202,8 @@
 
 static void pcb_line_draw(pcb_draw_info_t *info, pcb_line_t *line, int allow_term_gfx)
 {
-	const pcb_color_t *color;
-	pcb_color_t buf;
+	const rnd_color_t *color;
+	rnd_color_t buf;
 	const pcb_layer_t *layer = info->layer != NULL ? info->layer : pcb_layer_get_real(line->parent.layer);
 
 	pcb_obj_noexport(info, line, return);
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 30916)
+++ trunk/src/obj_poly.c	(revision 30917)
@@ -1383,8 +1383,8 @@
 
 static void pcb_poly_draw(pcb_draw_info_t *info, pcb_poly_t *polygon, int allow_term_gfx)
 {
-	static const pcb_color_t *color;
-	pcb_color_t buf;
+	static const rnd_color_t *color;
+	rnd_color_t buf;
 	const pcb_layer_t *layer = info->layer != NULL ? info->layer : pcb_layer_get_real(polygon->parent.layer);
 
 	pcb_obj_noexport(info, polygon, return);
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 30916)
+++ trunk/src/obj_pstk.c	(revision 30917)
@@ -338,8 +338,8 @@
 
 static void set_ps_color(pcb_pstk_t *ps, int is_current, pcb_layer_type_t lyt, const pcb_layer_t *ly1, pcb_xform_t *xform)
 {
-	const pcb_color_t *color, *layer_color = NULL;
-	pcb_color_t buf;
+	const rnd_color_t *color, *layer_color = NULL;
+	rnd_color_t buf;
 
 	if ((lyt & PCB_LYT_PASTE) || (lyt & PCB_LYT_MASK) || (lyt & PCB_LYT_SILK)) {
 		if (ly1 == NULL)
@@ -352,7 +352,7 @@
 		color = &conf_core.appearance.color.invisible_objects;
 	}
 	else if (xform->black_current_group && is_current) {
-		color = pcb_color_black;
+		color = rnd_color_black;
 	}
 	else if (ps->term == NULL) {
 		/* normal via, not a terminal */
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 30916)
+++ trunk/src/obj_subc.c	(revision 30917)
@@ -1971,7 +1971,7 @@
 	rnd_box_t *bb = &subc->BoundingBox;
 	int selected, locked;
 	int freq = conf_core.appearance.subc.dash_freq;
-	const pcb_color_t *nnclr;
+	const rnd_color_t *nnclr;
 
 	selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc);
 	locked = PCB_FLAG_TEST(PCB_FLAG_LOCK, subc);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 30916)
+++ trunk/src/obj_text.c	(revision 30917)
@@ -1403,7 +1403,7 @@
 
 	if (info->xform->flag_color && PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) {
 		if (layer->is_bound) {
-			const pcb_color_t *color;
+			const rnd_color_t *color;
 			PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
 			pcb_render->set_color(pcb_draw_out.fgGC, color);
 		}
@@ -1414,7 +1414,7 @@
 		pcb_render->set_color(pcb_draw_out.fgGC, text->override_color);
 	}
 	else if (layer->is_bound) {
-		const pcb_color_t *color;
+		const rnd_color_t *color;
 		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
 		pcb_render->set_color(pcb_draw_out.fgGC, color);
 	}
Index: trunk/src/stub_draw.c
===================================================================
--- trunk/src/stub_draw.c	(revision 30916)
+++ trunk/src/stub_draw.c	(revision 30917)
@@ -35,7 +35,7 @@
 {
 	pcb_text_t t;
 
-	pcb_render->set_color(gc, pcb_color_red);
+	pcb_render->set_color(gc, rnd_color_red);
 
 	memset(&t, 0, sizeof(t));
 	t.TextString = (char *)str;
Index: trunk/src_plugins/acompnet/acompnet.c
===================================================================
--- trunk/src_plugins/acompnet/acompnet.c	(revision 30916)
+++ trunk/src_plugins/acompnet/acompnet.c	(revision 30917)
@@ -225,12 +225,12 @@
 
 int pplg_init_acompnet(void)
 {
-	static pcb_color_t clr;
+	static rnd_color_t clr;
 
 	PCB_API_CHK_VER;
 
 	if (clr.str[0] != '#')
-		pcb_color_load_str(&clr, "#c09920");
+		rnd_color_load_str(&clr, "#c09920");
 
 	RND_REGISTER_ACTIONS(acompnet_action_list, acompnet_cookie)
 	ly = pcb_uilayer_alloc(acompnet_cookie, "autocomp-net", &clr);
Index: trunk/src_plugins/asm/asm.c
===================================================================
--- trunk/src_plugins/asm/asm.c	(revision 30916)
+++ trunk/src_plugins/asm/asm.c	(revision 30917)
@@ -298,7 +298,7 @@
 			r = fade(r, 4);
 			g = fade(g, 4);
 			b = fade(b, 4);
-			pcb_color_load_int(&ly->meta.real.color, r, g, b, 255);
+			rnd_color_load_int(&ly->meta.real.color, r, g, b, 255);
 		}
 	}
 	else {
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 30916)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 30917)
@@ -446,7 +446,7 @@
 	int n;
 	pcb_render->set_line_cap(pcb_crosshair.GC, pcb_cap_round);
 	pcb_render->set_line_width(pcb_crosshair.GC, 1);
-	pcb_render->set_color(pcb_crosshair.GC, pcb_color_grey33);
+	pcb_render->set_color(pcb_crosshair.GC, rnd_color_grey33);
 	for(n = 0; n < vtc0_len(&pcb_ddraft_attached.annot_lines); n += 4) {
 		rnd_coord_t *c = &pcb_ddraft_attached.annot_lines.array[n];
 		pcb_render->draw_line(pcb_crosshair.GC, c[0], c[1], c[2], c[3]);
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 30917)
@@ -173,7 +173,7 @@
 
 	pcb_pstk_draw_preview(PCB, &ps, layers, 0, 0, &e->view);
 
-	pcb_render->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, rnd_color_black);
 	pcb_hid_set_line_cap(gc, pcb_cap_round);
 	pcb_hid_set_line_width(gc, -1);
 
Index: trunk/src_plugins/dialogs/dlg_netlist.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_netlist.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_netlist.c	(revision 30917)
@@ -283,7 +283,7 @@
 				vtp0_append(&netlist_color_save, (char *)obj->override_color);
 			else
 				vtp0_append(&netlist_color_save, NULL);
-			obj->override_color = pcb_color_magenta;
+			obj->override_color = rnd_color_magenta;
 		}
 	}
 
@@ -295,7 +295,7 @@
 	if (net != NULL) {/* restore object color */
 		for(n = 0, p = netlist_color_save.array; n < netlist_color_save.used; n+=2,p+=2) {
 			pcb_any_obj_t *obj = p[0];
-			pcb_color_t *s = p[1];
+			rnd_color_t *s = p[1];
 			obj->override_color = s;
 		}
 		vtp0_truncate(&netlist_color_save, 0);
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 30917)
@@ -76,7 +76,7 @@
 		bbox.X1 = bbox.Y1 = 0;
 		bbox.X2 = bbox.Y2 = PCB_MM_TO_COORD(10);
 		pcb_dad_preview_zoomto(attrib, &bbox);
-		pcb_render->set_color(gc, pcb_color_red);
+		pcb_render->set_color(gc, rnd_color_red);
 		pcb_text_draw_string_simple(NULL, tmp, PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 100, 0, 0, 0, 0, 0, 0);
 	}
 }
Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30917)
@@ -88,7 +88,7 @@
 			break;
 		case CFN_COLOR:
 			hv.clr = ctx->nat->val.color[ctx->idx];
-			pcb_color_load_str(&hv.clr, val);
+			rnd_color_load_str(&hv.clr, val);
 			pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv);
 			break;
 		case CFN_LIST:
Index: trunk/src_plugins/dialogs/dlg_test.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_test.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_test.c	(revision 30917)
@@ -510,7 +510,7 @@
 
 static void prv_expose(pcb_hid_attribute_t *attrib, pcb_hid_preview_t *prv, pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
 {
-	pcb_render->set_color(gc, pcb_color_red);
+	pcb_render->set_color(gc, rnd_color_red);
 	pcb_text_draw_string_simple(NULL, "foo", PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 500, 10.0, 0, 0, 0, 0, 0);
 
 	printf("expose in dlg_test!\n");
@@ -536,7 +536,7 @@
 	test_t *ctx = caller_data;
 	pcb_hid_attr_val_t val;
 
-	pcb_color_load_str(&val.clr, "#005599");
+	rnd_color_load_str(&val.clr, "#005599");
 	pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val);
 }
 
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 30916)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 30917)
@@ -208,7 +208,7 @@
 	view_ctx_t *ctx = prv->user_ctx;
 	pcb_xform_t xform;
 	int old_termlab, g;
-	static const pcb_color_t *offend_color[2];
+	static const rnd_color_t *offend_color[2];
 	pcb_view_t *v = pcb_view_by_uid(ctx->lst, ctx->selected);
 	size_t n;
 	void **p;
@@ -216,8 +216,8 @@
 	if (v == NULL)
 		return;
 
-	offend_color[0] = pcb_color_red;
-	offend_color[1] = pcb_color_blue;
+	offend_color[0] = rnd_color_red;
+	offend_color[1] = rnd_color_blue;
 
 	/* NOTE: zoom box was already set on select */
 
@@ -249,7 +249,7 @@
 	/* restore object color */
 	for(n = 0, p = view_color_save.array; n < view_color_save.used; n+=2,p+=2) {
 		pcb_any_obj_t *obj = p[0];
-		pcb_color_t *s = p[1];
+		rnd_color_t *s = p[1];
 		obj->override_color = s;
 	}
 	vtp0_truncate(&view_color_save, 0);
Index: trunk/src_plugins/draw_csect/draw_csect.c
===================================================================
--- trunk/src_plugins/draw_csect/draw_csect.c	(revision 30916)
+++ trunk/src_plugins/draw_csect/draw_csect.c	(revision 30917)
@@ -57,7 +57,7 @@
 #define COLOR_ANNOT  pcbhl_conf.appearance.color.grid
 #define COLOR_BG     pcbhl_conf.appearance.color.background
 
-static pcb_color_t
+static rnd_color_t
 	COLOR_COPPER, COLOR_SUBSTRATE, COLOR_SILK, COLOR_MASK,
 	COLOR_PASTE, COLOR_MISC, COLOR_OUTLINE;
 
@@ -106,7 +106,7 @@
 }
 
 /* Draw a text at x;y with a background */
-static pcb_text_t *dtext_bg(pcb_hid_gc_t gc, int x, int y, int scale, int dir, const char *txt, const pcb_color_t *bgcolor, const pcb_color_t *fgcolor)
+static pcb_text_t *dtext_bg(pcb_hid_gc_t gc, int x, int y, int scale, int dir, const char *txt, const rnd_color_t *bgcolor, const rnd_color_t *fgcolor)
 {
 	static pcb_text_t t;
 
@@ -453,7 +453,7 @@
 	for(gid = 0; gid < pcb_max_group(PCB); gid++) {
 		int i, stepf = 0, stepb = 0, th;
 		pcb_layergrp_t *g = PCB->LayerGroups.grp + gid;
-		const pcb_color_t *color;
+		const rnd_color_t *color;
 
 		if ((!g->valid) || (gid == drag_gid)  || (gid == drag_gid_subst))
 			continue;
@@ -580,7 +580,7 @@
 
 
 	if (DRAGGING) {
-		pcb_render->set_color(gc, pcb_color_black);
+		pcb_render->set_color(gc, rnd_color_black);
 
 		/* draw the actual operation */
 		if (drag_addgrp) {
@@ -958,13 +958,13 @@
 
 	def_info.xform = &def_xform;
 
-	pcb_color_load_str(&COLOR_COPPER,    COLOR_COPPER_);
-	pcb_color_load_str(&COLOR_SUBSTRATE, COLOR_SUBSTRATE_);
-	pcb_color_load_str(&COLOR_SILK,      COLOR_SILK_);
-	pcb_color_load_str(&COLOR_MASK,      COLOR_MASK_);
-	pcb_color_load_str(&COLOR_PASTE,     COLOR_PASTE_);
-	pcb_color_load_str(&COLOR_MISC,      COLOR_MISC_);
-	pcb_color_load_str(&COLOR_OUTLINE,   COLOR_OUTLINE_);
+	rnd_color_load_str(&COLOR_COPPER,    COLOR_COPPER_);
+	rnd_color_load_str(&COLOR_SUBSTRATE, COLOR_SUBSTRATE_);
+	rnd_color_load_str(&COLOR_SILK,      COLOR_SILK_);
+	rnd_color_load_str(&COLOR_MASK,      COLOR_MASK_);
+	rnd_color_load_str(&COLOR_PASTE,     COLOR_PASTE_);
+	rnd_color_load_str(&COLOR_MISC,      COLOR_MISC_);
+	rnd_color_load_str(&COLOR_OUTLINE,   COLOR_OUTLINE_);
 
 	pcb_stub_draw_csect = draw_csect;
 	pcb_stub_draw_csect_mouse_ev = mouse_csect;
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 30916)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 30917)
@@ -87,13 +87,13 @@
 	int w = 2, h = 2;
 	float th = 0.1, th2 = 0.4;
 
-	pcb_render->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, rnd_color_black);
 	dline(x0, y0, x0+w, y0, th);
 	dline(x0+w, y0, x0+w, y0+h, th);
 	dline(x0+w, y0+h, x0, y0+h, th);
 	dline(x0, y0+h, x0, y0, th);
 	if (checked) {
-		pcb_render->set_color(gc, pcb_color_red);
+		pcb_render->set_color(gc, rnd_color_red);
 		dline(x0, y0, x0+w, y0+h, th2);
 		dline(x0, y0+h, x0+w, y0, th2);
 	}
@@ -121,7 +121,7 @@
 
 	dchkbox(gc, x-4, *y, (f->id == target_fid));
 
-	pcb_render->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, rnd_color_black);
 	t = dtext(x, *y, 200, f->id, buf);
 	pcb_text_bbox(pcb_font(PCB, f->id, 1), t);
 
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 30916)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 30917)
@@ -462,9 +462,9 @@
 	}
 }
 
-static void dxf_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void dxf_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
-	if (pcb_color_is_drill(color) == 0)
+	if (rnd_color_is_drill(color) == 0)
 		gc->drawing_hole = 1;
 }
 
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 30916)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 30917)
@@ -354,7 +354,7 @@
 	}
 }
 
-static void excellon_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void excellon_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 }
 
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 30916)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 30917)
@@ -598,8 +598,8 @@
 
 	if (want_outline && !(PCB_LAYER_IS_ROUTE(flags, purpi))) {
 		if (has_outline) {
-			pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_proute, NULL, &region, pcb_color_black, PCB_LYT_MECH, 0, 0);
-			pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_uroute, NULL, &region, pcb_color_black, PCB_LYT_MECH, 0, 0);
+			pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_proute, NULL, &region, rnd_color_black, PCB_LYT_MECH, 0, 0);
+			pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_uroute, NULL, &region, rnd_color_black, PCB_LYT_MECH, 0, 0);
 		}
 		else {
 			pcb_hid_gc_t gc = pcb_hid_make_gc();
@@ -638,9 +638,9 @@
 		fprintf(f, "G04 hid debug composite: %d*\r\n", op);
 }
 
-static void gerber_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void gerber_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
-	if (pcb_color_is_drill(color)) {
+	if (rnd_color_is_drill(color)) {
 		gc->color = 1;
 		gc->erase = 0;
 		gc->drill = 1;
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 30916)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 30917)
@@ -724,7 +724,7 @@
 	}
 }
 
-static void openems_set_color(pcb_hid_gc_t gc, const pcb_color_t *name)
+static void openems_set_color(pcb_hid_gc_t gc, const rnd_color_t *name)
 {
 }
 
Index: trunk/src_plugins/export_openems/mesh.c
===================================================================
--- trunk/src_plugins/export_openems/mesh.c	(revision 30916)
+++ trunk/src_plugins/export_openems/mesh.c	(revision 30917)
@@ -943,10 +943,10 @@
 
 static void mesh_layer_reset()
 {
-	static pcb_color_t clr;
+	static rnd_color_t clr;
 
 	if (clr.str[0] != '#')
-		pcb_color_load_str(&clr, "#007733");
+		rnd_color_load_str(&clr, "#007733");
 
 	if (mesh.ui_layer_xy != NULL)
 		pcb_uilayer_free(mesh.ui_layer_xy);
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 30916)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 30917)
@@ -449,7 +449,7 @@
 	}
 }
 
-static void openscad_set_color(pcb_hid_gc_t gc, const pcb_color_t *name)
+static void openscad_set_color(pcb_hid_gc_t gc, const rnd_color_t *name)
 {
 }
 
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 30916)
+++ trunk/src_plugins/export_png/png.c	(revision 30917)
@@ -935,7 +935,7 @@
 	}
 }
 
-static void png_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void png_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	color_struct *cc;
 
@@ -943,9 +943,9 @@
 		return;
 
 	if (color == NULL)
-		color = pcb_color_red;
+		color = rnd_color_red;
 
-	if (pcb_color_is_drill(color)) {
+	if (rnd_color_is_drill(color)) {
 		gc->color = white;
 		gc->is_erase = 1;
 		return;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 30916)
+++ trunk/src_plugins/export_ps/eps.c	(revision 30917)
@@ -466,7 +466,7 @@
 }
 
 
-static void eps_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void eps_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	if (drawing_mode == PCB_HID_COMP_NEGATIVE) {
 		gc->color = 0xffffff;
@@ -473,7 +473,7 @@
 		gc->erase = 1;
 		return;
 	}
-	if (pcb_color_is_drill(color)) {
+	if (rnd_color_is_drill(color)) {
 		gc->color = 0xffffff;
 		gc->erase = 0;
 		return;
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 30916)
+++ trunk/src_plugins/export_ps/ps.c	(revision 30917)
@@ -941,8 +941,8 @@
 			!(PCB_LAYER_IS_ROUTE(flags, purpi))) {
 		int save_drill = global.is_drill;
 		global.is_drill = 0;
-		pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_proute, NULL, &global.exps.view, pcb_color_black, PCB_LYT_MECH, 0, 0);
-		pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_uroute, NULL, &global.exps.view, pcb_color_black, PCB_LYT_MECH, 0, 0);
+		pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_proute, NULL, &global.exps.view, rnd_color_black, PCB_LYT_MECH, 0, 0);
+		pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_uroute, NULL, &global.exps.view, rnd_color_black, PCB_LYT_MECH, 0, 0);
 		global.is_drill = save_drill;
 	}
 
@@ -969,13 +969,13 @@
 }
 
 
-static void ps_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void ps_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	if (global.drawing_mode == PCB_HID_COMP_NEGATIVE) {
 		gc->r = gc->g = gc->b = 255;
 		gc->erase = 0;
 	}
-	else if (pcb_color_is_drill(color)) {
+	else if (rnd_color_is_drill(color)) {
 		gc->r = gc->g = gc->b = 255;
 		gc->erase = 1;
 	}
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 30916)
+++ trunk/src_plugins/export_svg/svg.c	(revision 30917)
@@ -534,7 +534,7 @@
 	return NULL;
 }
 
-static void svg_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void svg_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	const char *name;
 	gc->drill = 0;
@@ -544,7 +544,7 @@
 	else
 		name = color->str;
 
-	if (pcb_color_is_drill(color)) {
+	if (rnd_color_is_drill(color)) {
 		name = "#ffffff";
 		gc->drill = 1;
 	}
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 30916)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 30917)
@@ -184,7 +184,7 @@
 {
 }
 
-static void batch_set_color(pcb_hid_gc_t gc, const pcb_color_t *name)
+static void batch_set_color(pcb_hid_gc_t gc, const rnd_color_t *name)
 {
 }
 
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 30916)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 30917)
@@ -64,7 +64,7 @@
 	GdkGC *pixel_gc;
 	GdkGC *clip_gc;
 
-	pcb_color_t pcolor;
+	rnd_color_t pcolor;
 	rnd_coord_t width;
 	gint cap, join;
 	gchar xor_mask;
@@ -83,7 +83,7 @@
 }
 
 /* Returns TRUE only if color_string has been allocated to color. */
-static rnd_bool map_color(const pcb_color_t *inclr, pcb_gtk_color_t *color)
+static rnd_bool map_color(const rnd_color_t *inclr, pcb_gtk_color_t *color)
 {
 	static GdkColormap *colormap = NULL;
 
@@ -479,7 +479,7 @@
 	}
 }
 
-static void ghid_gdk_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void ghid_gdk_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	static GdkColormap *colormap = NULL;
 	render_priv_t *priv = ghidgui->port.render_priv;
@@ -486,7 +486,7 @@
 
 	if (*color->str == '\0') {
 		fprintf(stderr, "ghid_gdk_set_color():  name = NULL, setting to magenta\n");
-		color = pcb_color_magenta;
+		color = rnd_color_magenta;
 	}
 
 	gc->pcolor = *color;
@@ -496,7 +496,7 @@
 	if (colormap == NULL)
 		colormap = gtk_widget_get_colormap(ghidgui->port.top_window);
 
-	if (pcb_color_is_drill(color)) {
+	if (rnd_color_is_drill(color)) {
 		gdk_gc_set_foreground(gc->pixel_gc, &priv->offlimits_color);
 	}
 	else {
@@ -1391,13 +1391,13 @@
 	if (!done_once) {
 		priv->bg_gc = gdk_gc_new(priv->out_pixel);
 		if (!map_color(&pcbhl_conf.appearance.color.background, &priv->bg_color))
-			map_color(pcb_color_white, &priv->bg_color);
+			map_color(rnd_color_white, &priv->bg_color);
 		gdk_gc_set_foreground(priv->bg_gc, &priv->bg_color);
 		gdk_gc_set_clip_origin(priv->bg_gc, 0, 0);
 
 		priv->offlimits_gc = gdk_gc_new(priv->out_pixel);
 		if (!map_color(&pcbhl_conf.appearance.color.off_limit, &priv->offlimits_color))
-			map_color(pcb_color_white, &priv->offlimits_color);
+			map_color(rnd_color_white, &priv->offlimits_color);
 		gdk_gc_set_foreground(priv->offlimits_gc, &priv->offlimits_color);
 		gdk_gc_set_clip_origin(priv->offlimits_gc, 0, 0);
 		done_once = 1;
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 30916)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 30917)
@@ -38,9 +38,9 @@
 
 typedef struct render_priv_s {
 	GdkGLConfig *glconfig;
-	pcb_color_t bg_color;
-	pcb_color_t offlimits_color;
-	pcb_color_t grid_color;
+	rnd_color_t bg_color;
+	rnd_color_t offlimits_color;
+	rnd_color_t grid_color;
 	rnd_bool trans_lines;
 	rnd_bool in_context;
 	int subcomposite_stencil_bit;
@@ -57,7 +57,7 @@
 	pcb_core_gc_t core_gc;
 	pcb_hid_t *me_pointer;
 
-	const pcb_color_t *pcolor;
+	const rnd_color_t *pcolor;
 	double alpha_mult;
 	rnd_coord_t width;
 } hid_gc_s;
@@ -79,7 +79,7 @@
 }
 
 /* Returns TRUE only if color_string has been allocated to color. */
-static rnd_bool map_color(const pcb_color_t *inclr, pcb_gtk_color_t *color)
+static rnd_bool map_color(const rnd_color_t *inclr, pcb_gtk_color_t *color)
 {
 	static GdkColormap *colormap = NULL;
 
@@ -257,7 +257,7 @@
 	r = priv->grid_color.r ^ priv->bg_color.r;
 	g = priv->grid_color.g ^ priv->bg_color.g;
 	b = priv->grid_color.b ^ priv->bg_color.b;
-	pcb_color_load_int(&priv->grid_color, r, g, b, 255);
+	rnd_color_load_int(&priv->grid_color, r, g, b, 255);
 }
 
 void ghid_gl_set_special_colors(conf_native_t *cfg)
@@ -295,7 +295,7 @@
 
 	if (*gc->pcolor->str == '\0') {
 		fprintf(stderr, "set_gl_color_for_gc:  gc->colorname = 0, setting to magenta\n");
-		gc->pcolor = pcb_color_magenta;
+		gc->pcolor = rnd_color_magenta;
 	}
 
 	if ((priv->current_color_packed == gc->pcolor->packed) && (priv->current_alpha_mult == gc->alpha_mult))
@@ -307,7 +307,7 @@
 	if (colormap == NULL)
 		colormap = gtk_widget_get_colormap(ghidgui->port.top_window);
 
-	if (pcb_color_is_drill(gc->pcolor)) {
+	if (rnd_color_is_drill(gc->pcolor)) {
 		r = priv->offlimits_color.fr;
 		g = priv->offlimits_color.fg;
 		b = priv->offlimits_color.fb;
@@ -385,11 +385,11 @@
 	drawgl_set_colour(r, g, b, a);
 }
 
-void ghid_gl_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+void ghid_gl_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	if (color == NULL) {
 		fprintf(stderr, "ghid_gl_set_color():  name = NULL, setting to magenta\n");
-		color = pcb_color_magenta;
+		color = rnd_color_magenta;
 	}
 
 	gc->pcolor = color;
@@ -720,7 +720,7 @@
 /* Settles background color + inital GL configuration, to allow further drawing in GL area.
     (w, h) describes the total area concerned, while (xr, yr, wr, hr) describes area requested by an expose event.
     The color structure holds the wanted solid back-ground color, used to first paint the exposed drawing area. */
-static void pcb_gl_draw_expose_init(pcb_hid_t *hid, int w, int h, int xr, int yr, int wr, int hr, pcb_color_t *bg_c)
+static void pcb_gl_draw_expose_init(pcb_hid_t *hid, int w, int h, int xr, int yr, int wr, int hr, rnd_color_t *bg_c)
 {
 	hidgl_init();
 
Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c	(revision 30917)
@@ -232,7 +232,7 @@
 	return pic;
 }
 
-static void ltf_colorbtn_set(lesstif_attr_dlg_t *ctx, int idx, const pcb_color_t *clr)
+static void ltf_colorbtn_set(lesstif_attr_dlg_t *ctx, int idx, const rnd_color_t *clr)
 {
 	Widget btn = ctx->wl[idx];
 	ctx->attrs[idx].val.clr = *clr;
@@ -246,8 +246,8 @@
 	fgw_error_t rs;
 	fgw_arg_t res, argv[2];
 	lesstif_attr_dlg_t *ctx;
-	const pcb_color_t *clr;
-	pcb_color_t nclr;
+	const rnd_color_t *clr;
+	rnd_color_t nclr;
 	int r, widx = attr_get_idx(w, &ctx);
 	if (widx < 0)
 		return;
@@ -267,7 +267,7 @@
 		return;
 	}
 
-	r = pcb_color_load_str(&nclr, res.val.str);
+	r = rnd_color_load_str(&nclr, res.val.str);
 	fgw_arg_free(&rnd_fgw, &res);
 	if (r != 0) {
 		rnd_message(PCB_MSG_ERROR, CPACT " returned invalid color string\n");
Index: trunk/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30917)
@@ -48,7 +48,7 @@
 extern void lesstif_pan_fixup(void);
 extern void lesstif_show_library(void);
 extern void lesstif_show_netlist(void);
-extern Pixel lesstif_parse_color(const pcb_color_t *value);
+extern Pixel lesstif_parse_color(const rnd_color_t *value);
 extern void lesstif_update_layer_groups();
 extern void lesstif_update_status_line();
 extern void lesstif_attributes_dialog(pcb_hid_t *hid, const char *, rnd_attribute_list_t *);
Index: trunk/src_plugins/hid_lesstif/ltf_stdarg.c
===================================================================
--- trunk/src_plugins/hid_lesstif/ltf_stdarg.c	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/ltf_stdarg.c	(revision 30917)
@@ -5,7 +5,7 @@
 extern Colormap lesstif_colormap;
 extern Display *lesstif_display;
 
-void stdarg_do_color(const pcb_color_t *value, char *which)
+void stdarg_do_color(const rnd_color_t *value, char *which)
 {
 	XColor color;
 	if (XParseColor(lesstif_display, lesstif_colormap, value->str, &color))
Index: trunk/src_plugins/hid_lesstif/ltf_stdarg.h
===================================================================
--- trunk/src_plugins/hid_lesstif/ltf_stdarg.h	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/ltf_stdarg.h	(revision 30917)
@@ -7,6 +7,6 @@
 extern int stdarg_n;
 #define stdarg(t,v) XtSetArg(stdarg_args[stdarg_n], t, v), stdarg_n++
 
-void stdarg_do_color(const pcb_color_t *value, char *which);
+void stdarg_do_color(const rnd_color_t *value, char *which);
 void stdarg_do_color_str(const char *value, char *which);
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 30917)
@@ -84,7 +84,7 @@
 	pcb_core_gc_t core_gc;
 	pcb_hid_t *me_pointer;
 	Pixel color;
-	pcb_color_t pcolor;
+	rnd_color_t pcolor;
 	int width;
 	pcb_cap_style_t cap;
 	char xor_set;
@@ -338,7 +338,7 @@
 	*py = Py(vy);
 }
 
-Pixel lesstif_parse_color(const pcb_color_t *value)
+Pixel lesstif_parse_color(const rnd_color_t *value)
 {
 	XColor color;
 	color.pixel = 0;
@@ -2241,7 +2241,7 @@
 	Pixel pix;
 } ltf_color_cache_t;
 
-static void lesstif_set_color(pcb_hid_gc_t gc, const pcb_color_t *pcolor)
+static void lesstif_set_color(pcb_hid_gc_t gc, const rnd_color_t *pcolor)
 {
 	ltf_color_cache_t *cc;
 
@@ -2248,7 +2248,7 @@
 	if (!display)
 		return;
 	if ((pcolor == NULL) || (*pcolor->str == '\0'))
-		pcolor = pcb_color_magenta;
+		pcolor = rnd_color_magenta;
 
 	gc->pcolor = *pcolor;
 
@@ -2257,7 +2257,7 @@
 		ltf_ccache_inited = 1;
 	}
 
-	if (pcb_color_is_drill(pcolor)) {
+	if (rnd_color_is_drill(pcolor)) {
 		gc->color = offlimit_color;
 		gc->erase = 0;
 	}
Index: trunk/src_plugins/hid_lesstif/wt_colorbtn.c
===================================================================
--- trunk/src_plugins/hid_lesstif/wt_colorbtn.c	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/wt_colorbtn.c	(revision 30917)
@@ -34,7 +34,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/color.h>
 
-static int fill_bar(Display *display, XImage *image, const pcb_color_t *color, int width, int height)
+static int fill_bar(Display *display, XImage *image, const rnd_color_t *color, int width, int height)
 {
 	int i, j, bytes_per_pixel;
 	char *q;
@@ -119,7 +119,7 @@
 	return 0;
 }
 
-static Pixmap set_color_bar(Display *display, Pixmap px, const pcb_color_t *color, int width, int height)
+static Pixmap set_color_bar(Display *display, Pixmap px, const rnd_color_t *color, int width, int height)
 {
 	Visual *visual;
 	int depth, res;
@@ -143,7 +143,7 @@
 	return px;
 }
 
-Widget pcb_ltf_color_button(Display *display, Widget parent, String name, const pcb_color_t *color)
+Widget pcb_ltf_color_button(Display *display, Widget parent, String name, const rnd_color_t *color)
 {
 	Widget btn;
 	Pixel background;
@@ -168,7 +168,7 @@
 	return btn;
 }
 
-int pcb_ltf_color_button_recolor(Display *display, Widget btn, const pcb_color_t *color)
+int pcb_ltf_color_button_recolor(Display *display, Widget btn, const rnd_color_t *color)
 {
 	Arg args[3];
 	int n = 0;
Index: trunk/src_plugins/hid_lesstif/wt_colorbtn.h
===================================================================
--- trunk/src_plugins/hid_lesstif/wt_colorbtn.h	(revision 30916)
+++ trunk/src_plugins/hid_lesstif/wt_colorbtn.h	(revision 30917)
@@ -1,7 +1,7 @@
 
-Widget pcb_ltf_color_button(Display *display, Widget parent, String name, const pcb_color_t *color);
+Widget pcb_ltf_color_button(Display *display, Widget parent, String name, const rnd_color_t *color);
 
-int pcb_ltf_color_button_recolor(Display *display, Widget btn, const pcb_color_t *color);
+int pcb_ltf_color_button_recolor(Display *display, Widget btn, const rnd_color_t *color);
 
 
 
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 30916)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 30917)
@@ -200,7 +200,7 @@
 		rnd_message(PCB_MSG_ERROR, "Invalid drawing mode %d\n", op);
 }
 
-static void remote_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void remote_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	int idx = gc2idx(gc);
 	if (idx >= 0) {
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 30916)
+++ trunk/src_plugins/io_lihata/read.c	(revision 30917)
@@ -985,7 +985,7 @@
 			if (rdver < 5)
 				iolht_warn(nclr, 1, "layer color was not supprted before lihata board v5 (reading from v%d)\n", rdver);
 			if (nclr->type == LHT_TEXT) {
-				if (pcb_color_load_str(&ly->meta.real.color, nclr->data.text.value) != 0)
+				if (rnd_color_load_str(&ly->meta.real.color, nclr->data.text.value) != 0)
 					return iolht_error(nclr, "Invalid color: '%s'\n", nclr->data.text.value);
 			}
 			else
Index: trunk/src_plugins/io_tedax/stackup.c
===================================================================
--- trunk/src_plugins/io_tedax/stackup.c	(revision 30916)
+++ trunk/src_plugins/io_tedax/stackup.c	(revision 30917)
@@ -382,7 +382,7 @@
 				if (grp->len > 0) {
 					pcb_layer_t *ly = pcb_get_layer(pcb->Data, grp->lid[0]);
 					if (ly != NULL)
-						pcb_color_load_str(&ly->meta.real.color, argv[3]);
+						rnd_color_load_str(&ly->meta.real.color, argv[3]);
 				}
 			}
 			else
Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c	(revision 30916)
+++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c	(revision 30917)
@@ -179,7 +179,7 @@
 	bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]);
 
 	memset(&gclr, 0, sizeof(gclr));
-	ctx->gctx->impl.map_color(pcb_color_black, &gclr);
+	ctx->gctx->impl.map_color(rnd_color_black, &gclr);
 
 	button = gtkc_color_button_new_with_color(&gclr);
 	gtk_color_button_set_title(GTK_COLOR_BUTTON(button), NULL);
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 30916)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 30917)
@@ -188,7 +188,7 @@
 
 	gtkc_color_button_get_color(GTK_WIDGET(button), &clr);
 	str = ctx->gctx->impl.get_color_name(&clr);
-	pcb_color_load_str(&dst->val.clr, str);
+	rnd_color_load_str(&dst->val.clr, str);
 
 	change_cb(ctx, dst);
 }
Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/pcb_gtk.h	(revision 30916)
+++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h	(revision 30917)
@@ -67,7 +67,7 @@
 	void (*screen_update)(void);
 	void (*shutdown_renderer)(void *port);
 
-	rnd_bool (*map_color)(const pcb_color_t *inclr, pcb_gtk_color_t *color);
+	rnd_bool (*map_color)(const rnd_color_t *inclr, pcb_gtk_color_t *color);
 	const gchar *(*get_color_name)(pcb_gtk_color_t *color);
 
 	void (*set_special_colors)(conf_native_t *cfg);
Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30916)
+++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30917)
@@ -134,7 +134,7 @@
 typedef struct {
 	PCB_DAD_DECL_NOINIT(dlg)
 	int wclr, wr, wg, wb;
-	pcb_color_t clr;
+	rnd_color_t clr;
 } clrpick_t;
 
 static int clamp(int c)
@@ -151,7 +151,7 @@
 	pcb_hid_attr_val_t val;
 	clrpick_t *ctx = caller_data;
 
-	pcb_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.lng), clamp(ctx->dlg[ctx->wg].val.lng), clamp(ctx->dlg[ctx->wb].val.lng), 255);
+	rnd_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.lng), clamp(ctx->dlg[ctx->wg].val.lng), clamp(ctx->dlg[ctx->wb].val.lng), 255);
 	val.clr = ctx->clr;
 	pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val);
 }
@@ -167,7 +167,7 @@
 	RND_PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, sclr = argv[1].val.str);
 
 	memset(&ctx, 0, sizeof(ctx));
-	if (pcb_color_load_str(&ctx.clr, sclr) != 0)
+	if (rnd_color_load_str(&ctx.clr, sclr) != 0)
 		return -1;
 
 	PCB_DAD_BEGIN_VBOX(ctx.dlg);
Index: trunk/src_plugins/lib_hid_common/lead_user.c
===================================================================
--- trunk/src_plugins/lib_hid_common/lead_user.c	(revision 30916)
+++ trunk/src_plugins/lib_hid_common/lead_user.c	(revision 30917)
@@ -99,7 +99,7 @@
 		pcb_render->set_line_width(*gc, ARL/40);
 		pcb_render->draw_arc(*gc, leadx, leady, LEAD_CENTER_RAD+step/10, LEAD_CENTER_RAD+step/10, 0, 360);
 
-/*		pcb_render->set_color(*gc, const pcb_color_t *color);*/
+/*		pcb_render->set_color(*gc, const rnd_color_t *color);*/
 
 		pcb_render->draw_line(*gc, x, y, x - ARL, y);
 		pcb_render->draw_line(*gc, x, y, x, y-ARL);
Index: trunk/src_plugins/lib_hid_pcbui/layersel.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30916)
+++ trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30917)
@@ -453,7 +453,7 @@
 }
 
 /* draw a visibility box: filled or partially filled with layer color */
-static void layer_vis_box(gen_xpm_t *dst, int filled, const pcb_color_t *color, int brd, int hatch, int width, int height, int slant)
+static void layer_vis_box(gen_xpm_t *dst, int filled, const rnd_color_t *color, int brd, int hatch, int width, int height, int slant)
 {
 	int max_height = height;
 	char *p;
@@ -537,7 +537,7 @@
 }
 
 
-static void layersel_create_layer_open(layersel_ctx_t *ls, ls_layer_t *lys, const char *name, const pcb_color_t *color, int brd, int hatch, int selectable)
+static void layersel_create_layer_open(layersel_ctx_t *ls, ls_layer_t *lys, const char *name, const rnd_color_t *color, int brd, int hatch, int selectable)
 {
 	layer_vis_box(&lys->on_open, 1, color, brd, hatch, 16, 16, 5);
 	layer_vis_box(&lys->off_open, 0, color, brd, hatch, 16, 16, 5);
@@ -561,7 +561,7 @@
 	PCB_DAD_END(ls->sub.dlg);
 }
 
-static void layersel_create_layer_closed(layersel_ctx_t *ls, ls_layer_t *lys, const char *name, const pcb_color_t *color, int brd, int hatch, int selected, int selectable)
+static void layersel_create_layer_closed(layersel_ctx_t *ls, ls_layer_t *lys, const char *name, const rnd_color_t *color, int brd, int hatch, int selected, int selectable)
 {
 	layer_vis_box(&lys->on_closed, 1, color, brd, hatch, 10, 10, 0);
 	layer_vis_box(&lys->off_closed, 0, color, brd, hatch, 10, 10, 0);
@@ -616,7 +616,7 @@
 		if (ly != NULL) {
 			int brd = (((ly != NULL) && (ly->comb & PCB_LYC_SUB)) ? 2 : 1);
 			int hatch = (((ly != NULL) && (ly->comb & PCB_LYC_AUTO)) ? 1 : 0);
-			const pcb_color_t *clr = &ly->meta.real.color;
+			const rnd_color_t *clr = &ly->meta.real.color;
 			ls_layer_t *lys = lys_get(ls, &ls->real_layer, g->lid[n], 1);
 
 			lys->ly = ly;
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 30916)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 30917)
@@ -102,7 +102,7 @@
 }
 
 
-static void log_set_color(pcb_hid_gc_t gc, const pcb_color_t *color)
+static void log_set_color(pcb_hid_gc_t gc, const rnd_color_t *color)
 {
 	pcb_fprintf(out_, "set_color(gc, %s)\n", color->str);
 	delegatee_->set_color(gc, color);
Index: trunk/src_plugins/millpath/toolpath.c
===================================================================
--- trunk/src_plugins/millpath/toolpath.c	(revision 30916)
+++ trunk/src_plugins/millpath/toolpath.c	(revision 30917)
@@ -188,14 +188,14 @@
 {
 	gdl_iterator_t it;
 	pcb_line_t *line;
-	static pcb_color_t clr1, clr2, clr3;
+	static rnd_color_t clr1, clr2, clr3;
 
 	if (clr1.str[0] != '#')
-		pcb_color_load_str(&clr1, "#EE9922");
+		rnd_color_load_str(&clr1, "#EE9922");
 	if (clr2.str[0] != '#')
-		pcb_color_load_str(&clr2, "#886611");
+		rnd_color_load_str(&clr2, "#886611");
 	if (clr3.str[0] != '#')
-		pcb_color_load_str(&clr3, "#FFCC55");
+		rnd_color_load_str(&clr3, "#FFCC55");
 
 	if (result->res_ply == NULL)
 		result->res_ply = pcb_uilayer_alloc(pcb_millpath_cookie, "mill remove", &clr1);
Index: trunk/src_plugins/propedit/props.h
===================================================================
--- trunk/src_plugins/propedit/props.h	(revision 30916)
+++ trunk/src_plugins/propedit/props.h	(revision 30917)
@@ -58,7 +58,7 @@
 	rnd_coord_t coord;
 	pcb_angle_t angle;
 	int i;
-	pcb_color_t clr;
+	rnd_color_t clr;
 } pcb_propval_t;
 
 typedef pcb_propval_t htprop_key_t;
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 30916)
+++ trunk/src_plugins/propedit/propsel.c	(revision 30917)
@@ -426,8 +426,8 @@
 
 static int layer_recolor(pcb_layer_t *layer, const char *clr)
 {
-	pcb_color_t c;
-	if (pcb_color_load_str(&c, clr) != 0)
+	rnd_color_t c;
+	if (rnd_color_load_str(&c, clr) != 0)
 		return -1;
 	return pcb_layer_recolor_(layer, &c, 1);
 }
Index: trunk/src_plugins/propedit/propsel.h
===================================================================
--- trunk/src_plugins/propedit/propsel.h	(revision 30916)
+++ trunk/src_plugins/propedit/propsel.h	(revision 30917)
@@ -31,7 +31,7 @@
 	const char *s; /* only for string */
 	rnd_coord_t c; /* also int */
 	double d;
-	pcb_color_t color;
+	rnd_color_t color;
 	rnd_bool c_absolute, d_absolute, c_valid, d_valid, clr_valid;
 
 	/* private */