Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16955
Modified Files: Tag: desiredata desire.h m_pd.h Log Message: introducing t_boxes, t_gobj::next(), NO_NEXT
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.73 retrieving revision 1.4.4.11.2.33.2.74 diff -C2 -d -r1.4.4.11.2.33.2.73 -r1.4.4.11.2.33.2.74 *** m_pd.h 15 Aug 2007 21:20:02 -0000 1.4.4.11.2.33.2.73 --- m_pd.h 17 Aug 2007 23:33:08 -0000 1.4.4.11.2.33.2.74 *************** *** 252,256 **** --- 252,260 ---- and non-DesireData systems. The equivalent in the Tcl side is really part of every view object. */ typedef struct t_appendix { + #ifdef NO_NEXT + struct _gobj *pas_touche; + #else struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */ + #endif t_canvas *canvas; /* the holder of this object */ /* actual observable */ *************** *** 283,286 **** --- 287,293 ---- #define g_adix dix #define g_next dix->next + #ifdef PD_PLUSPLUS_FACE + _gobj *next(); + #endif } t_gobj;
Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.47 retrieving revision 1.1.2.49.2.48 diff -C2 -d -r1.1.2.49.2.47 -r1.1.2.49.2.48 *** desire.h 17 Aug 2007 18:35:10 -0000 1.1.2.49.2.47 --- desire.h 17 Aug 2007 23:33:08 -0000 1.1.2.49.2.48 *************** *** 48,51 **** --- 48,52 ----
#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) + //#include <map> extern "C" { #endif *************** *** 146,157 **** } t_tick;
/* the t_canvas structure, which describes a list of elements that live on an area of a window.*/ #ifdef PD_PLUSPLUS_FACE struct _glist : t_object { #else struct _glist { t_object gl_obj; /* header in case we're a [pd] or abstraction */ #endif ! t_gobj *list; /* the actual data */ t_canvas *owner; /* parent canvas, supercanvas, or 0 if none */ int pixwidth, pixheight; /* width in pixels (on parent, if a graph) */ --- 147,165 ---- } t_tick;
+ typedef struct t_boxes t_boxes; + /* the t_canvas structure, which describes a list of elements that live on an area of a window.*/ #ifdef PD_PLUSPLUS_FACE struct _glist : t_object { + // std::map<int,t_gobj *> boxes; #else struct _glist { t_object gl_obj; /* header in case we're a [pd] or abstraction */ #endif ! #ifdef NO_NEXT ! t_gobj *gotohell; ! #else ! t_gobj *list; /* DIE */ ! #endif t_canvas *owner; /* parent canvas, supercanvas, or 0 if none */ int pixwidth, pixheight; /* width in pixels (on parent, if a graph) */ *************** *** 172,175 **** --- 180,184 ---- long next_o_index; /* next object index. to be incremented on each use */ long next_w_index; /* next wire index. to be incremented on each use */ + t_boxes *boxes; };
*************** *** 283,287 **** EXTERN t_canvas *canvas_getrootfor(t_canvas *x); EXTERN t_canvas *canvas_getcurrent(void); - EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); EXTERN int canvas_getdollarzero(void); --- 292,295 ----