Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 25344) +++ trunk/src/hid.h (revision 25345) @@ -317,11 +317,12 @@ void (*fill_circle)(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius); void (*fill_polygon)(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y); void (*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); - void (*fill_pcb_polygon)(pcb_hid_gc_t gc, pcb_polyarea_t *poly, const pcb_box_t *clip_box, int fullpoly); - void (*thindraw_pcb_polygon)(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box); void (*fill_rect)(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2); + /* OPTIONAL drawing function: when NULL, fill_polygon is called */ + void (*fill_pcb_polygon)(pcb_hid_gc_t gc, pcb_polyarea_t *poly, const pcb_box_t *clip_box, int fullpoly); + /* This is for the printer. If you call this for the GUI, xval_ and yval_ are ignored, and a dialog pops up to lead you through the calibration procedure. For the printer, if xval_ and yval_ are Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 25344) +++ trunk/src/hid_draw_helpers.c (revision 25345) @@ -224,7 +224,6 @@ void pcb_dhlp_draw_helpers_init(pcb_hid_t * hid) { -TODO("Remove this: nogui should leave these NULL"); +TODO("Remove this: nogui should leave this NULL"); hid->fill_pcb_polygon = NULL; - hid->thindraw_pcb_polygon = pcb_dhlp_thindraw_pcb_polygon; } Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 25344) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 25345) @@ -522,18 +522,6 @@ hidgl_fill_pcb_polygon(poly, clip_box, gport->view.coord_per_px, fullpoly); } -static void ghid_gl_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box) -{ - pcb_dhlp_thindraw_pcb_polygon(gc, poly, clip_box); - /* Disable thindraw poly filling until it is fixed. The poly fill overwrites lines and - * arcs that are drawn underneath. - * - ghid_gl_set_alpha_mult(gc, 0.25); - ghid_gl_fill_pcb_polygon(gc, poly, clip_box); - ghid_gl_set_alpha_mult(gc, 1.0); - */ -} - static void ghid_gl_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2) { USE_GC(gc); @@ -723,7 +711,6 @@ /* Setup HID function pointers specific to the GL renderer */ gtk2_gl_hid.end_layer = ghid_gl_end_layer; gtk2_gl_hid.fill_pcb_polygon = ghid_gl_fill_pcb_polygon; - gtk2_gl_hid.thindraw_pcb_polygon = ghid_gl_thindraw_pcb_polygon; } static void ghid_gl_shutdown_renderer(void *p) Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 25344) +++ trunk/src_plugins/loghid/hid-logger.c (revision 25345) @@ -190,12 +190,6 @@ delegatee_->fill_pcb_polygon(gc, poly, clip_box, fullpoly); } -static void log_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box) -{ - pcb_fprintf(out_, "thindraw_pcb_polygon(gc, poly->PointN=%d, ...)\n", poly->PointN); - delegatee_->thindraw_pcb_polygon(gc, poly, clip_box); -} - static void log_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2) { pcb_fprintf(out_, "fill_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); @@ -251,7 +245,6 @@ REGISTER_IF_NOT_NULL(fill_polygon); REGISTER_IF_NOT_NULL(fill_polygon_offs); REGISTER_IF_NOT_NULL(fill_pcb_polygon); - REGISTER_IF_NOT_NULL(thindraw_pcb_polygon); REGISTER_IF_NOT_NULL(fill_rect); REGISTER_IF_NOT_NULL(beep);