Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4892) +++ trunk/doc-rnd/hacking/renames (revision 4893) @@ -370,3 +370,9 @@ hid_remove_actions -> pcb_hid_remove_actions hid_remove_action -> pcb_hid_remove_action hid_remove_actions_by_cookie -> pcb_hid_remove_actions_by_cookie +hid_action -> pcb_hid_action +hid_actionl -> pcb_hid_actionl +hid_actionv -> pcb_hid_actionv +hid_actionv_ -> pcb_hid_actionv_ +hid_parse_command -> pcb_hid_parse_command +hid_parse_actions -> pcb_hid_parse_actions Index: trunk/src/action_act.c =================================================================== --- trunk/src/action_act.c (revision 4892) +++ trunk/src/action_act.c (revision 4893) @@ -88,7 +88,7 @@ if (*sp && *sp != '#') { /*pcb_message("%s : line %-3d : \"%s\"\n", fname, n, sp); */ - hid_parse_actions(sp); + pcb_hid_parse_actions(sp); } } Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4892) +++ trunk/src/action_helper.c (revision 4893) @@ -703,7 +703,7 @@ */ DrawElement(element); pcb_draw(); - hid_actionl("Report", "Object", NULL); + pcb_hid_actionl("Report", "Object", NULL); } else if (type != PCB_TYPE_NONE) { pcb_text_t *thing = (pcb_text_t *) ptr3; @@ -715,7 +715,7 @@ pcb_draw_obj(type, ptr1, ptr2); pcb_draw(); } - hid_actionl("Report", "Object", NULL); + pcb_hid_actionl("Report", "Object", NULL); } break; } @@ -934,7 +934,7 @@ /* check if this is the last point of a polygon */ if (n >= 3 && points[0].X == Crosshair.AttachedLine.Point2.X && points[0].Y == Crosshair.AttachedLine.Point2.Y) { - hid_actionl("Polygon", "Close", NULL); + pcb_hid_actionl("Polygon", "Close", NULL); ClosePolygon(); break; } @@ -941,7 +941,7 @@ /* Someone clicking twice on the same point ('doubleclick'): close polygon */ if (n >= 3 && points[n - 1].X == Crosshair.AttachedLine.Point2.X && points[n - 1].Y == Crosshair.AttachedLine.Point2.Y) { - hid_actionl("Polygon", "Close", NULL); + pcb_hid_actionl("Polygon", "Close", NULL); break; } Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 4892) +++ trunk/src/board.c (revision 4893) @@ -82,7 +82,7 @@ ParseGroupString(conf_core.design.groups, &ptr->LayerGroups, MAX_LAYER); save = PCB; PCB = ptr; - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); PCB = save; ptr->Zoom = conf_core.editor.zoom; @@ -220,7 +220,7 @@ free(PCB->Name); PCB->Name = Name; if (gui != NULL) - hid_action("PCBChanged"); + pcb_hid_action("PCBChanged"); return (pcb_true); } @@ -242,5 +242,5 @@ pcb_crosshair_set_range(0, 0, Width, Height); if (gui != NULL) - hid_action("PCBChanged"); + pcb_hid_action("PCBChanged"); } Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4892) +++ trunk/src/change_act.c (revision 4893) @@ -1321,7 +1321,7 @@ switch (pcb_funchash_get(function, NULL)) { case F_ViaDrillingHole: SetViaDrillingHole(absolute ? value : value + conf_core.design.via_drilling_hole, pcb_false); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; case F_Grid: @@ -1342,13 +1342,13 @@ case F_LineSize: case F_Line: SetLineSize(absolute ? value : value + conf_core.design.line_thickness); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; case F_Via: case F_ViaSize: SetViaSize(absolute ? value : value + conf_core.design.via_thickness, pcb_false); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; case F_Text: Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4892) +++ trunk/src/crosshair.c (revision 4893) @@ -1139,9 +1139,9 @@ if (conf_core.editor.mode == PCB_MODE_ARROW) { ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) - hid_action("PointCursor"); + pcb_hid_action("PointCursor"); else if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) - hid_actionl("PointCursor", "True", NULL); + pcb_hid_actionl("PointCursor", "True", NULL); } if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST && conf_core.editor.auto_drc) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 4892) +++ trunk/src/file_act.c (revision 4893) @@ -202,7 +202,7 @@ pcb_redraw(); if (gui != NULL) - hid_action("PCBChanged"); + pcb_hid_action("PCBChanged"); pcb_notify_crosshair_change(pcb_true); return 0; } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4892) +++ trunk/src/find_drc.c (revision 4893) @@ -335,7 +335,7 @@ drcerr_count = 0; SaveStackAndVisibility(); ResetStackAndVisibility(); - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); pcb_conn_lookup_init(); TheFlag = PCB_FLAG_FOUND | PCB_FLAG_DRC | PCB_FLAG_SELECTED; @@ -690,7 +690,7 @@ RestoreStackAndVisibility(); - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); gui->invalidate_all(); if (nopastecnt > 0) { Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4892) +++ trunk/src/find_misc.c (revision 4893) @@ -240,7 +240,7 @@ } else { name = ConnectionName(type, ptr1, ptr2); - hid_actionl("NetlistShow", name, NULL); + pcb_hid_actionl("NetlistShow", name, NULL); } TheFlag = which_flag; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4892) +++ trunk/src/gui_act.c (revision 4893) @@ -1039,7 +1039,7 @@ SetViaSize(rts->Diameter, pcb_true); SetViaDrillingHole(rts->Hole, pcb_true); SetClearanceWidth(rts->Clearance); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); } else pcb_message(PCB_MSG_DEFAULT, "Error: invalid route style name or index\n"); @@ -1145,7 +1145,7 @@ if (conf_core.editor.mode != PCB_MODE_LINE) SetMode(PCB_MODE_LINE); pcb_notify_crosshair_change(pcb_true); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; case PCB_TYPE_ARC: @@ -1155,7 +1155,7 @@ if (conf_core.editor.mode != PCB_MODE_ARC) SetMode(PCB_MODE_ARC); pcb_notify_crosshair_change(pcb_true); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; case PCB_TYPE_POLYGON: @@ -1168,7 +1168,7 @@ if (conf_core.editor.mode != PCB_MODE_VIA) SetMode(PCB_MODE_VIA); pcb_notify_crosshair_change(pcb_true); - hid_action("RouteStylesChanged"); + pcb_hid_action("RouteStylesChanged"); break; default: Index: trunk/src/hid_actions.c =================================================================== --- trunk/src/hid_actions.c (revision 4892) +++ trunk/src/hid_actions.c (revision 4893) @@ -200,12 +200,12 @@ } } -int hid_action(const char *name) +int pcb_hid_action(const char *name) { - return hid_actionv(name, 0, 0); + return pcb_hid_actionv(name, 0, 0); } -int hid_actionl(const char *name, ...) +int pcb_hid_actionl(const char *name, ...) { const char *argv[20]; int argc = 0; @@ -216,10 +216,10 @@ while ((arg = va_arg(ap, char *)) != 0) argv[argc++] = arg; va_end(ap); - return hid_actionv(name, argc, argv); + return pcb_hid_actionv(name, argc, argv); } -int hid_actionv_(const pcb_hid_action_t *a, int argc, const char **argv) +int pcb_hid_actionv_(const pcb_hid_action_t *a, int argc, const char **argv) { pcb_coord_t x = 0, y = 0; int i, ret; @@ -243,7 +243,7 @@ return ret; } -int hid_actionv(const char *name, int argc, const char **argv) +int pcb_hid_actionv(const char *name, int argc, const char **argv) { const pcb_hid_action_t *a; @@ -261,7 +261,7 @@ pcb_message(PCB_MSG_DEFAULT, ")\n"); return 1; } - return hid_actionv_(a, argc, argv); + return pcb_hid_actionv_(a, argc, argv); } static int hid_parse_actionstring(const char *rstr, char require_parens) @@ -312,7 +312,7 @@ * with no parameters or event. */ if (!*sp) { - retcode = hid_actionv(aname, 0, 0); + retcode = pcb_hid_actionv(aname, 0, 0); goto cleanup; } @@ -335,7 +335,7 @@ * "," */ if (!maybe_empty && ((parens && *sp == ')') || (!parens && !*sp))) { - retcode = hid_actionv(aname, num, list); + retcode = pcb_hid_actionv(aname, num, list); if (retcode) goto cleanup; @@ -411,13 +411,13 @@ return retcode; } -int hid_parse_command(const char *str_) +int pcb_hid_parse_command(const char *str_) { pcb_event(EVENT_CLI_ENTER, "s", str_); return hid_parse_actionstring(str_, pcb_false); } -int hid_parse_actions(const char *str_) +int pcb_hid_parse_actions(const char *str_) { return hid_parse_actionstring(str_, pcb_true); } Index: trunk/src/hid_actions.h =================================================================== --- trunk/src/hid_actions.h (revision 4892) +++ trunk/src/hid_actions.h (revision 4893) @@ -17,10 +17,10 @@ extern void pcb_hid_remove_action(const pcb_hid_action_t * a); extern void pcb_hid_remove_actions_by_cookie(const char *cookie); -int hid_action(const char *action_); -int hid_actionl(const char *action_, ...); /* NULL terminated */ -int hid_actionv(const char *action_, int argc_, const char **argv_); -int hid_actionv_(const pcb_hid_action_t *a, int argc, const char **argv); +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); /* Parse the given command string into action calls, and call hid_actionv for each action found. Accepts both "action(arg1, @@ -27,11 +27,11 @@ 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 hid_parse_command(const char *str_); +int pcb_hid_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 hid_parse_actions(const char *str_); +int pcb_hid_parse_actions(const char *str_); #endif Index: trunk/src/hid_cfg_action.c =================================================================== --- trunk/src/hid_cfg_action.c (revision 4892) +++ trunk/src/hid_cfg_action.c (revision 4893) @@ -30,11 +30,11 @@ return -1; switch(node->type) { case LHT_TEXT: - return hid_parse_actions(node->data.text.value); + return pcb_hid_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 (hid_parse_actions(node->data.text.value) != 0) + if (pcb_hid_parse_actions(node->data.text.value) != 0) return -1; } else Index: trunk/src/hid_flags.c =================================================================== --- trunk/src/hid_flags.c (revision 4892) +++ trunk/src/hid_flags.c (revision 4893) @@ -67,11 +67,11 @@ buff[len] = '\0'; argv[0] = buff; argv[1] = NULL; - return hid_actionv_(a, len > 0, argv); + return pcb_hid_actionv_(a, len > 0, argv); } else { /* slower but more generic way */ - return hid_parse_command(name); + return pcb_hid_parse_command(name); } } else { Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 4892) +++ trunk/src/layer.c (revision 4893) @@ -227,7 +227,7 @@ PushOnTopOfLayerStack(Layer); /* update control panel and exit */ - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); return (changed); } @@ -851,6 +851,6 @@ { free((char*)CURRENT->Name); CURRENT->Name = Name; - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); return (pcb_true); } Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 4892) +++ trunk/src/main.c (revision 4893) @@ -430,7 +430,7 @@ conf_update(NULL); if (main_action != NULL) { - hid_parse_command(main_action); + pcb_hid_parse_command(main_action); exit(0); } @@ -473,15 +473,15 @@ /* read the library file and display it if it's not empty */ if (!fp_read_lib_all() && library.data.dir.children.used) - hid_action("LibraryChanged"); + pcb_hid_action("LibraryChanged"); if (conf_core.rc.script_filename) { pcb_message(PCB_MSG_DEFAULT, _("Executing startup script file %s\n"), conf_core.rc.script_filename); - hid_actionl("ExecuteFile", conf_core.rc.script_filename, NULL); + pcb_hid_actionl("ExecuteFile", conf_core.rc.script_filename, NULL); } if (conf_core.rc.action_string) { pcb_message(PCB_MSG_DEFAULT, _("Executing startup action %s\n"), conf_core.rc.action_string); - hid_parse_actions(conf_core.rc.action_string); + pcb_hid_parse_actions(conf_core.rc.action_string); } if (gui->printer || gui->exporter) { @@ -504,7 +504,7 @@ if (gui->gui) pcb_crosshair_init(); SetMode(PCB_MODE_ARROW); - hid_action("LibraryChanged"); + pcb_hid_action("LibraryChanged"); } } while(gui != NULL); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4892) +++ trunk/src/move.c (revision 4893) @@ -338,7 +338,7 @@ &PCB->LayerGroups.Entries[g + 1], (MAX_LAYER - g - 1) * sizeof(PCB->LayerGroups.Entries[g])); } - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); gui->invalidate_all(); return 0; } Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4892) +++ trunk/src/netlist.c (revision 4893) @@ -62,7 +62,7 @@ PCB->netlist_needs_update = 1; else { PCB->netlist_needs_update = 0; - hid_action("NetlistChanged"); + pcb_hid_action("NetlistChanged"); } } Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4892) +++ trunk/src/plug_io.c (revision 4893) @@ -361,9 +361,9 @@ if (((how == 0) || (revert)) && (gui != NULL)) { if (revert) - hid_actionl("PCBChanged", "revert", NULL); + pcb_hid_actionl("PCBChanged", "revert", NULL); else - hid_action("PCBChanged"); + pcb_hid_action("PCBChanged"); } #ifdef DEBUG @@ -386,7 +386,7 @@ } if (gui != NULL) - hid_action("PCBChanged"); + pcb_hid_action("PCBChanged"); /* release unused memory */ RemovePCB(newPCB); Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 4892) +++ trunk/src_plugins/autoplace/action.c (revision 4893) @@ -45,7 +45,7 @@ static int ActionAutoPlaceSelected(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - hid_action("Busy"); + pcb_hid_action("Busy"); if (gui->confirm_dialog(_("Auto-placement can NOT be undone.\n" "Do you want to continue anyway?\n"), 0)) { if (AutoPlaceSelected()) SetChangedFlag(pcb_true); Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 4892) +++ trunk/src_plugins/autoroute/action.c (revision 4893) @@ -65,7 +65,7 @@ static int ActionAutoRoute(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { const char *function = PCB_ACTION_ARG(0); - hid_action("Busy"); + pcb_hid_action("Busy"); if (function) { /* one parameter */ if (strcmp(function, "AllRats") == 0) { if (AutoRoute(pcb_false)) Index: trunk/src_plugins/dbus/dbus.c =================================================================== --- trunk/src_plugins/dbus/dbus.c (revision 4892) +++ trunk/src_plugins/dbus/dbus.c (revision 4893) @@ -152,7 +152,7 @@ #endif /* TODO: Proper return value from actions */ - hid_actionv(action_name, argc, (const char**)argv); + pcb_hid_actionv(action_name, argc, (const char**)argv); retval = 0; dbus_free_string_array(argv); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4892) +++ trunk/src_plugins/djopt/djopt.c (revision 4893) @@ -2556,7 +2556,7 @@ SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, pcb_false); #endif - hid_action("Busy"); + pcb_hid_action("Busy"); lines = 0; corners = 0; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4892) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4893) @@ -73,7 +73,7 @@ pcb_layer_t *lfont, *lorig, *lwidth, *lgrid; int s, l; - if (hid_actionl("New", "Font", 0)) + if (pcb_hid_actionl("New", "Font", 0)) return 1; #warning TODO do we need to change design.bloat here? @@ -98,8 +98,8 @@ PCB->Data->Layer[1].Name = pcb_strdup("OrigFont"); PCB->Data->Layer[2].Name = pcb_strdup("Width"); PCB->Data->Layer[3].Name = pcb_strdup("Grid"); - hid_action("PCBChanged"); - hid_action("LayersChanged"); + pcb_hid_action("PCBChanged"); + pcb_hid_action("LayersChanged"); lfont = PCB->Data->Layer + 0; lorig = PCB->Data->Layer + 1; 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 4892) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c (revision 4893) @@ -93,7 +93,7 @@ int action(const char *cmdline) { - return hid_parse_command(cmdline); + return pcb_hid_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/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 4892) +++ trunk/src_plugins/hid_batch/batch.c (revision 4893) @@ -150,7 +150,7 @@ hid_batch_uninit(); return; } - hid_parse_command(line); + pcb_hid_parse_command(line); } batch_end(); } Index: trunk/src_plugins/hid_gtk/ghid-layer-selector.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-layer-selector.c (revision 4892) +++ trunk/src_plugins/hid_gtk/ghid-layer-selector.c (revision 4893) @@ -737,7 +737,7 @@ * Deletes layers according to a callback function: a return value of TRUE * means delete, FALSE means leave it alone. Do not try to delete all layers * using this function; with nothing left to select, pcb will likely go into - * an infinite recursion between hid_action() and g_signal(). + * an infinite recursion between pcb_hid_action() and g_signal(). * * Separators will be deleted if the layer AFTER them is deleted. * Index: trunk/src_plugins/hid_gtk/ghid-search.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-search.c (revision 4892) +++ trunk/src_plugins/hid_gtk/ghid-search.c (revision 4893) @@ -759,7 +759,7 @@ case GTK_RESPONSE_APPLY: script = gtk_entry_get_text(GTK_ENTRY(sdlg.expr)); act = gtk_combo_box_get_active_text(GTK_COMBO_BOX(sdlg.action)); - hid_actionl("query", act, script, NULL); + pcb_hid_actionl("query", act, script, NULL); break; case GTK_RESPONSE_CLOSE: gtk_widget_destroy(GTK_WIDGET(dlg)); @@ -775,7 +775,7 @@ const char **s; int ver; - ver = hid_actionl("query", "version", NULL); + ver = pcb_hid_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/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4893) @@ -570,7 +570,7 @@ switch (ghid_dialog_close_confirm()) { case GUI_DIALOG_CLOSE_CONFIRM_SAVE: { - if (hid_actionl("Save", NULL)) { /* Save failed */ + if (pcb_hid_actionl("Save", NULL)) { /* Save failed */ return 0; /* Cancel */ } else { @@ -1154,7 +1154,7 @@ /* we've been given the file name */ if (argc > 1) - return hid_actionv("LoadFrom", argc, argv); + return pcb_hid_actionv("LoadFrom", argc, argv); function = argc ? argv[0] : "Layout"; @@ -1175,7 +1175,7 @@ if (name) { if (conf_core.rc.verbose) fprintf(stderr, "Load: Calling LoadFrom(%s, %s)\n", function, name); - hid_actionl("LoadFrom", function, name, NULL); + pcb_hid_actionl("LoadFrom", function, name, NULL); g_free(name); } @@ -1214,13 +1214,13 @@ current_dir = dup_cwd(); if (argc > 1) - return hid_actionv("SaveTo", argc, argv); + return pcb_hid_actionv("SaveTo", argc, argv); function = argc ? argv[0] : "Layout"; if (strcasecmp(function, "Layout") == 0) if (PCB->Filename) - return hid_actionl("SaveTo", "Layout", PCB->Filename, NULL); + return pcb_hid_actionl("SaveTo", "Layout", PCB->Filename, NULL); if (strcasecmp(function, "PasteBuffer") == 0) { prompt = _("Save element as"); @@ -1254,7 +1254,7 @@ fprintf(stderr, "Save: Calling SaveTo(%s, %s)\n", function, name); if (strcasecmp(function, "PasteBuffer") == 0) { - hid_actionl("PasteBuffer", "Save", name, avail.plug[fmt]->description, "1", NULL); + pcb_hid_actionl("PasteBuffer", "Save", name, avail.plug[fmt]->description, "1", NULL); pcb_io_list_free(&avail); } else { @@ -1268,9 +1268,9 @@ if (fmt_param != NULL) sfmt = avail.plug[fmt]->description; if (strcasecmp(function, "Layout") == 0) - hid_actionl("SaveTo", "LayoutAs", name, sfmt, NULL); + pcb_hid_actionl("SaveTo", "LayoutAs", name, sfmt, NULL); else - hid_actionl("SaveTo", function, name, sfmt, NULL); + pcb_hid_actionl("SaveTo", function, name, sfmt, NULL); } g_free(name); } @@ -1890,7 +1890,7 @@ free(name); I_am_recursing = 1; - rv = hid_action("Import"); + rv = pcb_hid_action("Import"); I_am_recursing = 0; return rv; Index: trunk/src_plugins/hid_gtk/gui-command-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-command-window.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gui-command-window.c (revision 4893) @@ -193,7 +193,7 @@ command_history_add(command); if (conf_hid_gtk.plugins.hid_gtk.use_command_window) { - hid_parse_command(command); + pcb_hid_parse_command(command); g_free(command); } else { @@ -418,12 +418,12 @@ /* copy new comand line to save buffer */ g_free(previous); previous = g_strdup(command); - hid_parse_command(command); + pcb_hid_parse_command(command); g_free(command); } else if (previous) { command = g_strdup(previous); - hid_parse_command(command); + pcb_hid_parse_command(command); g_free(command); } } Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4893) @@ -71,7 +71,7 @@ static void drc_refresh_cb(gpointer data) { - hid_actionl("DRC", NULL); + pcb_hid_actionl("DRC", NULL); } static void drc_destroy_cb(GtkWidget * widget, gpointer data) Index: trunk/src_plugins/hid_gtk/gui-log-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-log-window.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gui-log-window.c (revision 4893) @@ -120,7 +120,7 @@ ghid_text_view_append(log_text, msg); if (popup) - hid_actionl("DoWindows", "Log", "false", NULL); + pcb_hid_actionl("DoWindows", "Log", "false", NULL); } static void ghid_log_append_string(enum pcb_message_level level, gchar *s) Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4893) @@ -522,8 +522,8 @@ return; name = selected_net->Name + 2; - hid_actionl("connection", "reset", NULL); - hid_actionl("netlist", "find", name, NULL); + pcb_hid_actionl("connection", "reset", NULL); + pcb_hid_actionl("netlist", "find", name, NULL); } static void netlist_rip_up_cb(GtkWidget * widget, gpointer data) Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4892) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4893) @@ -29,7 +29,7 @@ /* Set to ! because ActionDisplay toggles it */ conf_core.editor.draw_grid = !gtk_toggle_action_get_active(action); -hid_actionl("Display", "Grid", "", NULL); +pcb_hid_actionl("Display", "Grid", "", NULL); ghid_set_status_line_label(); @@ -427,11 +427,11 @@ PCB->RatDraw = (layer == LAYER_BUTTON_RATS); if (layer == LAYER_BUTTON_SILK) { PCB->ElementOn = pcb_true; - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); } else if (layer == LAYER_BUTTON_RATS) { PCB->RatOn = pcb_true; - hid_action("LayersChanged"); + pcb_hid_action("LayersChanged"); } else if (layer < max_copper_layer) ChangeGroupVisibility(layer, TRUE, pcb_true); @@ -552,9 +552,9 @@ { /* Button only toggles between mm and mil */ if (conf_core.editor.grid_unit == get_unit_struct("mm")) - hid_actionl("SetUnits", "mil", NULL); + pcb_hid_actionl("SetUnits", "mil", NULL); else - hid_actionl("SetUnits", "mm", NULL); + pcb_hid_actionl("SetUnits", "mm", NULL); } /* @@ -933,7 +933,7 @@ if (ghid_entry_loop != NULL) g_main_loop_quit(ghid_entry_loop); - hid_action("Quit"); + pcb_hid_action("Quit"); /* * Return TRUE to keep our app running. A FALSE here would let the @@ -1321,7 +1321,7 @@ status = g_io_channel_read_line(source, &str, &len, &term, &err); switch (status) { case G_IO_STATUS_NORMAL: - hid_parse_actions(str); + pcb_hid_parse_actions(str); g_free(str); break; @@ -1747,7 +1747,7 @@ if (argc != 0) PCB_AFAIL(editlayergroups); - hid_actionl("DoWindows", "Preferences", NULL); + pcb_hid_actionl("DoWindows", "Preferences", NULL); return 0; } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 4892) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 4893) @@ -97,7 +97,7 @@ XmString xmname, pattern; if (argc > 1) - return hid_actionv("LoadFrom", argc, argv); + return pcb_hid_actionv("LoadFrom", argc, argv); function = argc ? argv[0] : "Layout"; @@ -129,7 +129,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); - hid_actionl("LoadFrom", function, name, NULL); + pcb_hid_actionl("LoadFrom", function, name, NULL); XtFree(name); @@ -154,7 +154,7 @@ XmString xmname, pattern; if (argc > 0) - return hid_actionv("LoadVendorFrom", argc, argv); + return pcb_hid_actionv("LoadVendorFrom", argc, argv); setup_fsb_dialog(); @@ -179,7 +179,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); - hid_actionl("LoadVendorFrom", name, NULL); + pcb_hid_actionl("LoadVendorFrom", name, NULL); XtFree(name); @@ -208,13 +208,13 @@ XmString xmname, pattern; if (argc > 1) - hid_actionv("SaveTo", argc, argv); + pcb_hid_actionv("SaveTo", argc, argv); function = argc ? argv[0] : "Layout"; if (strcasecmp(function, "Layout") == 0) if (PCB->Filename) - return hid_actionl("SaveTo", "Layout", PCB->Filename, NULL); + return pcb_hid_actionl("SaveTo", "Layout", PCB->Filename, NULL); setup_fsb_dialog(); @@ -242,7 +242,7 @@ XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); if (strcasecmp(function, "PasteBuffer") == 0) - hid_actionl("PasteBuffer", "Save", name, NULL); + pcb_hid_actionl("PasteBuffer", "Save", name, NULL); else { /* * if we got this far and the function is Layout, then @@ -251,9 +251,9 @@ * just obtained. */ if (strcasecmp(function, "Layout") == 0) - hid_actionl("SaveTo", "LayoutAs", name, NULL); + pcb_hid_actionl("SaveTo", "LayoutAs", name, NULL); else - hid_actionl("SaveTo", function, name, NULL); + pcb_hid_actionl("SaveTo", function, name, NULL); } XtFree(name); @@ -1896,7 +1896,7 @@ I_am_recursing = 1; - rv = hid_action("Import"); + rv = pcb_hid_action("Import"); I_am_recursing = 0; return rv; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 4892) +++ trunk/src_plugins/hid_lesstif/main.c (revision 4893) @@ -353,9 +353,9 @@ XtSetValues(vscroll, stdarg_args, stdarg_n); zoom_max(); - hid_action("NetlistChanged"); - hid_action("LayersChanged"); - hid_action("RouteStylesChanged"); + pcb_hid_action("NetlistChanged"); + pcb_hid_action("LayersChanged"); + pcb_hid_action("RouteStylesChanged"); lesstif_sizes_reset(); lesstif_update_layer_groups(); while (pinouts) @@ -645,7 +645,7 @@ case XmCR_ACTIVATE: s = XmTextGetString(w); lesstif_show_crosshair(0); - hid_parse_command(s); + pcb_hid_parse_command(s); XtFree(s); XmTextSetString(w, XmStrCast("")); case XmCR_LOSING_FOCUS: @@ -1913,7 +1913,7 @@ static void mainwind_delete_cb() { - hid_action("Quit"); + pcb_hid_action("Quit"); } static void lesstif_listener_cb(XtPointer client_data, int *fid, XtInputId * id) @@ -1926,7 +1926,7 @@ if (nbytes) { buf[nbytes] = '\0'; - hid_parse_actions(buf); + pcb_hid_parse_actions(buf); } } Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4892) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4893) @@ -142,7 +142,7 @@ static void nbcb_find(pcb_lib_menu_t *net, int pos) { char *name = net->Name + 2; - hid_actionl("netlist", "find", name, NULL); + pcb_hid_actionl("netlist", "find", name, NULL); } static void nbcb_std_callback(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs) @@ -152,7 +152,7 @@ if (XmListGetSelectedPos(netlist_list, &posl, &posc) == False) return; if (v == nbcb_find) - hid_actionl("connection", "reset", NULL); + pcb_hid_actionl("connection", "reset", NULL); for (i = 0; i < posc; i++) { pcb_lib_menu_t *net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[posl[i] - 1]); v(net, posl[i]); Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 4892) +++ trunk/src_plugins/import_sch/import_sch.c (revision 4893) @@ -281,7 +281,7 @@ char *dot, *slash, *bslash; if (!pcbname) - return hid_action("ImportGUI"); + return pcb_hid_action("ImportGUI"); schname = (char *) malloc(strlen(pcbname) + 5); strcpy(schname, pcbname); @@ -297,7 +297,7 @@ strcat(schname, ".sch"); if (access(schname, F_OK)) - return hid_action("ImportGUI"); + return pcb_hid_action("ImportGUI"); sources = (const char **) malloc(2 * sizeof(char *)); sources[0] = schname; Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4892) +++ trunk/src_plugins/io_lihata/write.c (revision 4893) @@ -766,7 +766,7 @@ orig_fn = PCB->Filename; PCB->Filename = NULL; - fprintf(stderr, "NOTE: io_lihata_write_pcb will save to '%s' but first saves in '%s': %d\n", new_filename, pcb_fn, hid_actionl("SaveTo", "LayoutAs", pcb_fn, "pcb", NULL)); + fprintf(stderr, "NOTE: io_lihata_write_pcb will save to '%s' but first saves in '%s': %d\n", new_filename, pcb_fn, pcb_hid_actionl("SaveTo", "LayoutAs", pcb_fn, "pcb", NULL)); free(pcb_fn); /* restore these because SaveTo() has changed them */ Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4892) +++ trunk/src_plugins/jostle/jostle.c (revision 4893) @@ -116,7 +116,7 @@ } } while ((p = p->f) != s); ddraw->flush_debug_draw(); - hid_action("Busy"); + pcb_hid_action("Busy"); sleep(3); ddraw->finish_debug_draw(); } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4892) +++ trunk/src_plugins/puller/puller.c (revision 4893) @@ -2280,7 +2280,7 @@ printf("optimizing...\n"); /* This canonicalizes all the lines, and cleans up near-misses. */ - /* hid_actionl ("djopt", "puller", 0); */ + /* pcb_hid_actionl("djopt", "puller", 0); */ current_is_solder = (GetLayerGroupNumberByPointer(CURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer)); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 4892) +++ trunk/src_plugins/vendordrill/vendor.c (revision 4893) @@ -106,7 +106,7 @@ int ActionApplyVendor(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - hid_action("Busy"); + pcb_hid_action("Busy"); apply_vendor_map(); return 0; }