Revision: 75963
http://sourceforge.net/p/brlcad/code/75963
Author: starseeker
Date: 2020-05-28 17:35:44 +0000 (Thu, 28 May 2020)
Log Message:
-----------
Remove default bind_dm call 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:28:58 UTC
(rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-05-28 17:35:44 UTC
(rev 75963)
@@ -493,8 +493,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0)
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
/* initialize dm specific variables */
pubvars->devmotionnotify = LASTEvent;
@@ -549,12 +547,14 @@
(char *)Tk_Name(pubvars->xtkwin));
#endif
- bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ 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);
- (void)X_close(dmp);
- return DM_NULL;
+ if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
+ bu_vls_free(&str);
+ (void)X_close(dmp);
+ return DM_NULL;
+ }
}
bu_vls_free(&init_proc_vls);
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:28:58 UTC
(rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-05-28 17:35:44 UTC
(rev 75963)
@@ -754,8 +754,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0)
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
/* initialize dm specific variables */
pubvars->devmotionnotify = LASTEvent;
@@ -862,13 +860,16 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- 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);
- bu_vls_free(&str);
- (void)ogl_close(dmp);
- return DM_NULL;
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ 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);
+ bu_vls_free(&str);
+ (void)ogl_close(dmp);
+ return DM_NULL;
+ }
}
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:28:58 UTC (rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-05-28
17:35:44 UTC (rev 75963)
@@ -476,8 +476,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0)
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
/* initialize dm specific variables */
pubvars->devmotionnotify = LASTEvent;
@@ -582,14 +580,16 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- /* Important - note that this is a bu_vls_sprintf, to clear the string */
- bu_vls_sprintf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ /* Important - note that this is a bu_vls_sprintf, to clear the string
*/
+ 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);
- bu_vls_free(&str);
- (void)osgl_close(dmp);
- return DM_NULL;
+ if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
+ bu_vls_free(&init_proc_vls);
+ bu_vls_free(&str);
+ (void)osgl_close(dmp);
+ return DM_NULL;
+ }
}
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:28:58 UTC
(rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-05-28 17:35:44 UTC
(rev 75963)
@@ -370,9 +370,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0) {
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
- }
/* initialize dm specific variables */
pubvars->devmotionnotify = LASTEvent;
@@ -415,14 +412,16 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s", (char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ 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: dm init failed\n");
- bu_vls_free(&init_proc_vls);
- bu_vls_free(&str);
- (void)qt_close(dmp);
- return DM_NULL;
+ if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
+ bu_log("qt_open: dm init failed\n");
+ bu_vls_free(&init_proc_vls);
+ bu_vls_free(&str);
+ (void)qt_close(dmp);
+ return DM_NULL;
+ }
}
bu_vls_free(&init_proc_vls);
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:28:58 UTC
(rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-05-28 17:35:44 UTC
(rev 75963)
@@ -132,8 +132,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0)
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
/* initialize dm specific variables */
pubvars->devmotionnotify = LASTEvent;
@@ -178,12 +176,14 @@
bu_vls_printf(&dmp->i->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ 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);
- (void)tk_close(dmp);
- return DM_NULL;
+ if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
+ bu_vls_free(&str);
+ (void)tk_close(dmp);
+ return DM_NULL;
+ }
}
bu_vls_free(&init_proc_vls);
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:28:58 UTC
(rev 75962)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-05-28 17:35:44 UTC
(rev 75963)
@@ -2426,8 +2426,6 @@
else
bu_vls_strcpy(&dmp->i->dm_dName, ":0.0");
}
- if (bu_vls_strlen(&init_proc_vls) == 0)
- bu_vls_strcpy(&init_proc_vls, "bind_dm");
/* initialize dm specific variables */
((struct dm_wglvars *)dmp->i->dm_vars.pub_vars)->devmotionnotify =
LASTEvent;
@@ -2521,14 +2519,16 @@
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, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->i->dm_pathName));
+ if (bu_vls_strlen(&init_proc_vls) > 0) {
+ 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) {
+ if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_log("open_wgl: dm init failed\n");
bu_vls_free(&init_proc_vls);
bu_vls_free(&str);
(void)wgl_close(dmp);
return DM_NULL;
+ }
}
bu_vls_free(&init_proc_vls);
Modified: brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl
===================================================================
--- brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl 2020-05-28
17:28:58 UTC (rev 75962)
+++ brlcad/branches/dm-fb-merge/src/tclscripts/libdm.tcl 2020-05-28
17:35:44 UTC (rev 75963)
@@ -19,9 +19,6 @@
#
###
-proc bind_dm { w } {
-}
-
## - init_dm_obj
#
# Called to initialize display manager objects.
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
