Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 16607)
+++ trunk/src/hid.h	(revision 16608)
@@ -349,7 +349,7 @@
 	   or mils accordingly.  If cursor_action_ is set, the cursor or
 	   screen may be adjusted so that the cursor and the crosshair are
 	   at the same point on the screen.  */
-	void (*set_crosshair) (int x, int y, int cursor_action);
+	void (*set_crosshair)(pcb_coord_t x, pcb_coord_t y, int cursor_action);
 #define HID_SC_DO_NOTHING	0
 #define HID_SC_WARP_POINTER	1
 #define HID_SC_PAN_VIEWPORT	2
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 16607)
+++ trunk/src/hid_nogui.c	(revision 16608)
@@ -163,7 +163,7 @@
 	CRASH("get_coords");
 }
 
-static void nogui_set_crosshair(int x, int y, int action)
+static void nogui_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 16607)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 16608)
@@ -589,7 +589,7 @@
 	abort();
 }
 
-static void bboard_set_crosshair(int x, int y, int action)
+static void bboard_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 16607)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 16608)
@@ -457,7 +457,7 @@
 	return;
 }
 
-static void dxf_set_crosshair(int x, int y, int a)
+static void dxf_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 16607)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 16608)
@@ -868,7 +868,7 @@
 	CRASH("gcode_calibrate");
 }
 
-static void gcode_set_crosshair(int x, int y, int a)
+static void gcode_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 16607)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 16608)
@@ -58,7 +58,7 @@
 static void gerber_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
 static void gerber_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
 static void gerber_calibrate(double xval, double yval);
-static void gerber_set_crosshair(int x, int y, int action);
+static void gerber_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action);
 static void gerber_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
 static void gerber_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y);
 
@@ -1284,7 +1284,7 @@
 	return 0;
 }
 
-static void gerber_set_crosshair(int x, int y, int action)
+static void gerber_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 16607)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 16608)
@@ -954,7 +954,7 @@
 	CRASH("nelma_calibrate");
 }
 
-static void nelma_set_crosshair(int x, int y, int a)
+static void nelma_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 16607)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 16608)
@@ -736,7 +736,7 @@
 	return;
 }
 
-static void openems_set_crosshair(int x, int y, int a)
+static void openems_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 16607)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 16608)
@@ -580,7 +580,7 @@
 	return;
 }
 
-static void openscad_set_crosshair(int x, int y, int a)
+static void openscad_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 16607)
+++ trunk/src_plugins/export_png/png.c	(revision 16608)
@@ -1827,7 +1827,7 @@
 	CRASH("png_calibrate");
 }
 
-static void png_set_crosshair(int x, int y, int a)
+static void png_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 16607)
+++ trunk/src_plugins/export_ps/eps.c	(revision 16608)
@@ -47,7 +47,7 @@
 static void eps_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y);
 static void eps_fill_polygon_ffs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
 static void eps_calibrate(double xval, double yval);
-static void eps_set_crosshair(int x, int y, int action);
+static void eps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action);
 /*----------------------------------------------------------------------------*/
 
 typedef struct hid_gc_s {
@@ -613,7 +613,7 @@
 	CRASH("eps_calibrate");
 }
 
-static void eps_set_crosshair(int x, int y, int action)
+static void eps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 16607)
+++ trunk/src_plugins/export_ps/ps.c	(revision 16608)
@@ -1442,7 +1442,7 @@
 	ps_calibrate_1(xval, yval, 0);
 }
 
-static void ps_set_crosshair(int x, int y, int action)
+static void ps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 16607)
+++ trunk/src_plugins/export_svg/svg.c	(revision 16608)
@@ -787,7 +787,7 @@
 	return;
 }
 
-static void svg_set_crosshair(int x, int y, int a)
+static void svg_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
 {
 }
 
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 16607)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 16608)
@@ -74,7 +74,7 @@
 	return pcb_hid_parse_command_line(pcbargc, pcbargv);
 }
 
-void gpmi_hid_set_crosshair(int x, int y, int cursor_action)
+void gpmi_hid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int cursor_action)
 {
 	/* Do nothing */
 }
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(revision 16607)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(revision 16608)
@@ -3,7 +3,7 @@
 void gpmi_hid_destroy_gc(pcb_hid_gc_t gc);
 void gpmi_hid_do_export(pcb_hid_attr_val_t * options);
 int gpmi_hid_parse_arguments(int *pcbargc, char ***pcbargv);
-void gpmi_hid_set_crosshair(int x, int y, int cursor_action);
+void gpmi_hid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int cursor_action);
 int gpmi_hid_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
 void gpmi_hid_set_color(pcb_hid_gc_t gc, const char *name);
 void gpmi_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 16607)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 16608)
@@ -237,7 +237,7 @@
 {
 }
 
-static void batch_set_crosshair(int x, int y, int action)
+static void batch_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 16607)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 16608)
@@ -136,7 +136,7 @@
 /* If set, we are currently updating this pinout window.  */
 static PreviewData *pinout = 0;
 
-static int crosshair_x = 0, crosshair_y = 0;
+static pcb_coord_t crosshair_x = 0, crosshair_y = 0;
 static int in_move_event = 0, crosshair_in_window = 1;
 
 Widget mainwind;
@@ -3220,7 +3220,7 @@
 
 extern void lesstif_get_coords(const char *msg, pcb_coord_t * x, pcb_coord_t * y);
 
-static void lesstif_set_crosshair(int x, int y, int action)
+static void lesstif_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 	if (crosshair_x != x || crosshair_y != y) {
 		lesstif_show_crosshair(0);
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 16607)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 16608)
@@ -226,8 +226,8 @@
 			PCB_PAD_LOOP(element);
 			{
 				if (strcmp(pad->Number, pname) == 0) {
-					int x = (pad->Point1.X + pad->Point2.X) / 2;
-					int y = (pad->Point1.Y + pad->Point2.Y) / 2;
+					pcb_coord_t x = (pad->Point1.X + pad->Point2.X) / 2;
+					pcb_coord_t y = (pad->Point1.Y + pad->Point2.Y) / 2;
 					pcb_gui->set_crosshair(x, y, HID_SC_PAN_VIEWPORT);
 					free(ename);
 					return;
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 16607)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 16608)
@@ -318,7 +318,7 @@
 {
 }
 
-static void remote_set_crosshair(int x, int y, int action)
+static void remote_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 }
 
Index: trunk/src_plugins/lib_gtk_common/ui_crosshair.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/ui_crosshair.c	(revision 16607)
+++ trunk/src_plugins/lib_gtk_common/ui_crosshair.c	(revision 16608)
@@ -36,7 +36,7 @@
 #include "ui_zoompan.h"
 #include "bu_cursor_pos.h"
 
-void pcb_gtk_crosshair_set(int x, int y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view)
+void pcb_gtk_crosshair_set(pcb_coord_t x, pcb_coord_t y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view)
 {
 	GdkDisplay *display;
 	GdkScreen *screen;
Index: trunk/src_plugins/lib_gtk_common/ui_crosshair.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/ui_crosshair.h	(revision 16607)
+++ trunk/src_plugins/lib_gtk_common/ui_crosshair.h	(revision 16608)
@@ -2,5 +2,5 @@
 #include "ui_zoompan.h"
 #include "bu_cursor_pos.h"
 
-void pcb_gtk_crosshair_set(int x, int y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view);
+void pcb_gtk_crosshair_set(pcb_coord_t x, pcb_coord_t y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view);
 
Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 16607)
+++ trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 16608)
@@ -290,7 +290,7 @@
 	printf(_("ghid_calibrate() -- not implemented\n"));
 }
 
-static void ghid_set_crosshair(int x, int y, int action)
+static void ghid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
 {
 	int offset_x, offset_y;