[PD-cvs] pd/src desire.c, 1.1.2.159, 1.1.2.160 desire.h, 1.1.2.28, 1.1.2.29

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c desire.h 
Log Message:
last wave of renaming


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -C2 -d -r1.1.2.28 -r1.1.2.29
*** desire.h	7 Sep 2006 00:52:18 -0000	1.1.2.28
--- desire.h	7 Sep 2006 01:39:34 -0000	1.1.2.29
***************
*** 68,77 ****
  /* this structure is instantiated whenever a glist becomes visible. */
  typedef struct _editor {
!     t_rtext *e_rtext;               /* text responder linked list */
!     t_rtext *e_textedfor;           /* the rtext if any that we are editing */
!     t_gobj *e_grab;                 /* object being "dragged" */
!     t_binbuf *e_connectbuf;         /* connections to deleted objects */
!     t_guiconnect *e_guiconnect;     /* GUI connection for filtering messages */
!     struct _glist *e_glist;         /* glist which owns this */
  } t_editor;
  
--- 68,74 ----
  /* this structure is instantiated whenever a glist becomes visible. */
  typedef struct _editor {
!     t_binbuf *connectbuf;         /* connections to deleted objects */
!     t_guiconnect *guiconnect;     /* GUI connection for filtering messages */
!     struct _glist *glist;         /* glist which owns this */
  } t_editor;
  
***************
*** 93,101 ****
      int pixwidth, pixheight;
      /* bounding rectangle in our own coordinates */
!     float gl_x1,gl_y1;
!     float gl_x2,gl_y2;
       /* screen coordinates when toplevel */
!     int screenx1, screeny1;
!     int screenx2, screeny2;
      /* origin for GOP rectangle */
      int xmargin, ymargin;
--- 90,96 ----
      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;
***************
*** 119,126 ****
  /* LATER consider adding font size to this struct (see glist_getfont()) */
  struct _canvasenvironment {
!     t_symbol *ce_dir;   /* directory patch lives in */
!     int ce_argc;        /* number of "$" arguments */
!     t_atom *ce_argv;    /* array of "$" arguments */
!     int ce_dollarzero;  /* value of "$0" */
  };
  
--- 114,121 ----
  /* LATER consider adding font size to this struct (see glist_getfont()) */
  struct _canvasenvironment {
!     t_symbol *dir;   /* directory patch lives in */
!     int argc;        /* number of "$" arguments */
!     t_atom *argv;    /* array of "$" arguments */
!     int dollarzero;  /* value of "$0" */
  };
  
***************
*** 132,138 ****
  
  typedef struct _dataslot {
!     int ds_type;
!     t_symbol *ds_name;
!     t_symbol *ds_arraytemplate;     /* filled in for arrays only */
  } t_dataslot;
  
--- 127,133 ----
  
  typedef struct _dataslot {
!     int type;
!     t_symbol *name;
!     t_symbol *arraytemplate;     /* filled in for arrays only */
  } t_dataslot;
  
***************
*** 140,167 ****
      t_pd t_pdobj;               /* header */
      struct _gtemplate *t_list;  /* list of "struct"/gtemplate objects */
!     t_symbol *t_sym;            /* name */
!     int t_n;                    /* number of dataslots (fields) */
!     t_dataslot *t_vec;          /* array of dataslots */
  } t_template;
  
  struct _array {
!     int a_n;            /* number of elements */
!     int a_elemsize;     /* size in bytes; LATER get this from template */
!     char *a_vec;        /* array of elements */
!     t_symbol *a_templatesym;    /* template for elements */
!     int a_valid;        /* protection against stale pointers into array */
!     t_gpointer a_gp;    /* pointer to scalar or array element we're in */
!     t_gstub *a_stub;    /* stub for pointing into this array */
  };
  
  struct _garray {
      t_gobj x_gobj;
!     t_scalar *x_scalar;     /* scalar "containing" the array */
!     t_glist *x_glist;       /* containing glist */
!     t_symbol *x_name;       /* unexpanded name (possibly with leading '$') */
!     t_symbol *x_realname;   /* expanded name (symbol we're bound to) */
!     char x_usedindsp;       /* true if some DSP routine is using this */
!     char x_saveit;          /* true if we should save this with parent */
!     char x_listviewing;     /* true if list view window is open */
  };
  
--- 135,162 ----
      t_pd t_pdobj;               /* header */
      struct _gtemplate *t_list;  /* list of "struct"/gtemplate objects */
!     t_symbol *sym;            /* name */
!     int n;                    /* number of dataslots (fields) */
!     t_dataslot *vec;          /* array of dataslots */
  } t_template;
  
  struct _array {
!     int n;            /* number of elements */
!     int elemsize;     /* size in bytes; LATER get this from template */
!     char *vec;        /* array of elements */
!     t_symbol *templatesym;    /* template for elements */
!     int valid;        /* protection against stale pointers into array */
!     t_gpointer gp;    /* pointer to scalar or array element we're in */
!     t_gstub *stub;    /* stub for pointing into this array */
  };
  
  struct _garray {
      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) */
!     char usedindsp;       /* true if some DSP routine is using this */
!     char saveit;          /* true if we should save this with parent */
!     char listviewing;     /* true if list view window is open */
  };
  

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.159
retrieving revision 1.1.2.160
diff -C2 -d -r1.1.2.159 -r1.1.2.160
*** desire.c	7 Sep 2006 01:23:12 -0000	1.1.2.159
--- desire.c	7 Sep 2006 01:39:33 -0000	1.1.2.160
***************
*** 357,361 ****
      t_canvas *x = canvas_getcurrent();
      t_canvasenvironment *env = x ? canvas_getenv(x) : 0;
!     return env ? env->ce_dollarzero : 0;
  }
  
--- 357,361 ----
      t_canvas *x = canvas_getcurrent();
      t_canvasenvironment *env = x ? canvas_getenv(x) : 0;
!     return env ? env->dollarzero : 0;
  }
[...2961 lines suppressed...]
--- 6863,6868 ----
  void canvas_getargs(int *argcp, t_atom **argvp) {
      t_canvasenvironment *e = canvas_getenv(canvas_getcurrent());
!     *argcp = e->argc;
!     *argvp = e->argv;
  }
  
***************
*** 7682,7686 ****
  		sys_mgui((t_gobj *)self,"wires=","S",foo);
  		sys_mgui(self,"name=","s",can->name);
! 		sys_mgui(self,"folder=","s",canvas_getenv(can)->ce_dir);
  	}
  }
--- 7677,7681 ----
  		sys_mgui((t_gobj *)self,"wires=","S",foo);
  		sys_mgui(self,"name=","s",can->name);
! 		sys_mgui(self,"folder=","s",canvas_getenv(can)->dir);
  	}
  }