[PD-cvs] pd/src desire.c, 1.1.2.168, 1.1.2.169 desire.h, 1.1.2.33, 1.1.2.34

Mathieu Bouchard matju at users.sourceforge.net
Fri Sep 8 22:03:30 CEST 2006


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1697

Modified Files:
      Tag: devel_0_39
	desire.c desire.h 
Log Message:
renaming glist_* to canvas_*


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -C2 -d -r1.1.2.33 -r1.1.2.34
*** desire.h	8 Sep 2006 08:48:32 -0000	1.1.2.33
--- desire.h	8 Sep 2006 20:03:28 -0000	1.1.2.34
***************
*** 73,110 ****
  } t_tick;
  
! /* the t_glist structure, which describes a list of elements that live on an area of a window.*/
  struct _glist {
!     t_object gl_obj;            /* header in case we're a glist */
      t_gobj *list;            /* the actual data */
      struct _gstub *stub;     /* safe pointer handler */
      int valid;               /* incremented when pointers might be stale */
!     struct _glist *owner;    /* parent glist, supercanvas, or 0 if none */
!     /* width in pixels (on parent, if a graph) */
!     int pixwidth, pixheight;
!     /* bounding rectangle in our own coordinates */
!     float x1,y1,x2,y2;
!      /* screen coordinates when toplevel */
!     int screenx1, screeny1, screenx2, screeny2;
!     /* origin for GOP rectangle */
!     int xmargin, ymargin;
      /* ticks and tick labels */
      t_tick xtick; int nxlabels; t_symbol **xlabel; float xlabely;
      t_tick ytick; int nylabels; t_symbol **ylabel; float ylabelx;
!     t_symbol *name;          /* symbol bound here */
!     int font;                /* nominal font size in points, e.g., 10 */
!     struct _glist *gl_next;         /* link in list of toplevels */
!     t_canvasenvironment *env;    /* for root canvases and abstractions only */
!     unsigned int havewindow:1;   /* true if we own a window */
!     unsigned int mapped:1;       /* true if, moreover, it's "mapped" */
!     unsigned int loading:1;      /* am now loading from file */
!     unsigned int willvis:1;      /* make me visible after loading */ 
!     unsigned int goprect:1;      /* draw rectangle for graph-on-parent */
!     unsigned int isgraph:1;      /* show as graph on parent */
!     long next_add;               /* insertion point for next call to glist_add (for future use!?) */
!     t_binbuf *connectbuf;         /* connections to deleted objects */
!     t_guiconnect *guiconnect;     /* GUI connection for filtering messages */
  };
  
! /* LATER consider adding font size to this struct (see glist_getfont()) */
  struct _canvasenvironment {
      t_symbol *dir;   /* directory patch lives in */
--- 73,106 ----
  } t_tick;
  
! /* the t_canvas structure, which describes a list of elements that live on an area of a window.*/
  struct _glist {
!     t_object gl_obj;         /* header in case we're a glist */
      t_gobj *list;            /* the actual data */
      struct _gstub *stub;     /* safe pointer handler */
      int valid;               /* incremented when pointers might be stale */
!     t_canvas *owner;         /* parent glist, supercanvas, or 0 if none */
!     int pixwidth, pixheight; /* width in pixels (on parent, if a graph) */
!     float x1,y1,x2,y2;       /* bounding rectangle in our own coordinates */
!     int screenx1, screeny1, screenx2, screeny2; /* screen coordinates when toplevel */
!     int xmargin, ymargin;    /* origin for GOP rectangle */
      /* ticks and tick labels */
      t_tick xtick; int nxlabels; t_symbol **xlabel; float xlabely;
      t_tick ytick; int nylabels; t_symbol **ylabel; float ylabelx;
!     t_symbol *name;            /* symbol bound here */
!     int font;                  /* nominal font size in points, e.g., 10 */
!     t_canvas *gl_next;         /* link in list of toplevels */
!     t_canvasenvironment *env;  /* for root canvases and abstractions only */
!     unsigned int havewindow:1; /* true if we own a window */
!     unsigned int mapped:1;     /* true if, moreover, it's "mapped" */
!     unsigned int loading:1;    /* am now loading from file */
!     unsigned int willvis:1;    /* make me visible after loading */ 
!     unsigned int goprect:1;    /* draw rectangle for graph-on-parent */
!     unsigned int isgraph:1;    /* show as graph on parent */
!     long next_add;             /* insertion point for next call to canvas_add (for future use!?) */
!     t_binbuf *connectbuf;      /* connections to deleted objects */
!     t_guiconnect *guiconnect;  /* GUI connection for filtering messages */
  };
  
! /* LATER consider adding font size to this struct (see canvas_getfont()) */
  struct _canvasenvironment {
      t_symbol *dir;   /* directory patch lives in */
***************
*** 147,151 ****
      t_gobj x_gobj;
      t_scalar *scalar;     /* scalar "containing" the array */
!     t_glist *glist;       /* containing glist */
      t_symbol *name;       /* unexpanded name (possibly with leading '$') */
      t_symbol *realname;   /* expanded name (symbol we're bound to) */
--- 143,147 ----
      t_gobj x_gobj;
      t_scalar *scalar;     /* scalar "containing" the array */
!     t_canvas *glist;       /* containing glist */
      t_symbol *name;       /* unexpanded name (possibly with leading '$') */
      t_symbol *realname;   /* expanded name (symbol we're bound to) */
***************
*** 193,197 ****
  extern t_canvas *canvas_list; /* list of all root canvases */
  extern t_class *vinlet_class, *voutlet_class, *canvas_class;
! extern int glist_valid;         /* incremented when pointers might be stale */
  EXTERN int sys_noloadbang;
  EXTERN t_symbol *s_empty;
--- 189,193 ----
  extern t_canvas *canvas_list; /* list of all root canvases */
  extern t_class *vinlet_class, *voutlet_class, *canvas_class;
! extern int canvas_valid;         /* incremented when pointers might be stale */
  EXTERN int sys_noloadbang;
  EXTERN t_symbol *s_empty;
***************
*** 209,226 ****
  EXTERN void pd_upload(t_gobj *self);
  EXTERN void sys_mgui(void *self,   const char *sel, const char *fmt, ...);
! 
! EXTERN t_glist *glist_new(void);
! EXTERN void glist_init(t_glist *x);
! EXTERN void glist_add(t_glist *x, t_gobj *g);
! EXTERN void glist_delete(t_glist *x, t_gobj *y);
  EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text);
  EXTERN void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp);
! 
! EXTERN int glist_isvisible(t_glist *x);
! EXTERN int glist_istoplevel(t_glist *x);
  EXTERN int canvas_istable(t_canvas *x);
  EXTERN int canvas_isabstraction(t_canvas *x);
! 
! EXTERN t_canvas *glist_getcanvas(t_glist *x);
  EXTERN t_canvas *canvas_getrootfor(t_canvas *x);
  EXTERN t_canvas *canvas_getcurrent(void);
--- 205,217 ----
  EXTERN void pd_upload(t_gobj *self);
  EXTERN void sys_mgui(void *self,   const char *sel, const char *fmt, ...);
! EXTERN void canvas_add(t_canvas *x, t_gobj *g);
! EXTERN void canvas_delete(t_canvas *x, t_gobj *y);
  EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text);
  EXTERN void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp);
! EXTERN int canvas_isvisible(t_canvas *x);
! EXTERN int canvas_istoplevel(t_canvas *x);
  EXTERN int canvas_istable(t_canvas *x);
  EXTERN int canvas_isabstraction(t_canvas *x);
! EXTERN t_canvas *canvas_getcanvas(t_canvas *x);
  EXTERN t_canvas *canvas_getrootfor(t_canvas *x);
  EXTERN t_canvas *canvas_getcurrent(void);
***************
*** 228,250 ****
  EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x);
  EXTERN int canvas_getdollarzero(void);
  
  EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x);
  EXTERN t_outconnect *linetraverser_next(t_linetraverser *t);
  
- EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s);
- EXTERN t_symbol *canvas_makebindsym(t_symbol *s);
- 
  /* -------------------- TO BE SORTED OUT --------------------- */
  EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action);
  EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent);
  EXTERN void array_resize(t_array *x, int n);
! EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a);
  EXTERN void gstub_cutoff(t_gstub *gs);
! EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x);
  EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp);
  EXTERN void word_restore(t_word *wp, t_template *tmpl, int argc, t_atom *argv);
! EXTERN t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym);
  EXTERN void word_free(t_word *wp, t_template *tmpl);
! EXTERN void scalar_redraw(t_scalar *x, t_glist *glist);
  EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv);
  EXTERN void template_free(t_template *x);
--- 219,240 ----
  EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x);
  EXTERN int canvas_getdollarzero(void);
+ EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s);
+ EXTERN t_symbol *canvas_makebindsym(t_symbol *s);
  
  EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x);
  EXTERN t_outconnect *linetraverser_next(t_linetraverser *t);
  
  /* -------------------- TO BE SORTED OUT --------------------- */
  EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action);
  EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent);
  EXTERN void array_resize(t_array *x, int n);
! EXTERN t_gstub *gstub_new(t_canvas *gl, t_array *a);
  EXTERN void gstub_cutoff(t_gstub *gs);
! EXTERN void gpointer_setglist(t_gpointer *gp, t_canvas *glist, t_scalar *x);
  EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp);
  EXTERN void word_restore(t_word *wp, t_template *tmpl, int argc, t_atom *argv);
! EXTERN t_scalar *scalar_new(t_canvas *owner, t_symbol *templatesym);
  EXTERN void word_free(t_word *wp, t_template *tmpl);
! EXTERN void scalar_redraw(t_scalar *x, t_canvas *glist);
  EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv);
  EXTERN void template_free(t_template *x);

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.168
retrieving revision 1.1.2.169
diff -C2 -d -r1.1.2.168 -r1.1.2.169
*** desire.c	8 Sep 2006 08:48:30 -0000	1.1.2.168
--- desire.c	8 Sep 2006 20:03:27 -0000	1.1.2.169
***************
*** 57,63 ****
  
  #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig)
! #define glist_each(CHILD,GLIST)   for(CHILD=(GLIST)->list; CHILD; CHILD=CHILD->g_next)
  #define glists_each(GLIST,GLISTS) for(GLIST=GLISTS; GLIST; GLIST=GLIST->gl_next)
! #define glist_wire_each(WIRE,TRAV,GLIST) \
  	for (linetraverser_start(&TRAV,GLIST); (WIRE=linetraverser_next(&TRAV)); )
  
--- 57,63 ----
  
  #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig)
[...3166 lines suppressed...]
      class_addmethod3(c,canvas_floatatom,"floatatom","*");
      class_addmethod3(c,canvas_symbolatom,"symbolatom","*");
!     class_addmethod3(c,canvas_text,"text","*");
!     class_addmethod3(c,canvas_canvas,"graph","*");
!     class_addmethod3(c,canvas_scalar,"scalar","*");
      class_addmethod3(c,canvas_bng,"bng","*");
      class_addmethod3(c,canvas_toggle,"toggle","*");
***************
*** 8065,8069 ****
      class_addmethod3(c,canvas_relocate,"relocate","ss");
      class_addmethod3(c,canvas_vis,"vis","f");
!     class_addmethod3(c,glist_menu_open,"menu-open","");
      class_addmethod3(c,canvas_map,"map","f");
  
--- 8035,8039 ----
      class_addmethod3(c,canvas_relocate,"relocate","ss");
      class_addmethod3(c,canvas_vis,"vis","f");
!     class_addmethod3(c,canvas_menu_open,"menu-open","");
      class_addmethod3(c,canvas_map,"map","f");
  





More information about the Pd-cvs mailing list