Revision: 75290
http://sourceforge.net/p/brlcad/code/75290
Author: starseeker
Date: 2020-04-07 18:45:04 +0000 (Tue, 07 Apr 2020)
Log Message:
-----------
narrow scope of fb.h includes to limit tcl.h propagation, remove remaining
tcl.h includes in libged.
Modified Paths:
--------------
brlcad/trunk/include/ged/framebuffer.h
brlcad/trunk/src/libged/ged_private.h
brlcad/trunk/src/libged/png2fb.c
brlcad/trunk/src/libged/preview.c
brlcad/trunk/src/libged/rt.c
brlcad/trunk/src/libged/rtcheck.c
brlcad/trunk/src/libged/rtwizard.c
Modified: brlcad/trunk/include/ged/framebuffer.h
===================================================================
--- brlcad/trunk/include/ged/framebuffer.h 2020-04-07 18:30:22 UTC (rev
75289)
+++ brlcad/trunk/include/ged/framebuffer.h 2020-04-07 18:45:04 UTC (rev
75290)
@@ -29,13 +29,14 @@
#define GED_FRAMEBUFFER_H
#include "common.h"
-#include "fb.h"
#include "ged/defines.h"
__BEGIN_DECLS
+
+
#define GED_CHECK_FBSERV(_gedp, _flags) \
- if (_gedp->ged_fbsp == FBSERV_OBJ_NULL) { \
+ if (_gedp->ged_fbsp == NULL) { \
int ged_check_view_quiet = (_flags) & GED_QUIET; \
if (!ged_check_view_quiet) { \
bu_vls_trunc((_gedp)->ged_result_str, 0); \
@@ -45,7 +46,7 @@
}
#define GED_CHECK_FBSERV_FBP(_gedp, _flags) \
- if (_gedp->ged_fbsp->fbs_fbp == FB_NULL) { \
+ if (_gedp->ged_fbsp->fbs_fbp == NULL) { \
int ged_check_view_quiet = (_flags) & GED_QUIET; \
if (!ged_check_view_quiet) { \
bu_vls_trunc((_gedp)->ged_result_str, 0); \
Modified: brlcad/trunk/src/libged/ged_private.h
===================================================================
--- brlcad/trunk/src/libged/ged_private.h 2020-04-07 18:30:22 UTC (rev
75289)
+++ brlcad/trunk/src/libged/ged_private.h 2020-04-07 18:45:04 UTC (rev
75290)
@@ -343,6 +343,9 @@
/* defined in rt.c */
+extern void
+_ged_rt_output_handler(void *clientData, int mask);
+
extern void _ged_rt_set_eye_model(struct ged *gedp,
vect_t eye_model);
extern int _ged_run_rt(struct ged *gdp, int cmd_len, const char **gd_rt_cmd,
int argc, const char **argv);
@@ -351,8 +354,6 @@
vect_t eye_model,
int argc,
const char **argv);
-extern void _ged_rt_output_handler(ClientData clientData,
- int mask);
/* defined in rtcheck.c */
extern void _ged_wait_status(struct bu_vls *logstr,
Modified: brlcad/trunk/src/libged/png2fb.c
===================================================================
--- brlcad/trunk/src/libged/png2fb.c 2020-04-07 18:30:22 UTC (rev 75289)
+++ brlcad/trunk/src/libged/png2fb.c 2020-04-07 18:45:04 UTC (rev 75290)
@@ -30,6 +30,7 @@
#include "bio.h"
#include "bu/getopt.h"
+#include "fb.h"
#include "ged.h"
static int multiple_lines = 0; /* Streamlined operation */
Modified: brlcad/trunk/src/libged/preview.c
===================================================================
--- brlcad/trunk/src/libged/preview.c 2020-04-07 18:30:22 UTC (rev 75289)
+++ brlcad/trunk/src/libged/preview.c 2020-04-07 18:45:04 UTC (rev 75290)
@@ -80,7 +80,7 @@
if (_ged_current_gedp->ged_wdbp->dbip == DBI_NULL)
return 0;
- /*f_zap((ClientData)NULL, interp, 0, (char **)0);*/
+ /*f_zap(NULL, interp, 0, (char **)0);*/
/* Free animation structures */
db_free_anim(_ged_current_gedp->ged_wdbp->dbip);
Modified: brlcad/trunk/src/libged/rt.c
===================================================================
--- brlcad/trunk/src/libged/rt.c 2020-04-07 18:30:22 UTC (rev 75289)
+++ brlcad/trunk/src/libged/rt.c 2020-04-07 18:45:04 UTC (rev 75290)
@@ -33,8 +33,6 @@
#endif
#include "bresource.h"
-#include "tcl.h"
-
#include "bu/app.h"
#include "bu/process.h"
@@ -153,7 +151,7 @@
void
-_ged_rt_output_handler(ClientData clientData, int UNUSED(mask))
+_ged_rt_output_handler(void *clientData, int UNUSED(mask))
{
struct _ged_rt_client_data *drcdp = (struct _ged_rt_client_data
*)clientData;
struct ged_subprocess *run_rtp;
Modified: brlcad/trunk/src/libged/rtcheck.c
===================================================================
--- brlcad/trunk/src/libged/rtcheck.c 2020-04-07 18:30:22 UTC (rev 75289)
+++ brlcad/trunk/src/libged/rtcheck.c 2020-04-07 18:45:04 UTC (rev 75290)
@@ -74,8 +74,8 @@
bu_vls_printf(logstr, ", return (exit) code = %d", ret);
}
-static void rtcheck_output_handler(ClientData clientData, int mask);
-static void rtcheck_vector_handler(ClientData clientData, int mask);
+static void rtcheck_output_handler(void *clientData, int mask);
+static void rtcheck_vector_handler(void *clientData, int mask);
static void
rtcheck_handler_cleanup(struct ged_rtcheck *rtcp)
@@ -105,7 +105,7 @@
}
static void
-rtcheck_vector_handler(ClientData clientData, int UNUSED(mask))
+rtcheck_vector_handler(void *clientData, int UNUSED(mask))
{
int value = 0;
struct ged_rtcheck *rtcp = (struct ged_rtcheck *)clientData;
@@ -166,7 +166,7 @@
}
static void
-rtcheck_output_handler(ClientData clientData, int UNUSED(mask))
+rtcheck_output_handler(void *clientData, int UNUSED(mask))
{
int count;
char line[RT_MAXLINE] = {0};
@@ -254,10 +254,11 @@
*vp++ = (char *)argv[i++];
*vp = 0;
vp = &gd_rt_cmd[0];
- while (*vp)
- Tcl_AppendResult((Tcl_Interp *)gedp->ged_interp, *vp++, " ", (char
*)NULL);
-
- Tcl_AppendResult((Tcl_Interp *)gedp->ged_interp, "\n", (char *)NULL);
+ while (*vp) {
+ bu_vls_printf(gedp->ged_result_str, "%s ", *vp);
+ vp++;
+ }
+ bu_vls_printf(gedp->ged_result_str, "\n");
}
Modified: brlcad/trunk/src/libged/rtwizard.c
===================================================================
--- brlcad/trunk/src/libged/rtwizard.c 2020-04-07 18:30:22 UTC (rev 75289)
+++ brlcad/trunk/src/libged/rtwizard.c 2020-04-07 18:45:04 UTC (rev 75290)
@@ -32,7 +32,6 @@
# include <sys/types.h>
#endif
-#include "tcl.h"
#include "bu/app.h"
#include "bu/process.h"
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
