Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 26805)
+++ trunk/src/change_act.c	(revision 26806)
@@ -468,7 +468,7 @@
 			defer_needs_update = 1;
 		else {
 			/* pcb_undo_inc_serial(); */
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 		}
 	}
 
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 26805)
+++ trunk/src/crosshair.c	(revision 26806)
@@ -532,7 +532,7 @@
 void pcb_notify_crosshair_change(pcb_bool changes_complete)
 {
 	if (pcb_gui->notify_crosshair_change)
-		pcb_gui->notify_crosshair_change(pcb_gui, &PCB->hidlib, changes_complete);
+		pcb_gui->notify_crosshair_change(pcb_gui, changes_complete);
 	pcb_event(&PCB->hidlib, PCB_EVENT_CROSSHAIR_MOVE, "i", (int)changes_complete, NULL);
 }
 
@@ -554,7 +554,7 @@
 void pcb_notify_mark_change(pcb_bool changes_complete)
 {
 	if (pcb_gui->notify_mark_change)
-		pcb_gui->notify_mark_change(pcb_gui, &PCB->hidlib, changes_complete);
+		pcb_gui->notify_mark_change(pcb_gui, changes_complete);
 }
 
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 26805)
+++ trunk/src/draw.c	(revision 26806)
@@ -160,7 +160,7 @@
 	if (pcb_draw_inhibit)
 		return;
 	if (pcb_draw_invalidated.X1 <= pcb_draw_invalidated.X2 && pcb_draw_invalidated.Y1 <= pcb_draw_invalidated.Y2)
-		pcb_gui->invalidate_lr(pcb_gui, &PCB->hidlib, pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2);
+		pcb_gui->invalidate_lr(pcb_gui, pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2);
 
 	/* shrink the update block */
 	pcb_draw_invalidated.X1 = pcb_draw_invalidated.Y1 = COORD_MAX;
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 26805)
+++ trunk/src/gui_act.c	(revision 26806)
@@ -115,7 +115,7 @@
 		else
 			conf_set(CFR_DESIGN, "editor/subc_id", -1, "", POL_OVERWRITE);
 
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib); /* doesn't change too often, isn't worth anything more complicated */
+		pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */
 		pcb_draw();
 		return 0;
 	}
@@ -126,7 +126,7 @@
 		else
 			conf_set(CFR_DESIGN, "editor/term_id", -1, "", POL_OVERWRITE);
 
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib); /* doesn't change too often, isn't worth anything more complicated */
+		pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */
 		pcb_draw();
 		return 0;
 	}
@@ -1311,7 +1311,7 @@
 
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 	if ((pcb_gui != NULL) && (pcb_exporter == NULL))
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 
 	return 0;
 }
@@ -1364,7 +1364,7 @@
 
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 	if ((pcb_gui != NULL) && (pcb_exporter == NULL))
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 
 	return 0;
 }
@@ -1409,7 +1409,7 @@
 
 	PCB->RatDraw = 0;
 	pcb_layervis_change_group_vis(atoi(name)-1, 1, 1);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	return 0;
 }
@@ -1490,7 +1490,7 @@
 		else
 			PCB_ACT_FAIL(toggleview);
 		pcb_layer_vis_change_all(PCB, open, vis);
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 		return 0;
 	}
@@ -1502,12 +1502,12 @@
 	}
 	else if ((pcb_strcasecmp(name, "padstacks") == 0) || (pcb_strcasecmp(name, "vias") == 0) || (pcb_strcasecmp(name, "pins") == 0) || (pcb_strcasecmp(name, "pads") == 0)) {
 		PCB->pstk_on = !PCB->pstk_on;
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	}
 	else if (pcb_strcasecmp(name, "BackSide") == 0) {
 		PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn;
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	}
 	else if (strncmp(name, "ui:", 3) == 0) {
@@ -1518,7 +1518,7 @@
 			return 0;
 		}
 		ly->meta.real.vis = !ly->meta.real.vis;
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	}
 	else {
@@ -1526,7 +1526,7 @@
 		int id = strtol(name, &end, 10) - 1;
 		if (*end == '\0') { /* integer layer */
 			pcb_layervis_change_group_vis(id, -1, 0);
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 			pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 			return 0;
 		}
@@ -1535,7 +1535,7 @@
 			if (ml != NULL) {
 				pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs);
 				*v = !(*v);
-				pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+				pcb_gui->invalidate_all(pcb_gui);
 				pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 				return 0;
 			}
@@ -1779,7 +1779,7 @@
 static const char pcb_acth_Redraw[] = "Redraw the entire screen";
 static fgw_error_t pcb_act_Redraw(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	PCB_ACT_IRES(0);
 	return 0;
 }
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26805)
+++ trunk/src/hid.h	(revision 26806)
@@ -255,10 +255,10 @@
 	int (*parse_arguments)(pcb_hid_t *hid, int *argc, char ***argv);
 
 	/* This may be called to ask the GUI to force a redraw of a given area */
-	void (*invalidate_lr)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom);
-	void (*invalidate_all)(pcb_hid_t *hid, pcb_hidlib_t *hidlib);
-	void (*notify_crosshair_change)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete);
-	void (*notify_mark_change)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete);
+	void (*invalidate_lr)(pcb_hid_t *hid, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom);
+	void (*invalidate_all)(pcb_hid_t *hid);
+	void (*notify_crosshair_change)(pcb_hid_t *hid, pcb_bool changes_complete);
+	void (*notify_mark_change)(pcb_hid_t *hid, pcb_bool changes_complete);
 
 	/* During redraw or print/export cycles, this is called once per layer group
 	   (physical layer); pusrpose/purpi are the extracted purpose field and its
@@ -624,7 +624,7 @@
 int pcb_hid_dock_enter(pcb_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id);
 void pcb_hid_dock_leave(pcb_hid_dad_subdialog_t *sub);
 
-#define pcb_hid_redraw(pcb) pcb_gui->invalidate_all(pcb_gui, &pcb->hidlib)
+#define pcb_hid_redraw(pcb) pcb_gui->invalidate_all(pcb_gui)
 
 #define pcb_hid_busy(pcb, is_busy) \
 do { \
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26805)
+++ trunk/src/hid_nogui.c	(revision 26806)
@@ -71,12 +71,12 @@
 	CRASH("parse_arguments");
 }
 
-static void nogui_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+static void nogui_invalidate_lr(pcb_hid_t *hid, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
 {
 	CRASH("invalidate_lr");
 }
 
-static void nogui_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void nogui_invalidate_all(pcb_hid_t *hid)
 {
 	CRASH("invalidate_all");
 }
Index: trunk/src/hidlib_conf.c
===================================================================
--- trunk/src/hidlib_conf.c	(revision 26805)
+++ trunk/src/hidlib_conf.c	(revision 26806)
@@ -60,7 +60,7 @@
 		hidlib->grid = Grid;
 		conf_set_design("editor/grid", "%$mS", Grid);
 		if (pcbhl_conf.editor.draw_grid)
-			pcb_gui->invalidate_all(pcb_gui, hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 	}
 }
 
Index: trunk/src/layer_grp.c
===================================================================
--- trunk/src/layer_grp.c	(revision 26805)
+++ trunk/src/layer_grp.c	(revision 26806)
@@ -45,7 +45,7 @@
 	if (!inhibit_notify) { \
 		pcb_event(&pcb->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); \
 		if ((pcb_gui != NULL) && (pcb_exporter == NULL)) \
-			pcb_gui->invalidate_all(pcb_gui, &pcb->hidlib); \
+			pcb_gui->invalidate_all(pcb_gui); \
 		pcb_board_set_changed_flag(pcb_true); \
 	} \
 } while(0)
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 26805)
+++ trunk/src/main_act.c	(revision 26806)
@@ -412,7 +412,7 @@
 	defer_updates = 0;
 	if (defer_needs_update) {
 		pcb_undo_inc_serial();
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 	fclose(fp);
 	PCB_ACT_IRES(0);
Index: trunk/src/netlist2.c
===================================================================
--- trunk/src/netlist2.c	(revision 26805)
+++ trunk/src/netlist2.c	(revision 26806)
@@ -337,7 +337,7 @@
 		free(e->key);
 	htsp_uninit(&sctx->found);
 	if (sctx->changed) {
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		conf_core.temp.rat_warn = pcb_true;
 	}
 }
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 26805)
+++ trunk/src/netlist_act.c	(revision 26806)
@@ -269,7 +269,7 @@
 			free(refdes);
 		}
 		if (pcb_gui != NULL)
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 	}
 	else if (argc > 2) {
 		pin_found = 1;
@@ -278,12 +278,12 @@
 				func(net, term);
 		}
 		if (pcb_gui != NULL)
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 	}
 	else {
 		func(net, NULL);
 		if (pcb_gui != NULL)
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 	}
 
 	return pin_found;
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 26805)
+++ trunk/src/obj_text.c	(revision 26806)
@@ -1398,7 +1398,7 @@
 		return;
 
 	if (pcb_text_font_chg_data(PCB->Data, argv[1].d.i))
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib); /* can't just redraw the text, as the old text may have been bigger, before the change! */
+		pcb_gui->invalidate_all(pcb_gui); /* can't just redraw the text, as the old text may have been bigger, before the change! */
 
 	pcb_trace("font change %d\n", argv[1].d.i);
 }
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 26805)
+++ trunk/src/rats_patch.c	(revision 26806)
@@ -443,7 +443,7 @@
 	pcb_undo_restore_serial();
 	if (changed) {
 		pcb_undo_inc_serial();
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 	return 0;
 }
Index: trunk/src/tool_buffer.c
===================================================================
--- trunk/src/tool_buffer.c	(revision 26805)
+++ trunk/src/tool_buffer.c	(revision 26806)
@@ -64,7 +64,7 @@
 
 	if (pcb_buffer_copy_to_layout(PCB, pcb_crosshair.AttachedObject.tx, pcb_crosshair.AttachedObject.ty)) {
 		pcb_board_set_changed_flag(pcb_true);
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 }
 
Index: trunk/src_plugins/ddraft/cli_line.c
===================================================================
--- trunk/src_plugins/ddraft/cli_line.c	(revision 26805)
+++ trunk/src_plugins/ddraft/cli_line.c	(revision 26806)
@@ -74,7 +74,7 @@
 		pcb_ddraft_attached.line.Point1.Y = box.Y1;
 		pcb_ddraft_attached.line.Point2.X = box.X2;
 		pcb_ddraft_attached.line.Point2.Y = box.Y2;
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 	return res;
 }
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 26805)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 26806)
@@ -107,7 +107,7 @@
 					continue;
 				}
 				res += pcb_trim_split(edges, (pcb_any_obj_t *)ptr2, REMO_INVALID, x, y, trim);
-				pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+				pcb_gui->invalidate_all(pcb_gui);
 			}
 			break;
 		default:
Index: trunk/src_plugins/dialogs/dlg_flag_edit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_flag_edit.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_flag_edit.c	(revision 26806)
@@ -75,7 +75,7 @@
 	if (clr != 0)
 		pcb_flag_change(ctx->pcb, PCB_CHGFLG_CLEAR, clr, ctx->obj_type, ctx->ptr1, ctx->obj, ctx->obj);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
Index: trunk/src_plugins/dialogs/dlg_layer_binding.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_layer_binding.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_layer_binding.c	(revision 26806)
@@ -228,11 +228,11 @@
 	lb_dialog2data(hid_ctx, ctx);
 	if (ctx->subc != NULL) {
 		if (pcb_subc_rebind(ctx->pcb, ctx->subc) > 0)
-			pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+			pcb_gui->invalidate_all(pcb_gui);
 	}
 	else { /* buffer */
 		pcb_data_binding_update(ctx->pcb, ctx->data);
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 	lb_data2dialog(hid_ctx, ctx); /* update disables */
 }
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 26806)
@@ -402,7 +402,7 @@
 			pcb_pstk_change_instance(ps, &to_pid, NULL, NULL, NULL, NULL);
 	}
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
@@ -445,7 +445,7 @@
 
 	if (changed) {
 		pcb_board_set_changed_flag(pcb_true);
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 }
 
Index: trunk/src_plugins/dialogs/dlg_library.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_library.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_library.c	(revision 26806)
@@ -188,7 +188,7 @@
 		pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
 		if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) != 0)
 			library_update_preview(ctx, pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc), NULL);
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 	ctx->timer_active = 0;
 	pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 1);
@@ -300,7 +300,7 @@
 					pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
 					if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) != 0)
 						library_update_preview(ctx, pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc), l);
-					pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+					pcb_gui->invalidate_all(pcb_gui);
 				}
 			}
 		}
Index: trunk/src_plugins/dialogs/dlg_netlist.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_netlist.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_netlist.c	(revision 26806)
@@ -227,7 +227,7 @@
 		pcb_message(PCB_MSG_ERROR, "Internal error: netlist_button_cb() called from an invalid widget\n");
 		return;
 	}
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void netlist_claim_obj_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
Index: trunk/src_plugins/dialogs/dlg_padstack.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_padstack.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_padstack.c	(revision 26806)
@@ -227,7 +227,7 @@
 	lock--;
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_chg_protodup(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -245,7 +245,7 @@
 	pcb_pstk_change_instance(pse->ps, &proto_id, NULL, NULL, NULL, NULL);
 	pse_ps2dlg(hid_ctx, pse);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_chg_instance(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -268,7 +268,7 @@
 	lock--;
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_chg_prname(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -297,7 +297,7 @@
 	lock--;
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_chg_hole(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -322,7 +322,7 @@
 	lock--;
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_chg_proto_clr(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -369,7 +369,7 @@
 	lock--;
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_del(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -381,7 +381,7 @@
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_hshadow(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -393,7 +393,7 @@
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_auto(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -439,7 +439,7 @@
 
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_copy(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -473,7 +473,7 @@
 
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_swap(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -507,7 +507,7 @@
 
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
@@ -535,7 +535,7 @@
 
 	pse_ps2dlg(pse->parent_hid_ctx, pse);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pse_shape_shrink(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -630,7 +630,7 @@
 	pse->shape_chg = NULL;
 	PCB_DAD_FREE(dlg);
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 /* Auto gen shape on a single layer */
@@ -733,7 +733,7 @@
 	pse_ps2dlg(hid_ctx, pse);
 	PCB_DAD_SET_VALUE(hid_ctx, pse->tab, int_value, 1); /* switch to the prototype view where the new attributes are visible */
 	pse_changed(pse);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 #define spring(dlg) \
Index: trunk/src_plugins/dialogs/dlg_pref_color.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_color.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_pref_color.c	(revision 26806)
@@ -74,7 +74,7 @@
 	pref_ctx_t *ctx = caller_data;
 	const char *path = attr->user_data;
 	conf_setf(ctx->role, path, -1, "%s", attr->default_val.clr_value.str);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pref_color_layer_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 26805)
+++ trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 26806)
@@ -180,7 +180,7 @@
 	else if (ctx->role == CFR_DESIGN)
 		pcb_board_set_changed_flag(1);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 static void pref_conf_editval_del_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *trigger_attr)
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 26805)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 26806)
@@ -174,7 +174,7 @@
 						default:
 							break;
 					}
-					pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+					pcb_gui->invalidate_all(pcb_gui);
 				}
 				return 1;
 			}
Index: trunk/src_plugins/drc_orig/drc_orig.c
===================================================================
--- trunk/src_plugins/drc_orig/drc_orig.c	(revision 26805)
+++ trunk/src_plugins/drc_orig/drc_orig.c	(revision 26806)
@@ -438,7 +438,7 @@
 	pcb_hid_progress(0, 0, NULL);
 	pcb_layervis_restore_stack();
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
Index: trunk/src_plugins/export_openems/mesh.c
===================================================================
--- trunk/src_plugins/export_openems/mesh.c	(revision 26805)
+++ trunk/src_plugins/export_openems/mesh.c	(revision 26806)
@@ -1030,7 +1030,7 @@
 	mesh.ui_layer_xy->name = pcb_strdup(mesh.ui_name_xy);
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 pcb_mesh_t *pcb_mesh_get(const char *name)
Index: trunk/src_plugins/extedit/extedit.c
===================================================================
--- trunk/src_plugins/extedit/extedit.c	(revision 26805)
+++ trunk/src_plugins/extedit/extedit.c	(revision 26806)
@@ -312,7 +312,7 @@
 			break;
 	}
 	if (pcb_gui != NULL)
-		pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 
 	quit1:;
 	pcb_tempfile_unlink(tmp_fn);
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 26805)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 26806)
@@ -161,11 +161,11 @@
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static void batch_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+static void batch_invalidate_lr(pcb_hid_t *hid, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
 {
 }
 
-static void batch_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void batch_invalidate_all(pcb_hid_t *hid)
 {
 }
 
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26805)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26806)
@@ -1117,8 +1117,9 @@
 }
 
 static int preview_lock = 0;
-static void ghid_gdk_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+static void ghid_gdk_invalidate_lr(pcb_hid_t *hid, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
 {
+	pcb_hidlib_t *hidlib = ghidgui->hidlib;
 	int dleft, dright, dtop, dbottom;
 	int minx, maxx, miny, maxy;
 	GdkRectangle rect;
@@ -1149,8 +1150,9 @@
 }
 
 
-static void ghid_gdk_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void ghid_gdk_invalidate_all(pcb_hid_t *hid)
 {
+	pcb_hidlib_t *hidlib = ghidgui->hidlib;
 	if (ghidgui && ghidgui->topwin.menu.menu_bar) {
 		redraw_region(hidlib, NULL);
 		if (!preview_lock) {
@@ -1162,8 +1164,9 @@
 	}
 }
 
-static void ghid_gdk_notify_crosshair_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void ghid_gdk_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
+	pcb_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = ghidgui->port.render_priv;
 
 	/* We sometimes get called before the GUI is up */
@@ -1180,7 +1183,7 @@
 		   is not expected to occur, but we will try to handle it gracefully.
 		   As we know the crosshair will have been shown already, we must
 		   repaint the entire view to be sure not to leave an artaefact. */
-		ghid_gdk_invalidate_all(pcb_gui, hidlib);
+		ghid_gdk_invalidate_all(pcb_gui);
 		return;
 	}
 
@@ -1196,8 +1199,9 @@
 	}
 }
 
-static void ghid_gdk_notify_mark_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void ghid_gdk_notify_mark_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
+	pcb_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = ghidgui->port.render_priv;
 
 	/* We sometimes get called before the GUI is up */
@@ -1213,7 +1217,7 @@
 		   is not expected to occur, but we will try to handle it gracefully.
 		   As we know the mark will have been shown already, we must
 		   repaint the entire view to be sure not to leave an artaefact. */
-		ghid_gdk_invalidate_all(pcb_gui, hidlib);
+		ghid_gdk_invalidate_all(pcb_gui);
 		return;
 	}
 
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26805)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26806)
@@ -522,7 +522,7 @@
 
 static int preview_lock = 0;
 
-void ghid_gl_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+void ghid_gl_invalidate_all(pcb_hid_t *hid)
 {
 	if (ghidgui && ghidgui->topwin.menu.menu_bar) {
 		ghid_draw_area_update(&ghidgui->port, NULL);
@@ -534,9 +534,9 @@
 	}
 }
 
-void ghid_gl_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+void ghid_gl_invalidate_lr(pcb_hid_t *hid, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
 {
-	ghid_gl_invalidate_all(hid, hidlib);
+	ghid_gl_invalidate_all(hid);
 	if (!preview_lock) {
 		preview_lock++;
 		pcb_gtk_previews_invalidate_all();
@@ -544,7 +544,7 @@
 	}
 }
 
-static void ghid_gl_notify_crosshair_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void ghid_gl_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	/* We sometimes get called before the GUI is up */
 	if (ghidgui->port.drawing_area == NULL)
@@ -551,10 +551,10 @@
 		return;
 
 	/* FIXME: We could just invalidate the bounds of the crosshair attached objects? */
-	ghid_gl_invalidate_all(hid, hidlib);
+	ghid_gl_invalidate_all(hid);
 }
 
-static void ghid_gl_notify_mark_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void ghid_gl_notify_mark_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	/* We sometimes get called before the GUI is up */
 	if (ghidgui->port.drawing_area == NULL)
@@ -561,7 +561,7 @@
 		return;
 
 	/* FIXME: We could just invalidate the bounds of the mark? */
-	ghid_gl_invalidate_all(hid, hidlib);
+	ghid_gl_invalidate_all(hid);
 }
 
 static void pcb_gl_draw_right_cross(pcb_hidlib_t *hidlib, GLint x, GLint y, GLint z)
Index: trunk/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- trunk/src_plugins/hid_lesstif/lesstif.h	(revision 26805)
+++ trunk/src_plugins/hid_lesstif/lesstif.h	(revision 26806)
@@ -40,7 +40,7 @@
 
 extern void lesstif_need_idle_proc(void);
 extern void lesstif_show_crosshair(int);
-extern void lesstif_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib);
+extern void lesstif_invalidate_all(pcb_hid_t *hid);
 extern void lesstif_coords_to_pcb(int, int, pcb_coord_t *, pcb_coord_t *);
 extern void lesstif_get_xy(const char *msg);
 extern void lesstif_update_widget_flags(pcb_hid_t *hid, const char *cookie);
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26805)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26806)
@@ -812,7 +812,7 @@
 	set_scroll(hscroll, view_left_x, view_width, ltf_hidlib->size_x);
 	set_scroll(vscroll, view_top_y, view_height, ltf_hidlib->size_y);
 
-	lesstif_invalidate_all(pcb_gui, ltf_hidlib);
+	lesstif_invalidate_all(pcb_gui);
 }
 
 static void zoom_max()
@@ -1203,7 +1203,7 @@
 static void scroll_callback(Widget scroll, int *view_dim, XmScrollBarCallbackStruct * cbs)
 {
 	*view_dim = cbs->value;
-	lesstif_invalidate_all(pcb_gui, ltf_hidlib);
+	lesstif_invalidate_all(pcb_gui);
 }
 
 static void work_area_make_pixmaps(Dimension width, Dimension height)
@@ -1339,7 +1339,7 @@
 
 	XtRemoveCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_first_expose, 0);
 	XtAddCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_expose, 0);
-	lesstif_invalidate_all(pcb_gui, ltf_hidlib);
+	lesstif_invalidate_all(pcb_gui);
 }
 
 static unsigned short int lesstif_translate_key(const char *desc, int len)
@@ -2143,7 +2143,7 @@
 	idle_proc_set = 1;
 }
 
-static void lesstif_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+static void lesstif_invalidate_lr(pcb_hid_t *hid, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
 {
 	if (!window)
 		return;
@@ -2152,13 +2152,13 @@
 	need_idle_proc();
 }
 
-void lesstif_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+void lesstif_invalidate_all(pcb_hid_t *hid)
 {
-	if (hidlib != NULL)
-		lesstif_invalidate_lr(hid, hidlib, 0, hidlib->size_x, 0, hidlib->size_y);
+	if (ltf_hidlib != NULL)
+		lesstif_invalidate_lr(hid, 0, ltf_hidlib->size_x, 0, ltf_hidlib->size_y);
 }
 
-static void lesstif_notify_crosshair_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void lesstif_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	static int invalidate_depth = 0;
 	Pixmap save_pixmap;
@@ -2184,7 +2184,7 @@
 	if (invalidate_depth == 0 && crosshair_on) {
 		save_pixmap = pixmap;
 		pixmap = window;
-		pcbhl_draw_attached(hidlib, 1);
+		pcbhl_draw_attached(ltf_hidlib, 1);
 		pixmap = save_pixmap;
 	}
 
@@ -2192,7 +2192,7 @@
 		invalidate_depth++;
 }
 
-static void lesstif_notify_mark_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void lesstif_notify_mark_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	static int invalidate_depth = 0;
 	Pixmap save_pixmap;
@@ -2214,7 +2214,7 @@
 	if (invalidate_depth == 0 && crosshair_on) {
 		save_pixmap = pixmap;
 		pixmap = window;
-		pcbhl_draw_marks(hidlib, 1);
+		pcbhl_draw_marks(ltf_hidlib, 1);
 		pixmap = save_pixmap;
 	}
 
@@ -2857,7 +2857,7 @@
 	if (!lesstif_active)
 		return;
 	if (strncmp(cfg->hash_path, "appearance/color/", 17) == 0)
-		lesstif_invalidate_all(pcb_gui, ltf_hidlib);
+		lesstif_invalidate_all(pcb_gui);
 	if (strncmp(cfg->hash_path, "rc/cli_", 7) == 0) {
 		stdarg_n = 0;
 		stdarg(XmNlabelString, XmStringCreatePCB(pcb_cli_prompt(":")));
Index: trunk/src_plugins/hid_remote/proto.c
===================================================================
--- trunk/src_plugins/hid_remote/proto.c	(revision 26805)
+++ trunk/src_plugins/hid_remote/proto.c	(revision 26806)
@@ -95,7 +95,7 @@
 	send_end(&pctx);
 }
 
-void proto_send_invalidate_all(pcb_hidlib_t *hidlib)
+void proto_send_invalidate_all(void)
 {
 	send_begin(&pctx, "inval");
 	send_open(&pctx, 0, 1);
Index: trunk/src_plugins/hid_remote/proto.h
===================================================================
--- trunk/src_plugins/hid_remote/proto.h	(revision 26805)
+++ trunk/src_plugins/hid_remote/proto.h	(revision 26806)
@@ -30,7 +30,7 @@
 void remote_proto_send_brddim(pcb_coord_t w, pcb_coord_t h);
 int remote_proto_send_ready();
 void proto_send_invalidate(int l, int r, int t, int b);
-void proto_send_invalidate_all(pcb_hidlib_t *hidlib);
+void proto_send_invalidate_all(void);
 
 int pcb_remote_new_layer_group(const char *name, pcb_layergrp_id_t idx, unsigned int flags);
 int pcb_remote_new_layer(const char *name, pcb_layer_id_t idx, unsigned int group);
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 26805)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 26806)
@@ -123,14 +123,14 @@
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static void remote_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+static void remote_invalidate_lr(pcb_hid_t *hid, pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
 {
 	proto_send_invalidate(l,r, t, b);
 }
 
-static void remote_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void remote_invalidate_all(pcb_hid_t *hid)
 {
-	proto_send_invalidate_all(hidlib);
+	proto_send_invalidate_all();
 }
 
 static int remote_set_layer_group(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
Index: trunk/src_plugins/lib_gtk_common/bu_menu.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 26805)
+++ trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 26806)
@@ -448,18 +448,14 @@
    executed. */
 static void ghid_menu_cb(GtkAction *action, const lht_node_t *node)
 {
-	pcb_gtk_menu_ctx_t *menu;
-
 	if (action == NULL || node == NULL)
 		return;
 
-	menu = node->doc->root->user_data;
-
 	pcb_hid_cfg_action(node);
 
 	/* GUI updates to reflect the result of the above action */
 	pcb_hidlib_adjust_attached_objects();
-	pcb_gui->invalidate_all(pcb_gui, menu->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 26805)
+++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 26806)
@@ -180,7 +180,7 @@
 		pcb_gtk_note_event_location(NULL);
 
 	pcb_hidlib_adjust_attached_objects();
-	pcb_gui->invalidate_all(pcb_gui, ghidgui->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	g_idle_add(ghid_idle_cb, tw);
 	return FALSE;
 }
@@ -326,7 +326,7 @@
 
 static gboolean drawing_area_enter_cb(GtkWidget *w, pcb_gtk_expose_t *p, void *user_data)
 {
-	pcb_gui->invalidate_all(pcb_gui, ghidgui->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	return FALSE;
 }
 
Index: trunk/src_plugins/lib_gtk_common/glue_common.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_common.c	(revision 26805)
+++ trunk/src_plugins/lib_gtk_common/glue_common.c	(revision 26806)
@@ -170,7 +170,7 @@
 	ghidgui->port.view.x0 = gtk_adjustment_get_value(h_adj);
 	ghidgui->port.view.y0 = gtk_adjustment_get_value(v_adj);
 
-	pcb_gui->invalidate_all(pcb_gui, ghidgui->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 void pcb_gtk_pan_common(void)
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26805)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26806)
@@ -132,7 +132,7 @@
 	ghdi_gui_inited(0, 1);
 
 	pcb_gtk_tw_ranges_scale(ghidgui);
-	pcb_gui->invalidate_all(pcb_gui, ghidgui->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	return 0;
 }
 
@@ -420,7 +420,7 @@
 	gdk_display_sync(display);
 	time(&start);
 	do {
-		pcb_gui->invalidate_all(pcb_gui, ghidgui->hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 		gdk_window_process_updates(window, FALSE);
 		time(&end);
 		i++;
Index: trunk/src_plugins/lib_gtk_common/in_mouse.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 26805)
+++ trunk/src_plugins/lib_gtk_common/in_mouse.c	(revision 26806)
@@ -276,7 +276,7 @@
 
 	hid_cfg_mouse_action(&ghid_mouse, ghid_mouse_button(ev->button) | mk, ctx->topwin.cmd.command_entry_status_line_active);
 
-	pcb_gui->invalidate_all(pcb_gui, ctx->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	if (!ctx->port.view.panning)
 		g_idle_add(ghid_idle_cb, &ctx->topwin);
 
@@ -296,7 +296,7 @@
 	hid_cfg_mouse_action(&ghid_mouse, ghid_mouse_button(ev->button) | mk | PCB_M_Release, ctx->topwin.cmd.command_entry_status_line_active);
 
 	pcb_hidlib_adjust_attached_objects();
-	pcb_gui->invalidate_all(pcb_gui, ctx->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	g_idle_add(ghid_idle_cb, &ctx->topwin);
 
 	return TRUE;
Index: trunk/src_plugins/lib_hid_common/lead_user.c
===================================================================
--- trunk/src_plugins/lib_hid_common/lead_user.c	(revision 26805)
+++ trunk/src_plugins/lib_hid_common/lead_user.c	(revision 26806)
@@ -50,7 +50,7 @@
 	step = sin(p) * LEAD_ANIM_AMP - LEAD_ANIM_AMP;
 	p += LEAD_ANIM_SPEED;
 
-	pcb_gui->invalidate_all(pcb_gui, lead_hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 
 	if (lead)
 		lead_timer = pcb_gui->add_timer(pcb_gui, lead_cb, LEAD_PERIOD_MS, user_data);
@@ -63,7 +63,7 @@
 	if (lead) {
 		pcb_gui->stop_timer(pcb_gui, lead_timer);
 		lead = enabled;
-		pcb_gui->invalidate_all(pcb_gui, lead_hidlib);
+		pcb_gui->invalidate_all(pcb_gui);
 	}
 
 	leadx = x;
Index: trunk/src_plugins/lib_hid_pcbui/act.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/act.c	(revision 26805)
+++ trunk/src_plugins/lib_hid_pcbui/act.c	(revision 26806)
@@ -299,7 +299,7 @@
 	pcb_gui->pan(pcb_gui, pcb_round(x + xoffs), pcb_round(y + yoffs), 0);
 	pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 
 	PCB_ACT_IRES(0);
 	return 0;
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 26805)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 26806)
@@ -36,28 +36,28 @@
 	return delegatee_->parse_arguments(delegatee_, argc, argv);
 }
 
-static void log_invalidate_lr(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+static void log_invalidate_lr(pcb_hid_t *hid, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
 {
 	pcb_fprintf(out_, "invalidate_lr(%mm, %mm, %mm, %mm)\n", left, right, top, bottom);
-	delegatee_->invalidate_lr(hid, hidlib, left, right, top, bottom);
+	delegatee_->invalidate_lr(hid, left, right, top, bottom);
 }
 
-static void log_invalidate_all(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void log_invalidate_all(pcb_hid_t *hid)
 {
 	pcb_fprintf(out_, "invalidate_all()\n");
-	delegatee_->invalidate_all(hid, hidlib);
+	delegatee_->invalidate_all(hid);
 }
 
-static void log_notify_crosshair_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void log_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	pcb_fprintf(out_, "pcb_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false");
-	delegatee_->notify_crosshair_change(hid, hidlib, changes_complete);
+	delegatee_->notify_crosshair_change(hid, changes_complete);
 }
 
-static void log_notify_mark_change(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_bool changes_complete)
+static void log_notify_mark_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
 	pcb_fprintf(out_, "pcb_notify_mark_change(%s)\n", changes_complete ? "true" : "false");
-	delegatee_->notify_mark_change(hid, hidlib, changes_complete);
+	delegatee_->notify_mark_change(hid, changes_complete);
 }
 
 static int log_set_layer_group(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
Index: trunk/src_plugins/propedit/propdlg.c
===================================================================
--- trunk/src_plugins/propedit/propdlg.c	(revision 26805)
+++ trunk/src_plugins/propedit/propdlg.c	(revision 26806)
@@ -349,7 +349,7 @@
 
 	pcb_propsel_set(&ctx->pe, r->user_data, &sctx);
 	prop_refresh(ctx);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 }
 
 
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 26805)
+++ trunk/src_plugins/puller/puller.c	(revision 26806)
@@ -439,7 +439,7 @@
 
 	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	pcb_undo_inc_serial();
 
 	PCB_ACT_IRES(0);
Index: trunk/src_plugins/script/live_script.c
===================================================================
--- trunk/src_plugins/script/live_script.c	(revision 26805)
+++ trunk/src_plugins/script/live_script.c	(revision 26806)
@@ -299,7 +299,7 @@
 		pcb_undo_inc_serial();
 	lvs->undo_post = pcb_undo_serial();
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib); /* if the script drew anything, get it displayed */
+	pcb_gui->invalidate_all(pcb_gui); /* if the script drew anything, get it displayed */
 
 	pcb_tempfile_unlink(fn);
 	return res;
@@ -320,7 +320,7 @@
 		return 1;
 	}
 	pcb_undo_above(lvs->undo_pre);
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 	return 0;
 }
 
Index: trunk/src_plugins/teardrops/teardrops.c
===================================================================
--- trunk/src_plugins/teardrops/teardrops.c	(revision 26805)
+++ trunk/src_plugins/teardrops/teardrops.c	(revision 26806)
@@ -258,7 +258,7 @@
 		check_pstk((pcb_pstk_t *)b);
 	pcb_r_end(&it);
 
-	pcb_gui->invalidate_all(pcb_gui, &PCB->hidlib);
+	pcb_gui->invalidate_all(pcb_gui);
 
 	if (new_arcs)
 		pcb_undo_inc_serial();