Index: trunk/doc/conf/tree/appearance.html =================================================================== --- trunk/doc/conf/tree/appearance.html (revision 36683) +++ trunk/doc/conf/tree/appearance.html (revision 36684) @@ -14,6 +14,4 @@ smart_labels rnd_cfn_boolean 0 attempt to place terminal labels in a way they don't overlap (costs extra CPU cycles, may slow down on-screen rendering) label_thickness rnd_cfn_coord 0 font thickness for labels (e.g. terminal labels); thinnest possible is 1nm render_script rnd_cfn_string 0 instructs the core about layer order in rendering - layer_alpha rnd_cfn_real 0 [hidlib] alpha value for layer drawing - drill_alpha rnd_cfn_real 0 [hidlib] alpha value for drill drawing Index: trunk/doc/conf/tree/appearance_color.html =================================================================== --- trunk/doc/conf/tree/appearance_color.html (revision 36683) +++ trunk/doc/conf/tree/appearance_color.html (revision 36684) @@ -26,8 +26,4 @@ paste rnd_cfn_color 0 default paste layer color (when a new paste layer is created) element rnd_cfn_color 0 default silk layer color (when a new silk layer is created) black_group rnd_cfn_color 0 'black' color used by the 'black current group' feature (set it to white if you use dark background) - background rnd_cfn_color 0 [hidlib] background and cursor color ... - off_limit rnd_cfn_color 0 [hidlib] on-screen background beyond the configured drawing area - grid rnd_cfn_color 0 [hidlib] on-screen grid - cross rnd_cfn_color 0 [hidlib] on-screen crosshair color (inverted) Index: trunk/doc/conf/tree/editor.html =================================================================== --- trunk/doc/conf/tree/editor.html (revision 36683) +++ trunk/doc/conf/tree/editor.html (revision 36684) @@ -53,16 +53,4 @@ beep_when_finished rnd_cfn_boolean 0 flag if a signal should be produced when searching of connections is done undo_warning_size rnd_cfn_integer 0 warn the user when undo list exceeds this amount of kilobytes in memory subc_conv_refdes rnd_cfn_string 0 automatic refdes value assigned to new subcircuits on conversion from objects - if empty, no refdes text or attribute is added; if the value is , the refdes text object is added but no refdes attribute is created - mode rnd_cfn_integer 0 [hidlib] currently active tool - grid_unit rnd_cfn_unit 0 [hidlib] select whether you draw in mm or mil - grid rnd_cfn_coord 0 [hidlib] grid in pcb-units - grids rnd_cfn_list 0 [hidlib] grid in grid-string format - grids_idx rnd_cfn_integer 0 [hidlib] the index of the currently active grid from grids - draw_grid rnd_cfn_boolean 0 [hidlib] draw grid points - cross_grid rnd_cfn_boolean 0 [hidlib] when drawing the grid, draw little 3x3 pixel crosses instead of single pixel dots - auto_place rnd_cfn_boolean 0 [hidlib] force placement of GUI windows (dialogs), trying to override the window manager - fullscreen rnd_cfn_boolean 0 [hidlib] hide widgets to make more room for the drawing - crosshair_shape_idx rnd_cfn_integer 0 [hidlib] OBSOLETE: do not use - enable_stroke rnd_cfn_boolean 0 [hidlib] Enable libstroke gestures on middle mouse button when non-zero - translate_key rnd_cfn_list 0 [hidlib] Index: trunk/doc/conf/tree/rc.html =================================================================== --- trunk/doc/conf/tree/rc.html (revision 36683) +++ trunk/doc/conf/tree/rc.html (revision 36684) @@ -27,15 +27,4 @@ save_final_fallback_fmt rnd_cfn_string 0 when a new file is created (by running pcb-rnd with the file name) there won't be a known format; pcb-rnd will guess from the file name (extension) but eventhat may fail. This format is the final fallback that'll be used if no other guessing mechanism worked. The user can override this by save as. save_fp_fmt rnd_cfn_string 0 when saving a buffer element/subcircuit, prefer this format by default have_regex rnd_cfn_boolean 0 whether we have regex compiled in - verbose rnd_cfn_integer 0 [hidlib] - quiet rnd_cfn_integer 0 [hidlib] print only errors on stderr - dup_log_to_stderr rnd_cfn_boolean 0 [hidlib] copy log messages to stderr even if there is a HID that can show them - cli_prompt rnd_cfn_string 0 [hidlib] plain text prompt to prefix the command entry - cli_backend rnd_cfn_string 0 [hidlib] command parser action - export_basename rnd_cfn_boolean 0 [hidlib] if an exported file contains the source file name, remove path from it, keeping the basename only - menu_file rnd_cfn_string 0 [hidlib] where to load the default menu file from. If empty/unset, fall back to the legacy 'per hid own menu file' setup. If contains slash, take it as a full path, if no slash, do a normal menu search for menu-NAME.lht - menu_patches rnd_cfn_list 0 [hidlib] file paths to extra menu patches to load - preferred_gui rnd_cfn_list 0 [hidlib] if set, try GUI HIDs in this order when no GUI is explicitly selected - hid_fallback rnd_cfn_boolean 0 [hidlib] if there is no explicitly specified HID (--gui) and the preferred GUI fails, automatically fall back on other HIDs, eventually running in batch mode - anyload_persist rnd_cfn_list 0 [hidlib] if not empty, load all anyload directories/files from this path on startup Index: trunk/doc/conf/tree/rc_path.html =================================================================== --- trunk/doc/conf/tree/rc_path.html (revision 36683) +++ trunk/doc/conf/tree/rc_path.html (revision 36684) @@ -8,6 +8,4 @@ bin rnd_cfn_string 0 e.g. /usr/bin share rnd_cfn_string 0 e.g. /usr/share/pcb-rnd design rnd_cfn_string 0 directory path of the current design, or if the current design doesn't have a file name yet - home rnd_cfn_string 0 [hidlib] user's home dir, determined run-time - exec_prefix rnd_cfn_string 0 [hidlib] exec prefix path (extracted from argv[0]) Index: trunk/doc/conf/tree/temp.html =================================================================== --- trunk/doc/conf/tree/temp.html (revision 36683) +++ trunk/doc/conf/tree/temp.html (revision 36684) @@ -5,5 +5,4 @@ node name type flags description rat_warn rnd_cfn_boolean 0 rats nest has set warnings clip_inhibit_chg rnd_cfn_boolean 0 dummy node to inform the menu about clip inhibit change - click_cmd_entry_active rnd_cfn_boolean 0 [hidlib] true if the command line is active when the user click - this gives the command interpreter a chance to capture the click and use the coords Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 36683) +++ trunk/src/font.c (revision 36684) @@ -78,7 +78,7 @@ } } -static pcb_font_t *pcb_font_(pcb_board_t *pcb, pcb_font_id_t id, int fallback, int unlink) +static pcb_font_t *pcb_font_(pcb_board_t *pcb, rnd_font_id_t id, int fallback, int unlink) { if (id <= 0) { do_default:; @@ -100,12 +100,12 @@ return NULL; } -pcb_font_t *pcb_font(pcb_board_t *pcb, pcb_font_id_t id, int fallback) +pcb_font_t *pcb_font(pcb_board_t *pcb, rnd_font_id_t id, int fallback) { return pcb_font_(pcb, id, fallback, 0); } -pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, pcb_font_id_t id) +pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, rnd_font_id_t id) { return pcb_font_(pcb, id, 0, 1); } @@ -120,7 +120,7 @@ fk->hash_inited = 1; } -pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, pcb_font_id_t id, const char *name) +pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, rnd_font_id_t id, const char *name) { pcb_font_t *f; @@ -179,7 +179,7 @@ static void update_last_id(pcb_fontkit_t *fk) { - pcb_font_id_t id; + rnd_font_id_t id; for (id = fk->last_id; id > 0; id--) { if (htip_has(&fk->fonts, id)) break; @@ -187,7 +187,7 @@ fk->last_id = id; } -int pcb_del_font(pcb_fontkit_t *fk, pcb_font_id_t id) +int pcb_del_font(pcb_fontkit_t *fk, rnd_font_id_t id) { htip_entry_t *e; pcb_font_t *f; @@ -204,7 +204,7 @@ return 0; } -int pcb_move_font(pcb_fontkit_t *fk, pcb_font_id_t src, pcb_font_id_t dst) +int pcb_move_font(pcb_fontkit_t *fk, rnd_font_id_t src, rnd_font_id_t dst) { htip_entry_t *e; pcb_font_t *src_font; Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 36683) +++ trunk/src/font.h (revision 36684) @@ -48,26 +48,26 @@ pcb_font_t dflt; /* default, fallback font, also the sysfont */ htip_t fonts; /* key: ->id; val: (pcb_font_t *) */ rnd_bool valid, hash_inited; - pcb_font_id_t last_id; /* highest font id ever seen in this kit */ + rnd_font_id_t last_id; /* highest font id ever seen in this kit */ }; /* Look up font. If not found: return NULL (fallback=0), or return the default font (fallback=1) */ -pcb_font_t *pcb_font(pcb_board_t *pcb, pcb_font_id_t id, int fallback); +pcb_font_t *pcb_font(pcb_board_t *pcb, rnd_font_id_t id, int fallback); void pcb_font_create_default(pcb_board_t *pcb); /*** font kit handling ***/ void pcb_fontkit_free(pcb_fontkit_t *fk); -pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, pcb_font_id_t id, const char *name); -int pcb_del_font(pcb_fontkit_t *fk, pcb_font_id_t id); -int pcb_move_font(pcb_fontkit_t *fk, pcb_font_id_t src, pcb_font_id_t dst); +pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, rnd_font_id_t id, const char *name); +int pcb_del_font(pcb_fontkit_t *fk, rnd_font_id_t id); +int pcb_move_font(pcb_fontkit_t *fk, rnd_font_id_t src, rnd_font_id_t dst); /* Reset the fontkit so that only the default font is kept and all extra fonts are purged */ void pcb_fontkit_reset(pcb_fontkit_t *fk); /* Unlink the font from pcb, but do not free anything but return the font */ -pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, pcb_font_id_t id); +pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, rnd_font_id_t id); #endif Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 36683) +++ trunk/src/font_act.c (revision 36684) @@ -42,7 +42,7 @@ { const char *fname = NULL, *sid = NULL; static char *default_file = NULL; - pcb_font_id_t fid, dst_fid = -1; + rnd_font_id_t fid, dst_fid = -1; pcb_font_t *fnt; int r; @@ -119,7 +119,7 @@ { const char *fname = NULL, *sid = NULL; static char *default_file = NULL; - pcb_font_id_t fid; + rnd_font_id_t fid; pcb_font_t *fnt; int r; Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 36683) +++ trunk/src/global_typedefs.h (revision 36684) @@ -65,6 +65,4 @@ typedef struct pcb_view_s pcb_view_t; -typedef long int pcb_font_id_t; /* a font is referenced by a pcb_board_t:pcb_font_id_t pair */ - #endif Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 36683) +++ trunk/src/gui_act.c (revision 36684) @@ -663,7 +663,7 @@ static const char pcb_acts_SetSame[] = "SetSame()"; static const char pcb_acth_SetSame[] = "Sets current layer and sizes to match indicated item."; /* DOC: setsame.html */ -static void set_same_(rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) +static void set_same_(rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) { int known; known = pcb_route_style_lookup_strict(&PCB->RouteStyle, PCB->route_style_last, Thick, textt, texts, fid, Clearance, via_proto, Name); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 36683) +++ trunk/src/obj_text.c (revision 36684) @@ -131,7 +131,7 @@ rnd_coord_t thickness; rnd_coord_t clearance; double rot; - pcb_font_id_t fid; + rnd_font_id_t fid; } undo_text_geo_t; static int undo_text_geo_swap(void *udata) @@ -152,7 +152,7 @@ rnd_swap(rnd_coord_t, g->thickness, g->text->thickness); rnd_swap(rnd_coord_t, g->clearance, g->text->clearance); rnd_swap(double, g->rot, g->text->rot); - rnd_swap(pcb_font_id_t, g->fid, g->text->fid); + rnd_swap(rnd_font_id_t, g->fid, g->text->fid); if (pcb != NULL) pcb_text_bbox(pcb_font(pcb, g->text->fid, 1), g->text); @@ -988,7 +988,7 @@ } -void pcb_text_set_font(pcb_text_t *text, pcb_font_id_t fid) +void pcb_text_set_font(pcb_text_t *text, rnd_font_id_t fid) { pcb_layer_t *layer = text->parent.layer; @@ -1564,7 +1564,7 @@ /* Recursively update the text objects of data and subcircuits; returns non-zero if a redraw is needed */ -static int pcb_text_font_chg_data(pcb_data_t *data, pcb_font_id_t fid) +static int pcb_text_font_chg_data(pcb_data_t *data, rnd_font_id_t fid) { int need_redraw = 0; Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 36683) +++ trunk/src/obj_text.h (revision 36684) @@ -40,7 +40,7 @@ int Scale; /* text scaling in percent */ double scale_x, scale_y; /* optional; x and y direction scale (1 means original size); if 0, use Scale/100 */ rnd_coord_t X, Y; /* origin */ - pcb_font_id_t fid; + rnd_font_id_t fid; char *TextString; /* string */ rnd_coord_t thickness; /* if non-zero, thickness of line/arc within the font */ rnd_coord_t clearance; /* clearance around the object in polygon if flags have PCB_FLAG_CLEARLINE */ @@ -95,7 +95,7 @@ void pcb_text_scale(pcb_text_t *text, double sx, double sy, double sth); void pcb_text_flip_side(pcb_layer_t *layer, pcb_text_t *text, rnd_coord_t y_offs, rnd_bool undoable); void pcb_text_mirror_coords(pcb_text_t *text, rnd_coord_t y_offs, rnd_bool undoable); /* mirror the coords but do not mirror the text itself (no on-solder) */ -void pcb_text_set_font(pcb_text_t *text, pcb_font_id_t fid); +void pcb_text_set_font(pcb_text_t *text, rnd_font_id_t fid); void pcb_text_update(pcb_layer_t *layer, pcb_text_t *text); void pcb_text_reg(pcb_layer_t *layer, pcb_text_t *text); Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 36683) +++ trunk/src/route_style.c (revision 36684) @@ -67,7 +67,7 @@ #define cmpi0(a,b) (((a) > 0) && (strict || ((b) > 0)) && ((a) != (b))) #define cmpi(a,b) (((a) != -1) && (strict || ((b) != -1)) && ((a) != (b))) #define cmps(a,b) (((a) != NULL) && (strcmp((a), (b)) != 0)) -RND_INLINE int pcb_route_style_match_(pcb_route_style_t *rst, int strict, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) +RND_INLINE int pcb_route_style_match_(pcb_route_style_t *rst, int strict, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) { if (cmp(Thick, rst->Thick)) return 0; if (cmp(textt, rst->textt)) return 0; @@ -80,7 +80,7 @@ return 1; } -int pcb_route_style_match(pcb_route_style_t *rst, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) +int pcb_route_style_match(pcb_route_style_t *rst, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) { return pcb_route_style_match_(rst, 0, Thick, textt, texts, fid, Clearance, via_proto, Name); } @@ -90,7 +90,7 @@ #undef cmpi0 #undef cmps -int pcb_route_style_lookup(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) +int pcb_route_style_lookup(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) { int n, len = vtroutestyle_len(styles); @@ -106,7 +106,7 @@ } -int pcb_route_style_lookup_strict(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) +int pcb_route_style_lookup_strict(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name) { int n, len = vtroutestyle_len(styles); @@ -227,7 +227,7 @@ }; -int pcb_route_style_change(pcb_board_t *pcb, int rstidx, rnd_coord_t *thick, rnd_coord_t *textt, int *texts, pcb_font_id_t *fid, rnd_coord_t *clearance, rnd_cardinal_t *via_proto, rnd_bool undoable) +int pcb_route_style_change(pcb_board_t *pcb, int rstidx, rnd_coord_t *thick, rnd_coord_t *textt, int *texts, rnd_font_id_t *fid, rnd_coord_t *clearance, rnd_cardinal_t *via_proto, rnd_bool undoable) { undo_rst_t gtmp, *g = >mp; pcb_route_style_t *rst = vtroutestyle_get(&pcb->RouteStyle, rstidx, 0); Index: trunk/src/route_style.h =================================================================== --- trunk/src/route_style.h (revision 36683) +++ trunk/src/route_style.h (revision 36684) @@ -54,12 +54,12 @@ the route style did set all values explicitly and not matching "wildcard" from the style's side. If hint >= 0, check that index first, out-of-order; this is useful for finding the last selected route style over the first match */ -int pcb_route_style_lookup(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); -int pcb_route_style_lookup_strict(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); +int pcb_route_style_lookup(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); +int pcb_route_style_lookup_strict(vtroutestyle_t *styles, int hint, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); /* Return 1 if rst matches the style in supplied args. Same matching rules as in pcb_route_style_lookup(). */ -int pcb_route_style_match(pcb_route_style_t *rst, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); +int pcb_route_style_match(pcb_route_style_t *rst, rnd_coord_t Thick, rnd_coord_t textt, int texts, rnd_font_id_t fid, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name); /* helper: get route style size for a function and selected object type. size_id: 0=main size; 1=2nd size (was drill); 2=clearance */ @@ -99,7 +99,7 @@ /*** Undoable changes to route styles ***/ /* Change a field. Returns 0 on success. */ -int pcb_route_style_change(pcb_board_t *pcb, int rstidx, rnd_coord_t *thick, rnd_coord_t *textt, int *texts, pcb_font_id_t *fid, rnd_coord_t *clearance, rnd_cardinal_t *via_proto, rnd_bool undoable); +int pcb_route_style_change(pcb_board_t *pcb, int rstidx, rnd_coord_t *thick, rnd_coord_t *textt, int *texts, rnd_font_id_t *fid, rnd_coord_t *clearance, rnd_cardinal_t *via_proto, rnd_bool undoable); /* Change the name. Returns 0 on success. */ int pcb_route_style_change_name(pcb_board_t *pcb, int rstidx, const char *new_name, rnd_bool undoable); Index: trunk/src/stub_draw.c =================================================================== --- trunk/src/stub_draw.c (revision 36683) +++ trunk/src/stub_draw.c (revision 36684) @@ -85,7 +85,7 @@ /****** font selector GUI ******/ -static void dummy_draw_fontsel(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, pcb_font_id_t *dst_fid) +static void dummy_draw_fontsel(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, rnd_font_id_t *dst_fid) { static rnd_xform_t xform = {0}; static pcb_draw_info_t info = {0}; @@ -95,11 +95,11 @@ dummy_draw_text(&info, gc, "Can't render the font selector: the draw_fontsel plugin is not compiled and/or not loaded"); } -static rnd_bool dummy_mouse_fontsel(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, pcb_font_id_t *dst_fid) +static rnd_bool dummy_mouse_fontsel(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, rnd_font_id_t *dst_fid) { return 0; } -void (*pcb_stub_draw_fontsel)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, pcb_font_id_t *dst_fid) = dummy_draw_fontsel; -rnd_bool (*pcb_stub_draw_fontsel_mouse_ev)(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, pcb_font_id_t *dst_fid) = dummy_mouse_fontsel; +void (*pcb_stub_draw_fontsel)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, rnd_font_id_t *dst_fid) = dummy_draw_fontsel; +rnd_bool (*pcb_stub_draw_fontsel_mouse_ev)(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, rnd_font_id_t *dst_fid) = dummy_mouse_fontsel; Index: trunk/src/stub_draw.h =================================================================== --- trunk/src/stub_draw.h (revision 36683) +++ trunk/src/stub_draw.h (revision 36684) @@ -45,7 +45,7 @@ extern rnd_bool (*pcb_stub_draw_csect_mouse_ev)(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); /* fontsel */ -extern void (*pcb_stub_draw_fontsel)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, pcb_font_id_t *dst_fid); -extern rnd_bool (*pcb_stub_draw_fontsel_mouse_ev)(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, pcb_font_id_t *dst_fid); +extern void (*pcb_stub_draw_fontsel)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, rnd_font_id_t *dst_fid); +extern rnd_bool (*pcb_stub_draw_fontsel_mouse_ev)(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, rnd_font_id_t *dst_fid); #endif Index: trunk/src/vtroutestyle.h =================================================================== --- trunk/src/vtroutestyle.h (revision 36683) +++ trunk/src/vtroutestyle.h (revision 36684) @@ -5,6 +5,7 @@ #include #include "attrib.h" #include +#include /* Elem=RouteStyle; init=0 */ @@ -14,7 +15,7 @@ rnd_coord_t Thick; /* line thickness */ rnd_coord_t textt; /* text thickness */ int texts; /* text scale */ - pcb_font_id_t fid; + rnd_font_id_t fid; rnd_coord_t Clearance; /* min. separation from other nets */ rnd_cardinal_t via_proto; /* via padstack prototype ID */ int via_proto_set; /* 1 if via_proto is set/valid, 0 if no via is configured */ Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 36683) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 36684) @@ -45,9 +45,9 @@ unsigned alloced:1; pcb_idpath_t *txt_id; - pcb_font_id_t *dst_fid; + rnd_font_id_t *dst_fid; void *last_fobj; - pcb_font_id_t last_fid; + rnd_font_id_t last_fid; gdl_elem_t link; } fontsel_ctx_t; @@ -153,7 +153,7 @@ } -static void pcb_dlg_fontsel(pcb_board_t *pcb, int modal, int global, pcb_text_t *txt_obj, pcb_font_id_t *dst_fid) +static void pcb_dlg_fontsel(pcb_board_t *pcb, int modal, int global, pcb_text_t *txt_obj, rnd_font_id_t *dst_fid) { rnd_box_t vbox = {0, 0, RND_MM_TO_COORD(55), RND_MM_TO_COORD(55)}; rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; @@ -224,7 +224,7 @@ const char *op = NULL; int modal = 0, global = 1; pcb_text_t *txt_obj = NULL; - pcb_font_id_t fid, *dst_fid = NULL; + rnd_font_id_t fid, *dst_fid = NULL; if (argc > 2) RND_ACT_FAIL(Fontsel); Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 36683) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 36684) @@ -53,7 +53,7 @@ #define BLACK (&conf_core.appearance.color.element) #define RED (&conf_core.appearance.color.mark) -static pcb_text_t *dtext(int x, int y, int scale, pcb_font_id_t fid, const char *txt) +static pcb_text_t *dtext(int x, int y, int scale, rnd_font_id_t fid, const char *txt) { static pcb_text_t t = {0}; @@ -104,19 +104,19 @@ #define MAX_FONT 128 typedef struct { int y1, y2; - pcb_font_id_t fid; + rnd_font_id_t fid; } font_coord_t; font_coord_t font_coord[MAX_FONT]; int font_coords; -static void pcb_draw_font(rnd_hid_gc_t gc, pcb_font_t *f, int x, int *y, pcb_text_t *txt, pcb_font_id_t *dst_fid) +static void pcb_draw_font(rnd_hid_gc_t gc, pcb_font_t *f, int x, int *y, pcb_text_t *txt, rnd_font_id_t *dst_fid) { char buf[256]; pcb_text_t *t; const char *nm; int y_old = *y; - pcb_font_id_t target_fid; + rnd_font_id_t target_fid; if (dst_fid != NULL) target_fid = *dst_fid; @@ -145,7 +145,7 @@ } -static void pcb_draw_fontsel(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, pcb_font_id_t *dst_fid) +static void pcb_draw_fontsel(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_text_t *txt, rnd_font_id_t *dst_fid) { int y = 0; @@ -159,7 +159,7 @@ } } -static pcb_font_id_t lookup_fid_for_coord(int ymm) +static rnd_font_id_t lookup_fid_for_coord(int ymm) { int n; @@ -169,9 +169,9 @@ return -1; } -static rnd_bool pcb_mouse_fontsel(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, pcb_font_id_t *dst_fid) +static rnd_bool pcb_mouse_fontsel(rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y, pcb_text_t *txt, rnd_font_id_t *dst_fid) { - pcb_font_id_t fid; + rnd_font_id_t fid; int ymm; switch(kind) { Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 36683) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 36684) @@ -222,7 +222,7 @@ args[1].val.cstr = "fontid"; err = rnd_actionv_bin(&PCB->hidlib, "fontsel", &res, 2, args); if ((err == 0) && (res.type == FGW_LONG)) { - pcb_font_id_t tmp = res.val.nat_long; + rnd_font_id_t tmp = res.val.nat_long; pcb_route_style_change(PCB, rstdlg_ctx.curr, NULL, NULL, NULL, &tmp, NULL, NULL, 1); } }