Revision: 75960
http://sourceforge.net/p/brlcad/code/75960
Author: starseeker
Date: 2020-05-28 17:07:12 +0000 (Thu, 28 May 2020)
Log Message:
-----------
remove _init_dm from branch
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-05-28 17:04:27 UTC
(rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-05-28 17:07:12 UTC
(rev 75960)
@@ -549,9 +549,7 @@
(char *)Tk_Name(pubvars->xtkwin));
#endif
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&str);
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-05-28 17:04:27 UTC
(rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-05-28 17:07:12 UTC
(rev 75960)
@@ -862,9 +862,7 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&init_proc_vls);
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-05-28
17:04:27 UTC (rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-05-28
17:07:12 UTC (rev 75960)
@@ -583,9 +583,7 @@
(char *)Tk_Name(pubvars->xtkwin));
/* Important - note that this is a bu_vls_sprintf, to clear the string */
- bu_vls_sprintf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_sprintf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
bu_vls_free(&init_proc_vls);
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-05-28 17:04:27 UTC
(rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-05-28 17:07:12 UTC
(rev 75960)
@@ -415,10 +415,10 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s", (char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
- bu_log("qt_open: _init_dm failed\n");
+ bu_log("qt_open: dm init failed\n");
bu_vls_free(&init_proc_vls);
bu_vls_free(&str);
(void)qt_close(dmp);
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-05-28 17:04:27 UTC
(rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-05-28 17:07:12 UTC
(rev 75960)
@@ -178,9 +178,7 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&str);
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-05-28 17:04:27 UTC
(rev 75959)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-05-28 17:07:12 UTC
(rev 75960)
@@ -2521,12 +2521,10 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(((struct dm_wglvars
*)dmp->i->dm_vars.pub_vars)->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->i->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
- bu_log("open_wgl: _init_dm failed\n");
+ bu_log("open_wgl: dm init failed\n");
bu_vls_free(&init_proc_vls);
bu_vls_free(&str);
(void)wgl_close(dmp);
Modified: brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl
===================================================================
--- brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl 2020-05-28
17:04:27 UTC (rev 75959)
+++ brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl 2020-05-28
17:07:12 UTC (rev 75960)
@@ -18,10 +18,6 @@
# information.
#
###
-proc _init_dm { func w } {
- $func $w
- catch { init_dm $w }
-}
proc bind_dm { w } {
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
