Revision: 55801
http://sourceforge.net/p/brlcad/code/55801
Author: brlcad
Date: 2013-06-19 20:08:41 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
accept sf patch 163 (Added a text DM) by Vlad Bogolin which implements a
non-graphical text debugging interface to libdm.
Modified Paths:
--------------
brlcad/trunk/include/dm.h
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/mged/attach.c
Added Paths:
-----------
brlcad/trunk/src/libdm/dm-txt.c
brlcad/trunk/src/mged/dm-txt.c
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2013-06-19 19:18:55 UTC (rev 55800)
+++ brlcad/trunk/include/dm.h 2013-06-19 20:08:41 UTC (rev 55801)
@@ -109,6 +109,7 @@
#define DM_TYPE_WGL 7
#define DM_TYPE_TK 8
#define DM_TYPE_RTGL 9
+#define DM_TYPE_TXT 10
/* Line Styles */
#define DM_SOLID_LINE 0
@@ -124,6 +125,7 @@
#define IS_DM_TYPE_PEX(_t) ((_t) == DM_TYPE_PEX)
#define IS_DM_TYPE_WGL(_t) ((_t) == DM_TYPE_WGL)
#define IS_DM_TYPE_RTGL(_t) ((_t) == DM_TYPE_RTGL)
+#define IS_DM_TYPE_TXT(_t) ((_t) == DM_TYPE_TXT)
#define GET_DM(p, structure, w, hp) { \
register struct structure *tp; \
@@ -334,6 +336,7 @@
DM_EXPORT extern struct dm dm_tk;
DM_EXPORT extern struct dm dm_wgl;
DM_EXPORT extern struct dm dm_X;
+DM_EXPORT extern struct dm dm_txt;
DM_EXPORT extern int Dm_Init();
DM_EXPORT extern struct dm *dm_open(Tcl_Interp *interp,
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2013-06-19 19:18:55 UTC (rev
55800)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2013-06-19 20:08:41 UTC (rev
55801)
@@ -77,6 +77,7 @@
dm-ps.c
dm_obj.c
dm_util.c
+ dm-txt.c
focus.c
grid.c
knob.c
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2013-06-19 19:18:55 UTC (rev 55800)
+++ brlcad/trunk/src/libdm/dm-generic.c 2013-06-19 20:08:41 UTC (rev 55801)
@@ -36,9 +36,9 @@
#include "dm-Null.h"
-
extern struct dm *plot_open(Tcl_Interp *interp, int argc, const char *argv[]);
extern struct dm *ps_open(Tcl_Interp *interp, int argc, const char *argv[]);
+extern struct dm *txt_open_dm(Tcl_Interp *interp, int argc, const char **argv);
#ifdef DM_X
# if defined(HAVE_TK)
@@ -70,7 +70,6 @@
extern int wgl_share_dlist();
#endif /* DM_WGL */
-
HIDDEN struct dm *
null_open(Tcl_Interp *interp, int argc, const char *argv[])
{
@@ -94,6 +93,8 @@
switch (type) {
case DM_TYPE_NULL:
return null_open(interp, argc, argv);
+ case DM_TYPE_TXT:
+ return txt_open_dm(interp, argc, argv);
case DM_TYPE_PLOT:
return plot_open(interp, argc, argv);
case DM_TYPE_PS:
Added: brlcad/trunk/src/libdm/dm-txt.c
===================================================================
--- brlcad/trunk/src/libdm/dm-txt.c (rev 0)
+++ brlcad/trunk/src/libdm/dm-txt.c 2013-06-19 20:08:41 UTC (rev 55801)
@@ -0,0 +1,406 @@
+/* D M - T X T . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2013 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file libdm/dm-txt.c
+ *
+ */
+
+#include "common.h"
+#include "bio.h"
+
+#include <stdio.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#include "tcl.h"
+#include "bu.h"
+#include "vmath.h"
+#include "dm.h"
+
+struct dm *
+txt_open_dm(Tcl_Interp *interp, int argc, const char **argv)
+{
+ struct dm *dmp;
+
+ if (argc < 0 || !argv)
+ return DM_NULL;
+
+ BU_ALLOC(dmp, struct dm);
+
+ *dmp = dm_txt;
+ dmp->dm_interp = interp;
+
+ bu_log("open called\n");
+
+ return dmp;
+}
+
+HIDDEN int
+txt_close(struct dm *UNUSED(dmp))
+{
+ bu_log("close called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawBegin(struct dm *UNUSED(dmp))
+{
+ bu_log("drawBegin called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawEnd(struct dm *UNUSED(dmp))
+{
+ bu_log("drawEnd called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_normal(struct dm *UNUSED(dmp))
+{
+ bu_log("normal called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_loadMatrix(struct dm *UNUSED(dmp), fastf_t *UNUSED(mat), int
UNUSED(which_eye))
+{
+ bu_log("loadMatrix called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_loadPMatrix(struct dm *UNUSED(dmp), fastf_t *UNUSED(mat))
+{
+ bu_log("loadPMatrix called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawString2D(struct dm *UNUSED(dmp), const char *UNUSED(str), fastf_t
UNUSED(x), fastf_t UNUSED(y), int UNUSED(size), int UNUSED(use_aspect))
+{
+ bu_log("drawString2D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawLine2D(struct dm *UNUSED(dmp), fastf_t UNUSED(x_1), fastf_t
UNUSED(y_1), fastf_t UNUSED(x_2), fastf_t UNUSED(y_2))
+{
+ bu_log("drawLine2D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawLine3D(struct dm *UNUSED(dmp), point_t UNUSED(pt1), point_t
UNUSED(pt2))
+{
+ bu_log("drawLine3D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawLines3D(struct dm *UNUSED(dmp), int UNUSED(npoints), point_t
*UNUSED(points), int UNUSED(sflag))
+{
+ bu_log("drawLines3D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawPoint2D(struct dm *UNUSED(dmp), fastf_t UNUSED(x), fastf_t UNUSED(y))
+{
+ bu_log("drawPoint2D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawPoint3D(struct dm *UNUSED(dmp), point_t UNUSED(point))
+{
+ bu_log("drawPoint3D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawPoints3D(struct dm *UNUSED(dmp), int UNUSED(npoints), point_t
*UNUSED(points))
+{
+ bu_log("drawPoints3D called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawVList(struct dm *UNUSED(dmp), struct bn_vlist *UNUSED(vp))
+{
+ bu_log("drawVList called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_drawVListHiddenLine(struct dm *UNUSED(dmp), struct bn_vlist *UNUSED(vp))
+{
+ bu_log("drawVListHiddenLine called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
+{
+ bu_log("draw called\n");
+ return dmp == NULL && callback_function == NULL && data == NULL;
+}
+
+
+HIDDEN int
+txt_setFGColor(struct dm *UNUSED(dmp), unsigned char UNUSED(r), unsigned char
UNUSED(g), unsigned char UNUSED(b), int UNUSED(strict), fastf_t
UNUSED(transparency))
+{
+ bu_log("setFGColor called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setBGColor(struct dm *UNUSED(dmp), unsigned char UNUSED(r), unsigned char
UNUSED(g), unsigned char UNUSED(b))
+{
+ bu_log("setBGColor called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setLineAttr(struct dm *UNUSED(dmp), int UNUSED(width), int UNUSED(style))
+{
+ bu_log("setLineAttr called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_configureWin(struct dm *UNUSED(dmp), int UNUSED(force))
+{
+ bu_log("configureWin called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setWinBounds(struct dm *UNUSED(dmp), fastf_t *UNUSED(w))
+{
+ bu_log("setWinBounds called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setLight(struct dm *UNUSED(dmp), int UNUSED(light_on))
+{
+ bu_log("setLight called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setTransparency(struct dm *UNUSED(dmp), int UNUSED(transparency))
+{
+ bu_log("setTransparency called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setDepthMask(struct dm *UNUSED(dmp), int UNUSED(mask))
+{
+ bu_log("setDepthMask called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_setZBuffer(struct dm *UNUSED(dmp), int UNUSED(zbuffer_on))
+{
+ bu_log("setZBuffer called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_debug(struct dm *UNUSED(dmp), int UNUSED(lvl))
+{
+ bu_log("debug called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_beginDList(struct dm *UNUSED(dmp), unsigned int UNUSED(list))
+{
+ bu_log("beginDList called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_endDList(struct dm *UNUSED(dmp))
+{
+ bu_log("endDList called\n");
+ return 0;
+}
+
+
+HIDDEN void
+txt_drawDList(unsigned int UNUSED(list))
+{
+ bu_log("drawDList called\n");
+}
+
+
+HIDDEN int
+txt_freeDLists(struct dm *UNUSED(dmp), unsigned int UNUSED(list), int
UNUSED(range))
+{
+ bu_log("freeDList called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_genDLists(struct dm *UNUSED(dmp), size_t UNUSED(range))
+{
+ bu_log("genDLists called\n");
+ return 0;
+}
+
+
+HIDDEN int
+txt_getDisplayImage(struct dm *UNUSED(dmp), unsigned char **UNUSED(image))
+{
+ bu_log("getDisplayImage called\n");
+ return 0;
+}
+
+
+HIDDEN void
+txt_reshape(struct dm *UNUSED(dmp), int UNUSED(width), int UNUSED(height))
+{
+ bu_log("reshape called\n");
+}
+
+
+HIDDEN int
+txt_makeCurrent(struct dm *UNUSED(dmp))
+{
+ bu_log("makeCurrent called\n");
+ return 0;
+}
+
+
+struct dm dm_txt = {
+ txt_close,
+ txt_drawBegin,
+ txt_drawEnd,
+ txt_normal,
+ txt_loadMatrix,
+ txt_loadPMatrix,
+ txt_drawString2D,
+ txt_drawLine2D,
+ txt_drawLine3D,
+ txt_drawLines3D,
+ txt_drawPoint2D,
+ txt_drawPoint3D,
+ txt_drawPoints3D,
+ txt_drawVList,
+ txt_drawVListHiddenLine,
+ txt_draw,
+ txt_setFGColor,
+ txt_setBGColor,
+ txt_setLineAttr,
+ txt_configureWin,
+ txt_setWinBounds,
+ txt_setLight,
+ txt_setTransparency,
+ txt_setDepthMask,
+ txt_setZBuffer,
+ txt_debug,
+ txt_beginDList,
+ txt_endDList,
+ txt_drawDList,
+ txt_freeDLists,
+ txt_genDLists,
+ txt_getDisplayImage,
+ txt_reshape,
+ txt_makeCurrent,
+ 0,
+ 0, /* no displaylist */
+ 0, /* no stereo */
+ 0.0, /* zoom-in limit */
+ 1, /* bound flag */
+ "txt",
+ "Text Display",
+ DM_TYPE_TXT,
+ 0,/* top */
+ 0,/* width */
+ 0,/* height */
+ 0,/* bytes per pixel */
+ 0,/* bits per channel */
+ 0,
+ 0,
+ 0,
+ 0,
+ {0, 0},
+ BU_VLS_INIT_ZERO, /* bu_vls path name*/
+ BU_VLS_INIT_ZERO, /* bu_vls full name drawing window */
+ BU_VLS_INIT_ZERO, /* bu_vls short name drawing window */
+ {0, 0, 0}, /* bg color */
+ {0, 0, 0}, /* fg color */
+ {0.0, 0.0, 0.0}, /* clipmin */
+ {0.0, 0.0, 0.0}, /* clipmax */
+ 0, /* no debugging */
+ 0, /* no perspective */
+ 0, /* no lighting */
+ 0, /* no transparency */
+ 0, /* depth buffer is not writable */
+ 0, /* no zbuffer */
+ 0, /* no zclipping */
+ 1, /* clear back buffer after drawing and swap */
+ 0, /* not overriding the auto font size */
+ 0 /* Tcl interpreter */
+};
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libdm/dm-txt.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2013-06-19 19:18:55 UTC (rev
55800)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2013-06-19 20:08:41 UTC (rev
55801)
@@ -79,6 +79,7 @@
dm-generic.c
dm-plot.c
dm-ps.c
+ dm-txt.c
dodraw.c
doevent.c
dozoom.c
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2013-06-19 19:18:55 UTC (rev 55800)
+++ brlcad/trunk/src/mged/attach.c 2013-06-19 20:08:41 UTC (rev 55801)
@@ -48,7 +48,6 @@
#include "./sedit.h"
#include "./mged_dm.h"
-
#define NEED_GUI(_type) (\
IS_DM_TYPE_WGL(_type) || \
IS_DM_TYPE_OGL(_type) || \
@@ -56,12 +55,14 @@
IS_DM_TYPE_GLX(_type) || \
IS_DM_TYPE_PEX(_type) || \
IS_DM_TYPE_TK(_type) || \
- IS_DM_TYPE_X(_type))
+ IS_DM_TYPE_X(_type) || \
+ IS_DM_TYPE_TXT(_type))
/* All systems can compile these! */
extern int Plot_dm_init(struct dm_list *o_dm_list, int argc, const char
*argv[]);
extern int PS_dm_init(struct dm_list *o_dm_list, int argc, const char *argv[]);
+extern int Txt_dm_init(struct dm_list *o_dm_list, int argc, const char
*argv[]);
#ifdef DM_X
extern int X_dm_init();
@@ -114,6 +115,7 @@
struct w_dm which_dm[] = {
{ DM_TYPE_PLOT, "plot", Plot_dm_init }, /* DM_PLOT_INDEX defined in
mged_dm.h */
{ DM_TYPE_PS, "ps", PS_dm_init }, /* DM_PS_INDEX defined in mged_dm.h
*/
+ { DM_TYPE_TXT, "txt", Txt_dm_init },
#ifdef DM_X
{ DM_TYPE_X, "X", X_dm_init },
#endif /* DM_X */
Added: brlcad/trunk/src/mged/dm-txt.c
===================================================================
--- brlcad/trunk/src/mged/dm-txt.c (rev 0)
+++ brlcad/trunk/src/mged/dm-txt.c 2013-06-19 20:08:41 UTC (rev 55801)
@@ -0,0 +1,56 @@
+/* D M - T X T . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2013 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file mged/dm-txt.c
+ *
+ * Routines specific to MGED's use of LIBDM's X display manager.
+ *
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+
+#include "./mged.h"
+#include "./sedit.h"
+#include "./mged_dm.h"
+
+extern void dm_var_init(struct dm_list *initial_dm_list); /*
defined in attach.c */
+
+int
+Txt_dm_init(struct dm_list *o_dm_list, int argc, const char *argv[])
+{
+ dm_var_init(o_dm_list);
+ if ((dmp = dm_open(INTERP, DM_TYPE_TXT, argc-1, argv)) == DM_NULL)
+ return TCL_ERROR;
+ return TCL_OK;
+}
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/mged/dm-txt.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
