Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 27090)
+++ trunk/src/crosshair.c	(revision 27091)
@@ -288,11 +288,11 @@
 			
 			/* Draw the DRC outline if it is enabled */
 			if (conf_core.editor.show_drc) {
-				pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+				pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 				pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y,
 																line.Point2.X, line.Point2.Y,
 																line.Thickness + 2 * (conf_core.design.bloat + 1), 0);
-				pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+				pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 			}
 			break;
 		}
@@ -311,10 +311,10 @@
 
 			/* Draw the DRC outline if it is enabled */
 			if (conf_core.editor.show_drc) {
-				pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+				pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 				arc.Thickness += 2 * (conf_core.design.bloat + 1);
 				pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
-				pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+				pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 			}
 			break;
 		}
@@ -354,10 +354,10 @@
 
 				/* Draw the DRC outline if it is enabled */
 				if (conf_core.editor.show_drc) {
-					pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+					pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 					pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, 
 																	point2.Y,line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
-					pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+					pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 				}
 			}
 			else {
@@ -409,10 +409,10 @@
 
 			/* Draw the DRC outline if it is enabled */
 			if (conf_core.editor.show_drc) {
-				pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+				pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 				arc.Thickness += 2 * (conf_core.design.bloat + 1);
 				pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
-				pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+				pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 			}
 
 			/* Get the new arc point positions, calculate the movement deltas and send them 
@@ -1050,7 +1050,7 @@
 {
 	pcb_crosshair.GC = pcb_hid_make_gc();
 
-	pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+	pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 	pcb_hid_set_draw_xor(pcb_crosshair.GC, 1);
 	pcb_hid_set_line_cap(pcb_crosshair.GC, pcb_cap_round);
 	pcb_hid_set_line_width(pcb_crosshair.GC, 1);
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 27090)
+++ trunk/src/draw.c	(revision 27091)
@@ -1107,7 +1107,7 @@
 	mirror = (flip_x ^ flip_y);
 	direction = (vert ? 1 : 0) + (flip_x ? 2 : 0);
 
-	pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name);
+	pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name);
 
 	if (pcb_gui->gui)
 		pcb_draw_force_termlab++;
Index: trunk/src/draw_composite.c
===================================================================
--- trunk/src/draw_composite.c	(revision 27090)
+++ trunk/src/draw_composite.c	(revision 27091)
@@ -41,7 +41,7 @@
 
 static void comp_fill_board(comp_ctx_t *ctx)
 {
-	pcb_gui->set_color(pcb_draw_out.fgGC, ctx->color);
+	pcb_render->set_color(pcb_draw_out.fgGC, ctx->color);
 	if (ctx->info->drawn_area == NULL)
 		pcb_gui->fill_rect(pcb_draw_out.fgGC, 0, 0, ctx->info->pcb->hidlib.size_x, ctx->info->pcb->hidlib.size_y);
 	else
@@ -62,7 +62,7 @@
 {
 	if (ctx->thin) {
 		pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area);
-		pcb_gui->set_color(pcb_draw_out.pmGC, ctx->color);
+		pcb_render->set_color(pcb_draw_out.pmGC, ctx->color);
 		return;
 	}
 
Index: trunk/src/draw_ly_spec.c
===================================================================
--- trunk/src/draw_ly_spec.c	(revision 27090)
+++ trunk/src/draw_ly_spec.c	(revision 27091)
@@ -267,7 +267,7 @@
 		pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
 		pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 
-		pcb_gui->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color);
+		pcb_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color);
 		pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
 		pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid);
 		pcb_gui->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 27090)
+++ trunk/src/obj_arc.c	(revision 27091)
@@ -995,7 +995,7 @@
 		pcb_lighten_color(color, &buf, 1.75);
 		color = &buf;
 	}
-	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_render->set_color(pcb_draw_out.fgGC, color);
 	pcb_arc_draw_(info, arc, allow_term_gfx);
 }
 
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 27090)
+++ trunk/src/obj_line.c	(revision 27091)
@@ -1148,7 +1148,7 @@
 		color = &buf;
 	}
 
-	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_render->set_color(pcb_draw_out.fgGC, color);
 	pcb_line_draw_(info, line, allow_term_gfx);
 }
 
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 27090)
+++ trunk/src/obj_poly.c	(revision 27091)
@@ -1103,9 +1103,9 @@
 		return;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, poly))
-		pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
+		pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
 	else
-		pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name);
+		pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name);
 
 	pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
 	pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
@@ -1276,7 +1276,7 @@
 		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
 	else
 		color = &layer->meta.real.color;
-	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_render->set_color(pcb_draw_out.fgGC, color);
 
 	pcb_poly_draw_(info, polygon, allow_term_gfx);
 }
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 27090)
+++ trunk/src/obj_pstk.c	(revision 27091)
@@ -404,12 +404,12 @@
 
 	}
 
-	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_render->set_color(pcb_draw_out.fgGC, color);
 }
 
 static void set_ps_annot_color(pcb_hid_gc_t gc, pcb_pstk_t *ps)
 {
-	pcb_gui->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ?
+	pcb_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ?
 		&conf_core.appearance.color.selected : &conf_core.appearance.color.padstackmark);
 }
 
@@ -660,7 +660,7 @@
 	if (!proto->hplated && !pcb_xform_omit_overlay(info)) {
 		pcb_coord_t r = proto->hdia / 2;
 		r -= r/8; /* +12.5% */
-		pcb_gui->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc);
+		pcb_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc);
 		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
 		pcb_gui->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290);
 	}
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 27090)
+++ trunk/src/obj_rat.c	(revision 27091)
@@ -443,15 +443,15 @@
 
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) {
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, rat))
-			pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
+			pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
 		else
-			pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.connected);
+			pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.connected);
 	}
 	else if (PCB_HAS_COLOROVERRIDE(rat)) {
-		pcb_gui->set_color(pcb_draw_out.fgGC, rat->override_color);
+		pcb_render->set_color(pcb_draw_out.fgGC, rat->override_color);
 	}
 	else
-		pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.rat);
+		pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.rat);
 
 	if (conf_core.appearance.rat_thickness < 20)
 		rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness;
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 27090)
+++ trunk/src/obj_subc.c	(revision 27091)
@@ -1706,7 +1706,7 @@
 		freq = 32;
 
 	nnclr = (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc)) ? &conf_core.appearance.color.subc_nonetlist : &conf_core.appearance.color.subc;
-	pcb_gui->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : nnclr);
+	pcb_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : nnclr);
 	pcb_subc_draw_origin(pcb_draw_out.fgGC, subc, 0, 0);
 
 	if (freq >= 0) {
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 27090)
+++ trunk/src/obj_text.c	(revision 27091)
@@ -1281,21 +1281,21 @@
 		if (layer->is_bound) {
 			const pcb_color_t *color;
 			PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
-			pcb_gui->set_color(pcb_draw_out.fgGC, color);
+			pcb_render->set_color(pcb_draw_out.fgGC, color);
 		}
 		else
-			pcb_gui->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
+			pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected);
 	}
 	else if (PCB_HAS_COLOROVERRIDE(text)) {
-		pcb_gui->set_color(pcb_draw_out.fgGC, text->override_color);
+		pcb_render->set_color(pcb_draw_out.fgGC, text->override_color);
 	}
 	else if (layer->is_bound) {
 		const pcb_color_t *color;
 		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
-		pcb_gui->set_color(pcb_draw_out.fgGC, color);
+		pcb_render->set_color(pcb_draw_out.fgGC, color);
 	}
 	else
-		pcb_gui->set_color(pcb_draw_out.fgGC, &layer->meta.real.color);
+		pcb_render->set_color(pcb_draw_out.fgGC, &layer->meta.real.color);
 
 	if ((!layer->is_bound) && (layer->meta.real.grp >= 0))
 		flg = pcb_layergrp_flags(PCB, layer->meta.real.grp);
Index: trunk/src/route.c
===================================================================
--- trunk/src/route.c	(revision 27090)
+++ trunk/src/route.c	(revision 27091)
@@ -684,7 +684,7 @@
 
 		pcb_layer_t *layer = pcb_get_layer(PCB->Data, p_obj->layer);
 		if (layer)
-			pcb_gui->set_color(GC, &layer->meta.real.color);
+			pcb_render->set_color(GC, &layer->meta.real.color);
 
 		switch (p_obj->type) {
 			case PCB_OBJ_LINE:
@@ -709,7 +709,7 @@
 	pcb_coord_t thickness = p_route->thickness + 2 * conf_core.design.bloat;
 	int i;
 
-	pcb_gui->set_color(GC, &pcbhl_conf.appearance.color.cross);
+	pcb_render->set_color(GC, &pcbhl_conf.appearance.color.cross);
 
 	for(i = 0; i < p_route->size; ++i) {
 		const pcb_route_object_t *p_obj = &p_route->objects[i];
Index: trunk/src/stub_draw.c
===================================================================
--- trunk/src/stub_draw.c	(revision 27090)
+++ trunk/src/stub_draw.c	(revision 27091)
@@ -35,7 +35,7 @@
 {
 	pcb_text_t t;
 
-	pcb_gui->set_color(gc, pcb_color_red);
+	pcb_render->set_color(gc, pcb_color_red);
 
 	memset(&t, 0, sizeof(t));
 	t.TextString = (char *)str;
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c	(revision 27090)
+++ trunk/src/tool_arc.c	(revision 27091)
@@ -140,15 +140,15 @@
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
 		pcb_xordraw_attached_arc(conf_core.design.line_thickness);
 		if (conf_core.editor.show_drc) {
-			pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+			pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 			pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
-			pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 		}
 	}
 	else {
 		/* Draw a circle (0 length line) to show where the arc will start when placed */
 		if(CURRENT)
-			pcb_gui->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
+			pcb_render->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
 
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_crosshair.X, pcb_crosshair.Y,
@@ -156,12 +156,12 @@
 			conf_core.design.line_thickness, 0);
 
 		if(conf_core.editor.show_drc) {
-			pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+			pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 			pcb_draw_wireframe_line(pcb_crosshair.GC,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
-			pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 		}
 	}
 
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c	(revision 27090)
+++ trunk/src/tool_line.c	(revision 27091)
@@ -358,12 +358,12 @@
 		pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC);
 		if (conf_core.editor.show_drc)
 			pcb_route_draw_drc(&pcb_crosshair.Route,pcb_crosshair.GC);
-		pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+		pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 	}
 	else {
 		/* Draw a circle (0 length line) to show where the line will be placed */
 		if (CURRENT)
-			pcb_gui->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
+			pcb_render->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
 
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_crosshair.X, pcb_crosshair.Y,
@@ -371,12 +371,12 @@
 			conf_core.design.line_thickness,0 );
 
 		if (conf_core.editor.show_drc) {
-			pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+			pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 			pcb_draw_wireframe_line(pcb_crosshair.GC,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				pcb_crosshair.X, pcb_crosshair.Y, 
 				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
-			pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 		}
 	}
 }
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 27090)
+++ trunk/src/tool_via.c	(revision 27091)
@@ -97,9 +97,9 @@
 	xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0);
 	if (conf_core.editor.show_drc) {
 		/* XXX: Naughty cheat - use the mask to draw DRC clearance! */
-		pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+		pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 		xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance);
-		pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+		pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 	}
 }
 
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 27090)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 27091)
@@ -378,7 +378,7 @@
 	int n;
 	pcb_gui->set_line_cap(pcb_crosshair.GC, pcb_cap_round);
 	pcb_gui->set_line_width(pcb_crosshair.GC, 1);
-	pcb_gui->set_color(pcb_crosshair.GC, pcb_color_grey33);
+	pcb_render->set_color(pcb_crosshair.GC, pcb_color_grey33);
 	for(n = 0; n < vtc0_len(&pcb_ddraft_attached.annot_lines); n += 4) {
 		pcb_coord_t *c = &pcb_ddraft_attached.annot_lines.array[n];
 		pcb_gui->draw_line(pcb_crosshair.GC, c[0], c[1], c[2], c[3]);
@@ -385,7 +385,7 @@
 	}
 
 	if (pcb_ddraft_attached.line_valid) {
-		pcb_gui->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
+		pcb_render->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_ddraft_attached.line.Point1.X, pcb_ddraft_attached.line.Point1.Y, pcb_ddraft_attached.line.Point2.X, pcb_ddraft_attached.line.Point2.Y,
 			conf_core.design.line_thickness, 0);
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 27090)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 27091)
@@ -173,7 +173,7 @@
 
 	pcb_pstk_draw_preview(PCB, &ps, layers, 0, 0, &e->view);
 
-	pcb_gui->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, pcb_color_black);
 	pcb_hid_set_line_cap(gc, pcb_cap_round);
 	pcb_hid_set_line_width(gc, -1);
 
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 27090)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 27091)
@@ -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_gui->set_color(gc, pcb_color_red);
+		pcb_render->set_color(gc, pcb_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_test.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_test.c	(revision 27090)
+++ trunk/src_plugins/dialogs/dlg_test.c	(revision 27091)
@@ -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_gui->set_color(gc, pcb_color_red);
+	pcb_render->set_color(gc, pcb_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");
Index: trunk/src_plugins/draw_csect/draw_csect.c
===================================================================
--- trunk/src_plugins/draw_csect/draw_csect.c	(revision 27090)
+++ trunk/src_plugins/draw_csect/draw_csect.c	(revision 27091)
@@ -116,11 +116,11 @@
 	t.Flags = pcb_no_flags();
 
 	if (pcb_gui->gui) { /* it is unreadable on black&white and on most exporters */
-		pcb_gui->set_color(gc, bgcolor);
+		pcb_render->set_color(gc, bgcolor);
 		pcb_text_draw_(NULL, &t, 1000000, 0, PCB_TXT_TINY_ACCURATE);
 	}
 
-	pcb_gui->set_color(gc, fgcolor);
+	pcb_render->set_color(gc, fgcolor);
 	pcb_text_draw_(NULL, &t, 0, 0, PCB_TXT_TINY_ACCURATE);
 
 	return &t;
@@ -439,7 +439,7 @@
 	reset_layer_coords();
 	csect_gc = gc;
 
-	pcb_gui->set_color(gc, &COLOR_ANNOT);
+	pcb_render->set_color(gc, &COLOR_ANNOT);
 	dtext(0, 0, 500, 0, "Board cross section");
 
 	/* draw physical layers */
@@ -493,7 +493,7 @@
 		else
 			continue;
 
-		pcb_gui->set_color(gc, color);
+		pcb_render->set_color(gc, color);
 		dhrect(0, y, GROUP_WIDTH_MM, y+th,  1, 0.5,  stepf, stepb, OMIT_LEFT | OMIT_RIGHT);
 		dtext_bg(gc, 5, y, 200, 0, g->name, &COLOR_BG, &COLOR_ANNOT);
 		reg_group_coords(gid, PCB_MM_TO_COORD(y), PCB_MM_TO_COORD(y+th));
@@ -541,7 +541,7 @@
 		pcb_text_t *t;
 		if (g->len > 0) {
 			pcb_layer_t *l = &PCB->Data->Layer[g->lid[0]];
-			pcb_gui->set_color(gc, &l->meta.real.color);
+			pcb_render->set_color(gc, &l->meta.real.color);
 			t = dtext_bg(gc, 1, y, 200, 0, l->name, &COLOR_BG, &l->meta.real.color);
 			pcb_text_bbox(pcb_font(PCB, 0, 1), t);
 			dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE);
@@ -549,7 +549,7 @@
 			reg_layer_coords(g->lid[0], t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4));
 		}
 		else {
-			pcb_gui->set_color(gc, &COLOR_OUTLINE);
+			pcb_render->set_color(gc, &COLOR_OUTLINE);
 			t = dtext_bg(gc, 1, y, 200, 0, "<outline>", &COLOR_BG, &COLOR_OUTLINE);
 			pcb_text_bbox(pcb_font(PCB, 0, 1), t);
 			dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE);
@@ -572,7 +572,7 @@
 
 
 	if (DRAGGING) {
-		pcb_gui->set_color(gc, pcb_color_black);
+		pcb_render->set_color(gc, pcb_color_black);
 
 		/* draw the actual operation */
 		if (drag_addgrp) {
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 27090)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 27091)
@@ -235,7 +235,7 @@
 			plated_sym = --ds;
 		if (drill->UnplatedCount)
 			unplated_sym = --ds;
-		pcb_gui->set_color(gc, &conf_core.appearance.color.pin);
+		pcb_render->set_color(gc, &conf_core.appearance.color.pin);
 		for (i = 0; i < drill->PinN; i++) {
 			int unplated = 1;
 			pcb_coord_t x, y;
@@ -262,7 +262,7 @@
 			text_at(info, gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO");
 			text_at(info, gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount);
 		}
-		pcb_gui->set_color(gc, &conf_core.appearance.color.element);
+		pcb_render->set_color(gc, &conf_core.appearance.color.element);
 		if (pcbhl_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
 			text_at(info, gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize));
 		else
@@ -278,7 +278,7 @@
 		total_drills += drill->ViaCount;
 	}
 
-	pcb_gui->set_color(gc, &conf_core.appearance.color.element);
+	pcb_render->set_color(gc, &conf_core.appearance.color.element);
 	text_at(info, gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol");
 	if (pcbhl_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
 		text_at(info, gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)");
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 27090)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 27091)
@@ -78,13 +78,13 @@
 	int w = 2, h = 2;
 	float th = 0.1, th2 = 0.4;
 
-	pcb_gui->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, pcb_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_gui->set_color(gc, pcb_color_red);
+		pcb_render->set_color(gc, pcb_color_red);
 		dline(x0, y0, x0+w, y0+h, th2);
 		dline(x0, y0+h, x0+w, y0, th2);
 	}
@@ -112,7 +112,7 @@
 
 	dchkbox(gc, x-4, *y, (f->id == target_fid));
 
-	pcb_gui->set_color(gc, pcb_color_black);
+	pcb_render->set_color(gc, pcb_color_black);
 	t = dtext(x, *y, 200, f->id, buf);
 	pcb_text_bbox(pcb_font(PCB, f->id, 1), t);
 
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 27090)
+++ trunk/src_plugins/jostle/jostle.c	(revision 27091)
@@ -97,7 +97,7 @@
 				y[i++] = v->point[1];
 			}
 /*			if (1) {
-				pcb_gui->set_color(ddgc, color ? color : conf_core.appearance.color.connected);
+				pcb_render->set_color(ddgc, color ? color : conf_core.appearance.color.connected);
 				pcb_hid_set_line_width(ddgc, 1);
 				for (i = 0; i < n - 1; i++) {
 					pcb_gui->draw_line(ddgc, x[i], y[i], x[i + 1], y[i + 1]);
Index: trunk/src_plugins/lib_hid_common/lead_user.c
===================================================================
--- trunk/src_plugins/lib_hid_common/lead_user.c	(revision 27090)
+++ trunk/src_plugins/lib_hid_common/lead_user.c	(revision 27091)
@@ -99,7 +99,7 @@
 		pcb_gui->set_line_width(*gc, ARL/40);
 		pcb_gui->draw_arc(*gc, leadx, leady, LEAD_CENTER_RAD+step/10, LEAD_CENTER_RAD+step/10, 0, 360);
 
-/*		pcb_gui->set_color(*gc, const pcb_color_t *color);*/
+/*		pcb_render->set_color(*gc, const pcb_color_t *color);*/
 
 		pcb_gui->draw_line(*gc, x, y, x - ARL, y);
 		pcb_gui->draw_line(*gc, x, y, x, y-ARL);
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c	(revision 27090)
+++ trunk/src_plugins/rubberband_orig/rubberband.c	(revision 27091)
@@ -1154,15 +1154,15 @@
 			}
 
 			if (PCB_FLAG_TEST(PCB_FLAG_RAT, ptr->Line)) {
-				pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.rat);
+				pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.rat);
 				pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness, 0);
 			}
 			else if (direct || (conf_core.editor.move_linepoint_uses_route == 0)) {
-				pcb_gui->set_color(pcb_crosshair.GC, &ptr->Layer->meta.real.color);
+				pcb_render->set_color(pcb_crosshair.GC, &ptr->Layer->meta.real.color);
 				pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness, 0);
 				/* Draw the DRC outline if it is enabled */
 				if (conf_core.editor.show_drc) {
-					pcb_gui->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+					pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
 					pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
 				}
 			}
@@ -1186,7 +1186,7 @@
 					pcb_route_draw_drc(&route, pcb_crosshair.GC);
 				pcb_route_destroy(&route);
 			}
-			pcb_gui->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
+			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
 		}
 
 		ptr++;
Index: trunk/src_plugins/serpentine/serpentine.c
===================================================================
--- trunk/src_plugins/serpentine/serpentine.c	(revision 27090)
+++ trunk/src_plugins/serpentine/serpentine.c	(revision 27091)
@@ -97,7 +97,7 @@
 	const pcb_coord_t x2 = p_info->end.X + nx;
 	const pcb_coord_t y2 = p_info->end.Y + ny;
 	
-	pcb_gui->set_color(pcb_crosshair.GC, "#808080" /*conf_core.appearance.color.crosshair*/ );
+	pcb_render->set_color(pcb_crosshair.GC, "#808080" /*conf_core.appearance.color.crosshair*/ );
 	pcb_gui->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, p_info->end.X, p_info->end.Y );
 	pcb_gui->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, x1, y1 );
 	pcb_gui->draw_line(pcb_crosshair.GC, p_info->end.X, p_info->end.Y, x2, y2 );