Revision: 76332
http://sourceforge.net/p/brlcad/code/76332
Author: starseeker
Date: 2020-07-14 19:16:50 +0000 (Tue, 14 Jul 2020)
Log Message:
-----------
Variety of libtclcad adjustments. Expose only the Tclcad init.
Modified Paths:
--------------
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libtclcad/bu_funcs.c
brlcad/trunk/src/libtclcad/cmdhist_obj.c
brlcad/trunk/src/libtclcad/dm_obj.c
brlcad/trunk/src/libtclcad/dm_tcl.c
brlcad/trunk/src/libtclcad/fb_obj.c
brlcad/trunk/src/libtclcad/tclcad_init.c
brlcad/trunk/src/libtclcad/tclcad_private.h
brlcad/trunk/src/mged/attach.c
Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h 2020-07-14 18:58:44 UTC (rev 76331)
+++ brlcad/trunk/include/tclcad.h 2020-07-14 19:16:50 UTC (rev 76332)
@@ -172,9 +172,7 @@
TCLCAD_EXPORT extern int tclcad_tk_setup(Tcl_Interp *interp);
TCLCAD_EXPORT extern void tclcad_auto_path(Tcl_Interp *interp);
TCLCAD_EXPORT extern void tclcad_tcl_library(Tcl_Interp *interp);
-TCLCAD_EXPORT extern int Bu_Init(void *interp);
TCLCAD_EXPORT extern void tclcad_bn_setup(Tcl_Interp *interp);
-TCLCAD_EXPORT extern int Bn_Init(Tcl_Interp *interp);
TCLCAD_EXPORT extern void tclcad_bn_mat_print(Tcl_Interp *interp, const char
*title, const mat_t m);
@@ -532,8 +530,6 @@
/* dm_tcl.c */
/* The presence of Tcl_Interp as an arg prevents giving arg list */
TCLCAD_EXPORT extern void fb_tcl_setup(void);
-TCLCAD_EXPORT extern int Fb_Init(Tcl_Interp *interp);
-TCLCAD_EXPORT extern int Dm_Init(void *interp);
__END_DECLS
Modified: brlcad/trunk/src/libtclcad/bu_funcs.c
===================================================================
--- brlcad/trunk/src/libtclcad/bu_funcs.c 2020-07-14 18:58:44 UTC (rev
76331)
+++ brlcad/trunk/src/libtclcad/bu_funcs.c 2020-07-14 19:16:50 UTC (rev
76332)
@@ -466,10 +466,8 @@
int
-Bu_Init(void *p)
+Bu_Init(Tcl_Interp *interp)
{
- Tcl_Interp *interp = (Tcl_Interp *)p;
-
static struct bu_cmdtab cmds[] = {
{"bu_units_conversion", tcl_bu_units_conversion},
{"bu_dir", tcl_bu_dir},
Modified: brlcad/trunk/src/libtclcad/cmdhist_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/cmdhist_obj.c 2020-07-14 18:58:44 UTC (rev
76331)
+++ brlcad/trunk/src/libtclcad/cmdhist_obj.c 2020-07-14 19:16:50 UTC (rev
76332)
@@ -30,6 +30,7 @@
#include "bu/malloc.h"
#include "bu/str.h"
#include "tclcad.h"
+#include "tclcad_private.h"
/* FIXME: this is apparently used by src/tclscripts/lib/Command.tcl so
Modified: brlcad/trunk/src/libtclcad/dm_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/dm_obj.c 2020-07-14 18:58:44 UTC (rev 76331)
+++ brlcad/trunk/src/libtclcad/dm_obj.c 2020-07-14 19:16:50 UTC (rev 76332)
@@ -46,6 +46,7 @@
#include "dm.h"
#include "../libdm/include/private.h"
#include "tclcad.h"
+#include "tclcad_private.h"
/**
*@brief
Modified: brlcad/trunk/src/libtclcad/dm_tcl.c
===================================================================
--- brlcad/trunk/src/libtclcad/dm_tcl.c 2020-07-14 18:58:44 UTC (rev 76331)
+++ brlcad/trunk/src/libtclcad/dm_tcl.c 2020-07-14 19:16:50 UTC (rev 76332)
@@ -45,16 +45,11 @@
/* private headers */
#include "../libdm/include/private.h"
#include "brlcad_version.h"
+#include "tclcad_private.h"
/* from libdm/query.c */
extern int dm_validXType(const char *dpy_string, const char *name);
-/* from libdm/dm_obj.c */
-extern int Dmo_Init(Tcl_Interp *interp);
-
-/* from lib./fb_obj.c */
-extern int Fbo_Init(Tcl_Interp *interp);
-
HIDDEN int
dm_validXType_tcl(void *clientData, int argc, const char **argv)
{
@@ -166,10 +161,8 @@
int
-Dm_Init(void *interpreter)
+Dm_Init(Tcl_Interp *interp)
{
- Tcl_Interp *interp = (Tcl_Interp *)interpreter;
-
static struct bu_cmdtab cmdtab[] = {
{"dm_validXType", dm_validXType_tcl},
{"dm_bestXType", dm_bestXType_tcl},
Modified: brlcad/trunk/src/libtclcad/fb_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/fb_obj.c 2020-07-14 18:58:44 UTC (rev 76331)
+++ brlcad/trunk/src/libtclcad/fb_obj.c 2020-07-14 19:16:50 UTC (rev 76332)
@@ -45,6 +45,7 @@
#include "../libdm/include/private.h"
#include "dm.h"
#include "tclcad.h"
+#include "tclcad_private.h"
/* defined in libfb/tcl.c */
extern int fb_refresh(struct fb *ifp, int x, int y, int w, int h);
Modified: brlcad/trunk/src/libtclcad/tclcad_init.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_init.c 2020-07-14 18:58:44 UTC (rev
76331)
+++ brlcad/trunk/src/libtclcad/tclcad_init.c 2020-07-14 19:16:50 UTC (rev
76332)
@@ -43,10 +43,6 @@
#include "brlcad_version.h"
#include "tclcad_private.h"
-/* defined in cmdhist_obj.c */
-extern int Cho_Init(Tcl_Interp *interp);
-
-
int
library_initialized(int setit)
{
Modified: brlcad/trunk/src/libtclcad/tclcad_private.h
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_private.h 2020-07-14 18:58:44 UTC (rev
76331)
+++ brlcad/trunk/src/libtclcad/tclcad_private.h 2020-07-14 19:16:50 UTC (rev
76332)
@@ -53,6 +53,16 @@
extern int tclcad_eval_noresult(Tcl_Interp *interp, const char *command,
size_t num_args, const char * const *args);
+/* Tcl initialization routines */
+extern int Bu_Init(Tcl_Interp *interp);
+extern int Bn_Init(Tcl_Interp *interp);
+extern int Cho_Init(Tcl_Interp *interp);
+extern int Dm_Init(Tcl_Interp *interp);
+extern int Dmo_Init(Tcl_Interp *interp);
+extern int Fbo_Init(Tcl_Interp *interp);
+extern int Go_Init(Tcl_Interp *interp);
+extern int Rt_Init(Tcl_Interp *interp);
+
__END_DECLS
#endif /* LIBTCLCAD_TCLCAD_PRIVATE_H */
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-07-14 18:58:44 UTC (rev 76331)
+++ brlcad/trunk/src/mged/attach.c 2020-07-14 19:16:50 UTC (rev 76332)
@@ -561,8 +561,8 @@
return TCL_ERROR;
}
- /* Initialize libdm */
- (void)Dm_Init(INTERP);
+ /* Initialize libtclcad */
+ (void)Tclcad_Init(INTERP);
#ifdef HAVE_TK
if ((tkwin = Tk_MainWindow(INTERP)) == NULL) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
