Index: trunk/src/action_act.c =================================================================== --- trunk/src/action_act.c (revision 17436) +++ trunk/src/action_act.c (revision 17437) @@ -98,7 +98,7 @@ if (*sp && *sp != '#') { /*pcb_message("%s : line %-3d : \"%s\"\n", fname, n, sp); */ - pcb_hid_parse_actions(sp); + pcb_parse_actions(sp); } } Index: trunk/src/actions.c =================================================================== --- trunk/src/actions.c (revision 17436) +++ trunk/src/actions.c (revision 17437) @@ -87,7 +87,7 @@ pcb_hid_register_actions(a, 1, cookie, copy); } -void pcb_hid_remove_actions(const pcb_hid_action_t *a, int n) +void pcb_remove_actions(const pcb_hid_action_t *a, int n) { int i; @@ -102,7 +102,7 @@ } } -void pcb_hid_remove_actions_by_cookie(const char *cookie) +void pcb_remove_actions_by_cookie(const char *cookie) { htsp_entry_t *e; @@ -120,7 +120,7 @@ } } -void pcb_hid_remove_action(const pcb_hid_action_t *a) +void pcb_remove_action(const pcb_hid_action_t *a) { htsp_entry_t *e; @@ -134,7 +134,7 @@ } } -const pcb_hid_action_t *pcb_hid_find_action(const char *name) +const pcb_hid_action_t *pcb_find_action(const char *name) { hid_cookie_action_t *ca; @@ -213,12 +213,12 @@ } } -int pcb_hid_action(const char *name) +int pcb_action(const char *name) { - return pcb_hid_actionv(name, 0, 0); + return pcb_actionv(name, 0, 0); } -int pcb_hid_actionl(const char *name, ...) +int pcb_actionl(const char *name, ...) { const char *argv[20]; int argc = 0; @@ -229,10 +229,10 @@ while ((arg = va_arg(ap, char *)) != 0) argv[argc++] = arg; va_end(ap); - return pcb_hid_actionv(name, argc, argv); + return pcb_actionv(name, argc, argv); } -int pcb_hid_actionv_(const pcb_hid_action_t *a, int argc, const char **argv) +int pcb_actionv_(const pcb_hid_action_t *a, int argc, const char **argv) { int i, ret; const pcb_hid_action_t *old_action; @@ -252,7 +252,7 @@ return ret; } -int pcb_hid_actionv(const char *name, int argc, const char **argv) +int pcb_actionv(const char *name, int argc, const char **argv) { const pcb_hid_action_t *a; @@ -259,7 +259,7 @@ if (name == NULL) return 1; - a = pcb_hid_find_action(name); + a = pcb_find_action(name); if (a == NULL) { int i; pcb_message(PCB_MSG_ERROR, "no action %s(", name); @@ -268,7 +268,7 @@ pcb_message(PCB_MSG_ERROR, ")\n"); return 1; } - return pcb_hid_actionv_(a, argc, argv); + return pcb_actionv_(a, argc, argv); } void pcb_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y) @@ -330,7 +330,7 @@ * with no parameters or event. */ if (*sp == '\0') { - retcode = pcb_hid_actionv(aname, 0, 0); + retcode = pcb_actionv(aname, 0, 0); goto cleanup; } @@ -353,7 +353,7 @@ * "," */ if (!maybe_empty && ((parens && *sp == ')') || (!parens && !*sp))) { - retcode = pcb_hid_actionv(aname, num, list); + retcode = pcb_actionv(aname, num, list); if (retcode) goto cleanup; @@ -429,13 +429,13 @@ return retcode; } -int pcb_hid_parse_command(const char *str_) +int pcb_parse_command(const char *str_) { pcb_event(PCB_EVENT_CLI_ENTER, "s", str_); return hid_parse_actionstring(str_, pcb_false); } -int pcb_hid_parse_actions(const char *str_) +int pcb_parse_actions(const char *str_) { return hid_parse_actionstring(str_, pcb_true); } Index: trunk/src/actions.h =================================================================== --- trunk/src/actions.h (revision 17436) +++ trunk/src/actions.h (revision 17437) @@ -7,16 +7,16 @@ void pcb_print_actions(void); void pcb_dump_actions(void); -const pcb_hid_action_t *pcb_hid_find_action(const char *name); +const pcb_hid_action_t *pcb_find_action(const char *name); -extern void pcb_hid_remove_actions(const pcb_hid_action_t *a, int n); -extern void pcb_hid_remove_action(const pcb_hid_action_t *a); -extern void pcb_hid_remove_actions_by_cookie(const char *cookie); +void pcb_remove_actions(const pcb_hid_action_t *a, int n); +void pcb_remove_action(const pcb_hid_action_t *a); +void pcb_remove_actions_by_cookie(const char *cookie); -int pcb_hid_action(const char *action_); -int pcb_hid_actionl(const char *action_, ...); /* NULL terminated */ -int pcb_hid_actionv(const char *action_, int argc_, const char **argv_); -int pcb_hid_actionv_(const pcb_hid_action_t *a, int argc, const char **argv); +int pcb_action(const char *action_); +int pcb_actionl(const char *action_, ...); /* NULL terminated */ +int pcb_actionv(const char *action_, int argc_, const char **argv_); +int pcb_actionv_(const pcb_hid_action_t *a, int argc, const char **argv); /* Parse the given command string into action calls, and call hid_actionv for each action found. Accepts both "action(arg1, @@ -23,12 +23,12 @@ arg2)" and command-style "action arg1 arg2", allowing only one action in the later case. Returns nonzero if the action handler(s) return nonzero. */ -int pcb_hid_parse_command(const char *str_); +int pcb_parse_command(const char *str_); /* Parse the given string into action calls, and call hid_actionv for each action found. Accepts only "action(arg1, arg2)" */ -int pcb_hid_parse_actions(const char *str_); +int pcb_parse_actions(const char *str_); /* If the mouse cursor is in the drawin area, set x;y silently and return; else show msg and let the user click in the drawing area */ Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 17436) +++ trunk/src/buffer.c (revision 17437) @@ -813,7 +813,7 @@ pcb_message(PCB_MSG_WARNING, "Nothing buffer-movable is selected, nothing moved to the paste buffer\n"); goto error; } - pcb_hid_actionl("RemoveSelected", NULL); + pcb_actionl("RemoveSelected", NULL); break; /* converts buffer contents into a subcircuit */ Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 17436) +++ trunk/src/find_misc.c (revision 17437) @@ -214,7 +214,7 @@ } else { name = pcb_connection_name(ptr2); - pcb_hid_actionl("NetlistShow", name, NULL); + pcb_actionl("NetlistShow", name, NULL); } TheFlag = which_flag; Index: trunk/src/hid_cfg_action.c =================================================================== --- trunk/src/hid_cfg_action.c (revision 17436) +++ trunk/src/hid_cfg_action.c (revision 17437) @@ -34,11 +34,11 @@ return -1; switch(node->type) { case LHT_TEXT: - return pcb_hid_parse_actions(node->data.text.value); + return pcb_parse_actions(node->data.text.value); case LHT_LIST: for(node = node->data.list.first; node != NULL; node = node->next) { if (node->type == LHT_TEXT) { - if (pcb_hid_parse_actions(node->data.text.value) != 0) + if (pcb_parse_actions(node->data.text.value) != 0) return -1; } else Index: trunk/src/hid_flags.c =================================================================== --- trunk/src/hid_flags.c (revision 17436) +++ trunk/src/hid_flags.c (revision 17437) @@ -69,7 +69,7 @@ } memcpy(buff, name, len); buff[len] = '\0'; - a = pcb_hid_find_action(buff); + a = pcb_find_action(buff); if (!a) { pcb_message(PCB_MSG_ERROR, "hid_get_flag: no action %s\n", name); return -1; @@ -97,11 +97,11 @@ buff[len] = '\0'; argv[0] = buff; argv[1] = NULL; - return pcb_hid_actionv_(a, len > 0, argv); + return pcb_actionv_(a, len > 0, argv); } else { /* slower but more generic way */ - return pcb_hid_parse_command(name); + return pcb_parse_command(name); } } else { Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 17436) +++ trunk/src/main.c (revision 17437) @@ -574,7 +574,7 @@ conf_update(NULL, -1); if (main_action != NULL) { - int res = pcb_hid_parse_command(main_action); + int res = pcb_parse_command(main_action); if ((res != 0) && (main_action_hint != NULL)) fprintf(stderr, "\nHint: %s\n", main_action_hint); exit(res); @@ -623,11 +623,11 @@ if (conf_core.rc.script_filename) { pcb_message(PCB_MSG_INFO, _("Executing startup script file %s\n"), conf_core.rc.script_filename); - pcb_hid_actionl("ExecuteFile", conf_core.rc.script_filename, NULL); + pcb_actionl("ExecuteFile", conf_core.rc.script_filename, NULL); } if (conf_core.rc.action_string) { pcb_message(PCB_MSG_INFO, _("Executing startup action %s\n"), conf_core.rc.action_string); - pcb_hid_parse_actions(conf_core.rc.action_string); + pcb_parse_actions(conf_core.rc.action_string); } if (pcb_gui->printer || pcb_gui->exporter) { Index: trunk/src/tool_lock.c =================================================================== --- trunk/src/tool_lock.c (revision 17436) +++ trunk/src/tool_lock.c (revision 17437) @@ -59,7 +59,7 @@ DrawSubc(subc); pcb_draw(); - pcb_hid_actionl("Report", "Subc", NULL); + pcb_actionl("Report", "Subc", NULL); } else if (type != PCB_OBJ_VOID) { pcb_text_t *thing = (pcb_text_t *) ptr3; @@ -71,7 +71,7 @@ pcb_draw_obj((pcb_any_obj_t *)ptr2); pcb_draw(); } - pcb_hid_actionl("Report", "Object", NULL); + pcb_actionl("Report", "Object", NULL); } } Index: trunk/src/tool_poly.c =================================================================== --- trunk/src/tool_poly.c (revision 17436) +++ trunk/src/tool_poly.c (revision 17437) @@ -65,13 +65,13 @@ /* check if this is the last point of a polygon */ if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_hid_actionl("Polygon", "Close", NULL); + pcb_actionl("Polygon", "Close", NULL); return; } /* Someone clicking twice on the same point ('doubleclick'): close polygon */ if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_hid_actionl("Polygon", "Close", NULL); + pcb_actionl("Polygon", "Close", NULL); return; } Index: trunk/src/tool_polyhole.c =================================================================== --- trunk/src/tool_polyhole.c (revision 17436) +++ trunk/src/tool_polyhole.c (revision 17437) @@ -98,13 +98,13 @@ /* check if this is the last point of a polygon */ if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_hid_actionl("Polygon", "CloseHole", NULL); + pcb_actionl("Polygon", "CloseHole", NULL); break; } /* Someone clicking twice on the same point ('doubleclick'): close polygon hole */ if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_hid_actionl("Polygon", "CloseHole", NULL); + pcb_actionl("Polygon", "CloseHole", NULL); break; } Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 17436) +++ trunk/src_plugins/acompnet/acompnet.c (revision 17437) @@ -105,7 +105,7 @@ void pplg_uninit_acompnet(void) { - pcb_hid_remove_actions_by_cookie(acompnet_cookie); + pcb_remove_actions_by_cookie(acompnet_cookie); pcb_uilayer_free_all_cookie(acompnet_cookie); } Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 17436) +++ trunk/src_plugins/autocrop/autocrop.c (revision 17437) @@ -84,7 +84,7 @@ void pplg_uninit_autocrop(void) { - pcb_hid_remove_actions_by_cookie(autocrop_cookie); + pcb_remove_actions_by_cookie(autocrop_cookie); } #include "dolists.h" Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 17436) +++ trunk/src_plugins/autoplace/action.c (revision 17437) @@ -75,7 +75,7 @@ void pplg_uninit_autoplace(void) { - pcb_hid_remove_actions_by_cookie(autoplace_cookie); + pcb_remove_actions_by_cookie(autoplace_cookie); } #include "dolists.h" Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 17436) +++ trunk/src_plugins/autoroute/action.c (revision 17437) @@ -100,7 +100,7 @@ void pplg_uninit_autoroute(void) { - pcb_hid_remove_actions_by_cookie(autoroute_cookie); + pcb_remove_actions_by_cookie(autoroute_cookie); } #include "dolists.h" Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 17436) +++ trunk/src_plugins/boardflip/boardflip.c (revision 17437) @@ -193,7 +193,7 @@ void pplg_uninit_boardflip(void) { - pcb_hid_remove_actions_by_cookie(boardflip_cookie); + pcb_remove_actions_by_cookie(boardflip_cookie); } #include "dolists.h" Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 17436) +++ trunk/src_plugins/diag/diag.c (revision 17437) @@ -474,7 +474,7 @@ void pplg_uninit_diag(void) { - pcb_hid_remove_actions_by_cookie(diag_cookie); + pcb_remove_actions_by_cookie(diag_cookie); conf_unreg_fields("plugins/diag/"); pcb_event_unbind_allcookie(diag_cookie); } Index: trunk/src_plugins/dialogs/dialogs.c =================================================================== --- trunk/src_plugins/dialogs/dialogs.c (revision 17436) +++ trunk/src_plugins/dialogs/dialogs.c (revision 17437) @@ -58,7 +58,7 @@ void pplg_uninit_dialogs(void) { - pcb_hid_remove_actions_by_cookie(dialogs_cookie); + pcb_remove_actions_by_cookie(dialogs_cookie); } #include "dolists.h" Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 17436) +++ trunk/src_plugins/distalign/distalign.c (revision 17437) @@ -550,7 +550,7 @@ void pplg_uninit_distalign(void) { - pcb_hid_remove_actions_by_cookie(distalign_cookie); + pcb_remove_actions_by_cookie(distalign_cookie); } #include "dolists.h" Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 17436) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 17437) @@ -613,7 +613,7 @@ void pplg_uninit_distaligntext(void) { - pcb_hid_remove_actions_by_cookie(distaligntext_cookie); + pcb_remove_actions_by_cookie(distaligntext_cookie); } #include "dolists.h" Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 17436) +++ trunk/src_plugins/djopt/djopt.c (revision 17437) @@ -2627,7 +2627,7 @@ void pplg_uninit_djopt(void) { - pcb_hid_remove_actions_by_cookie(djopt_cookie); + pcb_remove_actions_by_cookie(djopt_cookie); conf_unreg_fields("plugins/djopt/"); } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 17436) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 17437) @@ -748,7 +748,7 @@ if (lactive >= 0) { char tmp[32]; sprintf(tmp, "%ld", lactive); - pcb_hid_actionl("MoveLayer", tmp, "-1", NULL); + pcb_actionl("MoveLayer", tmp, "-1", NULL); } drag_dellayer = 0; lactive = -1; @@ -814,13 +814,13 @@ lid = get_layer_coords(x, y); if (lid >= 0) { pcb_layervis_change_group_vis(lid, 1, 1); - pcb_hid_actionl("Popup", "layer", NULL); + pcb_actionl("Popup", "layer", NULL); } else if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) { pcb_coord_t tmp; pcb_actd_EditGroup_gid = get_group_coords(y, &tmp, &tmp); if (pcb_actd_EditGroup_gid >= 0) - pcb_hid_actionl("Popup", "group", NULL); + pcb_actionl("Popup", "group", NULL); } break; @@ -888,7 +888,7 @@ void pplg_uninit_draw_csect(void) { - pcb_hid_remove_actions_by_cookie(draw_csect_cookie); + pcb_remove_actions_by_cookie(draw_csect_cookie); } #include "dolists.h" Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 17436) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 17437) @@ -213,13 +213,13 @@ return 1; } else if ((ymm >= font_new_y1) && (ymm <= font_new_y2)) { - pcb_hid_actionl("LoadFontFrom", NULL); /* modal, blocking */ + pcb_actionl("LoadFontFrom", NULL); /* modal, blocking */ return 1; } else if ((ymm >= font_replace_y1) && (ymm <= font_replace_y2)) { char file[1] = "", id[5]; pcb_snprintf(id, sizeof(id), "%ld", conf_core.design.text_font_id); - pcb_hid_actionl("LoadFontFrom", file, id, NULL); /* modal, blocking */ + pcb_actionl("LoadFontFrom", file, id, NULL); /* modal, blocking */ return 1; } else if ((ymm >= font_del_y1) && (ymm <= font_del_y2)) { Index: trunk/src_plugins/expfeat/expfeat.c =================================================================== --- trunk/src_plugins/expfeat/expfeat.c (revision 17436) +++ trunk/src_plugins/expfeat/expfeat.c (revision 17437) @@ -61,7 +61,7 @@ void pplg_uninit_expfeat(void) { - pcb_hid_remove_actions_by_cookie(expfeat_cookie); + pcb_remove_actions_by_cookie(expfeat_cookie); } #include "dolists.h" Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 17436) +++ trunk/src_plugins/export_lpr/lpr.c (revision 17437) @@ -119,7 +119,7 @@ void pplg_uninit_export_lpr(void) { - pcb_hid_remove_actions_by_cookie(lpr_cookie); + pcb_remove_actions_by_cookie(lpr_cookie); } int pplg_init_export_lpr(void) Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 17436) +++ trunk/src_plugins/export_openems/export_openems.c (revision 17437) @@ -806,7 +806,7 @@ void pplg_uninit_export_openems(void) { - pcb_hid_remove_actions_by_cookie(openems_cookie); + pcb_remove_actions_by_cookie(openems_cookie); pcb_hid_remove_attributes_by_cookie(openems_cookie); } Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 17436) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 17437) @@ -659,7 +659,7 @@ void pplg_uninit_export_openscad(void) { pcb_hid_remove_attributes_by_cookie(openscad_cookie); - pcb_hid_remove_actions_by_cookie(openscad_cookie); + pcb_remove_actions_by_cookie(openscad_cookie); } int pplg_init_export_openscad(void) Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 17436) +++ trunk/src_plugins/export_ps/ps.c (revision 17437) @@ -1510,7 +1510,7 @@ static void plugin_ps_uninit(void) { - pcb_hid_remove_actions_by_cookie(ps_cookie); + pcb_remove_actions_by_cookie(ps_cookie); pcb_hid_remove_attributes_by_cookie(ps_cookie); ps_inited = 0; } Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 17436) +++ trunk/src_plugins/extedit/extedit.c (revision 17437) @@ -303,7 +303,7 @@ void pplg_uninit_extedit(void) { - pcb_hid_remove_actions_by_cookie(extedit_cookie); + pcb_remove_actions_by_cookie(extedit_cookie); } #include "dolists.h" Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 17436) +++ trunk/src_plugins/fontmode/fontmode.c (revision 17437) @@ -117,7 +117,7 @@ return 1; } - if (pcb_hid_actionl("New", "Font", 0)) + if (pcb_actionl("New", "Font", 0)) return 1; #warning TODO do we need to change design.bloat here? @@ -352,7 +352,7 @@ } pcb_font_set_info(font); - pcb_hid_actionl("SaveFontTo", NULL); + pcb_actionl("SaveFontTo", NULL); return 0; PCB_OLD_ACT_END; @@ -371,7 +371,7 @@ void pplg_uninit_fontmode(void) { - pcb_hid_remove_actions_by_cookie(fontmode_cookie); + pcb_remove_actions_by_cookie(fontmode_cookie); } #include "dolists.h" 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 17436) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c (revision 17437) @@ -56,7 +56,7 @@ static void cleanup_action(gpmi_module *mod, gpmi_cleanup *cl) { acontext_t *ctx = cl->argv[0].p; - pcb_hid_remove_action(&ctx->action); + pcb_remove_action(&ctx->action); free((char *)ctx->action.name); free((char *)ctx->action.description); free((char *)ctx->action.syntax); @@ -86,7 +86,7 @@ int action(const char *cmdline) { - return pcb_hid_parse_command(cmdline); + return pcb_parse_command(cmdline); } void create_menu(const char *path, const char *action, const char *mnemonic, const char *hotkey, const char *tooltip) Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 17436) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 17437) @@ -237,7 +237,7 @@ void pplg_uninit_gpmi(void) { pcb_event_unbind_allcookie(gpmi_cookie); - pcb_hid_remove_actions_by_cookie(gpmi_cookie); + pcb_remove_actions_by_cookie(gpmi_cookie); hid_gpmi_script_info_uninit(); gpmi_pkg_unload(pkg_scripts); gpmi_uninit(); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 17436) +++ trunk/src_plugins/hid_batch/batch.c (revision 17437) @@ -54,7 +54,7 @@ static void uninit_batch(void) { - pcb_hid_remove_actions_by_cookie(batch_cookie); + pcb_remove_actions_by_cookie(batch_cookie); pcb_event_unbind_allcookie(batch_cookie); if (prompt != NULL) { free(prompt); @@ -146,7 +146,7 @@ uninit_batch(); goto quit; } - pcb_hid_parse_command(line); + pcb_parse_command(line); } quit:; @@ -423,6 +423,6 @@ static void batch_end(void) { - pcb_hid_remove_actions_by_cookie(batch_cookie); + pcb_remove_actions_by_cookie(batch_cookie); } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 17436) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 17437) @@ -128,7 +128,7 @@ XmString xmname, pattern; if (argc > 1) - return pcb_hid_actionv("LoadFrom", argc, argv); + return pcb_actionv("LoadFrom", argc, argv); function = argc ? argv[0] : "Layout"; @@ -160,7 +160,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); - pcb_hid_actionl("LoadFrom", function, name, NULL); + pcb_actionl("LoadFrom", function, name, NULL); XtFree(name); @@ -187,7 +187,7 @@ XmString xmname, pattern; if (argc > 0) - return pcb_hid_actionv("LoadVendorFrom", argc, argv); + return pcb_actionv("LoadVendorFrom", argc, argv); setup_fsb_dialog(); @@ -212,7 +212,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); - pcb_hid_actionl("LoadVendorFrom", name, NULL); + pcb_actionl("LoadVendorFrom", name, NULL); XtFree(name); @@ -242,13 +242,13 @@ XmString xmname, pattern; if (argc > 1) - pcb_hid_actionv("SaveTo", argc, argv); + pcb_actionv("SaveTo", argc, argv); function = argc ? argv[0] : "Layout"; if (pcb_strcasecmp(function, "Layout") == 0) if (PCB->Filename) - return pcb_hid_actionl("SaveTo", "Layout", NULL); + return pcb_actionl("SaveTo", "Layout", NULL); setup_fsb_dialog(); @@ -276,7 +276,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); if (pcb_strcasecmp(function, "PasteBuffer") == 0) - pcb_hid_actionl("PasteBuffer", "Save", name, NULL); + pcb_actionl("PasteBuffer", "Save", name, NULL); else { /* * if we got this far and the function is Layout, then @@ -285,9 +285,9 @@ * just obtained. */ if (pcb_strcasecmp(function, "Layout") == 0) - pcb_hid_actionl("SaveTo", "LayoutAs", name, NULL); + pcb_actionl("SaveTo", "LayoutAs", name, NULL); else - pcb_hid_actionl("SaveTo", function, name, NULL); + pcb_actionl("SaveTo", function, name, NULL); } XtFree(name); @@ -2072,7 +2072,7 @@ I_am_recursing = 1; - rv = pcb_hid_action("Import"); + rv = pcb_action("Import"); I_am_recursing = 0; return rv; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 17436) +++ trunk/src_plugins/hid_lesstif/main.c (revision 17437) @@ -705,7 +705,7 @@ case XmCR_ACTIVATE: s = XmTextGetString(w); lesstif_show_crosshair(0); - pcb_hid_parse_command(s); + pcb_parse_command(s); XtFree(s); XmTextSetString(w, XmStrCast("")); case XmCR_LOSING_FOCUS: @@ -1911,7 +1911,7 @@ static void mainwind_delete_cb() { - pcb_hid_action("Quit"); + pcb_action("Quit"); } static void lesstif_listener_cb(XtPointer client_data, int *fid, XtInputId * id) @@ -1924,7 +1924,7 @@ if (nbytes) { buf[nbytes] = '\0'; - pcb_hid_parse_actions(buf); + pcb_parse_actions(buf); } } @@ -3992,7 +3992,7 @@ static void lesstif_end(void) { - pcb_hid_remove_actions_by_cookie(lesstif_cookie); + pcb_remove_actions_by_cookie(lesstif_cookie); pcb_hid_remove_attributes_by_cookie(lesstif_cookie); lesstif_active = 0; } Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 17436) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 17437) @@ -140,7 +140,7 @@ static void nbcb_find(pcb_lib_menu_t *net, int pos) { char *name = net->Name + 2; - pcb_hid_actionl("netlist", "find", name, NULL); + pcb_actionl("netlist", "find", name, NULL); } static void nbcb_std_callback(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs) @@ -150,7 +150,7 @@ if (XmListGetSelectedPos(netlist_list, &posl, &posc) == False) return; if (v == nbcb_find) - pcb_hid_actionl("connection", "reset", NULL); + pcb_actionl("connection", "reset", NULL); for (i = 0; i < posc; i++) { pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[posl[i] - 1]); v(net, posl[i]); Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 17436) +++ trunk/src_plugins/hid_remote/remote.c (revision 17437) @@ -421,7 +421,7 @@ void pplg_uninit_hid_remote(void) { -/* pcb_hid_remove_actions_by_cookie(remote_cookie);*/ +/* pcb_remove_actions_by_cookie(remote_cookie);*/ pcb_event_unbind_allcookie(remote_cookie); } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 17436) +++ trunk/src_plugins/import_dsn/dsn.c (revision 17437) @@ -346,7 +346,7 @@ void pplg_uninit_import_dsn(void) { - pcb_hid_remove_actions_by_cookie(dsn_cookie); + pcb_remove_actions_by_cookie(dsn_cookie); } Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 17436) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 17437) @@ -137,7 +137,7 @@ pcb_message(PCB_MSG_ERROR, "Error loading HP-GL: could not load any object from %s\n", fname); return 0; } - pcb_hid_actionl("mode", "pastebuffer", NULL); + pcb_actionl("mode", "pastebuffer", NULL); return 0; } @@ -183,7 +183,7 @@ void pplg_uninit_import_hpgl(void) { - pcb_hid_remove_actions_by_cookie(hpgl_cookie); + pcb_remove_actions_by_cookie(hpgl_cookie); } #include "dolists.h" Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 17436) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 17437) @@ -338,7 +338,7 @@ if (want_net && (netname_valid(netname))) { char tn[36]; sprintf(tn, "%s-%s", refdes, term); - pcb_hid_actionl("Netlist", "Add", netname, tn, NULL); + pcb_actionl("Netlist", "Add", netname, tn, NULL); } break; case '9': /* EOF */ @@ -400,15 +400,15 @@ } if (want_net) { - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); } res = ipc356_parse(PCB, f, fname, scs, want_net, want_pads); if (want_net) { - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); } fclose(f); @@ -438,7 +438,7 @@ void pplg_uninit_import_ipcd356(void) { - pcb_hid_remove_actions_by_cookie(ipcd356_cookie); + pcb_remove_actions_by_cookie(ipcd356_cookie); } #include "dolists.h" Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 17436) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 17437) @@ -85,7 +85,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "ltspice: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_hid_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; free(sattr->value); sattr->value = NULL; @@ -99,7 +99,7 @@ memset(&sattr, 0, sizeof(sattr)); - pcb_hid_actionl("ElementList", "start", NULL); + pcb_actionl("ElementList", "start", NULL); while(fgets(line, sizeof(line), fa) != NULL) { char *s; @@ -193,7 +193,7 @@ } } sym_flush(&sattr); - pcb_hid_actionl("ElementList", "Done", NULL); + pcb_actionl("ElementList", "Done", NULL); return 0; } @@ -201,8 +201,8 @@ { char line[1024]; - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); while(fgets(line, sizeof(line), fn) != NULL) { int argc; @@ -216,13 +216,13 @@ int n; for(n = 2; n < argc; n++) { /* pcb_trace("net-add '%s' '%s'\n", argv[1], argv[n]);*/ - pcb_hid_actionl("Netlist", "Add", argv[1], argv[n], NULL); + pcb_actionl("Netlist", "Add", argv[1], argv[n], NULL); } } } - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); return 0; } @@ -321,7 +321,7 @@ void pplg_uninit_import_ltspice(void) { - pcb_hid_remove_actions_by_cookie(ltspice_cookie); + pcb_remove_actions_by_cookie(ltspice_cookie); } #include "dolists.h" Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 17436) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 17437) @@ -96,7 +96,7 @@ } nethlp_elem_done(&ectx); -/* pcb_hid_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);*/ +/* pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);*/ return 0; } @@ -177,9 +177,9 @@ return -1; } - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); - pcb_hid_actionl("ElementList", "start", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); + pcb_actionl("ElementList", "start", NULL); for(library = dom->root->children; library != NULL; library = library->next) { if (strcmp(library->str, "library") == 0) { @@ -199,9 +199,9 @@ } } - pcb_hid_actionl("ElementList", "Done", NULL); - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("ElementList", "Done", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); /* for(n = library->children; n != NULL; n = n->next) { printf("n=%s\n", n->str); @@ -291,7 +291,7 @@ void pplg_uninit_import_mentor_sch(void) { - pcb_hid_remove_actions_by_cookie(mentor_sch_cookie); + pcb_remove_actions_by_cookie(mentor_sch_cookie); conf_unreg_fields("plugins/import_mentor_sch/"); } Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 17436) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 17437) @@ -256,7 +256,7 @@ if (value == NULL) value = ""; /* create elemet */ - pcb_hid_actionl("ElementList", "Need", refdes, footprint, value, NULL); + pcb_actionl("ElementList", "Need", refdes, footprint, value, NULL); /* printf("Elem '%s' -> %s:%s:%s\n", ectx->id, refdes, footprint, value);*/ } else @@ -296,7 +296,7 @@ pcb_message(PCB_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part); } pcb_snprintf(term, sizeof(term), "%s-%s", refdes, pin); - pcb_hid_actionl("Netlist", "Add", nctx->netname, term, NULL); + pcb_actionl("Netlist", "Add", nctx->netname, term, NULL); } void nethlp_net_destroy(nethlp_net_ctx_t *nctx) Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 17436) +++ trunk/src_plugins/import_mucs/mucs.c (revision 17437) @@ -161,7 +161,7 @@ void pplg_uninit_import_mucs(void) { - pcb_hid_remove_actions_by_cookie(mucs_cookie); + pcb_remove_actions_by_cookie(mucs_cookie); } #include "dolists.h" Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 17436) +++ trunk/src_plugins/import_sch/import_sch.c (revision 17437) @@ -291,7 +291,7 @@ char *dot, *slash, *bslash; if (!pcbname) - return pcb_hid_action("ImportGUI"); + return pcb_action("ImportGUI"); schname = (char *) malloc(strlen(pcbname) + 5); strcpy(schname, pcbname); @@ -307,7 +307,7 @@ strcat(schname, ".sch"); if (access(schname, F_OK)) - return pcb_hid_action("ImportGUI"); + return pcb_action("ImportGUI"); sources = (const char **) malloc(2 * sizeof(char *)); sources[0] = schname; @@ -473,7 +473,7 @@ void pplg_uninit_import_sch(void) { - pcb_hid_remove_actions_by_cookie(import_sch_cookie); + pcb_remove_actions_by_cookie(import_sch_cookie); conf_unreg_fields("plugins/import_sch/"); } Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 17436) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 17437) @@ -73,7 +73,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "tinycad: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_hid_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; free(sattr->value); sattr->value = NULL; @@ -88,9 +88,9 @@ memset(&sattr, 0, sizeof(sattr)); - pcb_hid_actionl("ElementList", "start", NULL); - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("ElementList", "start", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); while(fgets(line, sizeof(line), fn) != NULL) { int argc; @@ -119,7 +119,7 @@ if (sep != NULL) { *sep = '-'; /* pcb_trace("net-add '%s' '%s'\n", argv[2], curr);*/ - pcb_hid_actionl("Netlist", "Add", argv[2], curr, NULL); + pcb_actionl("Netlist", "Add", argv[2], curr, NULL); } } } @@ -145,9 +145,9 @@ sym_flush(&sattr); - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); - pcb_hid_actionl("ElementList", "Done", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); + pcb_actionl("ElementList", "Done", NULL); return 0; } @@ -206,7 +206,7 @@ void pplg_uninit_import_tinycad(void) { - pcb_hid_remove_actions_by_cookie(tinycad_cookie); + pcb_remove_actions_by_cookie(tinycad_cookie); } #include "dolists.h" Index: trunk/src_plugins/io_autotrax/io_autotrax.c =================================================================== --- trunk/src_plugins/io_autotrax/io_autotrax.c (revision 17436) +++ trunk/src_plugins/io_autotrax/io_autotrax.c (revision 17437) @@ -66,7 +66,7 @@ void pplg_uninit_io_autotrax(void) { - pcb_hid_remove_actions_by_cookie(autotrax_cookie); + pcb_remove_actions_by_cookie(autotrax_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_autotrax); } Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 17436) +++ trunk/src_plugins/io_autotrax/read.c (revision 17437) @@ -90,7 +90,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "protel autotrax: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_hid_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; @@ -928,7 +928,7 @@ s = line; rtrim(s); if (line != NULL && netname != NULL) { - pcb_hid_actionl("Netlist", "Add", netname, line, NULL); + pcb_actionl("Netlist", "Add", netname, line, NULL); } } } @@ -1124,9 +1124,9 @@ } else if (strncmp(s, "NETDEF", 6) == 0) { if (netdefs == 0) { - pcb_hid_actionl("ElementList", "start", NULL); - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("ElementList", "start", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); } netdefs |= 1; rdax_net(&st, FP); @@ -1147,9 +1147,9 @@ } } if (netdefs) { - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); - pcb_hid_actionl("ElementList", "Done", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); + pcb_actionl("ElementList", "Done", NULL); } fclose(FP); box = pcb_data_bbox(&board_size, Ptr->Data, pcb_false); Index: trunk/src_plugins/io_eagle/io_eagle.c =================================================================== --- trunk/src_plugins/io_eagle/io_eagle.c (revision 17436) +++ trunk/src_plugins/io_eagle/io_eagle.c (revision 17437) @@ -55,7 +55,7 @@ void pplg_uninit_io_eagle(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ - pcb_hid_remove_actions_by_cookie(eagle_cookie); + pcb_remove_actions_by_cookie(eagle_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_xml); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_bin); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_dru); Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 17436) +++ trunk/src_plugins/io_eagle/read.c (revision 17437) @@ -1091,10 +1091,10 @@ net = eagle_get_attrs(st, PARENT(subtree), "name", NULL); if (net != NULL && net[0] == '-' && net[1] == '\0') { /* pcb-rnd doesn't like it when Eagle uses '-' for GND*/ - pcb_hid_actionl("Netlist", "Add", "GND", conn, NULL); + pcb_actionl("Netlist", "Add", "GND", conn, NULL); pcb_message(PCB_MSG_WARNING, "Substituted contactref net \"GND\" instead of original invalid '-'\n"); } else { - pcb_hid_actionl("Netlist", "Add", net, conn, NULL); + pcb_actionl("Netlist", "Add", net, conn, NULL); } return 0; } @@ -1169,8 +1169,8 @@ {NULL, NULL} }; - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) { if (STRCMP(NODENAME(n), "signal") == 0) { @@ -1183,8 +1183,8 @@ } } - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); return 0; } Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 17436) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 17437) @@ -159,7 +159,7 @@ void pplg_uninit_io_hyp(void) { - pcb_hid_remove_actions_by_cookie(hyp_cookie); + pcb_remove_actions_by_cookie(hyp_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_hyp); } Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 17436) +++ trunk/src_plugins/io_hyp/parser.c (revision 17437) @@ -386,8 +386,8 @@ void hyp_netlist_begin() { /* clear netlist */ - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); return; } @@ -401,7 +401,7 @@ if ((net_name != NULL) && (device_name != NULL) && (pin_name != NULL)) { pcb_snprintf(conn, sizeof(conn), "%s-%s", device_name, pin_name); - pcb_hid_actionl("Netlist", "Add", net_name, conn, NULL); + pcb_actionl("Netlist", "Add", net_name, conn, NULL); } return; } @@ -409,8 +409,8 @@ void hyp_netlist_end() { /* sort netlist */ - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); return; } Index: trunk/src_plugins/io_kicad/io_kicad.c =================================================================== --- trunk/src_plugins/io_kicad/io_kicad.c (revision 17436) +++ trunk/src_plugins/io_kicad/io_kicad.c (revision 17437) @@ -62,7 +62,7 @@ void pplg_uninit_io_kicad(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ - pcb_hid_remove_actions_by_cookie(kicad_cookie); + pcb_remove_actions_by_cookie(kicad_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad); } Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 17436) +++ trunk/src_plugins/io_kicad/read.c (revision 17437) @@ -1052,7 +1052,7 @@ pcb_layergrp_list(st->pcb, PCB_LYT_COPPER | ((lname[0] == 'B') ? PCB_LYT_BOTTOM : PCB_LYT_TOP), &gid, 1); id = pcb_layer_create(st->pcb, gid, lname); /*printf("------------------------------ layer=%s\n", lname); -pcb_hid_actionl("dumpcsect", NULL);*/ +pcb_actionl("dumpcsect", NULL);*/ break; default: if (strcmp(lname, "Edge.Cuts") == 0) { Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 17436) +++ trunk/src_plugins/io_kicad/read_net.c (revision 17437) @@ -98,7 +98,7 @@ } /* Load the elements */ - pcb_hid_actionl("ElementList", "start", NULL); + pcb_actionl("ElementList", "start", NULL); for(c = components->children; c != NULL; c = c->next) { const char *ref = NULL, *value = NULL, *footprint = NULL; @@ -117,15 +117,15 @@ pcb_message(PCB_MSG_WARNING, "eechema: ignoring component %s with no footprint\n", ref); continue; } - pcb_hid_actionl("ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL); + pcb_actionl("ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL); } - pcb_hid_actionl("ElementList", "Done", NULL); + pcb_actionl("ElementList", "Done", NULL); /* Load the netlist */ - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); for(net = nets->children; net != NULL; net = net->next) { const char *netname = NULL, *code = NULL, *name = NULL, *footprint = NULL; @@ -164,13 +164,13 @@ continue; } pcb_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin); - pcb_hid_actionl("Netlist", "Add", netname, refpin, NULL); + pcb_actionl("Netlist", "Add", netname, refpin, NULL); } } } - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); return 0; } Index: trunk/src_plugins/io_mentor_cell/io_mentor_cell.c =================================================================== --- trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 17436) +++ trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 17437) @@ -52,7 +52,7 @@ void pplg_uninit_io_mentor_cell(void) { - pcb_hid_remove_actions_by_cookie(mentor_cell_cookie); + pcb_remove_actions_by_cookie(mentor_cell_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_mentor_cell); } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 17436) +++ trunk/src_plugins/io_pcb/file.c (revision 17437) @@ -952,7 +952,7 @@ pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } -/* pcb_hid_action("dumplayers");*/ +/* pcb_action("dumplayers");*/ return 0; } Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 17436) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 17437) @@ -186,7 +186,7 @@ void pplg_uninit_io_tedax(void) { - pcb_hid_remove_actions_by_cookie(tedax_cookie); + pcb_remove_actions_by_cookie(tedax_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_tedax); } Index: trunk/src_plugins/io_tedax/netlist.c =================================================================== --- trunk/src_plugins/io_tedax/netlist.c (revision 17436) +++ trunk/src_plugins/io_tedax/netlist.c (revision 17437) @@ -72,8 +72,8 @@ htsp_init(&fps, strhash, strkeyeq); - pcb_hid_actionl("Netlist", "Freeze", NULL); - pcb_hid_actionl("Netlist", "Clear", NULL); + pcb_actionl("Netlist", "Freeze", NULL); + pcb_actionl("Netlist", "Clear", NULL); while((argc = tedax_getline(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) { if ((argc == 3) && (strcmp(argv[0], "footprint") == 0)) { @@ -87,16 +87,16 @@ else if ((argc == 4) && (strcmp(argv[0], "conn") == 0)) { char id[512]; sprintf(id, "%s-%s", argv[2], argv[3]); - pcb_hid_actionl("Netlist", "Add", argv[1], id, NULL); + pcb_actionl("Netlist", "Add", argv[1], id, NULL); } else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "netlist") == 0)) break; } - pcb_hid_actionl("Netlist", "Sort", NULL); - pcb_hid_actionl("Netlist", "Thaw", NULL); + pcb_actionl("Netlist", "Sort", NULL); + pcb_actionl("Netlist", "Thaw", NULL); - pcb_hid_actionl("ElementList", "start", NULL); + pcb_actionl("ElementList", "start", NULL); for (e = htsp_first(&fps); e; e = htsp_next(&fps, e)) { fp_t *fp = e->value; @@ -104,7 +104,7 @@ if (fp->footprint == NULL) pcb_message(PCB_MSG_ERROR, "tedax: not importing refdes=%s: no footprint specified\n", e->key); else - pcb_hid_actionl("ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL); + pcb_actionl("ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL); free(e->key); free(fp->value); @@ -112,7 +112,7 @@ free(fp); } - pcb_hid_actionl("ElementList", "Done", NULL); + pcb_actionl("ElementList", "Done", NULL); htsp_uninit(&fps); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 17436) +++ trunk/src_plugins/jostle/jostle.c (revision 17437) @@ -532,7 +532,7 @@ void pplg_uninit_jostle(void) { - pcb_hid_remove_actions_by_cookie(jostle_cookie); + pcb_remove_actions_by_cookie(jostle_cookie); } #include "dolists.h" Index: trunk/src_plugins/lib_gtk_common/act_fileio.c =================================================================== --- trunk/src_plugins/lib_gtk_common/act_fileio.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/act_fileio.c (revision 17437) @@ -76,7 +76,7 @@ /* we've been given the file name */ if (argc > 1) - return pcb_hid_actionv("LoadFrom", argc, argv); + return pcb_actionv("LoadFrom", argc, argv); function = argc ? argv[0] : "Layout"; @@ -97,7 +97,7 @@ if (name) { if (conf_core.rc.verbose) fprintf(stderr, "Load: Calling LoadFrom(%s, %s)\n", function, name); - pcb_hid_actionl("LoadFrom", function, name, NULL); + pcb_actionl("LoadFrom", function, name, NULL); g_free(name); } @@ -133,13 +133,13 @@ current_dir = dup_cwd(); if (argc > 1) - return pcb_hid_actionv("SaveTo", argc, argv); + return pcb_actionv("SaveTo", argc, argv); function = argc ? argv[0] : "Layout"; if (pcb_strcasecmp(function, "Layout") == 0) if (PCB->Filename) - return pcb_hid_actionl("SaveTo", "Layout", NULL); + return pcb_actionl("SaveTo", "Layout", NULL); if (pcb_strcasecmp(function, "PasteBuffer") == 0) { int num_fmts, n; @@ -232,7 +232,7 @@ fprintf(stderr, "Save: Calling SaveTo(%s, %s)\n", function, name); if (pcb_strcasecmp(function, "PasteBuffer") == 0) { - pcb_hid_actionl("PasteBuffer", "Save", name, avail.plug[fmt]->description, "1", NULL); + pcb_actionl("PasteBuffer", "Save", name, avail.plug[fmt]->description, "1", NULL); } else { @@ -246,9 +246,9 @@ if (fmt_param != NULL) sfmt = avail.plug[fmt]->description; if (pcb_strcasecmp(function, "Layout") == 0) - pcb_hid_actionl("SaveTo", "LayoutAs", name, sfmt, NULL); + pcb_actionl("SaveTo", "LayoutAs", name, sfmt, NULL); else - pcb_hid_actionl("SaveTo", function, name, sfmt, NULL); + pcb_actionl("SaveTo", function, name, sfmt, NULL); } g_free(name); pcb_io_list_free(&avail); @@ -287,7 +287,7 @@ free(name); I_am_recursing = 1; - rv = pcb_hid_action("Import"); + rv = pcb_action("Import"); I_am_recursing = 0; return rv; Index: trunk/src_plugins/lib_gtk_common/bu_cursor_pos.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_cursor_pos.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/bu_cursor_pos.c (revision 17437) @@ -39,9 +39,9 @@ { /* Button only toggles between mm and mil */ if (conf_core.editor.grid_unit == get_unit_struct("mm")) - pcb_hid_actionl("SetUnits", "mil", NULL); + pcb_actionl("SetUnits", "mil", NULL); else - pcb_hid_actionl("SetUnits", "mm", NULL); + pcb_actionl("SetUnits", "mm", NULL); } /* Index: trunk/src_plugins/lib_gtk_common/dlg_command.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_command.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_command.c (revision 17437) @@ -205,7 +205,7 @@ command_history_add(ctx, command); if (conf_hid_gtk.plugins.hid_gtk.use_command_window) { - pcb_hid_parse_command(command); + pcb_parse_command(command); g_free(command); } else { @@ -418,7 +418,7 @@ /* copy new command line to save buffer */ g_free(previous); previous = g_strdup(command); - pcb_hid_parse_command(command); + pcb_parse_command(command); g_free(command); } } Index: trunk/src_plugins/lib_gtk_common/dlg_confirm.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_confirm.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_confirm.c (revision 17437) @@ -93,7 +93,7 @@ switch (pcb_gtk_dlg_message(str, GTK_WINDOW(top_window))) { case GTK_RESPONSE_YES: { - if (pcb_hid_actionl("Save", NULL)) { /* Save failed */ + if (pcb_actionl("Save", NULL)) { /* Save failed */ return 0; /* Cancel */ } else { Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 17437) @@ -84,7 +84,7 @@ p->num_violations = 0; gtk_container_foreach(GTK_CONTAINER(p->drc_vbox), destroy_widget, NULL); - pcb_hid_actionl("DRC", NULL); + pcb_actionl("DRC", NULL); } static void drc_destroy_cb(GtkWidget * widget, gpointer data) Index: trunk/src_plugins/lib_gtk_common/dlg_library.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_library.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_library.c (revision 17437) @@ -355,7 +355,7 @@ that happened before the cancel */ norefresh = 1; g_object_set(library_window->preview, "element-data", NULL, NULL); - pcb_hid_actionl("PasteBuffer", "clear", NULL); + pcb_actionl("PasteBuffer", "clear", NULL); } else gtk_entry_set_text(library_window->entry_filter, name); Index: trunk/src_plugins/lib_gtk_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_log.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_log.c (revision 17437) @@ -131,7 +131,7 @@ ghid_text_view_append(log_text, msg); if (popup) - pcb_hid_actionl("DoWindows", "Log", "false", NULL); + pcb_actionl("DoWindows", "Log", "false", NULL); } static void ghid_log_append_string(enum pcb_message_level level, gchar *s, int hid_active) Index: trunk/src_plugins/lib_gtk_common/dlg_netlist.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 17437) @@ -508,8 +508,8 @@ return; name = selected_net->Name + 2; - pcb_hid_actionl("connection", "reset", NULL); - pcb_hid_actionl("netlist", "find", name, NULL); + pcb_actionl("connection", "reset", NULL); + pcb_actionl("netlist", "find", name, NULL); } #warning padstack TODO: this seems to be duplicate in lesstif Index: trunk/src_plugins/lib_gtk_common/dlg_search.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_search.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_search.c (revision 17437) @@ -810,7 +810,7 @@ case GTK_RESPONSE_APPLY: script = gtk_entry_get_text(GTK_ENTRY(sdlg.expr)); act = gtkc_combo_box_text_get_active_text(sdlg.action); - pcb_hid_actionl("query", act, script, NULL); + pcb_actionl("query", act, script, NULL); break; case GTK_RESPONSE_CLOSE: gtk_widget_destroy(GTK_WIDGET(dlg)); @@ -826,7 +826,7 @@ const char **s; int ver; - ver = pcb_hid_actionl("query", "version", NULL); + ver = pcb_actionl("query", "version", NULL); if (ver < 0100) { sdlg.window = NULL; pcb_message(PCB_MSG_ERROR, "The query plugin is not avaialble, can not do advanced search.\n"); Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 17437) @@ -246,7 +246,7 @@ */ static gint delete_chart_cb(GtkWidget *widget, GdkEvent *event, void *data) { - pcb_hid_action("Quit"); + pcb_action("Quit"); /* * Return TRUE to keep our app running. A FALSE here would let the Index: trunk/src_plugins/lib_gtk_common/util_listener.c =================================================================== --- trunk/src_plugins/lib_gtk_common/util_listener.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/util_listener.c (revision 17437) @@ -55,7 +55,7 @@ status = g_io_channel_read_line(source, &str, &len, &term, &err); switch (status) { case G_IO_STATUS_NORMAL: - pcb_hid_parse_actions(str); + pcb_parse_actions(str); g_free(str); break; Index: trunk/src_plugins/lib_gtk_common/wt_layersel.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_layersel.c (revision 17436) +++ trunk/src_plugins/lib_gtk_common/wt_layersel.c (revision 17437) @@ -247,7 +247,7 @@ return -1; /* can not be selected */ if (do_select) - pcb_hid_actionl("SelectLayer", ml->select_name, NULL); + pcb_actionl("SelectLayer", ml->select_name, NULL); b = (pcb_bool *)((char *)PCB + ml->sel_offs); return *b; @@ -274,7 +274,7 @@ case 3: if (lsg->grp != &lsg->ls->grp_virt) { pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, lsg->grp); - pcb_hid_actionl("Popup", "group", NULL); + pcb_actionl("Popup", "group", NULL); } break; } @@ -289,11 +289,11 @@ if (lid < 0) { if ((g != NULL) && (g != &ls->grp_virt)) { pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, g); - pcb_hid_actionl("Popup", "group", NULL); + pcb_actionl("Popup", "group", NULL); } } else - pcb_hid_actionl("Popup", "layer", NULL); + pcb_actionl("Popup", "layer", NULL); } static gboolean layer_vis_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_lyr_t *lsl) @@ -369,7 +369,7 @@ case 3: if (lsg->grp != &lsg->ls->grp_virt) { pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, lsg->grp); - pcb_hid_actionl("Popup", "group", NULL); + pcb_actionl("Popup", "group", NULL); } break; } Index: trunk/src_plugins/lib_gtk_hid/actions.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/actions.c (revision 17436) +++ trunk/src_plugins/lib_gtk_hid/actions.c (revision 17437) @@ -542,6 +542,6 @@ void pcb_gtk_action_unreg(void) { - pcb_hid_remove_actions_by_cookie(ghid_act_cookie); + pcb_remove_actions_by_cookie(ghid_act_cookie); pcb_hid_remove_attributes_by_cookie(ghid_act_cookie); } Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 17436) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 17437) @@ -512,7 +512,7 @@ void pplg_uninit_lib_polyhelp(void) { - pcb_hid_remove_actions_by_cookie(polyhelp_cookie); + pcb_remove_actions_by_cookie(polyhelp_cookie); } #include "dolists.h" Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 17436) +++ trunk/src_plugins/millpath/millpath.c (revision 17437) @@ -65,7 +65,7 @@ void pplg_uninit_millpath(void) { - pcb_hid_remove_actions_by_cookie(pcb_millpath_cookie); + pcb_remove_actions_by_cookie(pcb_millpath_cookie); } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 17436) +++ trunk/src_plugins/oldactions/oldactions.c (revision 17437) @@ -345,7 +345,7 @@ void pplg_uninit_oldactions(void) { - pcb_hid_remove_actions_by_cookie(oldactions_cookie); + pcb_remove_actions_by_cookie(oldactions_cookie); } #include "dolists.h" Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 17436) +++ trunk/src_plugins/polycombine/polycombine.c (revision 17437) @@ -349,7 +349,7 @@ void pplg_uninit_polycombine(void) { - pcb_hid_remove_actions_by_cookie(polycombine_cookie); + pcb_remove_actions_by_cookie(polycombine_cookie); } #include "dolists.h" Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 17436) +++ trunk/src_plugins/polystitch/polystitch.c (revision 17437) @@ -135,7 +135,7 @@ void pplg_uninit_polystitch(void) { - pcb_hid_remove_actions_by_cookie(polystitch_cookie); + pcb_remove_actions_by_cookie(polystitch_cookie); } #include "dolists.h" Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 17436) +++ trunk/src_plugins/propedit/propedit.c (revision 17437) @@ -149,7 +149,7 @@ void pplg_uninit_propedit(void) { - pcb_hid_remove_actions_by_cookie(propedit_cookie); + pcb_remove_actions_by_cookie(propedit_cookie); } #include "dolists.h" Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 17436) +++ trunk/src_plugins/puller/puller.c (revision 17437) @@ -2096,7 +2096,7 @@ printf("optimizing...\n"); /* This canonicalizes all the lines, and cleans up near-misses. */ - /* pcb_hid_actionl("djopt", "puller", 0); */ + /* pcb_actionl("djopt", "puller", 0); */ cflg = pcb_layergrp_flags(PCB, pcb_layer_get_group_(CURRENT)); current_is_solder = (cflg & PCB_LYT_BOTTOM); @@ -2208,7 +2208,7 @@ void pplg_uninit_puller(void) { - pcb_hid_remove_actions_by_cookie(puller_cookie); + pcb_remove_actions_by_cookie(puller_cookie); } #include "dolists.h" Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 17436) +++ trunk/src_plugins/query/query.c (revision 17437) @@ -295,7 +295,7 @@ void pplg_uninit_query(void) { - pcb_hid_remove_actions_by_cookie(query_cookie); + pcb_remove_actions_by_cookie(query_cookie); pcb_qry_fnc_destroy(); } Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 17436) +++ trunk/src_plugins/renumber/renumber.c (revision 17437) @@ -381,7 +381,7 @@ void pplg_uninit_renumber(void) { - pcb_hid_remove_actions_by_cookie(renumber_cookie); + pcb_remove_actions_by_cookie(renumber_cookie); } PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie) Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 17436) +++ trunk/src_plugins/report/report.c (revision 17437) @@ -842,7 +842,7 @@ void pplg_uninit_report(void) { - pcb_hid_remove_actions_by_cookie(report_cookie); + pcb_remove_actions_by_cookie(report_cookie); conf_unreg_fields("plugins/report/"); } Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 17436) +++ trunk/src_plugins/shand_cmd/command.c (revision 17437) @@ -401,7 +401,7 @@ void pplg_uninit_shand_cmd(void) { - pcb_hid_remove_actions_by_cookie(shand_cmd_cookie); + pcb_remove_actions_by_cookie(shand_cmd_cookie); } #include "dolists.h" Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 17436) +++ trunk/src_plugins/shape/shape.c (revision 17437) @@ -495,7 +495,7 @@ void pplg_uninit_shape(void) { pcb_event_unbind_allcookie(pcb_shape_cookie); - pcb_hid_remove_actions_by_cookie(pcb_shape_cookie); + pcb_remove_actions_by_cookie(pcb_shape_cookie); } Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 17436) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 17437) @@ -53,7 +53,7 @@ void pplg_uninit_sketch_route(void) { pcb_event_unbind_allcookie(pcb_sketch_route_cookie); - pcb_hid_remove_actions_by_cookie(pcb_sketch_route_cookie); + pcb_remove_actions_by_cookie(pcb_sketch_route_cookie); } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 17436) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 17437) @@ -249,7 +249,7 @@ void pplg_uninit_smartdisperse(void) { - pcb_hid_remove_actions_by_cookie(smartdisperse_cookie); + pcb_remove_actions_by_cookie(smartdisperse_cookie); } #include "dolists.h" Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 17436) +++ trunk/src_plugins/stroke/stroke.c (revision 17437) @@ -60,7 +60,7 @@ int idx; conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) { - if ((strcmp(seq, item->name) == 0) && (pcb_hid_parse_actions(item->val.string[0]) == 0)) + if ((strcmp(seq, item->name) == 0) && (pcb_parse_actions(item->val.string[0]) == 0)) return 0; } if (conf_stroke.plugins.stroke.warn4unknown) @@ -113,7 +113,7 @@ else if (pcb_strcasecmp(argv[0], "zoom") == 0) { char tmp[256]; pcb_snprintf(tmp, sizeof(tmp), "ZoomTo(%$mm, %$mm, %$mm, %$mm)", stroke_first_x, stroke_first_y, stroke_last_x, stroke_last_y); - pcb_hid_parse_command(tmp); + pcb_parse_command(tmp); } else if (pcb_strcasecmp(argv[0], "stopline") == 0) { if (conf_core.editor.mode == PCB_MODE_LINE) @@ -143,7 +143,7 @@ { conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal); conf_unreg_fields("plugins/stroke/"); - pcb_hid_remove_actions_by_cookie(pcb_stroke_cookie); + pcb_remove_actions_by_cookie(pcb_stroke_cookie); return 0; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 17436) +++ trunk/src_plugins/teardrops/teardrops.c (revision 17437) @@ -280,7 +280,7 @@ void pplg_uninit_teardrops(void) { - pcb_hid_remove_actions_by_cookie(teardrops_cookie); + pcb_remove_actions_by_cookie(teardrops_cookie); } #include "dolists.h" Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 17436) +++ trunk/src_plugins/vendordrill/vendor.c (revision 17437) @@ -701,7 +701,7 @@ void pplg_uninit_vendordrill(void) { pcb_event_unbind_allcookie(vendor_cookie); - pcb_hid_remove_actions_by_cookie(vendor_cookie); + pcb_remove_actions_by_cookie(vendor_cookie); vendor_free_all(); conf_unreg_fields("plugins/vendor/"); }