From b2547932352fb708126b129ee7df6234ff586160 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:57:45 -0500 Subject: [PATCH] Convert the readily convertible cases of ged_exec to wrappers For any cases in our code where we are using ged_exec simply to fire off a pre-defined command, use the wrapper so we will get a compile time breakage in the case of a command rename or removal. Cases where we are still using ged_exec warrant scrutiny to make sure it's a correct usage. There are some (gsh and qged command lines, for example) where the intent *is* general command execution, and a couple cases where there are multiple potential command names coming in from the caller that are passed through as-is (though the latter are problematic in that we're still losing the compile time validation.) There are definitely a few cases in libtclcad that are straight up broken - I tried to label them as I encountered them. --- src/conv/bot_dump.c | 2 +- src/conv/g-dot.c | 14 +- src/gtools/gchecker.cpp | 4 +- src/gtools/gist/InformationGatherer.cpp | 26 +- src/gtools/gqa.c | 2 +- src/gtools/tests/bigdb.c | 8 +- src/libqtcad/QgModel.cpp | 4 +- src/libqtcad/QgViewCtrl.cpp | 6 +- src/libqtcad/tests/qgmodel.cpp | 10 +- src/libtclcad/commands.c | 572 +++++++++--------- src/libtclcad/mouse.c | 54 +- src/libtclcad/view/autoview.c | 4 +- src/libtclcad/view/lines.c | 2 +- src/libtclcad/wrapper.c | 4 +- src/mged/chgview.c | 30 +- src/mged/cmd.c | 28 +- src/mged/dodraw.c | 14 +- src/mged/f_db.c | 14 +- src/mged/setup.c | 376 ++++++------ src/mged/wdb_obj.c | 144 +++-- src/proc-db/gtimes.c | 6 +- src/qged/QgEdMainWindow.cpp | 4 +- src/qged/plugins/polygon/QPolyMod.cpp | 5 +- .../plugins/view/select/CADViewSelector.cpp | 6 +- src/shapes/coil.c | 2 +- src/shapes/human.c | 2 +- src/shapes/tire.c | 2 +- 27 files changed, 658 insertions(+), 687 deletions(-) diff --git a/src/conv/bot_dump.c b/src/conv/bot_dump.c index 59b9d046bec..2db940a3232 100644 --- a/src/conv/bot_dump.c +++ b/src/conv/bot_dump.c @@ -89,7 +89,7 @@ main(int argc, char *argv[]) print_usage(argv[0]); } - (void)ged_exec(gedp, j, av); + (void)ged_exec_bot_dump(gedp, j, av); if (bu_vls_strlen(gedp->ged_result_str) > 0) bu_log("%s", bu_vls_addr(gedp->ged_result_str)); ged_close(gedp); diff --git a/src/conv/g-dot.c b/src/conv/g-dot.c index b3d37b21a9a..b8b836cb3b0 100644 --- a/src/conv/g-dot.c +++ b/src/conv/g-dot.c @@ -332,9 +332,8 @@ main(int ac, char *av[]) /* write out header */ { struct bu_vls vp = BU_VLS_INIT_ZERO; - const char *title[2] = {"title", NULL}; - - ged_exec(gp, 1, title); + const char *title[1] = {"title"}; + ged_exec_title(gp, 1, title); bu_vls_printf(&vp, "%s\\n", bu_vls_addr(gp->ged_result_str)); if (!(av[0][0] == '-' && av[0][1] == '\0')) { char base[MAXPATHLEN] = {0}; @@ -354,14 +353,11 @@ main(int ac, char *av[]) objs = bu_argv_dup(ac - 1, (const char **)(av + 1)); } else { - char **topobjs; - const char *tops[3] = {"tops", "-n", NULL}; - /* all top-level objects */ + const char *tops[2] = {"tops", "-n"}; + ged_exec_tops(gp, 2, tops); - ged_exec(gp, 2, tops); - - topobjs = (char **)bu_calloc(bu_vls_strlen(gp->ged_result_str) + 1, sizeof(char *), "alloc topobjs"); + char **topobjs = (char **)bu_calloc(bu_vls_strlen(gp->ged_result_str) + 1, sizeof(char *), "alloc topobjs"); c = (int)bu_argv_from_string(topobjs, bu_vls_strlen(gp->ged_result_str), bu_vls_addr(gp->ged_result_str)); objs = bu_argv_dup(c, (const char **)topobjs); bu_free(topobjs, "free topobjs"); diff --git a/src/gtools/gchecker.cpp b/src/gtools/gchecker.cpp index 5e5e1edd154..aa955acd06c 100644 --- a/src/gtools/gchecker.cpp +++ b/src/gtools/gchecker.cpp @@ -237,7 +237,7 @@ main(int argc, const char **argv) av[5] = bu_strdup("-q"); av[6] = bu_strdup(objs[i]->d_namep); bu_vls_trunc(gedp->ged_result_str, 0); - if (ged_exec(gedp, 7, av) != BRLCAD_OK) { + if (ged_exec_check(gedp, 7, av) != BRLCAD_OK) { bu_exit(1, "error running ged 'check' command\n"); } for (int j = 0; j < 7; j++) bu_free((void *)av[j], "str"); @@ -284,7 +284,7 @@ main(int argc, const char **argv) av[3] = bu_strdup("-q"); av[4] = bu_strdup(objs[i]->d_namep); bu_vls_trunc(gedp->ged_result_str, 0); - if (ged_exec(gedp, 5, av) != BRLCAD_OK) { + if (ged_exec_check(gedp, 5, av) != BRLCAD_OK) { bu_exit(1, "error running ged 'check' command\n"); } for (int j = 0; j < 5; j++) bu_free((void *)av[j], "str"); diff --git a/src/gtools/gist/InformationGatherer.cpp b/src/gtools/gist/InformationGatherer.cpp index 25aa2f163cf..6f43e02c4ce 100644 --- a/src/gtools/gist/InformationGatherer.cpp +++ b/src/gtools/gist/InformationGatherer.cpp @@ -214,8 +214,8 @@ boundingBox InformationGatherer::getBBData(std::string component) { // Gather bounding box dimensions - const char* cmd[4] = { "bb", "-q", component.c_str(), NULL }; - ged_exec(g, 3, cmd); + const char* cmd[3] = { "bb", "-q", component.c_str()}; + ged_exec_bb(g, 3, cmd); std::istringstream ss(bu_vls_addr(g->ged_result_str)); /* interested in saving X, Y, Z, Volume from output @@ -268,8 +268,8 @@ InformationGatherer::getMainComp() if (!topcomp.empty()) { const char *topname = topcomp.c_str(); // check if main comp exists - const char* cmd[3] = { "exists", topname, NULL }; - ged_exec(g, 2, cmd); + const char* cmd[2] = { "exists", topname }; + ged_exec_exists(g, 2, cmd); std::string res = bu_vls_addr(g->ged_result_str); if (res != "1") { bu_exit(BRLCAD_ERROR, "Could not find component (%s), aborting.\n", topname); @@ -282,9 +282,8 @@ InformationGatherer::getMainComp() } // get top level objects - const char* cmd[3] = { "tops", "-n", NULL }; - - ged_exec(g, 2, cmd); + const char* cmd[2] = { "tops", "-n" }; + ged_exec_tops(g, 2, cmd); std::istringstream ss(bu_vls_addr(g->ged_result_str)); std::string comp; std::vector topComponents; @@ -306,9 +305,8 @@ InformationGatherer::getMainComp() if (largestComponents.size() != 0) { return; } else { - const char* search_cmd[5] = { "search", ".", "-type", "comb", NULL }; - - ged_exec(g, 4, search_cmd); + const char* search_cmd[4] = { "search", ".", "-type", "comb" }; + ged_exec_search(g, 4, search_cmd); std::stringstream ss2(bu_vls_addr(g->ged_result_str)); std::string val2; std::vector topComponents2; @@ -398,21 +396,21 @@ InformationGatherer::gatherInformation(std::string UNUSED(name)) //Gather title const char* cmd[6] = { "title", NULL, NULL, NULL, NULL }; - ged_exec(g, 1, cmd); + ged_exec_title(g, 1, cmd); infoMap["title"] = bu_vls_addr(g->ged_result_str); //Gather DB Version cmd[0] = "dbversion"; cmd[1] = NULL; - ged_exec(g, 1, cmd); + ged_exec_dbversion(g, 1, cmd); infoMap["version"] = bu_vls_addr(g->ged_result_str); // CHECK //Gather primitives, regions, total objects /* cmd[0] = "summary"; - ged_exec(g, 1, cmd); + ged_exec_summary(g, 1, cmd); char* res = strtok(bu_vls_addr(g->ged_result_str), " "); int count = 0; while (res != NULL) { @@ -432,7 +430,7 @@ InformationGatherer::gatherInformation(std::string UNUSED(name)) // Gather units cmd[0] = "units"; cmd[1] = NULL; - ged_exec(g, 1, cmd); + ged_exec_units(g, 1, cmd); std::string result = bu_vls_addr(g->ged_result_str); std::size_t first = result.find_first_of("\'"); std::size_t last = result.find_last_of("\'"); diff --git a/src/gtools/gqa.c b/src/gtools/gqa.c index 8dc59238cea..235e5716ac6 100644 --- a/src/gtools/gqa.c +++ b/src/gtools/gqa.c @@ -103,7 +103,7 @@ main(int argc, char *argv[]) bu_exit(1, usage, argv[0]); } - (void)ged_exec(gedp, j, av); + (void)ged_exec_gqa(gedp, j, av); if (bu_vls_strlen(gedp->ged_result_str) > 0) bu_log("%s", bu_vls_addr(gedp->ged_result_str)); ged_close(gedp); diff --git a/src/gtools/tests/bigdb.c b/src/gtools/tests/bigdb.c index 94e113f6b9e..bb9a190bf66 100644 --- a/src/gtools/tests/bigdb.c +++ b/src/gtools/tests/bigdb.c @@ -137,22 +137,22 @@ main(int ac, char *av[]) /* validate */ struct ged *gedp = ged_open("db", filename, 1); - const char *tops_cmd[3] = {"tops", "-n", NULL}; - const char *title_cmd[2] = {"title", NULL}; const char *id = NULL; struct bu_vls vp = BU_VLS_INIT_ZERO; char *base = bu_path_basename(av[0], NULL); size_t idlen = 0; int match = 0; - ged_exec(gedp, 2, tops_cmd); + const char *tops_cmd[2] = {"tops", "-n"}; + ged_exec_tops(gedp, 2, tops_cmd); bu_vls_trimspace(gedp->ged_result_str); /* trailing newline */ printf("%s_tops=\"%s\"\n", base, bu_vls_cstr(gedp->ged_result_str)); if (!BU_STR_EQUIV(bu_vls_cstr(gedp->ged_result_str), ORIGIN_SPHERE)) failures++; - ged_exec(gedp, 1, title_cmd); + const char *title_cmd[1] = {"title"}; + ged_exec_title(gedp, 1, title_cmd); id = bu_vls_cstr(gedp->ged_result_str); idlen = bu_vls_strlen(gedp->ged_result_str); diff --git a/src/libqtcad/QgModel.cpp b/src/libqtcad/QgModel.cpp index fed5655ec61..f407a258bf4 100644 --- a/src/libqtcad/QgModel.cpp +++ b/src/libqtcad/QgModel.cpp @@ -893,7 +893,7 @@ QgModel::draw(const char *inst_path) argv[1] = inst_path; bu_setenv("GED_TEST_NEW_CMD_FORMS", "1", 1); - int ret = ged_exec(gedp, 2, argv); + int ret = ged_exec_draw(gedp, 2, argv); emit view_change(QG_VIEW_DRAWN); return ret; @@ -926,7 +926,7 @@ QgModel::erase(const char *inst_path) argv[1] = inst_path; bu_setenv("GED_TEST_NEW_CMD_FORMS", "1", 1); - int ret = ged_exec(gedp, 2, argv); + int ret = ged_exec_erase(gedp, 2, argv); emit view_change(QG_VIEW_DRAWN); return ret; diff --git a/src/libqtcad/QgViewCtrl.cpp b/src/libqtcad/QgViewCtrl.cpp index db158c1106f..1b23c7477a5 100644 --- a/src/libqtcad/QgViewCtrl.cpp +++ b/src/libqtcad/QgViewCtrl.cpp @@ -97,7 +97,7 @@ QgViewCtrl::fbclear_cmd() bu_setenv("GED_TEST_NEW_CMD_FORMS", "1", 1); const char *av[2] = {NULL}; av[0] = "fbclear"; - ged_exec(gedp, 1, (const char **)av); + ged_exec_fbclear(gedp, 1, (const char **)av); emit view_changed(QG_VIEW_REFRESH); } @@ -177,12 +177,12 @@ QgViewCtrl::raytrace_cmd() av[0] = "process"; av[1] = "pabort"; av[2] = bu_vls_cstr(&pid_str); - ged_exec(gedp, 3, (const char **)av); + ged_exec_process(gedp, 3, (const char **)av); goto cmd_cleanup; } av[0] = "ert"; - ged_exec(gedp, 1, (const char **)av); + ged_exec_ert(gedp, 1, (const char **)av); emit view_changed(QG_VIEW_REFRESH); cmd_cleanup: diff --git a/src/libqtcad/tests/qgmodel.cpp b/src/libqtcad/tests/qgmodel.cpp index 92ce0d320b0..ddc3a190737 100644 --- a/src/libqtcad/tests/qgmodel.cpp +++ b/src/libqtcad/tests/qgmodel.cpp @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) av[1] = "all.g"; av[2] = "ellipse.r"; av[3] = NULL; - ged_exec(g, ac, (const char **)av); + ged_exec_rm(g, ac, (const char **)av); s->g_update(g->dbip); std::cout << "\nRemoved ellipse.r from all.g:\n"; @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) av[1] = "all.g"; av[2] = "ellipse.r"; av[3] = NULL; - ged_exec(g, ac, (const char **)av); + ged_exec_g(g, ac, (const char **)av); s->g_update(g->dbip); std::cout << "\nAdded ellipse.r back to the end of all.g, no call to open:\n"; @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) av[1] = "tor.r"; av[2] = "tor"; av[3] = NULL; - ged_exec(g, ac, (const char **)av); + ged_exec_rm(g, ac, (const char **)av); s->g_update(g->dbip); std::cout << "\ntops tree after removing tor from tor.r:\n"; @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) av[1] = "-f"; av[2] = "all.g"; av[3] = NULL; - ged_exec(g, ac, (const char **)av); + ged_exec_kill(g, ac, (const char **)av); s->g_update(g->dbip); std::cout << "\ntops tree after deleting all.g:\n"; print_tops(s); @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) av[1] = "-f"; av[2] = obj; av[3] = NULL; - ged_exec(g, ac, (const char **)av); + ged_exec_kill(g, ac, (const char **)av); i++; obj = objs[i]; } diff --git a/src/libtclcad/commands.c b/src/libtclcad/commands.c index e5480f0d11b..c46df6202bb 100644 --- a/src/libtclcad/commands.c +++ b/src/libtclcad/commands.c @@ -550,280 +550,280 @@ struct to_cmdtab { static struct to_cmdtab ged_cmds[] = { - {"3ptarb", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"adc", "args", 7, to_view_func, ged_exec}, - {"adjust", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"ae2dir", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"aet", "[[-i] az el [tw]]", 6, to_view_func_plus, ged_exec}, - {"analyze", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"annotate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"pipe_append_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"arb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"arced", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"arot", "x y z angle", 6, to_view_func_plus, ged_exec}, - {"art", "art test", TO_UNLIMITED, to_view_func, ged_exec}, - {"attr", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bev", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bo", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_condense", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_decimate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_exterior", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_face_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_face_sort", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_flip", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_merge", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_smooth", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_split", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_sync", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"bot_vertex_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"brep", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"c", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"cat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"center", "[x y z]", 5, to_view_func_plus, ged_exec}, - {"check", (char *)0, TO_UNLIMITED, to_view_func, ged_exec}, - {"clear", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"clone", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"coil", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"color", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"comb_color", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"combmem", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"constraint", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"copyeval", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"copymat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"cpi", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"d", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"dbconcat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dbfind", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dbip", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dbot_dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"debug", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"debugbu", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"debugdir", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"debuglib", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"debugnmg", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"decompose", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"delay", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dplot", "dplot_logfile", 1, to_dplot, ged_exec}, - {"metaball_delete_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"pipe_delete_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dir2ae", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"draw", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"dup", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"E", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"e", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"eac", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"echo", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"edarb", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"edcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"edcolor", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"edcomb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"edit", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"edmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"env", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"erase", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"ev", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"expand", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"eye", "[x y z]", 5, to_view_func_plus, ged_exec}, - {"eye_pos", "[x y z]", 5, to_view_func_plus, ged_exec}, - {"eye_pt", "[x y z]", 5, to_view_func_plus, ged_exec}, - {"exists", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"facetize", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"voxelize", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"fb2pix", "[-h -i -c] [-s squaresize] [-w width] [-n height] [file.pix]", TO_UNLIMITED, to_view_func, ged_exec}, - {"fbclear", "[r g b]", TO_UNLIMITED, to_view_func, ged_exec}, - {"find_arb_edge", "arb vx vy ptol", 5, to_view_func, ged_exec}, - {"find_bot_edge", "bot vx vy", 5, to_view_func, ged_exec}, - {"find_bot_pnt", "bot vx vy", 5, to_view_func, ged_exec}, - {"find_pipe_pnt", "pipe x y z", 6, to_view_func, ged_exec}, - {"form", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"fracture", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"g", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"garbage_collect", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"gdiff", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"get", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"get_autoview", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"get_bot_edges", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"get_comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"get_eyemodel", "vname", 2, to_view_func, ged_exec}, - {"get_type", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"glob", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"gqa", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"graph", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"grid", "args", 6, to_view_func, ged_exec}, - {"grid2model_lu", "x y", 4, to_view_func_less, ged_exec}, - {"grid2view_lu", "x y", 4, to_view_func_less, ged_exec}, - {"heal", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"hide", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"how", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"human", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"i", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"idents", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"illum", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"importFg4Section", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"in", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"inside", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"isize", "vname", 2, to_view_func, ged_exec}, - {"item", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"joint", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"joint2", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"keep", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"keypoint", "[x y z]", 5, to_view_func, ged_exec}, - {"kill", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"killall", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"killrefs", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"killtree", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"l", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"lc", "[-d|-s|-r] [-z] [-0|-1|-2|-3|-4|-5] [-f {FileName}] {GroupName}", TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"listeval", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"loadview", "filename", 3, to_view_func, ged_exec}, - {"lod", (char *)0, TO_UNLIMITED, to_lod, ged_exec}, - {"log", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"lookat", "x y z", 5, to_view_func_plus, ged_exec}, - {"ls", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"lt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"m2v_point", "x y z", 5, to_view_func, ged_exec}, - {"make_name", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"make_pnts", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"mat4x3pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"match", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"mater", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec}, - {"material", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"model2grid_lu", "x y z", 5, to_view_func_less, ged_exec}, - {"model2view", "vname", 2, to_view_func, ged_exec}, - {"model2view_lu", "x y z", 5, to_view_func_less, ged_exec}, - {"move_arb_edge", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"move_arb_face", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"metaball_move_pnt", (char *)0, TO_UNLIMITED, to_move_pnt_common, ged_exec}, - {"pipe_move_pnt", (char *)0, TO_UNLIMITED, to_move_pnt_common, ged_exec}, - {"mouse_add_metaball_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec}, - {"mouse_append_pipe_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec}, - {"mouse_move_metaball_pnt", "obj i mx my", TO_UNLIMITED, to_mouse_move_pnt_common, ged_exec}, - {"mouse_move_pipe_pnt", "obj i mx my", TO_UNLIMITED, to_mouse_move_pnt_common, ged_exec}, - {"mouse_prepend_pipe_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec}, - {"mv", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"mvall", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"nirt", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"nmg_collapse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"nmg_fix_normals", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"nmg_simplify", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"npush", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"ocenter", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"open", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"orient", "quat", 6, to_view_func_plus, ged_exec}, - {"orientation", "quat", 6, to_view_func_plus, ged_exec}, - {"orotate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"oscale", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"otranslate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"overlay", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec}, - {"pathlist", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"paths", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"perspective", "[angle]", 3, to_view_func_plus, ged_exec}, - {"pix2fb", "[options] [file.pix]", TO_UNLIMITED, to_view_func, ged_exec}, - {"plot", "[options] file.pl", 16, to_view_func, ged_exec}, - {"pmat", "[mat]", 3, to_view_func, ged_exec}, - {"pmodel2view", "vname", 2, to_view_func, ged_exec}, - {"png2fb", "[options] [file.png]", TO_UNLIMITED, to_view_func, ged_exec}, - {"pngwf", "[options] file.png", 16, to_view_func, ged_exec}, - {"prcolor", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"prefix", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"pipe_prepend_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"preview", "[options] script", TO_UNLIMITED, to_dm_func, ged_exec}, - {"protate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"postscript", "[options] file.ps", 16, to_view_func, ged_exec}, - {"pscale", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"pset", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"ptranslate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"push", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"put", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"put_comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"putmat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"qray", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"quat", "a b c d", 6, to_view_func_plus, ged_exec}, - {"qvrot", "x y z angle", 6, to_view_func_plus, ged_exec}, - {"r", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rect", "args", 6, to_view_func, ged_exec}, - {"red", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"regdef", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"regions", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"solid_report", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rfarb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rm", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"rmap", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rmat", "[mat]", 3, to_view_func, ged_exec}, - {"rmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rot", "[-m|-v] x y z", 6, to_view_func_plus, ged_exec}, - {"rot_about", "[e|k|m|v]", 3, to_view_func, ged_exec}, - {"rot_point", "x y z", 5, to_view_func, ged_exec}, - {"rotate_arb_face", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rrt", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rselect", (char *)0, TO_UNLIMITED, to_view_func, ged_exec}, - {"rt", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rtabort", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"rtarea", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rtcheck", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rtedge", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rtweight", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"rtwizard", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"savekey", "filename", 3, to_view_func, ged_exec}, - {"saveview", (char *)0, TO_UNLIMITED, to_view_func, ged_exec}, - {"sca", "sf", 3, to_view_func_plus, ged_exec}, - {"screengrab", "imagename.ext", TO_UNLIMITED, to_dm_func, ged_exec}, - {"search", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"select", (char *)0, TO_UNLIMITED, to_view_func, ged_exec}, - {"set_output_script", "[script]", TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"set_transparency", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"set_uplotOutputMode", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"setview", "x y z", 5, to_view_func_plus, ged_exec}, - {"shaded_mode", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"shader", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"shells", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"showmats", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"size", "[size]", 3, to_view_func_plus, ged_exec}, - {"slew", "x y [z]", 5, to_view_func_plus, ged_exec}, - {"solids", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"solids_on_ray", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"summary", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"sv", "x y [z]", 5, to_view_func_plus, ged_exec}, - {"sync", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"t", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"tire", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"title", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"tol", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"tops", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"tra", "[-m|-v] x y z", 6, to_view_func_plus, ged_exec}, - {"track", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"tree", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"unhide", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"units", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"v2m_point", "x y z", 5, to_view_func, ged_exec}, - {"vdraw", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"version", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"view", "quat|ypr|aet|center|eye|size [args]", 7, to_view_func_plus, ged_exec}, - {"view2grid_lu", "x y z", 5, to_view_func_less, ged_exec}, - {"view2model", "", 2, to_view_func_less, ged_exec}, - {"view2model_lu", "x y z", 5, to_view_func_less, ged_exec}, - {"view2model_vec", "x y z", 5, to_view_func_less, ged_exec}, - {"viewdir", "[-i]", 3, to_view_func_less, ged_exec}, - {"vnirt", "[args]", TO_UNLIMITED, to_view_func, ged_exec}, - {"wcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"whatid", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"which_shader", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"whichair", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"whichid", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"who", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"wmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"x", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"xpush", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec}, - {"ypr", "yaw pitch roll", 5, to_view_func_plus, ged_exec}, - {"zap", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec}, - {"zoom", "sf", 3, to_view_func_plus, ged_exec}, + {"3ptarb", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_3ptarb}, + {"adc", "args", 7, to_view_func, ged_exec_adc}, + {"adjust", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_adjust}, + {"ae2dir", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_ae2dir}, + {"aet", "[[-i] az el [tw]]", 6, to_view_func_plus, ged_exec_aet}, + {"analyze", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_analyze}, + {"annotate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_annotate}, + {"pipe_append_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pipe_append_pnt}, + {"arb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_arb}, + {"arced", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_arced}, + {"arot", "x y z angle", 6, to_view_func_plus, ged_exec_arot}, + {"art", "art test", TO_UNLIMITED, to_view_func, ged_exec_art}, + {"attr", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_attr}, + {"bb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bb}, + {"bev", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bev}, + {"bo", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bo}, + {"bot", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot}, + {"bot_condense", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_condense}, + {"bot_decimate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_decimate}, + {"bot_dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_dump}, + {"bot_exterior", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_exterior}, + {"bot_face_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_face_fuse}, + {"bot_face_sort", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_face_sort}, + {"bot_flip", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_flip}, + {"bot_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_fuse}, + {"bot_merge", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_merge}, + {"bot_smooth", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_smooth}, + {"bot_split", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_split}, + {"bot_sync", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_sync}, + {"bot_vertex_fuse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_bot_vertex_fuse}, + {"brep", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_brep}, + {"c", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_c}, + {"cat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_cat}, + {"center", "[x y z]", 5, to_view_func_plus, ged_exec_center}, + {"check", (char *)0, TO_UNLIMITED, to_view_func, ged_exec_check}, + {"clear", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_clear}, + {"clone", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_clone}, + {"coil", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_coil}, + {"color", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_color}, + {"comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_comb}, + {"comb_color", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_comb_color}, + {"combmem", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_combmem}, + {"constraint", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_constraint}, + {"copyeval", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_copyeval}, + {"copymat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_copymat}, + {"cpi", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_cpi}, + {"d", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_d}, + {"dbconcat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dbconcat}, + {"dbfind", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dbfind}, + {"dbip", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dbip}, // TODO - this needs to go away + {"dbot_dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dbot_dump}, + {"debug", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_debug}, + {"debugbu", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_debugbu}, + {"debugdir", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_debugdir}, + {"debuglib", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_debuglib}, + {"debugnmg", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_debugnmg}, + {"decompose", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_decompose}, + {"delay", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_delay}, + {"dplot", "dplot_logfile", 1, to_dplot, ged_exec_dplot}, + {"metaball_delete_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_metaball_delete_pnt}, + {"pipe_delete_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pipe_delete_pnt}, + {"dir2ae", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dir2ae}, + {"draw", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_draw}, + {"dump", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dump}, + {"dup", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_dup}, + {"E", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_E}, + {"e", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_e}, + {"eac", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_eac}, + {"echo", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_echo}, + {"edarb", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_edarb}, + {"edcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_edcodes}, + {"edcolor", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_edcolor}, + {"edcomb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_edcomb}, + {"edit", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_edit}, + {"edmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_edmater}, + {"env", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_env}, + {"erase", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_erase}, + {"ev", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_ev}, + {"expand", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_expand}, + {"eye", "[x y z]", 5, to_view_func_plus, ged_exec_eye}, + {"eye_pos", "[x y z]", 5, to_view_func_plus, ged_exec_eye_pos}, + {"eye_pt", "[x y z]", 5, to_view_func_plus, ged_exec_eye_pt}, + {"exists", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_exists}, + {"facetize", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_facetize}, + {"voxelize", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_voxelize}, + {"fb2pix", "[-h -i -c] [-s squaresize] [-w width] [-n height] [file.pix]", TO_UNLIMITED, to_view_func, ged_exec_fb2pix}, + {"fbclear", "[r g b]", TO_UNLIMITED, to_view_func, ged_exec_fbclear}, + {"find_arb_edge", "arb vx vy ptol", 5, to_view_func, ged_exec_find_arb_edge}, + {"find_bot_edge", "bot vx vy", 5, to_view_func, ged_exec_find_bot_edge}, + {"find_bot_pnt", "bot vx vy", 5, to_view_func, ged_exec_find_bot_pnt}, + {"find_pipe_pnt", "pipe x y z", 6, to_view_func, ged_exec_find_pipe_pnt}, + {"form", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_form}, + {"fracture", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_fracture}, + {"g", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_g}, + {"garbage_collect", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_garbage_collect}, + {"gdiff", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_gdiff}, + {"get", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_get}, + {"get_autoview", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_get_autoview}, + {"get_bot_edges", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_get_bot_edges}, + {"get_comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_get_comb}, + {"get_eyemodel", "vname", 2, to_view_func, ged_exec_get_eyemodel}, + {"get_type", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_get_type}, + {"glob", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_glob}, + {"gqa", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_gqa}, + {"graph", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_graph}, + {"grid", "args", 6, to_view_func, ged_exec_grid}, + {"grid2model_lu", "x y", 4, to_view_func_less, ged_exec_grid2model_lu}, + {"grid2view_lu", "x y", 4, to_view_func_less, ged_exec_grid2view_lu}, + {"heal", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_heal}, + {"hide", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_hide}, + {"how", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_how}, + {"human", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_human}, + {"i", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_i}, + {"idents", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_idents}, + {"illum", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_illum}, + {"importFg4Section", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_importFg4Section}, + {"in", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_in}, + {"inside", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_inside}, + {"isize", "vname", 2, to_view_func, ged_exec_isize}, + {"item", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_item}, + {"joint", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_joint}, + {"joint2", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_joint2}, + {"keep", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_keep}, + {"keypoint", "[x y z]", 5, to_view_func, ged_exec_keypoint}, + {"kill", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_kill}, + {"killall", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_killall}, + {"killrefs", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_killrefs}, + {"killtree", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_killtree}, + {"l", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_l}, + {"lc", "[-d|-s|-r] [-z] [-0|-1|-2|-3|-4|-5] [-f {FileName}] {GroupName}", TO_UNLIMITED, to_pass_through_func, ged_exec_lc}, + {"listeval", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_listeval}, + {"loadview", "filename", 3, to_view_func, ged_exec_loadview}, + {"lod", (char *)0, TO_UNLIMITED, to_lod, ged_exec_lod}, + {"log", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_log}, + {"lookat", "x y z", 5, to_view_func_plus, ged_exec_lookat}, + {"ls", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_ls}, + {"lt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_lt}, + {"m2v_point", "x y z", 5, to_view_func, ged_exec_m2v_point}, + {"make_name", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_make_name}, + {"make_pnts", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_make_pnts}, + {"mat4x3pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_mat4x3pnt}, + {"match", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_match}, + {"mater", (char *)0, TO_UNLIMITED, to_more_args_func, ged_exec_mater}, + {"material", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_material}, + {"model2grid_lu", "x y z", 5, to_view_func_less, ged_exec_model2grid_lu}, + {"model2view", "vname", 2, to_view_func, ged_exec_model2view}, + {"model2view_lu", "x y z", 5, to_view_func_less, ged_exec_model2view_lu}, + {"move_arb_edge", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_move_arb_edge}, + {"move_arb_face", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_move_arb_face}, + {"metaball_move_pnt", (char *)0, TO_UNLIMITED, to_move_pnt_common, ged_exec_metaball_move_pnt}, + {"pipe_move_pnt", (char *)0, TO_UNLIMITED, to_move_pnt_common, ged_exec_pipe_move_pnt}, + {"mouse_add_metaball_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec_mouse_add_metaball_pnt}, + {"mouse_append_pipe_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec_mouse_append_pipe_pnt}, + {"mouse_move_metaball_pnt", "obj i mx my", TO_UNLIMITED, to_mouse_move_pnt_common, ged_exec_mouse_move_metaball_pnt}, + {"mouse_move_pipe_pnt", "obj i mx my", TO_UNLIMITED, to_mouse_move_pnt_common, ged_exec_mouse_move_pipe_pnt}, + {"mouse_prepend_pipe_pnt", "obj mx my", TO_UNLIMITED, to_mouse_append_pnt_common, ged_exec_mouse_prepend_pipe_pnt}, + {"mv", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_mv}, + {"mvall", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_mvall}, + {"nirt", "[args]", TO_UNLIMITED, to_view_func, ged_exec_nirt}, + {"nmg_collapse", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_nmg_collapse}, + {"nmg_fix_normals", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_nmg_fix_normals}, + {"nmg_simplify", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_nmg_simplify}, + {"npush", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_npush}, + {"ocenter", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_ocenter}, + {"open", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_open}, + {"orient", "quat", 6, to_view_func_plus, ged_exec_orient}, + {"orientation", "quat", 6, to_view_func_plus, ged_exec_orientation}, + {"orotate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_orotate}, + {"oscale", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_oscale}, + {"otranslate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_otranslate}, + {"overlay", (char *)0, TO_UNLIMITED, to_autoview_func, ged_exec_overlay}, + {"pathlist", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pathlist}, + {"paths", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_paths}, + {"perspective", "[angle]", 3, to_view_func_plus, ged_exec_perspective}, + {"pix2fb", "[options] [file.pix]", TO_UNLIMITED, to_view_func, ged_exec_pix2fb}, + {"plot", "[options] file.pl", 16, to_view_func, ged_exec_plot}, + {"pmat", "[mat]", 3, to_view_func, ged_exec_pmat}, + {"pmodel2view", "vname", 2, to_view_func, ged_exec_pmodel2view}, + {"png2fb", "[options] [file.png]", TO_UNLIMITED, to_view_func, ged_exec_png2fb}, + {"pngwf", "[options] file.png", 16, to_view_func, ged_exec_pngwf}, + {"prcolor", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_prcolor}, + {"prefix", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_prefix}, + {"pipe_prepend_pnt", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pipe_prepend_pnt}, + {"preview", "[options] script", TO_UNLIMITED, to_dm_func, ged_exec_preview}, + {"protate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_protate}, + {"postscript", "[options] file.ps", 16, to_view_func, ged_exec_postscript}, + {"pscale", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pscale}, + {"pset", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_pset}, + {"ptranslate", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_ptranslate}, + {"push", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_push}, + {"put", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_put}, + {"put_comb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_put_comb}, + {"putmat", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_putmat}, + {"qray", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_qray}, + {"quat", "a b c d", 6, to_view_func_plus, ged_exec_quat}, + {"qvrot", "x y z angle", 6, to_view_func_plus, ged_exec_qvrot}, + {"r", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_r}, + {"rcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rcodes}, + {"rect", "args", 6, to_view_func, ged_exec_rect}, + {"red", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_red}, + {"regdef", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_regdef}, + {"regions", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_regions}, + {"solid_report", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_solid_report}, + {"rfarb", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rfarb}, + {"rm", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_rm}, + {"rmap", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rmap}, + {"rmat", "[mat]", 3, to_view_func, ged_exec_rmat}, + {"rmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rmater}, + {"rot", "[-m|-v] x y z", 6, to_view_func_plus, ged_exec_rot}, + {"rot_about", "[e|k|m|v]", 3, to_view_func, ged_exec_rot_about}, + {"rot_point", "x y z", 5, to_view_func, ged_exec_rot_point}, + {"rotate_arb_face", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rotate_arb_face}, + {"rrt", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rrt}, + {"rselect", (char *)0, TO_UNLIMITED, to_view_func, ged_exec_rselect}, + {"rt", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rt}, + {"rtabort", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_rtabort}, + {"rtarea", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rtarea}, + {"rtcheck", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rtcheck}, + {"rtedge", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rtedge}, + {"rtweight", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rtweight}, + {"rtwizard", "[args]", TO_UNLIMITED, to_view_func, ged_exec_rtwizard}, + {"savekey", "filename", 3, to_view_func, ged_exec_savekey}, + {"saveview", (char *)0, TO_UNLIMITED, to_view_func, ged_exec_saveview}, + {"sca", "sf", 3, to_view_func_plus, ged_exec_sca}, + {"screengrab", "imagename.ext", TO_UNLIMITED, to_dm_func, ged_exec_screengrab}, + {"search", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_search}, + {"select", (char *)0, TO_UNLIMITED, to_view_func, ged_exec_select}, + {"set_output_script", "[script]", TO_UNLIMITED, to_pass_through_func, ged_exec_set_output_script}, + {"set_transparency", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_set_transparency}, + {"set_uplotOutputMode", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_set_uplotOutputMode}, + {"setview", "x y z", 5, to_view_func_plus, ged_exec_setview}, + {"shaded_mode", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_shaded_mode}, + {"shader", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_shader}, + {"shells", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_shells}, + {"showmats", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_showmats}, + {"size", "[size]", 3, to_view_func_plus, ged_exec_size}, + {"slew", "x y [z]", 5, to_view_func_plus, ged_exec_slew}, + {"solids", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_solids}, + {"solids_on_ray", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_solids_on_ray}, + {"summary", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_summary}, + {"sv", "x y [z]", 5, to_view_func_plus, ged_exec_sv}, + {"sync", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_sync}, + {"t", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_t}, + {"tire", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_tire}, + {"title", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_title}, + {"tol", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_tol}, + {"tops", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_tops}, + {"tra", "[-m|-v] x y z", 6, to_view_func_plus, ged_exec_tra}, + {"track", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_track}, + {"tree", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_tree}, + {"unhide", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_unhide}, + {"units", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_units}, + {"v2m_point", "x y z", 5, to_view_func, ged_exec_v2m_point}, + {"vdraw", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_vdraw}, + {"version", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_version}, + {"view", "quat|ypr|aet|center|eye|size [args]", 7, to_view_func_plus, ged_exec_view}, + {"view2grid_lu", "x y z", 5, to_view_func_less, ged_exec_view2grid_lu}, + {"view2model", "", 2, to_view_func_less, ged_exec_view2model}, + {"view2model_lu", "x y z", 5, to_view_func_less, ged_exec_view2model_lu}, + {"view2model_vec", "x y z", 5, to_view_func_less, ged_exec_view2model_vec}, + {"viewdir", "[-i]", 3, to_view_func_less, ged_exec_viewdir}, + {"vnirt", "[args]", TO_UNLIMITED, to_view_func, ged_exec_vnirt}, + {"wcodes", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_wcodes}, + {"whatid", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_whatid}, + {"which_shader", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_which_shader}, + {"whichair", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_whichair}, + {"whichid", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_whichid}, + {"who", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_who}, + {"wmater", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_wmater}, + {"x", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_x}, + {"xpush", (char *)0, TO_UNLIMITED, to_pass_through_func, ged_exec_xpush}, + {"ypr", "yaw pitch roll", 5, to_view_func_plus, ged_exec_ypr}, + {"zap", (char *)0, TO_UNLIMITED, to_pass_through_and_refresh_func, ged_exec_zap}, + {"zoom", "sf", 3, to_view_func_plus, ged_exec_zoom}, {(char *)0, (char *)0, 0, TO_WRAPPER_FUNC_PTR_NULL, GED_FUNC_PTR_NULL} }; @@ -1511,7 +1511,7 @@ to_configure(struct ged *gedp, av[4] = NULL; gedp->ged_gvp = gdvp; - (void)ged_exec(gedp, 4, (const char **)av); + (void)ged_exec_rect(gedp, 4, (const char **)av); } if (status == TCL_OK) { @@ -3157,7 +3157,7 @@ to_dplot(struct ged *gedp, av[ac] = (char *)0; /* check for displayed objects */ - ret = ged_exec(gedp, 2, (const char **)who_av); + ret = ged_exec_who(gedp, 2, (const char **)who_av); if (ret == BRLCAD_OK && strlen(bu_vls_addr(gedp->ged_result_str)) == 0) aflag = 1; bu_vls_trunc(gedp->ged_result_str, 0); @@ -3171,7 +3171,7 @@ to_dplot(struct ged *gedp, bu_vls_substr(&result_copy, gedp->ged_result_str, 0, bu_vls_strlen(gedp->ged_result_str)); bu_vls_trunc(gedp->ged_result_str, 0); - ret = ged_exec(gedp, 1, (const char **)who_av); + ret = ged_exec_who(gedp, 1, (const char **)who_av); if (ret == BRLCAD_OK && strlen(bu_vls_addr(gedp->ged_result_str)) == 0) aflag = 1; @@ -3584,7 +3584,7 @@ redraw_edited_paths(struct bu_hash_tbl *t, void *udata) av[0] = "how"; av[1] = draw_path; av[2] = NULL; - ret = ged_exec(data->gedp, 2, av); + ret = ged_exec_how(data->gedp, 2, av); if (ret == BRLCAD_OK) { bu_sscanf(bu_vls_cstr(data->gedp->ged_result_str), "%d", &dmode); } @@ -3595,7 +3595,7 @@ redraw_edited_paths(struct bu_hash_tbl *t, void *udata) } av[0] = "erase"; - ret = ged_exec(data->gedp, 2, av); + ret = ged_exec_erase(data->gedp, 2, av); if (ret == BRLCAD_OK) { av[0] = "draw"; @@ -3603,7 +3603,7 @@ redraw_edited_paths(struct bu_hash_tbl *t, void *udata) av[2] = bu_vls_cstr(&path_dmode); av[3] = draw_path; av[4] = NULL; - ged_exec(data->gedp, 4, av); + ged_exec_draw(data->gedp, 4, av); } *data->need_refresh = 1; @@ -3653,7 +3653,7 @@ to_idle_mode(struct ged *gedp, { const char *av[] = {"redraw", NULL}; - ged_exec(gedp, 1, (const char **)av); + ged_exec_redraw(gedp, 1, (const char **)av); need_refresh = 1; } @@ -3684,7 +3684,7 @@ to_idle_mode(struct ged *gedp, av[0] = "grid"; av[1] = "vsnap"; av[2] = NULL; - ged_exec(gedp, 2, (const char **)av); + ged_exec_grid(gedp, 2, (const char **)av); struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->u_data; if (0 < bu_vls_strlen(&tvd->gdv_callback)) { @@ -5033,14 +5033,14 @@ to_rect_mode(struct ged *gedp, av[2] = "0"; av[3] = "0"; av[4] = (char *)0; - (void)ged_exec(gedp, ac, (const char **)av); + (void)ged_exec_rect(gedp, ac, (const char **)av); bu_vls_printf(&x_vls, "%d", (int)gdvp->gv_prevMouseX); bu_vls_printf(&y_vls, "%d", (int)gdvp->gv_prevMouseY); av[1] = "pos"; av[2] = bu_vls_addr(&x_vls); av[3] = bu_vls_addr(&y_vls); - (void)ged_exec(gedp, ac, (const char **)av); + (void)ged_exec_rect(gedp, ac, (const char **)av); bu_vls_free(&x_vls); bu_vls_free(&y_vls); @@ -5049,7 +5049,7 @@ to_rect_mode(struct ged *gedp, av[1] = "draw"; av[2] = "1"; av[3] = (char *)0; - (void)ged_exec(gedp, ac, (const char **)av); + (void)ged_exec_rect(gedp, ac, (const char **)av); struct bu_vls *pathname = dm_get_pathname((struct dm *)gdvp->dmp); if (pathname && bu_vls_strlen(pathname)) { @@ -6258,7 +6258,7 @@ to_vslew(struct ged *gedp, av[0] = "grid"; av[1] = "vsnap"; av[2] = NULL; - ged_exec(gedp, 2, (const char **)av); + ged_exec_grid(gedp, 2, (const char **)av); } if (gedp->ged_gvp->gv_s->gv_snap_lines) { diff --git a/src/libtclcad/mouse.c b/src/libtclcad/mouse.c index d899806a3a7..c2a7ecfcea1 100644 --- a/src/libtclcad/mouse.c +++ b/src/libtclcad/mouse.c @@ -226,7 +226,7 @@ to_mouse_brep_selection_append(struct ged *gedp, cmd_argv[10] = bu_vls_addr(&dir[Z]); gedp->ged_gvp = gdvp; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_brep(gedp, cmd_argc, cmd_argv); bu_vls_free(&start[X]); bu_vls_free(&start[Y]); @@ -326,7 +326,7 @@ to_mouse_brep_selection_translate(struct ged *gedp, cmd_argv[6] = bu_vls_addr(&delta[Y]); cmd_argv[7] = bu_vls_addr(&delta[Z]); - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_brep(gedp, cmd_argc, cmd_argv); bu_free((void *)brep_name, "brep_name"); bu_vls_free(&delta[X]); @@ -445,7 +445,7 @@ to_mouse_constrain_rot(struct ged *gedp, av[2] = bu_vls_addr(&rot_vls); av[3] = (char *)0; - ret = ged_exec(gedp, ac, (const char **)av); + ret = ged_exec_rot(gedp, ac, (const char **)av); bu_vls_free(&rot_vls); if (ret == BRLCAD_OK) { @@ -556,7 +556,7 @@ to_mouse_constrain_trans(struct ged *gedp, av[2] = bu_vls_addr(&tran_vls); av[3] = (char *)0; - ret = ged_exec(gedp, ac, (const char **)av); + ret = ged_exec_tra(gedp, ac, (const char **)av); bu_vls_free(&tran_vls); if (ret == BRLCAD_OK) { @@ -627,6 +627,7 @@ to_mouse_find_arb_edge(struct ged *gedp, av[3] = (char *)argv[5]; av[4] = (char *)0; + // TODO - above is not a current GED command - broken (void)ged_exec(gedp, 4, (const char **)av); bu_vls_free(&pt_vls); @@ -688,6 +689,7 @@ to_mouse_find_bot_edge(struct ged *gedp, av[2] = bu_vls_addr(&pt_vls); av[3] = (char *)0; + // TODO - above is not a current GED command - broken (void)ged_exec(gedp, 3, (const char **)av); bu_vls_free(&pt_vls); @@ -749,6 +751,7 @@ to_mouse_find_bot_pnt(struct ged *gedp, av[2] = bu_vls_addr(&pt_vls); av[3] = (char *)0; + // TODO - above is not a current GED command - broken (void)ged_exec(gedp, 3, (const char **)av); bu_vls_free(&pt_vls); @@ -812,6 +815,7 @@ to_mouse_find_metaball_pnt(struct ged *gedp, av[2] = bu_vls_addr(&pt_vls); av[3] = (char *)0; + // TODO - above is not a current GED command - broken (void)ged_exec(gedp, 3, (const char **)av); bu_vls_free(&pt_vls); @@ -875,6 +879,7 @@ to_mouse_find_pipe_pnt(struct ged *gedp, av[2] = bu_vls_addr(&pt_vls); av[3] = (char *)0; + // TODO - above is not a current GED command - broken (void)ged_exec(gedp, 3, (const char **)av); bu_vls_free(&pt_vls); @@ -965,7 +970,7 @@ to_mouse_joint_select( cmd_argv[10] = bu_vls_addr(&dir[Z]); gedp->ged_gvp = gdvp; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_joint2(gedp, cmd_argc, cmd_argv); bu_vls_free(&start[X]); bu_vls_free(&start[Y]); @@ -1063,7 +1068,7 @@ to_mouse_joint_selection_translate( cmd_argv[6] = bu_vls_addr(&delta[Y]); cmd_argv[7] = bu_vls_addr(&delta[Z]); - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_joint2(gedp, cmd_argc, cmd_argv); if (ret != BRLCAD_OK) { bu_free((void *)joint_name, "joint_name"); @@ -1084,7 +1089,7 @@ to_mouse_joint_selection_translate( cmd_argv[1] = joint_name; cmd_argv[2] = "RP1"; cmd_argv[3] = NULL; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_get(gedp, cmd_argc, cmd_argv); if (ret == BRLCAD_OK) { char *path_name = bu_strdup(bu_vls_cstr(gedp->ged_result_str)); @@ -1096,7 +1101,7 @@ to_mouse_joint_selection_translate( cmd_argv[0] = "how"; cmd_argv[1] = path_name; cmd_argv[2] = NULL; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_how(gedp, cmd_argc, cmd_argv); if (ret == BRLCAD_OK) { bu_sscanf(bu_vls_cstr(gedp->ged_result_str), "%d", &dmode); @@ -1112,7 +1117,7 @@ to_mouse_joint_selection_translate( cmd_argv[0] = "erase"; cmd_argv[1] = path_name; cmd_argv[2] = NULL; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_erase(gedp, cmd_argc, cmd_argv); if (ret == BRLCAD_OK) { /* redraw path with its previous display mode */ @@ -1122,7 +1127,7 @@ to_mouse_joint_selection_translate( cmd_argv[2] = bu_vls_cstr(&path_dmode); cmd_argv[3] = path_name; cmd_argv[4] = NULL; - ret = ged_exec(gedp, cmd_argc, cmd_argv); + ret = ged_exec_draw(gedp, cmd_argc, cmd_argv); to_refresh_all_views(current_top); } @@ -1221,7 +1226,7 @@ to_mouse_move_arb_edge(struct ged *gedp, av[4] = bu_vls_addr(&pt_vls); av[5] = (char *)0; - ret = ged_exec(gedp, 5, (const char **)av); + ret = ged_exec_move_arb_edge(gedp, 5, (const char **)av); bu_vls_free(&pt_vls); if (ret == BRLCAD_OK) { @@ -1317,7 +1322,7 @@ to_mouse_move_arb_face(struct ged *gedp, av[4] = bu_vls_addr(&pt_vls); av[5] = (char *)0; - ret = ged_exec(gedp, 5, (const char **)av); + ret = ged_exec_move_arb_face(gedp, 5, (const char **)av); bu_vls_free(&pt_vls); if (ret == BRLCAD_OK) { @@ -1483,7 +1488,7 @@ to_mouse_move_bot_pnt(struct ged *gedp, gedp->ged_gvp = gdvp; av[0] = "bot_move_pnt"; - + // TODO - bot_move_pnt is not a current LIBGED cmd - the following are broken if (rflag) { av[1] = "-r"; av[2] = (char *)argv[2]; @@ -1601,6 +1606,7 @@ to_mouse_move_bot_pnts(struct ged *gedp, int ac = argc - 2; char **av = (char **)bu_calloc(ac, sizeof(char *), "to_mouse_move_bot_pnts: av[]"); av[0] = "bot_move_pnts"; + // TODO - above is not a current GED command - broken av[1] = (char *)argv[4]; av[2] = bu_vls_addr(&pt_vls); @@ -1814,7 +1820,7 @@ to_mouse_orotate(struct ged *gedp, av[4] = bu_vls_addr(&rot_z_vls); av[5] = (char *)0; - if (ged_exec(gedp, 5, (const char **)av) == BRLCAD_OK) { + if (ged_exec_orotate(gedp, 5, (const char **)av) == BRLCAD_OK) { av[0] = "draw"; av[1] = (char *)argv[2]; av[2] = (char *)0; @@ -1919,7 +1925,7 @@ to_mouse_oscale(struct ged *gedp, av[2] = bu_vls_addr(&sf_vls); av[3] = (char *)0; - if (ged_exec(gedp, 3, (const char **)av) == BRLCAD_OK) { + if (ged_exec_oscale(gedp, 3, (const char **)av) == BRLCAD_OK) { av[0] = "draw"; av[1] = (char *)argv[2]; av[2] = (char *)0; @@ -2049,7 +2055,7 @@ to_mouse_otranslate(struct ged *gedp, av[4] = bu_vls_addr(&tran_z_vls); av[5] = (char *)0; - if (ged_exec(gedp, 5, (const char **)av) == BRLCAD_OK) { + if (ged_exec_otranslate(gedp, 5, (const char **)av) == BRLCAD_OK) { av[0] = "draw"; av[1] = (char *)argv[2]; av[2] = (char *)0; @@ -2807,7 +2813,7 @@ to_mouse_rect(struct ged *gedp, av[3] = bu_vls_addr(&dy_vls); av[4] = (char *)0; - ret = ged_exec(gedp, ac, (const char **)av); + ret = ged_exec_rect(gedp, ac, (const char **)av); bu_vls_free(&dx_vls); bu_vls_free(&dy_vls); @@ -2889,7 +2895,7 @@ to_mouse_rot(struct ged *gedp, av[2] = bu_vls_addr(&rot_vls); av[3] = (char *)0; - ret = ged_exec(gedp, ac, (const char **)av); + ret = ged_exec_rot(gedp, ac, (const char **)av); bu_vls_free(&rot_vls); if (ret == BRLCAD_OK) { @@ -2983,7 +2989,7 @@ to_mouse_rotate_arb_face(struct ged *gedp, av[4] = bu_vls_addr(&pt_vls); av[5] = (char *)0; - ret = ged_exec(gedp, 5, (const char **)av); + ret = ged_exec_rotate_arb_face(gedp, 5, (const char **)av); bu_vls_free(&pt_vls); if (ret == BRLCAD_OK) { @@ -3192,7 +3198,7 @@ to_mouse_scale(struct ged *gedp, av[0] = "zoom"; av[1] = bu_vls_addr(&zoom_vls); av[2] = (char *)0; - ret = ged_exec(gedp, 2, (const char **)av); + ret = ged_exec_zoom(gedp, 2, (const char **)av); bu_vls_free(&zoom_vls); if (ret == BRLCAD_OK) { @@ -3285,7 +3291,7 @@ to_mouse_protate(struct ged *gedp, av[3] = bu_vls_addr(&mrot_vls); av[4] = (char *)0; - ret = ged_exec(gedp, 4, (const char **)av); + ret = ged_exec_protate(gedp, 4, (const char **)av); bu_vls_free(&mrot_vls); if (ret == BRLCAD_OK) { @@ -3379,7 +3385,7 @@ to_mouse_pscale(struct ged *gedp, av[4] = bu_vls_addr(&sf_vls); av[5] = (char *)0; - ret = ged_exec(gedp, 5, (const char **)av); + ret = ged_exec_pscale(gedp, 5, (const char **)av); bu_vls_free(&sf_vls); if (ret == BRLCAD_OK) { @@ -3474,7 +3480,7 @@ to_mouse_ptranslate(struct ged *gedp, av[4] = bu_vls_addr(&tvec_vls); av[5] = (char *)0; - ret = ged_exec(gedp, 5, (const char **)av); + ret = ged_exec_ptranslate(gedp, 5, (const char **)av); bu_vls_free(&tvec_vls); if (ret == BRLCAD_OK) { @@ -3562,7 +3568,7 @@ to_mouse_trans(struct ged *gedp, av[2] = bu_vls_addr(&trans_vls); av[3] = (char *)0; - ret = ged_exec(gedp, ac, (const char **)av); + ret = ged_exec_tra(gedp, ac, (const char **)av); bu_vls_free(&trans_vls); if (ret == BRLCAD_OK) { diff --git a/src/libtclcad/view/autoview.c b/src/libtclcad/view/autoview.c index fc5b746883b..31814c50597 100644 --- a/src/libtclcad/view/autoview.c +++ b/src/libtclcad/view/autoview.c @@ -46,9 +46,9 @@ to_autoview_view(struct bview *gdvp, const char *scale) av[2] = NULL; if (scale) - ret = ged_exec(tvd->gedp, 2, (const char **)av); + ret = ged_exec_autoview(tvd->gedp, 2, (const char **)av); else - ret = ged_exec(tvd->gedp, 1, (const char **)av); + ret = ged_exec_autoview(tvd->gedp, 1, (const char **)av); if (ret == BRLCAD_OK) { if (0 < bu_vls_strlen(&tvd->gdv_callback)) { diff --git a/src/libtclcad/view/lines.c b/src/libtclcad/view/lines.c index e075bded6b2..927bc6d68e1 100644 --- a/src/libtclcad/view/lines.c +++ b/src/libtclcad/view/lines.c @@ -118,7 +118,7 @@ to_data_lines(struct ged *gedp, struct bview *btmp = gedp->ged_gvp; gedp->ged_gvp = gdvp; - ret = ged_exec(gedp, argc, argv); + ret = ged_exec_view(gedp, argc, argv); gedp->ged_gvp = btmp; diff --git a/src/libtclcad/wrapper.c b/src/libtclcad/wrapper.c index 387e4e2fc68..3f01ed13c6c 100644 --- a/src/libtclcad/wrapper.c +++ b/src/libtclcad/wrapper.c @@ -45,7 +45,7 @@ to_autoview_func(struct ged *gedp, av[0] = "who"; av[1] = (char *)0; - ret = ged_exec(gedp, 1, (const char **)av); + ret = ged_exec_who(gedp, 1, (const char **)av); for (i = 1; i < (size_t)argc; ++i) { if (argv[i][0] != '-') { @@ -291,7 +291,7 @@ to_view_func_common(struct ged *gedp, { char *gr_av[] = {"redraw", NULL}; - ged_exec(gedp, 1, (const char **)gr_av); + ged_exec_redraw(gedp, 1, (const char **)gr_av); gdvp->gv_width = dm_get_width((struct dm *)gdvp->dmp); gdvp->gv_height = dm_get_height((struct dm *)gdvp->dmp); diff --git a/src/mged/chgview.c b/src/mged/chgview.c index 178c37319df..134ed226f6f 100644 --- a/src/mged/chgview.c +++ b/src/mged/chgview.c @@ -166,7 +166,7 @@ mged_center(point_t center) av[2] = ybuf; av[3] = zbuf; av[4] = (char *)0; - ged_exec(GEDP, 4, (const char **)av); + ged_exec_center(GEDP, 4, (const char **)av); (void)mged_svbase(); view_state->vs_flag = 1; } @@ -222,15 +222,11 @@ cmd_size(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const char void size_reset(void) { - char *av[2]; - - if (GEDP == GED_NULL) { + if (GEDP == GED_NULL) return; - } - av[0] = "autoview"; - av[1] = (char *)0; - ged_exec(GEDP, 1, (const char **)av); + const char *av[1] = {"autoview"}; + ged_exec_autoview(GEDP, 1, (const char **)av); view_state->vs_gvp->gv_i_scale = view_state->vs_gvp->gv_scale; view_state->vs_flag = 1; } @@ -466,7 +462,7 @@ edit_com(int argc, av[0] = "autoview"; av[1] = (char *)0; - ged_exec(GEDP, 1, (const char **)av); + ged_exec_autoview(GEDP, 1, (const char **)av); (void)mged_svbase(); @@ -606,7 +602,7 @@ cmd_autoview(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const ac = 2; } - ged_exec(GEDP, ac, (const char **)av); + ged_exec_autoview(GEDP, ac, (const char **)av); view_state->vs_flag = 1; } (void)mged_svbase(); @@ -684,7 +680,7 @@ int cmd_zap(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interp), int UNUSED(argc), const char *UNUSED(argv[])) { void (*tmp_callback)(unsigned int, int) = GEDP->ged_destroy_vlist_callback; - char *av[2] = {"zap", (char *)0}; + const char *av[1] = {"zap"}; CHECK_DBI_NULL; @@ -697,7 +693,7 @@ cmd_zap(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interp), int UNUSED(ar button(BE_REJECT); } - ged_exec(GEDP, 1, (const char **)av); + ged_exec_zap(GEDP, 1, (const char **)av); (void)chg_state(STATE, STATE, "zap"); solid_list_callback(); @@ -2560,8 +2556,7 @@ abs_zoom(void) av[0] = "zoom"; av[1] = "1.0"; - av[2] = (char *)0; - ged_exec(GEDP, 2, (const char **)av); + ged_exec_zoom(GEDP, 2, (const char **)av); if (!ZERO(view_state->vs_absolute_tran[X]) || !ZERO(view_state->vs_absolute_tran[Y]) @@ -2591,9 +2586,8 @@ mged_zoom(double val) av[0] = "zoom"; av[1] = buf; - av[2] = (char *)0; - ret = ged_exec(GEDP, 2, (const char **)av); + ret = ged_exec_zoom(GEDP, 2, (const char **)av); Tcl_DStringInit(&ds); Tcl_DStringAppend(&ds, bu_vls_addr(GEDP->ged_result_str), -1); Tcl_DStringResult(INTERP, &ds); @@ -2904,7 +2898,7 @@ setview(double a1, av[2] = ybuf; av[3] = zbuf; av[4] = (char *)0; - ged_exec(GEDP, 4, (const char **)av); + ged_exec_setview(GEDP, 4, (const char **)av); if (!ZERO(view_state->vs_absolute_tran[X]) || !ZERO(view_state->vs_absolute_tran[Y]) @@ -2949,7 +2943,7 @@ slewview(vect_t view_pos) av[2] = ybuf; av[3] = zbuf; av[4] = (char *)0; - ged_exec(GEDP, 4, (const char **)av); + ged_exec_slew(GEDP, 4, (const char **)av); /* all this for ModelDelta */ MAT_DELTAS_GET_NEG(new_model_center, view_state->vs_gvp->gv_center); diff --git a/src/mged/cmd.c b/src/mged/cmd.c index 294da5399fe..0c7801ec117 100644 --- a/src/mged/cmd.c +++ b/src/mged/cmd.c @@ -718,12 +718,12 @@ cmd_ged_plain_wrapper(ClientData clientData, Tcl_Interp *interpreter, int argc, if (argc > 1) { struct bu_vls rcache = BU_VLS_INIT_ZERO; int who_ret; - const char *who_cmd[2] = {"who", NULL}; + const char *who_cmd[1] = {"who"}; /* Stash previous result string state so who cmd doesn't replace it */ bu_vls_sprintf(&rcache, "%s", bu_vls_addr(GEDP->ged_result_str)); - who_ret = ged_exec(GEDP, 1, who_cmd); + who_ret = ged_exec_who(GEDP, 1, who_cmd); if (who_ret == BRLCAD_OK) { /* worst possible is a bunch of 1-char names, allocate and * split into an argv accordingly. @@ -1126,7 +1126,6 @@ cmdline(struct bu_vls *vp, int record) */ if (glob_compat_mode) { - const char **av; struct bu_vls tmpstr = BU_VLS_INIT_ZERO; if (GEDP == GED_NULL) return CMD_BAD; @@ -1135,13 +1134,9 @@ cmdline(struct bu_vls *vp, int record) bu_vls_sprintf(&tmpstr, "%s", bu_vls_addr(GEDP->ged_result_str)); /* Run ged_glob */ - av = (const char **)bu_malloc(sizeof(char *)*3, "ged_glob argv"); - - av[0] = "glob"; - av[1] = bu_vls_addr(vp); - av[2] = NULL; - - (void)ged_exec(GEDP, 2, (const char **)av); + const char *av[2] = {"glob", NULL}; + av[1] = bu_vls_cstr(vp); + (void)ged_exec_glob(GEDP, 2, av); if (bu_vls_strlen(GEDP->ged_result_str) > 0) { bu_vls_sprintf(&globbed, "%s", bu_vls_addr(GEDP->ged_result_str)); } else { @@ -1153,7 +1148,6 @@ cmdline(struct bu_vls *vp, int record) /* cleanup */ bu_vls_free(&tmpstr); - bu_free((void *)av, "ged_glob argv"); } else { bu_vls_vlscat(&globbed, vp); } @@ -1987,11 +1981,8 @@ cmd_blast(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interpreter), int ar if (mged_variables->mv_autosize && non_empty) { struct view_ring *vrp; - char *av[2]; - - av[0] = "autoview"; - av[1] = (char *)0; - ged_exec(GEDP, 1, (const char **)av); + const char *av[1] = {"autoview"}; + ged_exec_autoview(GEDP, 1, (const char **)av); (void)mged_svbase(); @@ -2112,10 +2103,7 @@ cmd_ps(ClientData UNUSED(clientData), const char **UNUSED(argv)) { int ret = 0; - const char *av[3]; - av[0] = "process"; - av[1] = "list"; - av[2] = NULL; + const char *av[2] = {"process", "list"}; ret = ged_exec(GEDP, 2, (const char **)av); /* For the next couple releases, print a rename notice */ mged_pr_output(interpreter); diff --git a/src/mged/dodraw.c b/src/mged/dodraw.c index ff69148a9bb..7406b918f62 100644 --- a/src/mged/dodraw.c +++ b/src/mged/dodraw.c @@ -65,13 +65,13 @@ cvt_vlblock_to_solids(struct bv_vlblock *vbp, const char *name, int copy) av[0] = "erase"; av[1] = shortname; av[2] = NULL; - (void)ged_exec(GEDP, 2, (const char **)av); + (void)ged_exec_erase(GEDP, 2, (const char **)av); } else { av[0] = "kill"; av[1] = "-f"; av[2] = shortname; av[3] = NULL; - (void)ged_exec(GEDP, 3, (const char **)av); + (void)ged_exec_kill(GEDP, 3, (const char **)av); } for (i=0; i < vbp->nused; i++) { @@ -319,15 +319,11 @@ add_solid_path_to_result( int redraw_visible_objects(void) { - int ret, ac = 1; - char *av[] = {NULL, NULL}; + const char *av[1] = {"redraw"}; + int ret = ged_exec(GEDP, 1, av); - av[0] = "redraw"; - ret = ged_exec(GEDP, ac, (const char **)av); - - if (ret & BRLCAD_ERROR) { + if (ret & BRLCAD_ERROR) return TCL_ERROR; - } return TCL_OK; } diff --git a/src/mged/f_db.c b/src/mged/f_db.c index 1244b9c43d9..eef70f5ecad 100644 --- a/src/mged/f_db.c +++ b/src/mged/f_db.c @@ -136,11 +136,9 @@ _post_opendb_failed(struct ged *gedp, struct mged_opendb_ctx *ctx) } if (ctx->post_open_cnt < 2) { - const char *av[3]; - av[0] = "opendb"; - av[1] = "-c"; + const char *av[3] = {"opendb", "-c", NULL}; av[2] = fname; - ctx->ged_ret = ged_exec(gedp, 3, (const char **)av); + ctx->ged_ret = ged_exec_opendb(gedp, 3, av); } if (gedp->dbip == DBI_NULL) { @@ -407,7 +405,7 @@ f_opendb(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, const ctx.argv = av; ctx.argc = argc+ind; - ctx.ged_ret = ged_exec(GEDP, argc+ind, (const char **)av); + ctx.ged_ret = ged_exec_opendb(GEDP, argc+ind, (const char **)av); // Done - restore standard values GEDP->ged_pre_opendb_callback = pre_opendb_clbk; @@ -453,10 +451,8 @@ f_closedb(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, cons void *gctx = GEDP->ged_db_callback_udata; GEDP->ged_db_callback_udata = (void *)&ctx; - const char *av[2]; - av[0] = "closedb"; - av[1] = NULL; - ged_exec(GEDP, 1, (const char **)av); + const char *av[1] = {"closedb"}; + ged_exec_closedb(GEDP, 1, (const char **)av); GEDP->ged_db_callback_udata = gctx; diff --git a/src/mged/setup.c b/src/mged/setup.c index bd2b2d37871..931a8c61e81 100644 --- a/src/mged/setup.c +++ b/src/mged/setup.c @@ -69,190 +69,190 @@ struct mged_opendb_ctx mged_global_db_ctx; static struct cmdtab mged_cmdtab[] = { {"%", f_comm, GED_FUNC_PTR_NULL}, {cmd3525, f_bv_35_25, GED_FUNC_PTR_NULL}, /* 35,25 */ - {"3ptarb", cmd_ged_more_wrapper, ged_exec}, + {"3ptarb", cmd_ged_more_wrapper, ged_exec_3ptarb}, {cmd4545, f_bv_45_45, GED_FUNC_PTR_NULL}, /* 45,45 */ {"B", cmd_blast, GED_FUNC_PTR_NULL}, {"accept", f_be_accept, GED_FUNC_PTR_NULL}, {"adc", f_adc, GED_FUNC_PTR_NULL}, - {"adjust", cmd_ged_plain_wrapper, ged_exec}, - {"ae", cmd_ged_view_wrapper, ged_exec}, - {"ae2dir", cmd_ged_plain_wrapper, ged_exec}, + {"adjust", cmd_ged_plain_wrapper, ged_exec_adjust}, + {"ae", cmd_ged_view_wrapper, ged_exec_ae}, + {"ae2dir", cmd_ged_plain_wrapper, ged_exec_ae2dir}, {"aip", f_aip, GED_FUNC_PTR_NULL}, - {"analyze", cmd_ged_info_wrapper, ged_exec}, - {"annotate", cmd_ged_plain_wrapper, ged_exec}, - {"arb", cmd_ged_plain_wrapper, ged_exec}, - {"arced", cmd_ged_plain_wrapper, ged_exec}, + {"analyze", cmd_ged_info_wrapper, ged_exec_analyze}, + {"annotate", cmd_ged_plain_wrapper, ged_exec_annotate}, + {"arb", cmd_ged_plain_wrapper, ged_exec_arb}, + {"arced", cmd_ged_plain_wrapper, ged_exec_arced}, {"area", f_area, GED_FUNC_PTR_NULL}, {"arot", cmd_arot, GED_FUNC_PTR_NULL}, {"art", cmd_rt, GED_FUNC_PTR_NULL}, {"attach", f_attach, GED_FUNC_PTR_NULL}, - {"attr", cmd_ged_plain_wrapper, ged_exec}, + {"attr", cmd_ged_plain_wrapper, ged_exec_attr}, {"autoview", cmd_autoview, GED_FUNC_PTR_NULL}, - {"bb", cmd_ged_plain_wrapper, ged_exec}, - {"bev", cmd_ged_plain_wrapper, ged_exec}, - {"bo", cmd_ged_plain_wrapper, ged_exec}, + {"bb", cmd_ged_plain_wrapper, ged_exec_bb}, + {"bev", cmd_ged_plain_wrapper, ged_exec_bev}, + {"bo", cmd_ged_plain_wrapper, ged_exec_bo}, {"bomb", f_bomb, GED_FUNC_PTR_NULL}, - {"bot", cmd_ged_plain_wrapper, ged_exec}, - {"bot_condense", cmd_ged_plain_wrapper, ged_exec}, - {"bot_decimate", cmd_ged_plain_wrapper, ged_exec}, - {"bot_dump", cmd_ged_plain_wrapper, ged_exec}, - {"bot_exterior", cmd_ged_plain_wrapper, ged_exec}, - {"bot_face_fuse", cmd_ged_plain_wrapper, ged_exec}, - {"bot_face_sort", cmd_ged_plain_wrapper, ged_exec}, - {"bot_flip", cmd_ged_plain_wrapper, ged_exec}, - {"bot_fuse", cmd_ged_plain_wrapper, ged_exec}, - {"bot_merge", cmd_ged_plain_wrapper, ged_exec}, - {"bot_smooth", cmd_ged_plain_wrapper, ged_exec}, - {"bot_split", cmd_ged_plain_wrapper, ged_exec}, - {"bot_sync", cmd_ged_plain_wrapper, ged_exec}, - {"bot_vertex_fuse", cmd_ged_plain_wrapper, ged_exec}, + {"bot", cmd_ged_plain_wrapper, ged_exec_bot}, + {"bot_condense", cmd_ged_plain_wrapper, ged_exec_bot_condense}, + {"bot_decimate", cmd_ged_plain_wrapper, ged_exec_bot_decimate}, + {"bot_dump", cmd_ged_plain_wrapper, ged_exec_bot_dump}, + {"bot_exterior", cmd_ged_plain_wrapper, ged_exec_bot_exterior}, + {"bot_face_fuse", cmd_ged_plain_wrapper, ged_exec_bot_face_fuse}, + {"bot_face_sort", cmd_ged_plain_wrapper, ged_exec_bot_face_sort}, + {"bot_flip", cmd_ged_plain_wrapper, ged_exec_bot_flip}, + {"bot_fuse", cmd_ged_plain_wrapper, ged_exec_bot_fuse}, + {"bot_merge", cmd_ged_plain_wrapper, ged_exec_bot_merge}, + {"bot_smooth", cmd_ged_plain_wrapper, ged_exec_bot_smooth}, + {"bot_split", cmd_ged_plain_wrapper, ged_exec_bot_split}, + {"bot_sync", cmd_ged_plain_wrapper, ged_exec_bot_sync}, + {"bot_vertex_fuse", cmd_ged_plain_wrapper, ged_exec_bot_vertex_fuse}, {"bottom", f_bv_bottom, GED_FUNC_PTR_NULL}, - {"brep", cmd_ged_view_wrapper, ged_exec}, - {"c", cmd_ged_plain_wrapper, ged_exec}, - {"cat", cmd_ged_info_wrapper, ged_exec}, - {"cc", cmd_ged_plain_wrapper, ged_exec}, + {"brep", cmd_ged_view_wrapper, ged_exec_brep}, + {"c", cmd_ged_plain_wrapper, ged_exec_c}, + {"cat", cmd_ged_info_wrapper, ged_exec_cat}, + {"cc", cmd_ged_plain_wrapper, ged_exec_cc}, {"center", cmd_center, GED_FUNC_PTR_NULL}, - {"check", cmd_ged_plain_wrapper, ged_exec}, - {"clone", cmd_ged_edit_wrapper, ged_exec}, + {"check", cmd_ged_plain_wrapper, ged_exec_check}, + {"clone", cmd_ged_edit_wrapper, ged_exec_clone}, {"closedb", f_closedb, GED_FUNC_PTR_NULL}, {"cmd_win", cmd_cmd_win, GED_FUNC_PTR_NULL}, - {"coil", cmd_ged_plain_wrapper, ged_exec}, - {"color", cmd_ged_plain_wrapper, ged_exec}, - {"comb", cmd_ged_plain_wrapper, ged_exec}, - {"comb_color", cmd_ged_plain_wrapper, ged_exec}, - {"constraint", cmd_ged_plain_wrapper, ged_exec}, - {"copyeval", cmd_ged_plain_wrapper, ged_exec}, - {"copymat", cmd_ged_plain_wrapper, ged_exec}, - {"cp", cmd_ged_plain_wrapper, ged_exec}, + {"coil", cmd_ged_plain_wrapper, ged_exec_coil}, + {"color", cmd_ged_plain_wrapper, ged_exec_color}, + {"comb", cmd_ged_plain_wrapper, ged_exec_comb}, + {"comb_color", cmd_ged_plain_wrapper, ged_exec_comb_color}, + {"constraint", cmd_ged_plain_wrapper, ged_exec_constraint}, + {"copyeval", cmd_ged_plain_wrapper, ged_exec_copyeval}, + {"copymat", cmd_ged_plain_wrapper, ged_exec_copymat}, + {"cp", cmd_ged_plain_wrapper, ged_exec_cp}, {"cpi", f_copy_inv, GED_FUNC_PTR_NULL}, - {"d", cmd_ged_erase_wrapper, ged_exec}, + {"d", cmd_ged_erase_wrapper, ged_exec_d}, {"db", cmd_stub, GED_FUNC_PTR_NULL}, - {"db_glob", cmd_ged_plain_wrapper, ged_exec}, - {"dbconcat", cmd_ged_plain_wrapper, ged_exec}, - {"dbfind", cmd_ged_info_wrapper, ged_exec}, - {"dbip", cmd_ged_plain_wrapper, ged_exec}, - {"dbversion", cmd_ged_plain_wrapper, ged_exec}, - {"debug", cmd_ged_plain_wrapper, ged_exec}, - {"debugbu", cmd_ged_plain_wrapper, ged_exec}, - {"debugdir", cmd_ged_plain_wrapper, ged_exec}, - {"debuglib", cmd_ged_plain_wrapper, ged_exec}, - {"debugnmg", cmd_ged_plain_wrapper, ged_exec}, - {"decompose", cmd_ged_plain_wrapper, ged_exec}, - {"delay", cmd_ged_plain_wrapper, ged_exec}, - {"dir2ae", cmd_ged_plain_wrapper, ged_exec}, - {"dump", cmd_ged_plain_wrapper, ged_exec}, + {"db_glob", cmd_ged_plain_wrapper, ged_exec_db_glob}, + {"dbconcat", cmd_ged_plain_wrapper, ged_exec_dbconcat}, + {"dbfind", cmd_ged_info_wrapper, ged_exec_dbfind}, + {"dbip", cmd_ged_plain_wrapper, ged_exec_dbip}, // TODO - this needs to go away + {"dbversion", cmd_ged_plain_wrapper, ged_exec_dbversion}, + {"debug", cmd_ged_plain_wrapper, ged_exec_debug}, + {"debugbu", cmd_ged_plain_wrapper, ged_exec_debugbu}, + {"debugdir", cmd_ged_plain_wrapper, ged_exec_debugdir}, + {"debuglib", cmd_ged_plain_wrapper, ged_exec_debuglib}, + {"debugnmg", cmd_ged_plain_wrapper, ged_exec_debugnmg}, + {"decompose", cmd_ged_plain_wrapper, ged_exec_decompose}, + {"delay", cmd_ged_plain_wrapper, ged_exec_delay}, + {"dir2ae", cmd_ged_plain_wrapper, ged_exec_dir2ae}, + {"dump", cmd_ged_plain_wrapper, ged_exec_dump}, {"dm", f_dm, GED_FUNC_PTR_NULL}, {"draw", cmd_draw, GED_FUNC_PTR_NULL}, - {"dsp", cmd_ged_plain_wrapper, ged_exec}, - {"dup", cmd_ged_plain_wrapper, ged_exec}, + {"dsp", cmd_ged_plain_wrapper, ged_exec_dsp}, + {"dup", cmd_ged_plain_wrapper, ged_exec_dup}, {"E", cmd_E, GED_FUNC_PTR_NULL}, {"e", cmd_draw, GED_FUNC_PTR_NULL}, - {"eac", cmd_ged_view_wrapper, ged_exec}, - {"echo", cmd_ged_plain_wrapper, ged_exec}, + {"eac", cmd_ged_view_wrapper, ged_exec_eac}, + {"echo", cmd_ged_plain_wrapper, ged_exec_echo}, {"edcodes", f_edcodes, GED_FUNC_PTR_NULL}, - {"edit", cmd_ged_plain_wrapper, ged_exec}, - {"color", cmd_ged_plain_wrapper, ged_exec}, + {"edit", cmd_ged_plain_wrapper, ged_exec_edit}, + {"color", cmd_ged_plain_wrapper, ged_exec_color}, {"edcolor", f_edcolor, GED_FUNC_PTR_NULL}, - {"edcomb", cmd_ged_plain_wrapper, ged_exec}, + {"edcomb", cmd_ged_plain_wrapper, ged_exec_edcomb}, {"edgedir", f_edgedir, GED_FUNC_PTR_NULL}, {"edmater", f_edmater, GED_FUNC_PTR_NULL}, - {"env", cmd_ged_plain_wrapper, ged_exec}, - {"erase", cmd_ged_erase_wrapper, ged_exec}, + {"env", cmd_ged_plain_wrapper, ged_exec_env}, + {"erase", cmd_ged_erase_wrapper, ged_exec_erase}, {"ev", cmd_ev, GED_FUNC_PTR_NULL}, {"eqn", f_eqn, GED_FUNC_PTR_NULL}, {"exit", f_quit, GED_FUNC_PTR_NULL}, - {"expand", cmd_ged_plain_wrapper, ged_exec}, + {"expand", cmd_ged_plain_wrapper, ged_exec_expand}, {"extrude", f_extrude, GED_FUNC_PTR_NULL}, - {"eye_pt", cmd_ged_view_wrapper, ged_exec}, - {"exists", cmd_ged_plain_wrapper, ged_exec}, + {"eye_pt", cmd_ged_view_wrapper, ged_exec_eye_pt}, + {"exists", cmd_ged_plain_wrapper, ged_exec_exists}, {"facedef", f_facedef, GED_FUNC_PTR_NULL}, - {"facetize", cmd_ged_plain_wrapper, ged_exec}, - {"facetize_old", cmd_ged_plain_wrapper, ged_exec}, - {"form", cmd_ged_plain_wrapper, ged_exec}, - {"fracture", cmd_ged_plain_wrapper, ged_exec}, + {"facetize", cmd_ged_plain_wrapper, ged_exec_facetize}, + {"facetize_old", cmd_ged_plain_wrapper, ged_exec_facetize_old}, + {"form", cmd_ged_plain_wrapper, ged_exec_form}, + {"fracture", cmd_ged_plain_wrapper, ged_exec_fracture}, {"front", f_bv_front, GED_FUNC_PTR_NULL}, - {"g", cmd_ged_plain_wrapper, ged_exec}, - {"gdiff", cmd_ged_plain_wrapper, ged_exec}, - {"garbage_collect", cmd_ged_plain_wrapper, ged_exec}, - {"get", cmd_ged_plain_wrapper, ged_exec}, - {"get_type", cmd_ged_plain_wrapper, ged_exec}, - {"get_autoview", cmd_ged_plain_wrapper, ged_exec}, - {"get_comb", cmd_ged_plain_wrapper, ged_exec}, - {"get_dbip", cmd_ged_plain_wrapper, ged_exec}, + {"g", cmd_ged_plain_wrapper, ged_exec_g}, + {"gdiff", cmd_ged_plain_wrapper, ged_exec_gdiff}, + {"garbage_collect", cmd_ged_plain_wrapper, ged_exec_garbage_collect}, + {"get", cmd_ged_plain_wrapper, ged_exec_get}, + {"get_type", cmd_ged_plain_wrapper, ged_exec_get_type}, + {"get_autoview", cmd_ged_plain_wrapper, ged_exec_get_autoview}, + {"get_comb", cmd_ged_plain_wrapper, ged_exec_get_comb}, + {"get_dbip", cmd_ged_plain_wrapper, ged_exec_get_dbip}, // TODO - this needs to go away {"get_dm_list", f_get_dm_list, GED_FUNC_PTR_NULL}, {"get_more_default", cmd_get_more_default, GED_FUNC_PTR_NULL}, {"get_sed", f_get_sedit, GED_FUNC_PTR_NULL}, {"get_sed_menus", f_get_sedit_menus, GED_FUNC_PTR_NULL}, {"get_solid_keypoint", f_get_solid_keypoint, GED_FUNC_PTR_NULL}, - {"graph", cmd_ged_plain_wrapper, ged_exec}, - {"gqa", cmd_ged_gqa, ged_exec}, - {"grid2model_lu", cmd_ged_plain_wrapper, ged_exec}, - {"grid2view_lu", cmd_ged_plain_wrapper, ged_exec}, + {"graph", cmd_ged_plain_wrapper, ged_exec_graph}, + {"gqa", cmd_ged_gqa, ged_exec_gqa}, + {"grid2model_lu", cmd_ged_plain_wrapper, ged_exec_grid2model_lu}, + {"grid2view_lu", cmd_ged_plain_wrapper, ged_exec_grid2view_lu}, {"has_embedded_fb", cmd_has_embedded_fb, GED_FUNC_PTR_NULL}, - {"heal", cmd_ged_plain_wrapper, ged_exec}, - {"hide", cmd_ged_plain_wrapper, ged_exec}, + {"heal", cmd_ged_plain_wrapper, ged_exec_heal}, + {"hide", cmd_ged_plain_wrapper, ged_exec_hide}, {"hist", cmd_hist, GED_FUNC_PTR_NULL}, {"history", f_history, GED_FUNC_PTR_NULL}, - {"i", cmd_ged_plain_wrapper, ged_exec}, - {"idents", cmd_ged_plain_wrapper, ged_exec}, + {"i", cmd_ged_plain_wrapper, ged_exec_i}, + {"idents", cmd_ged_plain_wrapper, ged_exec_idents}, {"ill", f_ill, GED_FUNC_PTR_NULL}, - {"in", cmd_ged_in, ged_exec}, - {"inside", cmd_ged_inside, ged_exec}, - {"item", cmd_ged_plain_wrapper, ged_exec}, - {"joint", cmd_ged_plain_wrapper, ged_exec}, - {"joint2", cmd_ged_plain_wrapper, ged_exec}, + {"in", cmd_ged_in, ged_exec_in}, + {"inside", cmd_ged_inside, ged_exec_inside}, + {"item", cmd_ged_plain_wrapper, ged_exec_item}, + {"joint", cmd_ged_plain_wrapper, ged_exec_joint}, + {"joint2", cmd_ged_plain_wrapper, ged_exec_joint2}, {"journal", f_journal, GED_FUNC_PTR_NULL}, - {"keep", cmd_ged_plain_wrapper, ged_exec}, + {"keep", cmd_ged_plain_wrapper, ged_exec_keep}, {"keypoint", f_keypoint, GED_FUNC_PTR_NULL}, - {"kill", cmd_ged_erase_wrapper, ged_exec}, - {"killall", cmd_ged_erase_wrapper, ged_exec}, - {"killrefs", cmd_ged_erase_wrapper, ged_exec}, - {"killtree", cmd_ged_erase_wrapper, ged_exec}, + {"kill", cmd_ged_erase_wrapper, ged_exec_kill}, + {"killall", cmd_ged_erase_wrapper, ged_exec_killall}, + {"killrefs", cmd_ged_erase_wrapper, ged_exec_killrefs}, + {"killtree", cmd_ged_erase_wrapper, ged_exec_killtree}, {"knob", f_knob, GED_FUNC_PTR_NULL}, - {"l", cmd_ged_info_wrapper, ged_exec}, + {"l", cmd_ged_info_wrapper, ged_exec_l}, {"labelvert", f_labelvert, GED_FUNC_PTR_NULL}, {"labelface", f_labelface, GED_FUNC_PTR_NULL}, - {"lc", cmd_ged_plain_wrapper, ged_exec}, + {"lc", cmd_ged_plain_wrapper, ged_exec_lc}, {"left", f_bv_left, GED_FUNC_PTR_NULL}, - {"lint", cmd_ged_plain_wrapper, ged_exec}, - {"listeval", cmd_ged_plain_wrapper, ged_exec}, + {"lint", cmd_ged_plain_wrapper, ged_exec_lint}, + {"listeval", cmd_ged_plain_wrapper, ged_exec_listeval}, {"loadtk", cmd_tk, GED_FUNC_PTR_NULL}, - {"loadview", cmd_ged_view_wrapper, ged_exec}, - {"lod", cmd_ged_plain_wrapper, ged_exec}, - {"lookat", cmd_ged_view_wrapper, ged_exec}, - {"ls", cmd_ged_plain_wrapper, ged_exec}, - {"lt", cmd_ged_plain_wrapper, ged_exec}, + {"loadview", cmd_ged_view_wrapper, ged_exec_loadview}, + {"lod", cmd_ged_plain_wrapper, ged_exec_lod}, + {"lookat", cmd_ged_view_wrapper, ged_exec_lookat}, + {"ls", cmd_ged_plain_wrapper, ged_exec_ls}, + {"lt", cmd_ged_plain_wrapper, ged_exec_lt}, {"M", f_mouse, GED_FUNC_PTR_NULL}, - {"m2v_point", cmd_ged_plain_wrapper, ged_exec}, + {"m2v_point", cmd_ged_plain_wrapper, ged_exec_m2v_point}, {"make", f_make, GED_FUNC_PTR_NULL}, - {"make_name", cmd_ged_plain_wrapper, ged_exec}, - {"make_pnts", cmd_ged_more_wrapper, ged_exec}, - {"match", cmd_ged_plain_wrapper, ged_exec}, - {"mater", cmd_ged_plain_wrapper, ged_exec}, - {"material", cmd_ged_plain_wrapper, ged_exec}, + {"make_name", cmd_ged_plain_wrapper, ged_exec_make_name}, + {"make_pnts", cmd_ged_more_wrapper, ged_exec_make_pnts}, + {"match", cmd_ged_plain_wrapper, ged_exec_match}, + {"mater", cmd_ged_plain_wrapper, ged_exec_mater}, + {"material", cmd_ged_plain_wrapper, ged_exec_material}, {"matpick", f_matpick, GED_FUNC_PTR_NULL}, - {"mat_ae", cmd_ged_plain_wrapper, ged_exec}, - {"mat_mul", cmd_ged_plain_wrapper, ged_exec}, - {"mat4x3pnt", cmd_ged_plain_wrapper, ged_exec}, - {"mat_scale_about_pnt", cmd_ged_plain_wrapper, ged_exec}, + {"mat_ae", cmd_ged_plain_wrapper, ged_exec_mat_ae}, + {"mat_mul", cmd_ged_plain_wrapper, ged_exec_mat_mul}, + {"mat4x3pnt", cmd_ged_plain_wrapper, ged_exec_mat4x3pnt}, + {"mat_scale_about_pnt", cmd_ged_plain_wrapper, ged_exec_mat_scale_about_pnt}, {"mged_update", f_update, GED_FUNC_PTR_NULL}, {"mged_wait", f_wait, GED_FUNC_PTR_NULL}, {"mirface", f_mirface, GED_FUNC_PTR_NULL}, - {"mirror", cmd_ged_plain_wrapper, ged_exec}, + {"mirror", cmd_ged_plain_wrapper, ged_exec_mirror}, {"mmenu_get", cmd_mmenu_get, GED_FUNC_PTR_NULL}, {"mmenu_set", cmd_nop, GED_FUNC_PTR_NULL}, - {"model2grid_lu", cmd_ged_plain_wrapper, ged_exec}, - {"model2view", cmd_ged_plain_wrapper, ged_exec}, - {"model2view_lu", cmd_ged_plain_wrapper, ged_exec}, + {"model2grid_lu", cmd_ged_plain_wrapper, ged_exec_model2grid_lu}, + {"model2view", cmd_ged_plain_wrapper, ged_exec_model2view}, + {"model2view_lu", cmd_ged_plain_wrapper, ged_exec_model2view_lu}, {"mrot", cmd_mrot, GED_FUNC_PTR_NULL}, - {"mv", cmd_ged_plain_wrapper, ged_exec}, - {"mvall", cmd_ged_plain_wrapper, ged_exec}, + {"mv", cmd_ged_plain_wrapper, ged_exec_mv}, + {"mvall", cmd_ged_plain_wrapper, ged_exec_mvall}, {"nirt", f_nirt, GED_FUNC_PTR_NULL}, {"nmg_collapse", cmd_nmg_collapse, GED_FUNC_PTR_NULL}, - {"nmg_fix_normals", cmd_ged_plain_wrapper, ged_exec}, - {"nmg_simplify", cmd_ged_plain_wrapper, ged_exec}, - {"nmg", cmd_ged_plain_wrapper, ged_exec}, - {"npush", cmd_ged_plain_wrapper, ged_exec}, + {"nmg_fix_normals", cmd_ged_plain_wrapper, ged_exec_nmg_fix_normals}, + {"nmg_simplify", cmd_ged_plain_wrapper, ged_exec_nmg_simplify}, + {"nmg", cmd_ged_plain_wrapper, ged_exec_nmg}, + {"npush", cmd_ged_plain_wrapper, ged_exec_npush}, {"o_rotate", f_be_o_rotate, GED_FUNC_PTR_NULL}, {"o_scale", f_be_o_scale, GED_FUNC_PTR_NULL}, {"oed", cmd_oed, GED_FUNC_PTR_NULL}, @@ -260,7 +260,7 @@ static struct cmdtab mged_cmdtab[] = { {"oed_reset", f_oedit_reset, GED_FUNC_PTR_NULL}, {"oill", f_be_o_illuminate, GED_FUNC_PTR_NULL}, {"opendb", f_opendb, GED_FUNC_PTR_NULL}, - {"orientation", cmd_ged_view_wrapper, ged_exec}, + {"orientation", cmd_ged_view_wrapper, ged_exec_orientation}, {"orot", f_rot_obj, GED_FUNC_PTR_NULL}, {"oscale", f_sc_obj, GED_FUNC_PTR_NULL}, {"output_hook", cmd_output_hook, GED_FUNC_PTR_NULL}, @@ -272,48 +272,48 @@ static struct cmdtab mged_cmdtab[] = { {"oyscale", f_be_o_yscale, GED_FUNC_PTR_NULL}, {"ozscale", f_be_o_zscale, GED_FUNC_PTR_NULL}, {"p", f_param, GED_FUNC_PTR_NULL}, - {"pathlist", cmd_ged_plain_wrapper, ged_exec}, - {"paths", cmd_ged_plain_wrapper, ged_exec}, + {"pathlist", cmd_ged_plain_wrapper, ged_exec_pathlist}, + {"paths", cmd_ged_plain_wrapper, ged_exec_paths}, {"permute", f_permute, GED_FUNC_PTR_NULL}, - {"plot", cmd_ged_plain_wrapper, ged_exec}, - {"png", cmd_ged_plain_wrapper, ged_exec}, - {"pnts", cmd_ged_plain_wrapper, ged_exec}, - {"prcolor", cmd_ged_plain_wrapper, ged_exec}, - {"prefix", cmd_ged_plain_wrapper, ged_exec}, + {"plot", cmd_ged_plain_wrapper, ged_exec_plot}, + {"png", cmd_ged_plain_wrapper, ged_exec_png}, + {"pnts", cmd_ged_plain_wrapper, ged_exec_pnts}, + {"prcolor", cmd_ged_plain_wrapper, ged_exec_prcolor}, + {"prefix", cmd_ged_plain_wrapper, ged_exec_prefix}, {"press", f_press, GED_FUNC_PTR_NULL}, - {"preview", cmd_ged_dm_wrapper, ged_exec}, - {"process", cmd_ged_plain_wrapper, ged_exec}, + {"preview", cmd_ged_dm_wrapper, ged_exec_preview}, + {"process", cmd_ged_plain_wrapper, ged_exec_process}, {"postscript", f_postscript, GED_FUNC_PTR_NULL}, {"ps", cmd_ps, GED_FUNC_PTR_NULL}, - {"pull", cmd_ged_plain_wrapper, ged_exec}, - {"push", cmd_ged_plain_wrapper, ged_exec}, - {"put", cmd_ged_plain_wrapper, ged_exec}, - {"put_comb", cmd_ged_plain_wrapper, ged_exec}, + {"pull", cmd_ged_plain_wrapper, ged_exec_pull}, + {"push", cmd_ged_plain_wrapper, ged_exec_push}, + {"put", cmd_ged_plain_wrapper, ged_exec_put}, + {"put_comb", cmd_ged_plain_wrapper, ged_exec_put_comb}, {"put_sed", f_put_sedit, GED_FUNC_PTR_NULL}, - {"putmat", cmd_ged_plain_wrapper, ged_exec}, + {"putmat", cmd_ged_plain_wrapper, ged_exec_putmat}, {"q", f_quit, GED_FUNC_PTR_NULL}, {"qorot", f_qorot, GED_FUNC_PTR_NULL}, - {"qray", cmd_ged_plain_wrapper, ged_exec}, + {"qray", cmd_ged_plain_wrapper, ged_exec_qray}, {"query_ray", f_nirt, GED_FUNC_PTR_NULL}, {"quit", f_quit, GED_FUNC_PTR_NULL}, - {"qvrot", cmd_ged_view_wrapper, ged_exec}, - {"r", cmd_ged_plain_wrapper, ged_exec}, + {"qvrot", cmd_ged_view_wrapper, ged_exec_qvrot}, + {"r", cmd_ged_plain_wrapper, ged_exec_r}, {"rate", f_bv_rate_toggle, GED_FUNC_PTR_NULL}, - {"rcodes", cmd_ged_plain_wrapper, ged_exec}, + {"rcodes", cmd_ged_plain_wrapper, ged_exec_rcodes}, {"rear", f_bv_rear, GED_FUNC_PTR_NULL}, {"red", f_red, GED_FUNC_PTR_NULL}, {"refresh", f_refresh, GED_FUNC_PTR_NULL}, {"regdebug", f_regdebug, GED_FUNC_PTR_NULL}, - {"regdef", cmd_ged_plain_wrapper, ged_exec}, - {"regions", cmd_ged_plain_wrapper, ged_exec}, + {"regdef", cmd_ged_plain_wrapper, ged_exec_regdef}, + {"regions", cmd_ged_plain_wrapper, ged_exec_regions}, {"reject", f_be_reject, GED_FUNC_PTR_NULL}, {"release", f_release, GED_FUNC_PTR_NULL}, {"reset", f_bv_reset, GED_FUNC_PTR_NULL}, {"restore", f_bv_vrestore, GED_FUNC_PTR_NULL}, {"rfarb", f_rfarb, GED_FUNC_PTR_NULL}, {"right", f_bv_right, GED_FUNC_PTR_NULL}, - {"rm", cmd_ged_plain_wrapper, ged_exec}, - {"rmater", cmd_ged_plain_wrapper, ged_exec}, + {"rm", cmd_ged_plain_wrapper, ged_exec_rm}, + {"rmater", cmd_ged_plain_wrapper, ged_exec_rmater}, {"rmats", f_rmats, GED_FUNC_PTR_NULL}, {"rot", cmd_rot, GED_FUNC_PTR_NULL}, {"rotobj", f_rot_obj, GED_FUNC_PTR_NULL}, @@ -321,85 +321,85 @@ static struct cmdtab mged_cmdtab[] = { {"rset", f_rset, GED_FUNC_PTR_NULL}, {"rt", cmd_rt, GED_FUNC_PTR_NULL}, {"rt_gettrees", cmd_rt_gettrees, GED_FUNC_PTR_NULL}, - {"rtabort", cmd_ged_plain_wrapper, ged_exec}, + {"rtabort", cmd_ged_plain_wrapper, ged_exec_rtabort}, {"rtarea", cmd_rt, GED_FUNC_PTR_NULL}, {"rtcheck", cmd_rt, GED_FUNC_PTR_NULL}, {"rtedge", cmd_rt, GED_FUNC_PTR_NULL}, {"rtweight", cmd_rt, GED_FUNC_PTR_NULL}, {"save", f_bv_vsave, GED_FUNC_PTR_NULL}, - {"savekey", cmd_ged_plain_wrapper, ged_exec}, - {"saveview", cmd_ged_plain_wrapper, ged_exec}, + {"savekey", cmd_ged_plain_wrapper, ged_exec_savekey}, + {"saveview", cmd_ged_plain_wrapper, ged_exec_saveview}, {"sca", cmd_sca, GED_FUNC_PTR_NULL}, - {"screengrab", cmd_ged_dm_wrapper, ged_exec}, + {"screengrab", cmd_ged_dm_wrapper, ged_exec_screengrab}, {"search", cmd_search, GED_FUNC_PTR_NULL}, {"sed", f_sed, GED_FUNC_PTR_NULL}, {"sed_apply", f_sedit_apply, GED_FUNC_PTR_NULL}, {"sed_reset", f_sedit_reset, GED_FUNC_PTR_NULL}, {"sedit", f_be_s_edit, GED_FUNC_PTR_NULL}, - {"select", cmd_ged_plain_wrapper, ged_exec}, + {"select", cmd_ged_plain_wrapper, ged_exec_select}, {"set_more_default", cmd_set_more_default, GED_FUNC_PTR_NULL}, {"setview", cmd_setview, GED_FUNC_PTR_NULL}, {"shaded_mode", cmd_shaded_mode, GED_FUNC_PTR_NULL}, - {"shader", cmd_ged_plain_wrapper, ged_exec}, + {"shader", cmd_ged_plain_wrapper, ged_exec_shader}, {"share", f_share, GED_FUNC_PTR_NULL}, - {"shells", cmd_ged_plain_wrapper, ged_exec}, - {"showmats", cmd_ged_plain_wrapper, ged_exec}, + {"shells", cmd_ged_plain_wrapper, ged_exec_shells}, + {"showmats", cmd_ged_plain_wrapper, ged_exec_showmats}, {"sill", f_be_s_illuminate, GED_FUNC_PTR_NULL}, {"size", cmd_size, GED_FUNC_PTR_NULL}, - {"simulate", cmd_ged_simulate_wrapper, ged_exec}, - {"solid_report", cmd_ged_plain_wrapper, ged_exec}, - {"solids", cmd_ged_plain_wrapper, ged_exec}, - {"solids_on_ray", cmd_ged_plain_wrapper, ged_exec}, + {"simulate", cmd_ged_simulate_wrapper, ged_exec_simulate}, + {"solid_report", cmd_ged_plain_wrapper, ged_exec_solid_report}, + {"solids", cmd_ged_plain_wrapper, ged_exec_solids}, + {"solids_on_ray", cmd_ged_plain_wrapper, ged_exec_solids_on_ray}, {"srot", f_be_s_rotate, GED_FUNC_PTR_NULL}, {"sscale", f_be_s_scale, GED_FUNC_PTR_NULL}, - {"stat", cmd_ged_plain_wrapper, ged_exec}, + {"stat", cmd_ged_plain_wrapper, ged_exec_stat}, {"status", f_status, GED_FUNC_PTR_NULL}, {"stuff_str", cmd_stuff_str, GED_FUNC_PTR_NULL}, - {"summary", cmd_ged_plain_wrapper, ged_exec}, + {"summary", cmd_ged_plain_wrapper, ged_exec_summary}, {"sv", f_slewview, GED_FUNC_PTR_NULL}, {"svb", f_svbase, GED_FUNC_PTR_NULL}, {"sxy", f_be_s_trans, GED_FUNC_PTR_NULL}, - {"sync", cmd_ged_plain_wrapper, ged_exec}, - {"t", cmd_ged_plain_wrapper, ged_exec}, + {"sync", cmd_ged_plain_wrapper, ged_exec_sync}, + {"t", cmd_ged_plain_wrapper, ged_exec_t}, {"ted", f_tedit, GED_FUNC_PTR_NULL}, {"tie", f_tie, GED_FUNC_PTR_NULL}, - {"tire", cmd_ged_plain_wrapper, ged_exec}, - {"title", cmd_ged_plain_wrapper, ged_exec}, + {"tire", cmd_ged_plain_wrapper, ged_exec_tire}, + {"title", cmd_ged_plain_wrapper, ged_exec_title}, {"tol", cmd_tol, GED_FUNC_PTR_NULL}, {"top", f_bv_top, GED_FUNC_PTR_NULL}, - {"tops", cmd_ged_plain_wrapper, ged_exec}, + {"tops", cmd_ged_plain_wrapper, ged_exec_tops}, {"tra", cmd_tra, GED_FUNC_PTR_NULL}, {"track", f_amtrack, GED_FUNC_PTR_NULL}, {"tracker", f_tracker, GED_FUNC_PTR_NULL}, {"translate", f_tr_obj, GED_FUNC_PTR_NULL}, - {"tree", cmd_ged_plain_wrapper, ged_exec}, - {"unhide", cmd_ged_plain_wrapper, ged_exec}, + {"tree", cmd_ged_plain_wrapper, ged_exec_tree}, + {"unhide", cmd_ged_plain_wrapper, ged_exec_unhide}, {"units", cmd_units, GED_FUNC_PTR_NULL}, - {"v2m_point", cmd_ged_plain_wrapper, ged_exec}, + {"v2m_point", cmd_ged_plain_wrapper, ged_exec_v2m_point}, {"vars", f_set, GED_FUNC_PTR_NULL}, - {"vdraw", cmd_ged_plain_wrapper, ged_exec}, - {"view", cmd_ged_view_wrapper, ged_exec}, + {"vdraw", cmd_ged_plain_wrapper, ged_exec_vdraw}, + {"view", cmd_ged_view_wrapper, ged_exec_view}, {"view_ring", f_view_ring, GED_FUNC_PTR_NULL}, - {"view2grid_lu", cmd_ged_plain_wrapper, ged_exec}, - {"view2model", cmd_ged_plain_wrapper, ged_exec}, - {"view2model_lu", cmd_ged_plain_wrapper, ged_exec}, - {"view2model_vec", cmd_ged_plain_wrapper, ged_exec}, - {"viewdir", cmd_ged_plain_wrapper, ged_exec}, + {"view2grid_lu", cmd_ged_plain_wrapper, ged_exec_view2grid_lu}, + {"view2model", cmd_ged_plain_wrapper, ged_exec_view2model}, + {"view2model_lu", cmd_ged_plain_wrapper, ged_exec_view2model_lu}, + {"view2model_vec", cmd_ged_plain_wrapper, ged_exec_view2model_vec}, + {"viewdir", cmd_ged_plain_wrapper, ged_exec_viewdir}, {"viewsize", cmd_size, GED_FUNC_PTR_NULL}, /* alias "size" for saveview scripts */ {"vnirt", f_vnirt, GED_FUNC_PTR_NULL}, - {"voxelize", cmd_ged_plain_wrapper, ged_exec}, + {"voxelize", cmd_ged_plain_wrapper, ged_exec_voxelize}, {"vquery_ray", f_vnirt, GED_FUNC_PTR_NULL}, {"vrot", cmd_vrot, GED_FUNC_PTR_NULL}, - {"wcodes", cmd_ged_plain_wrapper, ged_exec}, - {"whatid", cmd_ged_plain_wrapper, ged_exec}, - {"which_shader", cmd_ged_plain_wrapper, ged_exec}, - {"whichair", cmd_ged_plain_wrapper, ged_exec}, - {"whichid", cmd_ged_plain_wrapper, ged_exec}, - {"who", cmd_ged_plain_wrapper, ged_exec}, + {"wcodes", cmd_ged_plain_wrapper, ged_exec_wcodes}, + {"whatid", cmd_ged_plain_wrapper, ged_exec_whatid}, + {"which_shader", cmd_ged_plain_wrapper, ged_exec_which_shader}, + {"whichair", cmd_ged_plain_wrapper, ged_exec_whichair}, + {"whichid", cmd_ged_plain_wrapper, ged_exec_whichid}, + {"who", cmd_ged_plain_wrapper, ged_exec_who}, {"winset", f_winset, GED_FUNC_PTR_NULL}, - {"wmater", cmd_ged_plain_wrapper, ged_exec}, - {"x", cmd_ged_plain_wrapper, ged_exec}, - {"xpush", cmd_ged_plain_wrapper, ged_exec}, + {"wmater", cmd_ged_plain_wrapper, ged_exec_wmater}, + {"x", cmd_ged_plain_wrapper, ged_exec_x}, + {"xpush", cmd_ged_plain_wrapper, ged_exec_xpush}, {"Z", cmd_zap, GED_FUNC_PTR_NULL}, {"zoom", cmd_zoom, GED_FUNC_PTR_NULL}, {"zoomin", f_bv_zoomin, GED_FUNC_PTR_NULL}, diff --git a/src/mged/wdb_obj.c b/src/mged/wdb_obj.c index 8b76d2d693b..2217261add4 100644 --- a/src/mged/wdb_obj.c +++ b/src/mged/wdb_obj.c @@ -1834,79 +1834,77 @@ wdb_version_tcl(void *clientData, static struct bu_cmdtab wdb_newcmds[] = { - {"adjust", (int (*)(void *, int, const char **))ged_exec}, - {"arced", (int (*)(void *, int, const char **))ged_exec}, - {"attr", (int (*)(void *, int, const char **))ged_exec}, - {"bo", (int (*)(void *, int, const char **))ged_exec}, - {"bot_face_sort", (int (*)(void *, int, const char **))ged_exec}, - {"bot_smooth", (int (*)(void *, int, const char **))ged_exec}, - {"bot_smooth", (int (*)(void *, int, const char **))ged_exec}, - {"c", (int (*)(void *, int, const char **))ged_exec}, - {"cat", (int (*)(void *, int, const char **))ged_exec}, - {"cc", (int (*)(void *, int, const char **))ged_exec}, - {"color", (int (*)(void *, int, const char **))ged_exec}, - {"comb", (int (*)(void *, int, const char **))ged_exec}, - {"comb_color", (int (*)(void *, int, const char **))ged_exec}, - {"concat", (int (*)(void *, int, const char **))ged_exec}, - {"copyeval", (int (*)(void *, int, const char **))ged_exec}, - {"cp", (int (*)(void *, int, const char **))ged_exec}, - {"dbip", (int (*)(void *, int, const char **))ged_exec}, - {"dump", (int (*)(void *, int, const char **))ged_exec}, - {"dup", (int (*)(void *, int, const char **))ged_exec}, - {"edcomb", (int (*)(void *, int, const char **))ged_exec}, - {"edit", (int (*)(void *, int, const char **))ged_exec}, - {"edmater", (int (*)(void *, int, const char **))ged_exec}, - {"expand", (int (*)(void *, int, const char **))ged_exec}, - {"facetize", (int (*)(void *, int, const char **))ged_exec}, - {"form", (int (*)(void *, int, const char **))ged_exec}, - {"g", (int (*)(void *, int, const char **))ged_exec}, - {"get", (int (*)(void *, int, const char **))ged_exec}, - {"get_type", (int (*)(void *, int, const char **))ged_exec}, - {"hide", (int (*)(void *, int, const char **))ged_exec}, - {"i", (int (*)(void *, int, const char **))ged_exec}, - {"item", (int (*)(void *, int, const char **))ged_exec}, - {"keep", (int (*)(void *, int, const char **))ged_exec}, - {"kill", (int (*)(void *, int, const char **))ged_exec}, - {"killall", (int (*)(void *, int, const char **))ged_exec}, - {"killtree", (int (*)(void *, int, const char **))ged_exec}, - {"l", (int (*)(void *, int, const char **))ged_exec}, - {"listeval", (int (*)(void *, int, const char **))ged_exec}, - {"log", (int (*)(void *, int, const char **))ged_exec}, - {"ls", (int (*)(void *, int, const char **))ged_exec}, - {"lt", (int (*)(void *, int, const char **))ged_exec}, - {"make", (int (*)(void *, int, const char **))ged_exec}, - {"make_name", (int (*)(void *, int, const char **))ged_exec}, - {"match", (int (*)(void *, int, const char **))ged_exec}, - {"mater", (int (*)(void *, int, const char **))ged_exec}, - {"mirror", (int (*)(void *, int, const char **))ged_exec}, - {"mv", (int (*)(void *, int, const char **))ged_exec}, - {"mvall", (int (*)(void *, int, const char **))ged_exec}, - {"nirt", (int (*)(void *, int, const char **))ged_exec}, - {"nirt", (int (*)(void *, int, const char **))ged_exec}, - {"ocenter", (int (*)(void *, int, const char **))ged_exec}, - {"orotate", (int (*)(void *, int, const char **))ged_exec}, - {"oscale", (int (*)(void *, int, const char **))ged_exec}, - {"otranslate", (int (*)(void *, int, const char **))ged_exec}, - {"pathlist", (int (*)(void *, int, const char **))ged_exec}, - {"paths", (int (*)(void *, int, const char **))ged_exec}, - {"prcolor", (int (*)(void *, int, const char **))ged_exec}, - {"push", (int (*)(void *, int, const char **))ged_exec}, - {"put", (int (*)(void *, int, const char **))ged_exec}, - {"r", (int (*)(void *, int, const char **))ged_exec}, - {"rm", (int (*)(void *, int, const char **))ged_exec}, - {"rmater", (int (*)(void *, int, const char **))ged_exec}, - {"shader", (int (*)(void *, int, const char **))ged_exec}, - {"shells", (int (*)(void *, int, const char **))ged_exec}, - {"showmats", (int (*)(void *, int, const char **))ged_exec}, - {"summary", (int (*)(void *, int, const char **))ged_exec}, - {"title", (int (*)(void *, int, const char **))ged_exec}, - {"tops", (int (*)(void *, int, const char **))ged_exec}, - {"unhide", (int (*)(void *, int, const char **))ged_exec}, - {"whatid", (int (*)(void *, int, const char **))ged_exec}, - {"whichair", (int (*)(void *, int, const char **))ged_exec}, - {"whichid", (int (*)(void *, int, const char **))ged_exec}, - {"wmater", (int (*)(void *, int, const char **))ged_exec}, - {"xpush", (int (*)(void *, int, const char **))ged_exec}, + {"adjust", (int (*)(void *, int, const char **))ged_exec_adjust}, + {"arced", (int (*)(void *, int, const char **))ged_exec_arced}, + {"attr", (int (*)(void *, int, const char **))ged_exec_attr}, + {"bo", (int (*)(void *, int, const char **))ged_exec_bo}, + {"bot_face_sort", (int (*)(void *, int, const char **))ged_exec_bot_face_sort}, + {"bot_smooth", (int (*)(void *, int, const char **))ged_exec_bot_smooth}, + {"c", (int (*)(void *, int, const char **))ged_exec_c}, + {"cat", (int (*)(void *, int, const char **))ged_exec_cat}, + {"cc", (int (*)(void *, int, const char **))ged_exec_cc}, + {"color", (int (*)(void *, int, const char **))ged_exec_color}, + {"comb", (int (*)(void *, int, const char **))ged_exec_comb}, + {"comb_color", (int (*)(void *, int, const char **))ged_exec_comb_color}, + {"concat", (int (*)(void *, int, const char **))ged_exec_concat}, + {"copyeval", (int (*)(void *, int, const char **))ged_exec_copyeval}, + {"cp", (int (*)(void *, int, const char **))ged_exec_cp}, + {"dbip", (int (*)(void *, int, const char **))ged_exec_dbip}, // TODO - this needs to go away + {"dump", (int (*)(void *, int, const char **))ged_exec_dump}, + {"dup", (int (*)(void *, int, const char **))ged_exec_dup}, + {"edcomb", (int (*)(void *, int, const char **))ged_exec_edcomb}, + {"edit", (int (*)(void *, int, const char **))ged_exec_edit}, + {"edmater", (int (*)(void *, int, const char **))ged_exec_edmater}, + {"expand", (int (*)(void *, int, const char **))ged_exec_expand}, + {"facetize", (int (*)(void *, int, const char **))ged_exec_facetize}, + {"form", (int (*)(void *, int, const char **))ged_exec_form}, + {"g", (int (*)(void *, int, const char **))ged_exec_g}, + {"get", (int (*)(void *, int, const char **))ged_exec_get}, + {"get_type", (int (*)(void *, int, const char **))ged_exec_get_type}, + {"hide", (int (*)(void *, int, const char **))ged_exec_hide}, + {"i", (int (*)(void *, int, const char **))ged_exec_i}, + {"item", (int (*)(void *, int, const char **))ged_exec_item}, + {"keep", (int (*)(void *, int, const char **))ged_exec_keep}, + {"kill", (int (*)(void *, int, const char **))ged_exec_kill}, + {"killall", (int (*)(void *, int, const char **))ged_exec_killall}, + {"killtree", (int (*)(void *, int, const char **))ged_exec_killtree}, + {"l", (int (*)(void *, int, const char **))ged_exec_l}, + {"listeval", (int (*)(void *, int, const char **))ged_exec_listeval}, + {"log", (int (*)(void *, int, const char **))ged_exec_log}, + {"ls", (int (*)(void *, int, const char **))ged_exec_ls}, + {"lt", (int (*)(void *, int, const char **))ged_exec_lt}, + {"make", (int (*)(void *, int, const char **))ged_exec_make}, + {"make_name", (int (*)(void *, int, const char **))ged_exec_make_name}, + {"match", (int (*)(void *, int, const char **))ged_exec_match}, + {"mater", (int (*)(void *, int, const char **))ged_exec_mater}, + {"mirror", (int (*)(void *, int, const char **))ged_exec_mirror}, + {"mv", (int (*)(void *, int, const char **))ged_exec_mv}, + {"mvall", (int (*)(void *, int, const char **))ged_exec_mvall}, + {"nirt", (int (*)(void *, int, const char **))ged_exec_nirt}, + {"ocenter", (int (*)(void *, int, const char **))ged_exec_ocenter}, + {"orotate", (int (*)(void *, int, const char **))ged_exec_orotate}, + {"oscale", (int (*)(void *, int, const char **))ged_exec_oscale}, + {"otranslate", (int (*)(void *, int, const char **))ged_exec_otranslate}, + {"pathlist", (int (*)(void *, int, const char **))ged_exec_pathlist}, + {"paths", (int (*)(void *, int, const char **))ged_exec_paths}, + {"prcolor", (int (*)(void *, int, const char **))ged_exec_prcolor}, + {"push", (int (*)(void *, int, const char **))ged_exec_push}, + {"put", (int (*)(void *, int, const char **))ged_exec_put}, + {"r", (int (*)(void *, int, const char **))ged_exec_r}, + {"rm", (int (*)(void *, int, const char **))ged_exec_rm}, + {"rmater", (int (*)(void *, int, const char **))ged_exec_rmater}, + {"shader", (int (*)(void *, int, const char **))ged_exec_shader}, + {"shells", (int (*)(void *, int, const char **))ged_exec_shells}, + {"showmats", (int (*)(void *, int, const char **))ged_exec_showmats}, + {"summary", (int (*)(void *, int, const char **))ged_exec_summary}, + {"title", (int (*)(void *, int, const char **))ged_exec_title}, + {"tops", (int (*)(void *, int, const char **))ged_exec_tops}, + {"unhide", (int (*)(void *, int, const char **))ged_exec_unhide}, + {"whatid", (int (*)(void *, int, const char **))ged_exec_whatid}, + {"whichair", (int (*)(void *, int, const char **))ged_exec_whichair}, + {"whichid", (int (*)(void *, int, const char **))ged_exec_whichid}, + {"wmater", (int (*)(void *, int, const char **))ged_exec_wmater}, + {"xpush", (int (*)(void *, int, const char **))ged_exec_xpush}, {(const char *)NULL, BU_CMD_NULL} }; diff --git a/src/proc-db/gtimes.c b/src/proc-db/gtimes.c index f8c34f1492b..a87dc2b9cc8 100644 --- a/src/proc-db/gtimes.c +++ b/src/proc-db/gtimes.c @@ -98,11 +98,11 @@ main(int ac, char *av[]) timer = bu_gettime(); { struct ged ged; - int tops_ac = 1; - const char *tops_av[2] = {"tops", NULL}; struct rt_wdb *wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK); GED_INIT(&ged, wdbp); - (void)ged_exec(&ged, tops_ac, (const char **)tops_av); + + const char *tops_av[1] = {"tops"}; + (void)ged_exec_tops(&ged, 1, (const char **)tops_av); } seconds[4] += (bu_gettime() - timer) / 1000000.0; if (iterations < SKIP || (i % SKIP == 0)) diff --git a/src/qged/QgEdMainWindow.cpp b/src/qged/QgEdMainWindow.cpp index 375a68596a6..7fb614208b5 100644 --- a/src/qged/QgEdMainWindow.cpp +++ b/src/qged/QgEdMainWindow.cpp @@ -360,13 +360,13 @@ QgEdMainWindow::do_dm_init() av[1] = "bg"; av[2] = "110/110/110"; av[3] = "0/0/50"; - ged_exec(gedp, 4, (const char **)av); + ged_exec_dm(gedp, 4, (const char **)av); av[0] = "view"; av[1] = "lod"; av[2] = "mesh"; av[3] = "1"; - ged_exec(gedp, 4, (const char **)av); + ged_exec_view(gedp, 4, (const char **)av); emit ap->view_update(QG_VIEW_REFRESH); /////////////////////////////////////////////////////////////////////////// diff --git a/src/qged/plugins/polygon/QPolyMod.cpp b/src/qged/plugins/polygon/QPolyMod.cpp index 5e2f343c340..e1474a06216 100644 --- a/src/qged/plugins/polygon/QPolyMod.cpp +++ b/src/qged/plugins/polygon/QPolyMod.cpp @@ -776,11 +776,10 @@ QPolyMod::sketch_name_update() // Passed the tests - remove old object. int ac = 2; - const char *av[3]; + const char *av[2] = {"kill", NULL}; av[0] = "kill"; av[1] = dp->d_namep; - av[2] = NULL; - ged_exec(gedp, ac, av); + ged_exec_kill(gedp, ac, av); } ip->u_data = (void *)db_scene_obj_to_sketch(gedp->dbip, sk_name, p); diff --git a/src/qged/plugins/view/select/CADViewSelector.cpp b/src/qged/plugins/view/select/CADViewSelector.cpp index fc9815312f7..123c3a2f10b 100644 --- a/src/qged/plugins/view/select/CADViewSelector.cpp +++ b/src/qged/plugins/view/select/CADViewSelector.cpp @@ -280,7 +280,7 @@ CADViewSelector::erase_objs() av[i+1] = bu_vls_cstr(&s->s_name); scnt++; } - ged_exec(gedp, scnt, av); + ged_exec_erase(gedp, scnt, av); bu_free(av, "av"); } @@ -304,7 +304,7 @@ CADViewSelector::do_draw_selections() i++; } - ged_exec(gedp, (int)(ss->selected.size()+1), av); + ged_exec_draw(gedp, (int)(ss->selected.size()+1), av); for (size_t j = 0; j < ss->selected.size()+1; j++) { bu_free((void *)av[j], "path"); } @@ -333,7 +333,7 @@ CADViewSelector::do_erase_selections() i++; } - ged_exec(gedp, (int)(ss->selected.size()+1), av); + ged_exec_erase(gedp, (int)(ss->selected.size()+1), av); for (size_t j = 0; j < ss->selected.size()+1; j++) { bu_free((void *)av[j], "path"); } diff --git a/src/shapes/coil.c b/src/shapes/coil.c index c03e94cb5e6..9cebb0aa36b 100644 --- a/src/shapes/coil.c +++ b/src/shapes/coil.c @@ -64,7 +64,7 @@ main(int ac, char *av[]) /* do it. */ mk_id(db_fp, "coil"); GED_INIT(&ged, db_fp); - flag = ged_exec(&ged, ac, (const char**)av); + flag = ged_exec_coil(&ged, ac, (const char**)av); /* Close database */ db_close(db_fp->dbip); if (flag & BRLCAD_ERROR) diff --git a/src/shapes/human.c b/src/shapes/human.c index 5f276c9a2d6..c80fe194bcf 100644 --- a/src/shapes/human.c +++ b/src/shapes/human.c @@ -54,7 +54,7 @@ int main(int ac, char *av[]) GED_INIT(&ged, db_fp); bu_log("Building\n"); - ret = ged_exec(&ged, ac, (const char **)av); + ret = ged_exec_human(&ged, ac, (const char **)av); bu_log("Finished Building\n"); db_close(db_fp->dbip); diff --git a/src/shapes/tire.c b/src/shapes/tire.c index 723802b3628..a6ea1ad33ef 100644 --- a/src/shapes/tire.c +++ b/src/shapes/tire.c @@ -59,7 +59,7 @@ int main(int ac, char *av[]) GED_INIT(&ged, db_fp); /* create the tire */ - ret = ged_exec(&ged, ac, (const char **)av); + ret = ged_exec_tire(&ged, ac, (const char **)av); /* Close database */ db_close(db_fp->dbip);