Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 25351)
+++ trunk/src/crosshair.c	(revision 25352)
@@ -469,10 +469,7 @@
 		pcb_event(&PCB->hidlib, PCB_EVENT_RUBBER_MOVE_DRAW, "icc", 0, dx, dy );
 }
 
-/* ---------------------------------------------------------------------------
- * draws additional stuff that follows the crosshair
- */
-void pcb_draw_attached(pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_attached(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
 {
 	if (!inhibit_drawing_mode) {
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, NULL);
@@ -497,7 +494,7 @@
 }
 
 
-void pcb_draw_mark(pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_marks(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
 {
 	pcb_coord_t ms = conf_core.appearance.mark_size;
 
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 25351)
+++ trunk/src/crosshair.h	(revision 25352)
@@ -93,8 +93,6 @@
 
 void pcb_notify_crosshair_change(pcb_bool changes_complete);
 void pcb_notify_mark_change(pcb_bool changes_complete);
-void pcb_draw_attached(pcb_bool inhibit_drawing_mode);
-void pcb_draw_mark(pcb_bool inhibit_drawing_mode);
 void pcb_crosshair_move_relative(pcb_coord_t, pcb_coord_t);
 pcb_bool pcb_crosshair_move_absolute(pcb_coord_t, pcb_coord_t);
 void pcb_crosshair_set_range(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t);
Index: trunk/src/hidlib.h
===================================================================
--- trunk/src/hidlib.h	(revision 25351)
+++ trunk/src/hidlib.h	(revision 25352)
@@ -58,4 +58,10 @@
 /* The whole default menu file embedded in the executable; NULL if not present */
 extern const char *pcb_hidlib_default_embedded_menu;
 
+/* Draw any fixed mark on XOR overlay; if inhibit_drawing_mode is true, do not call ->set_drawing_mode */
+void pcbhl_draw_marks(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode);
+
+/* Draw any mark following the crosshair on XOR overlay; if inhibit_drawing_mode is true, do not call ->set_drawing_mode */
+void pcbhl_draw_attached(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode);
+
 #endif
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 25351)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 25352)
@@ -1100,11 +1100,11 @@
 
 	/* In some cases we are called with the crosshair still off */
 	if (priv->attached_invalidate_depth == 0)
-		pcb_draw_attached(0);
+		pcbhl_draw_attached(hidlib, 0);
 
 	/* In some cases we are called with the mark still off */
 	if (priv->mark_invalidate_depth == 0)
-		pcb_draw_mark(0);
+		pcbhl_draw_marks(hidlib, 0);
 
 	priv->clip_rect_valid = pcb_false;
 
@@ -1170,7 +1170,7 @@
 	}
 
 	if (priv->attached_invalidate_depth == 0)
-		pcb_draw_attached(0);
+		pcbhl_draw_attached(hidlib, 0);
 
 	if (!changes_complete) {
 		priv->attached_invalidate_depth++;
@@ -1204,7 +1204,7 @@
 	}
 
 	if (priv->mark_invalidate_depth == 0)
-		pcb_draw_mark(0);
+		pcbhl_draw_marks(hidlib, 0);
 
 	if (!changes_complete) {
 		priv->mark_invalidate_depth++;
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 25351)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 25352)
@@ -889,8 +889,8 @@
 
 	ghid_gl_invalidate_current_gc();
 
-	pcb_draw_attached(0);
-	pcb_draw_mark(0);
+	pcbhl_draw_attached(hidlib, 0);
+	pcbhl_draw_marks(hidlib, 0);
 	drawgl_flush();
 
 	ghid_gl_show_crosshair(hidlib, TRUE);
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 25351)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 25352)
@@ -1065,8 +1065,8 @@
 	case LeaveNotify:
 		crosshair_in_window = 0;
 		if (crosshair_on)
-			pcb_draw_attached(1);
-		pcb_draw_mark(1);
+			pcbhl_draw_attached(ltf_hidlib, 1);
+		pcbhl_draw_marks(ltf_hidlib, 1);
 		ShowCrosshair(pcb_false);
 		need_idle_proc();
 		break;
@@ -2017,8 +2017,8 @@
 		pixmap = window;
 		need_redraw = 0;
 		if (crosshair_on) {
-			pcb_draw_attached(1);
-			pcb_draw_mark(1);
+			pcbhl_draw_attached(ltf_hidlib, 1);
+			pcbhl_draw_marks(ltf_hidlib, 1);
 		}
 	}
 
@@ -2195,7 +2195,7 @@
 	if (invalidate_depth == 0 && crosshair_on) {
 		save_pixmap = pixmap;
 		pixmap = window;
-		pcb_draw_attached(1);
+		pcbhl_draw_attached(hidlib, 1);
 		pixmap = save_pixmap;
 	}
 
@@ -2225,7 +2225,7 @@
 	if (invalidate_depth == 0 && crosshair_on) {
 		save_pixmap = pixmap;
 		pixmap = window;
-		pcb_draw_mark(1);
+		pcbhl_draw_marks(hidlib, 1);
 		pixmap = save_pixmap;
 	}
 
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 25351)
+++ trunk/src_plugins/jostle/jostle.c	(revision 25352)
@@ -44,8 +44,6 @@
         t = (a)[1], (a)[1] = (b)[1], (b)[1] = t; \
 }
 
-/*{if (!pcb_marked.status && side==NORTHWEST) { pcb_draw_mark(pcb_true); pcb_marked.status = True; pcb_marked.X = p[0]; pcb_marked.Y = p[1]; pcb_draw_mark(False);} }*/
-
 enum {
 	JNORTH,
 	JNORTHEAST,