Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4890) +++ trunk/doc-rnd/hacking/renames (revision 4891) @@ -356,3 +356,11 @@ heap_replace -> pcb_heap_replace heap_is_empty -> pcb_heap_is_empty heap_size -> pcb_heap_size +hid_register_action -> pcb_hid_register_action +hid_register_actions -> pcb_hid_register_actions +REGISTER_ACTIONS -> PCB_REGISTER_ACTIONS +HIDCONCAT -> PCB_HIDCONCAT +hid_expose_callback -> pcb_hid_expose_callback +hid_actions_init -> pcb_hid_actions_init +hid_actions_uninit -> pcb_hid_actions_uninit +REGISTER_ATTRIBUTES -> PCB_REGISTER_ATTRIBUTES Index: trunk/src/action_act.c =================================================================== --- trunk/src/action_act.c (revision 4890) +++ trunk/src/action_act.c (revision 4891) @@ -108,4 +108,4 @@ executefile_help, executefile_syntax} }; -REGISTER_ACTIONS(action_action_list, NULL) +PCB_REGISTER_ACTIONS(action_action_list, NULL) Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4890) +++ trunk/src/buffer.c (revision 4891) @@ -903,4 +903,4 @@ pastebuffer_help, pastebuffer_syntax} }; -REGISTER_ACTIONS(buffer_action_list, NULL) +PCB_REGISTER_ACTIONS(buffer_action_list, NULL) Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4890) +++ trunk/src/change_act.c (revision 4891) @@ -1575,4 +1575,4 @@ clrflag_help, clrflag_syntax} }; -REGISTER_ACTIONS(change_action_list, NULL) +PCB_REGISTER_ACTIONS(change_action_list, NULL) Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 4890) +++ trunk/src/conf_act.c (revision 4891) @@ -304,4 +304,4 @@ ChkBuffer_help, ChkBuffer_syntax} }; -REGISTER_ACTIONS(conf_action_list, NULL) +PCB_REGISTER_ACTIONS(conf_action_list, NULL) Index: trunk/src/dolists.h =================================================================== --- trunk/src/dolists.h (revision 4890) +++ trunk/src/dolists.h (revision 4891) @@ -1,6 +1,6 @@ -#undef REGISTER_ACTIONS -#undef REGISTER_ATTRIBUTES +#undef PCB_REGISTER_ACTIONS +#undef PCB_REGISTER_ATTRIBUTES -#define REGISTER_ACTIONS(a, cookie) {extern void HIDCONCAT(register_,a)();HIDCONCAT(register_,a)();} -#define REGISTER_ATTRIBUTES(a, cookie) {extern void HIDCONCAT(register_,a)();HIDCONCAT(register_,a)();} +#define PCB_REGISTER_ACTIONS(a, cookie) {extern void PCB_HIDCONCAT(register_,a)();PCB_HIDCONCAT(register_,a)();} +#define PCB_REGISTER_ATTRIBUTES(a, cookie) {extern void PCB_HIDCONCAT(register_,a)();PCB_HIDCONCAT(register_,a)();} Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4890) +++ trunk/src/draw.c (revision 4891) @@ -576,7 +576,7 @@ * HID drawing callback. */ -void hid_expose_callback(pcb_hid_t * hid, pcb_box_t * region, void *item) +void pcb_hid_expose_callback(pcb_hid_t * hid, pcb_box_t * region, void *item) { pcb_hid_t *old_gui = gui; Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 4890) +++ trunk/src/file_act.c (revision 4891) @@ -366,4 +366,4 @@ quit_help, quit_syntax} }; -REGISTER_ACTIONS(file_action_list, NULL) +PCB_REGISTER_ACTIONS(file_action_list, NULL) Index: trunk/src/find_act.c =================================================================== --- trunk/src/find_act.c (revision 4890) +++ trunk/src/find_act.c (revision 4891) @@ -72,4 +72,4 @@ drc_help, drc_syntax} }; -REGISTER_ACTIONS(find_action_list, NULL) +PCB_REGISTER_ACTIONS(find_action_list, NULL) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4890) +++ trunk/src/gui_act.c (revision 4891) @@ -1273,4 +1273,4 @@ switchhid_help, switchhid_syntax} }; -REGISTER_ACTIONS(gui_action_list, NULL) +PCB_REGISTER_ACTIONS(gui_action_list, NULL) Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 4890) +++ trunk/src/hid.h (revision 4891) @@ -61,7 +61,7 @@ will result in a fatal error. */ typedef struct hid_gc_s *pcb_hid_gc_t; -#define HIDCONCAT(a,b) a##b +#define PCB_HIDCONCAT(a,b) a##b /* This is used to register the action callbacks (for menus and whatnot). HID assumes the following actions are available for its @@ -87,11 +87,11 @@ const char *syntax; } pcb_hid_action_t; -extern void hid_register_action(const pcb_hid_action_t *a, const char *cookie, int copy); +extern void pcb_hid_register_action(const pcb_hid_action_t *a, const char *cookie, int copy); -extern void hid_register_actions(const pcb_hid_action_t *a, int, const char *cookie, int copy); -#define REGISTER_ACTIONS(a, cookie) HIDCONCAT(void register_,a) ()\ -{ hid_register_actions(a, sizeof(a)/sizeof(a[0]), cookie, 0); } +extern void pcb_hid_register_actions(const pcb_hid_action_t *a, int, const char *cookie, int copy); +#define PCB_REGISTER_ACTIONS(a, cookie) PCB_HIDCONCAT(void register_,a) ()\ +{ pcb_hid_register_actions(a, sizeof(a)/sizeof(a[0]), cookie, 0); } /* Note that PCB expects the gui to provide the following actions: @@ -551,7 +551,7 @@ Do *not* assume that the hid that is passed is the GUI hid. This callback is also used for printing and exporting. */ struct pcb_box_t; -void hid_expose_callback(pcb_hid_t * hid_, pcb_box_t *region_, void *item_); +void pcb_hid_expose_callback(pcb_hid_t * hid_, pcb_box_t *region_, void *item_); /* This is initially set to a "no-gui" gui, and later reset by main. hid_expose_callback also temporarily set it for drawing. */ @@ -574,7 +574,7 @@ extern int pixel_slop; /* Init and uninit the whole action framework */ -void hid_actions_init(void); -void hid_actions_uninit(void); +void pcb_hid_actions_init(void); +void pcb_hid_actions_uninit(void); #endif Index: trunk/src/hid_actions.c =================================================================== --- trunk/src/hid_actions.c (revision 4890) +++ trunk/src/hid_actions.c (revision 4891) @@ -44,7 +44,7 @@ const pcb_hid_action_t *action; } hid_cookie_action_t; -void hid_register_actions(const pcb_hid_action_t * a, int n, const char *cookie, int copy) +void pcb_hid_register_actions(const pcb_hid_action_t * a, int n, const char *cookie, int copy) { int i; hid_cookie_action_t *ca; @@ -68,9 +68,9 @@ } } -void hid_register_action(const pcb_hid_action_t * a, const char *cookie, int copy) +void pcb_hid_register_action(const pcb_hid_action_t * a, const char *cookie, int copy) { - hid_register_actions(a, 1, cookie, copy); + pcb_hid_register_actions(a, 1, cookie, copy); } void hid_remove_actions(const pcb_hid_action_t * a, int n) @@ -422,12 +422,12 @@ return hid_parse_actionstring(str_, pcb_true); } -void hid_actions_init(void) +void pcb_hid_actions_init(void) { } -void hid_actions_uninit(void) +void pcb_hid_actions_uninit(void) { htsp_entry_t *e; Index: trunk/src/hid_attrib.h =================================================================== --- trunk/src/hid_attrib.h (revision 4890) +++ trunk/src/hid_attrib.h (revision 4891) @@ -40,7 +40,7 @@ }; extern void hid_register_attributes(pcb_hid_attribute_t *, int, const char *cookie, int copy); -#define REGISTER_ATTRIBUTES(a, cookie) HIDCONCAT(void register_,a) ()\ +#define PCB_REGISTER_ATTRIBUTES(a, cookie) PCB_HIDCONCAT(void register_,a) ()\ { hid_register_attributes(a, sizeof(a)/sizeof(a[0]), cookie, 0); } /* Remove all attributes registered with the given cookie */ Index: trunk/src/hid_extents.c =================================================================== --- trunk/src/hid_extents.c (revision 4890) +++ trunk/src/hid_extents.c (revision 4891) @@ -173,7 +173,7 @@ region.Y1 = -MAXINT; region.X2 = MAXINT; region.Y2 = MAXINT; - hid_expose_callback(&extents_hid, ®ion, item); + pcb_hid_expose_callback(&extents_hid, ®ion, item); return &box; } Index: trunk/src/hid_init.c =================================================================== --- trunk/src/hid_init.c (revision 4890) +++ trunk/src/hid_init.c (revision 4891) @@ -94,7 +94,7 @@ void hid_init() { - hid_actions_init(); + pcb_hid_actions_init(); /* Setup a "nogui" default HID */ gui = hid_nogui_get_hid(); @@ -125,7 +125,7 @@ } free(hid_list); - hid_actions_uninit(); + pcb_hid_actions_uninit(); hid_attributes_uninit(); } Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 4890) +++ trunk/src/main_act.c (revision 4891) @@ -264,4 +264,4 @@ printpaths_help, printpaths_syntax} }; -REGISTER_ACTIONS(main_action_list, NULL) +PCB_REGISTER_ACTIONS(main_action_list, NULL) Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4890) +++ trunk/src/move.c (revision 4891) @@ -449,4 +449,4 @@ movelayer_help, movelayer_syntax} }; -REGISTER_ACTIONS(move_action_list, NULL) +PCB_REGISTER_ACTIONS(move_action_list, NULL) Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 4890) +++ trunk/src/netlist_act.c (revision 4891) @@ -341,4 +341,4 @@ netlist_help, netlist_syntax} }; -REGISTER_ACTIONS(netlist_action_list, NULL) +PCB_REGISTER_ACTIONS(netlist_action_list, NULL) Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4890) +++ trunk/src/object_act.c (revision 4891) @@ -1031,4 +1031,4 @@ mincleargap_help, mincleargap_syntax} }; -REGISTER_ACTIONS(object_action_list, NULL) +PCB_REGISTER_ACTIONS(object_action_list, NULL) Index: trunk/src/plug_footprint_act.c =================================================================== --- trunk/src/plug_footprint_act.c (revision 4890) +++ trunk/src/plug_footprint_act.c (revision 4891) @@ -41,4 +41,4 @@ fp_rehash_help, fp_rehash_syntax} }; -REGISTER_ACTIONS(conf_plug_footprint_list, NULL) +PCB_REGISTER_ACTIONS(conf_plug_footprint_list, NULL) Index: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c (revision 4890) +++ trunk/src/plugins.c (revision 4891) @@ -138,4 +138,4 @@ manageplugins_help, manageplugins_syntax} }; -REGISTER_ACTIONS(plugins_action_list, NULL) +PCB_REGISTER_ACTIONS(plugins_action_list, NULL) Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 4890) +++ trunk/src/polygon_act.c (revision 4891) @@ -145,4 +145,4 @@ polygon_help, pcb_polygon_syntax} }; -REGISTER_ACTIONS(polygon_action_list, NULL) +PCB_REGISTER_ACTIONS(polygon_action_list, NULL) Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4890) +++ trunk/src/rats_act.c (revision 4891) @@ -226,4 +226,4 @@ deleterats_help, deleterats_syntax} }; -REGISTER_ACTIONS(rats_action_list, NULL) +PCB_REGISTER_ACTIONS(rats_action_list, NULL) Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 4890) +++ trunk/src/rats_patch.c (revision 4891) @@ -495,4 +495,4 @@ savepatch_help, savepatch_syntax} }; -REGISTER_ACTIONS(rats_patch_action_list, NULL) +PCB_REGISTER_ACTIONS(rats_patch_action_list, NULL) Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 4890) +++ trunk/src/remove_act.c (revision 4891) @@ -105,4 +105,4 @@ , }; -REGISTER_ACTIONS(remove_action_list, NULL) +PCB_REGISTER_ACTIONS(remove_action_list, NULL) Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 4890) +++ trunk/src/select_act.c (revision 4891) @@ -385,4 +385,4 @@ unselect_help, unselect_syntax} }; -REGISTER_ACTIONS(select_action_list, NULL) +PCB_REGISTER_ACTIONS(select_action_list, NULL) Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4890) +++ trunk/src/undo_act.c (revision 4891) @@ -295,4 +295,4 @@ redo_help, redo_syntax} }; -REGISTER_ACTIONS(undo_action_list, NULL) +PCB_REGISTER_ACTIONS(undo_action_list, NULL) Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4890) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4891) @@ -232,7 +232,7 @@ char *autocrop_cookie = "autocrop plugin"; -REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie) +PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie) static void hid_autocrop_uninit(void) { @@ -242,6 +242,6 @@ #include "dolists.h" pcb_uninit_t hid_autocrop_init() { - REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie); + PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie); return hid_autocrop_uninit; } Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 4890) +++ trunk/src_plugins/autoplace/action.c (revision 4891) @@ -61,7 +61,7 @@ , }; -REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) +PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) static void hid_autoplace_uninit(void) { @@ -71,6 +71,6 @@ #include "dolists.h" pcb_uninit_t hid_autoplace_init(void) { - REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) + PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie) return hid_autoplace_uninit; } Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 4890) +++ trunk/src_plugins/autoroute/action.c (revision 4891) @@ -87,7 +87,7 @@ , }; -REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) +PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) static void hid_autoroute_uninit(void) { @@ -97,6 +97,6 @@ #include "dolists.h" pcb_uninit_t hid_autoroute_init(void) { - REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) + PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie) return hid_autoroute_uninit; } Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 4890) +++ trunk/src_plugins/boardflip/boardflip.c (revision 4891) @@ -168,7 +168,7 @@ char *boardflip_cookie = "boardflip plugin"; -REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie) +PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie) static void hid_boardflip_uninit(void) { @@ -178,7 +178,7 @@ #include "dolists.h" pcb_uninit_t hid_boardflip_init() { - REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie); + PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie); return hid_boardflip_uninit; } Index: trunk/src_plugins/dbus/dbus.c =================================================================== --- trunk/src_plugins/dbus/dbus.c (revision 4890) +++ trunk/src_plugins/dbus/dbus.c (revision 4891) @@ -383,7 +383,7 @@ #include "dolists.h" pcb_uninit_t hid_dbus_init(void) { -/* REGISTER_ACTIONS(debug_action_list, dbus_cookie)*/ +/* PCB_REGISTER_ACTIONS(debug_action_list, dbus_cookie)*/ pcb_event_bind(EVENT_GUI_INIT, dbus_gui_init, NULL, dbus_cookie); return hid_dbus_uninit; } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 4890) +++ trunk/src_plugins/diag/diag.c (revision 4891) @@ -189,7 +189,7 @@ static const char *diag_cookie = "debug plugin"; -REGISTER_ACTIONS(diag_action_list, diag_cookie) +PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie) static void hid_diag_uninit(void) { @@ -199,6 +199,6 @@ #include "dolists.h" pcb_uninit_t hid_diag_init(void) { - REGISTER_ACTIONS(diag_action_list, diag_cookie) + PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie) return hid_diag_uninit; } Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 4890) +++ trunk/src_plugins/distalign/distalign.c (revision 4891) @@ -625,7 +625,7 @@ static char *distalign_cookie = "distalign plugin"; -REGISTER_ACTIONS(distalign_action_list, distalign_cookie) +PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie) static void hid_distalign_uninit(void) { @@ -635,7 +635,7 @@ #include "dolists.h" pcb_uninit_t hid_distalign_init() { - REGISTER_ACTIONS(distalign_action_list, distalign_cookie); + PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie); return hid_distalign_uninit; } Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 4890) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 4891) @@ -622,7 +622,7 @@ char *distaligntext_cookie = "distaligntext plugin"; -REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie) +PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie) static void hid_distaligntext_uninit(void) { @@ -632,6 +632,6 @@ #include "dolists.h" pcb_uninit_t hid_distaligntext_init() { - REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie); + PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie); return hid_distaligntext_uninit; } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4890) +++ trunk/src_plugins/djopt/djopt.c (revision 4891) @@ -2682,7 +2682,7 @@ djopt_help, djopt_syntax} }; -REGISTER_ACTIONS(djopt_action_list, djopt_cookie) +PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie) static void hid_djopt_uninit(void) { @@ -2697,6 +2697,6 @@ conf_reg_field(conf_djopt, field,isarray,type_name,cpath,cname,desc,flags); #include "djopt_conf_fields.h" - REGISTER_ACTIONS(djopt_action_list, djopt_cookie) + PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie) return hid_djopt_uninit; } Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 4890) +++ trunk/src_plugins/export_dsn/dsn.c (revision 4891) @@ -93,7 +93,7 @@ }; #define NUM_OPTIONS (sizeof(dsn_options)/sizeof(dsn_options[0])) -REGISTER_ATTRIBUTES(dsn_options, dsn_cookie) +PCB_REGISTER_ATTRIBUTES(dsn_options, dsn_cookie) static pcb_hid_attr_val_t dsn_values[NUM_OPTIONS]; Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 4890) +++ trunk/src_plugins/export_dxf/dxf.c (revision 4891) @@ -4317,10 +4317,10 @@ lastgroup = -1; c_layerapps = 0; dxf_finding_apertures = 1; - hid_expose_callback(&dxf_hid, ®ion, 0); + pcb_hid_expose_callback(&dxf_hid, ®ion, 0); c_layerapps = 0; dxf_finding_apertures = 0; - hid_expose_callback(&dxf_hid, ®ion, 0); + pcb_hid_expose_callback(&dxf_hid, ®ion, 0); memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); dxf_maybe_close_file(); hid_restore_layer_ons(save_ons); Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 4890) +++ trunk/src_plugins/export_gcode/gcode.c (revision 4891) @@ -176,7 +176,7 @@ #define NUM_OPTIONS (sizeof(gcode_attribute_list)/sizeof(gcode_attribute_list[0])) -REGISTER_ATTRIBUTES(gcode_attribute_list, gcode_cookie) +PCB_REGISTER_ATTRIBUTES(gcode_attribute_list, gcode_cookie) static pcb_hid_attr_val_t gcode_values[NUM_OPTIONS]; /* *** Utility funcions **************************************************** */ @@ -344,7 +344,7 @@ lastbrush = (gdImagePtr) ((void *) -1); lastcolor = -1; - hid_expose_callback(&gcode_hid, ®ion, 0); + pcb_hid_expose_callback(&gcode_hid, ®ion, 0); } static void gcode_do_export(pcb_hid_attr_val_t * options) Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4890) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4891) @@ -579,11 +579,11 @@ lastgroup = -1; layer_list_idx = 0; finding_apertures = 1; - hid_expose_callback(&gerber_hid, ®ion, 0); + pcb_hid_expose_callback(&gerber_hid, ®ion, 0); layer_list_idx = 0; finding_apertures = 0; - hid_expose_callback(&gerber_hid, ®ion, 0); + pcb_hid_expose_callback(&gerber_hid, ®ion, 0); memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 4890) +++ trunk/src_plugins/export_nelma/nelma.c (revision 4891) @@ -210,7 +210,7 @@ #define NUM_OPTIONS (sizeof(nelma_attribute_list)/sizeof(nelma_attribute_list[0])) -REGISTER_ATTRIBUTES(nelma_attribute_list, nelma_cookie) +PCB_REGISTER_ATTRIBUTES(nelma_attribute_list, nelma_cookie) static pcb_hid_attr_val_t nelma_values[NUM_OPTIONS]; /* *** Utility funcions **************************************************** */ @@ -591,7 +591,7 @@ lastbrush = (gdImagePtr) ((void *) -1); lastcolor = -1; - hid_expose_callback(&nelma_hid, ®ion, 0); + pcb_hid_expose_callback(&nelma_hid, ®ion, 0); } static void nelma_do_export(pcb_hid_attr_val_t * options) Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 4890) +++ trunk/src_plugins/export_openscad/scad.c (revision 4891) @@ -578,7 +578,7 @@ layer_open = 0; - hid_expose_callback(&scad_hid, ®ion, 0); + pcb_hid_expose_callback(&scad_hid, ®ion, 0); /* And now .... Board outlines */ Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 4890) +++ trunk/src_plugins/export_png/png.c (revision 4891) @@ -340,7 +340,7 @@ #define NUM_OPTIONS (sizeof(png_attribute_list)/sizeof(png_attribute_list[0])) -REGISTER_ATTRIBUTES(png_attribute_list, png_cookie) +PCB_REGISTER_ATTRIBUTES(png_attribute_list, png_cookie) static pcb_hid_attr_val_t png_values[NUM_OPTIONS]; @@ -521,7 +521,7 @@ } } - hid_expose_callback(&png_hid, bounds, 0); + pcb_hid_expose_callback(&png_hid, bounds, 0); memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); conf_update(NULL); /* restore forced sets */ Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 4890) +++ trunk/src_plugins/export_ps/eps.c (revision 4891) @@ -129,7 +129,7 @@ #define NUM_OPTIONS (sizeof(eps_attribute_list)/sizeof(eps_attribute_list[0])) -REGISTER_ATTRIBUTES(eps_attribute_list, ps_cookie) +PCB_REGISTER_ATTRIBUTES(eps_attribute_list, ps_cookie) static pcb_hid_attr_val_t eps_values[NUM_OPTIONS]; @@ -290,7 +290,7 @@ fprintf(f, "/cc { 0 360 arc nclip } bind def\n"); fprintf(f, "/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def\n"); - hid_expose_callback(&eps_hid, bounds, 0); + pcb_hid_expose_callback(&eps_hid, bounds, 0); fprintf(f, "showpage\n"); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4890) +++ trunk/src_plugins/export_ps/ps.c (revision 4891) @@ -370,7 +370,7 @@ #define NUM_OPTIONS (sizeof(ps_attribute_list)/sizeof(ps_attribute_list[0])) -REGISTER_ATTRIBUTES(ps_attribute_list, ps_cookie) +PCB_REGISTER_ATTRIBUTES(ps_attribute_list, ps_cookie) /* All file-scope data is in global struct */ static struct { @@ -686,14 +686,14 @@ fprintf(the_file, "/tocp { /y y 12 sub def 90 y moveto rightshow } bind def\n"); global.doing_toc = 1; - global.pagecount = 1; /* 'pagecount' is modified by hid_expose_callback() call */ - hid_expose_callback(&ps_hid, &global.region, 0); + global.pagecount = 1; /* 'pagecount' is modified by pcb_hid_expose_callback() call */ + pcb_hid_expose_callback(&ps_hid, &global.region, 0); } global.pagecount = 1; /* Reset 'pagecount' if single file */ global.doing_toc = 0; ps_set_layer(NULL, 0, -1); /* reset static vars */ - hid_expose_callback(&ps_hid, &global.region, 0); + pcb_hid_expose_callback(&ps_hid, &global.region, 0); if (the_file) fprintf(the_file, "showpage\n"); @@ -1554,7 +1554,7 @@ {"pscalib", 0, ActionPSCalib} }; -REGISTER_ACTIONS(hidps_action_list, ps_cookie) +PCB_REGISTER_ACTIONS(hidps_action_list, ps_cookie) #include "dolists.h" @@ -1588,7 +1588,7 @@ hid->calibrate = ps_calibrate; hid->set_crosshair = ps_set_crosshair; - REGISTER_ACTIONS(hidps_action_list, ps_cookie) + PCB_REGISTER_ACTIONS(hidps_action_list, ps_cookie) ps_inited = 1; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 4890) +++ trunk/src_plugins/export_svg/svg.c (revision 4891) @@ -174,7 +174,7 @@ } while(0) -REGISTER_ATTRIBUTES(svg_attribute_list, svg_cookie) +PCB_REGISTER_ATTRIBUTES(svg_attribute_list, svg_cookie) static pcb_hid_attr_val_t svg_values[NUM_OPTIONS]; @@ -237,7 +237,7 @@ gds_init(&sbright); gds_init(&sdark); gds_init(&snormal); - hid_expose_callback(&svg_hid, ®ion, 0); + pcb_hid_expose_callback(&svg_hid, ®ion, 0); conf_update(NULL); /* restore forced sets */ } Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4890) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4891) @@ -229,7 +229,7 @@ static const char *fontmode_cookie = "fontmode plugin"; -REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) +PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) static void hid_fontmode_uninit(void) { @@ -239,6 +239,6 @@ #include "dolists.h" pcb_uninit_t hid_fontmode_init(void) { - REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) + PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie) return hid_fontmode_uninit; } Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c (revision 4890) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c (revision 4891) @@ -83,7 +83,7 @@ ctx->module = gpmi_get_current_module(); ctx->next = NULL; - hid_register_action(&ctx->action, gpmi_cookie, 0); + pcb_hid_register_action(&ctx->action, gpmi_cookie, 0); gpmi_mod_cleanup_insert(ctx->module, cleanup_action, "p", ctx); 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 4890) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 4891) @@ -66,7 +66,7 @@ region.X2 = PCB->MaxWidth; region.Y2 = PCB->MaxHeight; - hid_expose_callback(h->hid, ®ion, 0); + pcb_hid_expose_callback(h->hid, ®ion, 0); hid_restore_layer_ons(save_ons); gpmi_event(h->module, HIDE_do_export_finish, h); h->result = NULL; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 4890) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 4891) @@ -119,7 +119,7 @@ act.description = "Manage gpmi scripts"; act.syntax = "TODO"; act.trigger_cb = action_gpmi_scripts; - hid_register_action(&act, gpmi_cookie, 0); + pcb_hid_register_action(&act, gpmi_cookie, 0); act.name = "rehash"; act.need_coord_msg = NULL; @@ -126,7 +126,7 @@ act.description = "Reload all gpmi scripts"; act.syntax = "TODO"; act.trigger_cb = action_gpmi_rehash; - hid_register_action(&act, gpmi_cookie, 0); + pcb_hid_register_action(&act, gpmi_cookie, 0); } #ifndef PLUGIN_INIT_NAME Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 4890) +++ trunk/src_plugins/hid_batch/batch.c (revision 4891) @@ -117,7 +117,7 @@ {"PointCursor", 0, info} }; -REGISTER_ACTIONS(batch_action_list, batch_cookie) +PCB_REGISTER_ACTIONS(batch_action_list, batch_cookie) extern int isatty(); @@ -400,7 +400,7 @@ static void batch_begin(void) { - REGISTER_ACTIONS(batch_action_list, batch_cookie) + PCB_REGISTER_ACTIONS(batch_action_list, batch_cookie) } static void batch_end(void) Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 4891) @@ -814,7 +814,7 @@ ghid_draw_bg_image(); - hid_expose_callback(&ghid_hid, ®ion, 0); + pcb_hid_expose_callback(&ghid_hid, ®ion, 0); ghid_draw_grid(); /* In some cases we are called with the crosshair still off */ @@ -1169,7 +1169,7 @@ gdk_draw_rectangle(window, priv->bg_gc, TRUE, 0, 0, allocation.width, allocation.height); /* call the drawing routine */ - hid_expose_callback(&ghid_hid, NULL, &pinout->element); + pcb_hid_expose_callback(&ghid_hid, NULL, &pinout->element); gport->drawable = save_drawable; gport->view = save_view; @@ -1223,7 +1223,7 @@ region.Y1 = MAX(0, MIN(PCB->MaxHeight, region.Y1)); region.Y2 = MAX(0, MIN(PCB->MaxHeight, region.Y2)); - hid_expose_callback(&ghid_hid, ®ion, NULL); + pcb_hid_expose_callback(&ghid_hid, ®ion, NULL); gport->drawable = save_drawable; gport->view = save_view; Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 4891) @@ -851,7 +851,7 @@ hidgl_init_triangle_array(&buffer); ghid_invalidate_current_gc(); - hid_expose_callback(&ghid_hid, ®ion, 0); + pcb_hid_expose_callback(&ghid_hid, ®ion, 0); hidgl_flush_triangles(&buffer); ghid_draw_grid(®ion); @@ -957,7 +957,7 @@ (conf_core.editor.view.flip_y ? -1. : 1.) / gport->view.coord_per_px, 1); glTranslatef(conf_core.editor.view.flip_x ? gport->view.x0 - PCB->MaxWidth : -gport->view.x0, conf_core.editor.view.flip_y ? gport->view.y0 - PCB->MaxHeight : -gport->view.y0, 0); - hid_expose_callback(&ghid_hid, NULL, &pinout->element); + pcb_hid_expose_callback(&ghid_hid, NULL, &pinout->element); hidgl_flush_triangles(&buffer); glPopMatrix(); @@ -1061,7 +1061,7 @@ region.Y1 = MAX(0, MIN(PCB->MaxHeight, region.Y1)); region.Y2 = MAX(0, MIN(PCB->MaxHeight, region.Y2)); - hid_expose_callback(&ghid_hid, ®ion, NULL); + pcb_hid_expose_callback(&ghid_hid, ®ion, NULL); hidgl_flush_triangles(&buffer); glPopMatrix(); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4891) @@ -1972,7 +1972,7 @@ {"Zoom", N_("Click on zoom focus"), Zoom, zoom_help, zoom_syntax} }; -REGISTER_ACTIONS(ghid_main_action_list, ghid_cookie) +PCB_REGISTER_ACTIONS(ghid_main_action_list, ghid_cookie) #include "dolists.h" /* @@ -2140,11 +2140,11 @@ void gtkhid_begin(void) { - REGISTER_ACTIONS(ghid_main_action_list, ghid_cookie) - REGISTER_ACTIONS(ghid_netlist_action_list, ghid_cookie) - REGISTER_ACTIONS(ghid_log_action_list, ghid_cookie) - REGISTER_ACTIONS(gtk_topwindow_action_list, ghid_cookie) - REGISTER_ACTIONS(ghid_menu_action_list, ghid_cookie) + PCB_REGISTER_ACTIONS(ghid_main_action_list, ghid_cookie) + PCB_REGISTER_ACTIONS(ghid_netlist_action_list, ghid_cookie) + PCB_REGISTER_ACTIONS(ghid_log_action_list, ghid_cookie) + PCB_REGISTER_ACTIONS(gtk_topwindow_action_list, ghid_cookie) + PCB_REGISTER_ACTIONS(ghid_menu_action_list, ghid_cookie) gtkhid_active = 1; } Index: trunk/src_plugins/hid_gtk/gui-log-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-log-window.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gui-log-window.c (revision 4891) @@ -199,4 +199,4 @@ , }; -REGISTER_ACTIONS(ghid_log_action_list, ghid_cookie) +PCB_REGISTER_ACTIONS(ghid_log_action_list, ghid_cookie) Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4891) @@ -962,4 +962,4 @@ , }; -REGISTER_ACTIONS(ghid_netlist_action_list, ghid_cookie) +PCB_REGISTER_ACTIONS(ghid_netlist_action_list, ghid_cookie) Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4890) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4891) @@ -1664,7 +1664,7 @@ toggleview_help, toggleview_syntax} }; -REGISTER_ACTIONS(gtk_topwindow_action_list, ghid_cookie) +PCB_REGISTER_ACTIONS(gtk_topwindow_action_list, ghid_cookie) static GtkWidget *ghid_load_menus(void) { @@ -1760,4 +1760,4 @@ {"EditLayerGroups", 0, EditLayerGroups, editlayergroups_help, editlayergroups_syntax} }; -REGISTER_ACTIONS(ghid_menu_action_list, ghid_cookie) +PCB_REGISTER_ACTIONS(ghid_menu_action_list, ghid_cookie) Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 4891) @@ -1945,4 +1945,4 @@ , }; -REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie) Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/library.c (revision 4891) @@ -190,4 +190,4 @@ , }; -REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie) Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/main.c (revision 4891) @@ -223,7 +223,7 @@ */ }; -REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie) +PCB_REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie) static void lesstif_use_mask(int use_it); static void zoom_max(); @@ -755,7 +755,7 @@ time(&start); do { XFillRectangle(display, pixmap, bg_gc, 0, 0, view_width, view_height); - hid_expose_callback(&lesstif_hid, ®ion, 0); + pcb_hid_expose_callback(&lesstif_hid, ®ion, 0); XSync(display, 0); time(&end); i++; @@ -902,7 +902,7 @@ , }; -REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie) /* ---------------------------------------------------------------------- @@ -2428,7 +2428,7 @@ } } DrawBackgroundImage(); - hid_expose_callback(&lesstif_hid, ®ion, 0); + pcb_hid_expose_callback(&lesstif_hid, ®ion, 0); draw_grid(); lesstif_use_mask(0); show_crosshair(0); /* To keep the drawn / not drawn info correct */ @@ -3517,7 +3517,7 @@ region.Y2 = PCB->MaxHeight; XFillRectangle(display, pixmap, bg_gc, 0, 0, pd->v_width, pd->v_height); - hid_expose_callback(&lesstif_hid, ®ion, pd->item); + pcb_hid_expose_callback(&lesstif_hid, ®ion, pd->item); pinout = 0; view_left_x = save_vx; @@ -3837,13 +3837,13 @@ static void lesstif_begin(void) { - REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie) - REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie) - REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie) - REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie) - REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie) - REGISTER_ACTIONS(lesstif_menu_action_list, lesstif_cookie) - REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie) + PCB_REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_menu_action_list, lesstif_cookie) + PCB_REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie) } static void lesstif_end(void) Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 4891) @@ -536,7 +536,7 @@ selectlayer_help, selectlayer_syntax} }; -REGISTER_ACTIONS(lesstif_menu_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_menu_action_list, lesstif_cookie) #if 0 static void stdarg_do_color(char *value, char *which) Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4891) @@ -438,4 +438,4 @@ netlistshow_help, netlistshow_syntax} }; -REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie) Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 4890) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 4891) @@ -434,4 +434,4 @@ routestyleschanged_help, routestyleschanged_syntax} }; -REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie) +PCB_REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie) Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 4890) +++ trunk/src_plugins/hid_remote/remote.c (revision 4891) @@ -76,7 +76,7 @@ {"PointCursor", 0, info} }; -REGISTER_ACTIONS(remote_action_list, remote_cookie) +PCB_REGISTER_ACTIONS(remote_action_list, remote_cookie) /* ----------------------------------------------------------------------------- */ static int remote_stay; @@ -94,7 +94,7 @@ if (remote_proto_send_ready() != 0) exit(1); - hid_expose_callback(&remote_hid, ®ion, 0); + pcb_hid_expose_callback(&remote_hid, ®ion, 0); /* main loop, parser */ if (remote_proto_parse_all() != 0) @@ -427,7 +427,7 @@ remote_hid.propedit_add_value = remote_propedit_add_value; remote_hid.propedit_add_stat = remote_propedit_add_stat; - REGISTER_ACTIONS(remote_action_list, remote_cookie) + PCB_REGISTER_ACTIONS(remote_action_list, remote_cookie) hid_register_hid(&remote_hid); Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 4890) +++ trunk/src_plugins/import_dsn/dsn.c (revision 4891) @@ -163,7 +163,7 @@ {"LoadDsnFrom", 0, ActionLoadDsnFrom, load_dsn_help, load_dsn_syntax} }; -REGISTER_ACTIONS(dsn_action_list, dsn_cookie) +PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie) static void hid_dsn_uninit() { @@ -173,7 +173,7 @@ #include "dolists.h" pcb_uninit_t hid_import_dsn_init() { - REGISTER_ACTIONS(dsn_action_list, dsn_cookie) + PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie) return hid_dsn_uninit; } Index: trunk/src_plugins/import_hyp/import_hyp.c =================================================================== --- trunk/src_plugins/import_hyp/import_hyp.c (revision 4890) +++ trunk/src_plugins/import_hyp/import_hyp.c (revision 4891) @@ -84,7 +84,7 @@ {"LoadhypFrom", 0, ActionLoadhypFrom, load_hyp_help, load_hyp_syntax} }; -REGISTER_ACTIONS(hyp_action_list, hyp_cookie) +PCB_REGISTER_ACTIONS(hyp_action_list, hyp_cookie) static void hid_hyp_uninit() { @@ -95,7 +95,7 @@ pcb_uninit_t hid_import_hyp_init() { #warning TODO: rather register an importer than an action - REGISTER_ACTIONS(hyp_action_list, hyp_cookie) + PCB_REGISTER_ACTIONS(hyp_action_list, hyp_cookie) return hid_hyp_uninit; } Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 4890) +++ trunk/src_plugins/import_sch/import_sch.c (revision 4891) @@ -451,7 +451,7 @@ import_help, import_syntax} }; -REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) +PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) static void hid_import_sch_uninit(void) { @@ -464,7 +464,7 @@ { char *tmp; - REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) + PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags); #include "import_sch_conf_fields.h" Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4890) +++ trunk/src_plugins/jostle/jostle.c (revision 4891) @@ -547,7 +547,7 @@ char *jostle_cookie = "jostle plugin"; -REGISTER_ACTIONS(jostle_action_list, jostle_cookie) +PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie) static void hid_jostle_uninit(void) { @@ -557,6 +557,6 @@ #include "dolists.h" pcb_uninit_t hid_jostle_init() { - REGISTER_ACTIONS(jostle_action_list, jostle_cookie); + PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie); return hid_jostle_uninit; } Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 4890) +++ trunk/src_plugins/loghid/loghid.c (revision 4891) @@ -86,7 +86,7 @@ return 0; } -REGISTER_ATTRIBUTES(loghid_attribute_list, loghid_cookie) +PCB_REGISTER_ATTRIBUTES(loghid_attribute_list, loghid_cookie) static pcb_hid_attribute_t *loghid_get_export_options(int *n) { Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 4890) +++ trunk/src_plugins/oldactions/oldactions.c (revision 4891) @@ -304,7 +304,7 @@ static const char *oldactions_cookie = "oldactions plugin"; -REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) +PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) static void hid_oldactions_uninit(void) { @@ -314,6 +314,6 @@ #include "dolists.h" pcb_uninit_t hid_oldactions_init(void) { - REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) + PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie) return hid_oldactions_uninit; } Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4890) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4891) @@ -346,7 +346,7 @@ char *polycombine_cookie = "polycombine plugin"; -REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie) +PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie) static void hid_polycombine_uninit(void) { @@ -356,6 +356,6 @@ #include "dolists.h" pcb_uninit_t hid_polycombine_init() { - REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie); + PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie); return hid_polycombine_uninit; } Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 4890) +++ trunk/src_plugins/polystitch/polystitch.c (revision 4891) @@ -247,7 +247,7 @@ char *polystitch_cookie = "polystitch plugin"; -REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie) +PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie) static void hid_polystitch_uninit(void) { @@ -257,6 +257,6 @@ #include "dolists.h" pcb_uninit_t hid_polystitch_init() { - REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie); + PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie); return hid_polystitch_uninit; } Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 4890) +++ trunk/src_plugins/propedit/propedit.c (revision 4891) @@ -79,7 +79,7 @@ propset_help, propset_syntax}, }; -REGISTER_ACTIONS(propedit_action_list, propedit_cookie) +PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie) static void hid_propedit_uninit(void) { @@ -89,6 +89,6 @@ #include "dolists.h" pcb_uninit_t hid_propedit_init(void) { - REGISTER_ACTIONS(propedit_action_list, propedit_cookie) + PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie) return hid_propedit_uninit; } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4890) +++ trunk/src_plugins/puller/puller.c (revision 4891) @@ -2389,7 +2389,7 @@ static const char *puller_cookie = "puller plugin"; -REGISTER_ACTIONS(puller_action_list, puller_cookie) +PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie) static void hid_puller_uninit(void) { @@ -2399,6 +2399,6 @@ #include "dolists.h" pcb_uninit_t hid_puller_init(void) { - REGISTER_ACTIONS(puller_action_list, puller_cookie) + PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie) return hid_puller_uninit; } Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 4890) +++ trunk/src_plugins/query/query_act.c (revision 4891) @@ -171,10 +171,10 @@ query_action_help, query_action_syntax} }; -REGISTER_ACTIONS(query_action_list, NULL) +PCB_REGISTER_ACTIONS(query_action_list, NULL) #include "dolists.h" void query_action_reg(const char *cookie) { - REGISTER_ACTIONS(query_action_list, cookie) + PCB_REGISTER_ACTIONS(query_action_list, cookie) } Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 4890) +++ trunk/src_plugins/renumber/renumber.c (revision 4891) @@ -372,11 +372,11 @@ hid_remove_actions_by_cookie(renumber_cookie); } -REGISTER_ACTIONS(renumber_action_list, renumber_cookie) +PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie) #include "dolists.h" pcb_uninit_t hid_renumber_init(void) { - REGISTER_ACTIONS(renumber_action_list, renumber_cookie) + PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie) return hid_renumber_uninit; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4890) +++ trunk/src_plugins/report/report.c (revision 4891) @@ -901,7 +901,7 @@ static const char *report_cookie = "report plugin"; -REGISTER_ACTIONS(report_action_list, report_cookie) +PCB_REGISTER_ACTIONS(report_action_list, report_cookie) static void hid_report_uninit(void) { @@ -911,7 +911,7 @@ #include "dolists.h" pcb_uninit_t hid_report_init(void) { - REGISTER_ACTIONS(report_action_list, report_cookie) + PCB_REGISTER_ACTIONS(report_action_list, report_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_report, field,isarray,type_name,cpath,cname,desc,flags); #include "report_conf_fields.h" Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 4890) +++ trunk/src_plugins/shand_cmd/command.c (revision 4891) @@ -399,7 +399,7 @@ static const char *shand_cmd_cookie = "shand_cmd plugin"; -REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) +PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) static void hid_shand_cmd_uninit(void) { @@ -409,6 +409,6 @@ #include "dolists.h" pcb_uninit_t hid_shand_cmd_init(void) { - REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) + PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie) return hid_shand_cmd_uninit; } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4890) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4891) @@ -269,7 +269,7 @@ char *smartdisperse_cookie = "smartdisperse plugin"; -REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie) +PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie) static void hid_smartdisperse_uninit(void) { @@ -279,6 +279,6 @@ #include "dolists.h" pcb_uninit_t hid_smartdisperse_init() { - REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie); + PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie); return hid_smartdisperse_uninit; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4890) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4891) @@ -314,7 +314,7 @@ char *teardrops_cookie = "teardrops plugin"; -REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie) +PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie) static void hid_teardrops_uninit(void) { @@ -324,6 +324,6 @@ #include "dolists.h" pcb_uninit_t hid_teardrops_init() { - REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie); + PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie); return hid_teardrops_uninit; } Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4890) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4891) @@ -8230,7 +8230,7 @@ {"Toporouter", "Select net(s)", toporouter, "Topological autorouter", "Toporouter()"} }; -REGISTER_ACTIONS(toporouter_action_list, toporouter_cookie) +PCB_REGISTER_ACTIONS(toporouter_action_list, toporouter_cookie) static void hid_toporouter_uninit(void) { Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 4890) +++ trunk/src_plugins/vendordrill/vendor.c (revision 4891) @@ -651,7 +651,7 @@ load_vendor_help, load_vendor_syntax} }; -REGISTER_ACTIONS(vendor_action_list, vendor_cookie) +PCB_REGISTER_ACTIONS(vendor_action_list, vendor_cookie) static char **vendor_free_vect(char **lst, int *len) { @@ -696,6 +696,6 @@ stub_vendorDrillMap = vendorDrillMap; stub_vendorIsElementMappable = vendorIsElementMappable; - REGISTER_ACTIONS(vendor_action_list, vendor_cookie) + PCB_REGISTER_ACTIONS(vendor_action_list, vendor_cookie) return hid_vendordrill_uninit; }