[PD-cvs] pd/src desire.c, 1.1.2.217.2.192, 1.1.2.217.2.193 desire.h, 1.1.2.49.2.39, 1.1.2.49.2.40

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c desire.h 
Log Message:
added new wire index counter in canvas


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.49.2.39
retrieving revision 1.1.2.49.2.40
diff -C2 -d -r1.1.2.49.2.39 -r1.1.2.49.2.40
*** desire.h	3 Aug 2007 14:57:15 -0000	1.1.2.49.2.39
--- desire.h	7 Aug 2007 18:46:40 -0000	1.1.2.49.2.40
***************
*** 150,154 ****
  #else
  struct _glist {
!     t_object gl_obj;         /* header in case we're a canvas */
  #endif
      t_gobj *list;            /* the actual data */
--- 150,154 ----
  #else
  struct _glist {
!     t_object gl_obj;         /* header in case we're a [pd] or abstraction */
  #endif
      t_gobj *list;            /* the actual data */
***************
*** 172,176 ****
      unsigned int isgraph:1;    /* show as graph on parent */
      unsigned int hidetext:1;   /* hide object-name + args when doing graph on parent */
!     long next_index;           /* next index. to be incremented on each use */
  };
  
--- 172,177 ----
      unsigned int isgraph:1;    /* show as graph on parent */
      unsigned int hidetext:1;   /* hide object-name + args when doing graph on parent */
!     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 */
  };
  
***************
*** 232,239 ****
      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 */
!     char hidename;        /* don't print name above graph */
  };
  
--- 233,240 ----
      t_symbol *name;       /* unexpanded name (possibly with leading '$') */
      t_symbol *realname;   /* expanded name (symbol we're bound to) */
!     unsigned int usedindsp:1;   /* true if some DSP routine is using this */
!     unsigned int saveit:1;      /* true if we should save this with parent */
!     unsigned int listviewing:1; /* true if list view window is open */
!     unsigned int hidename:1;    /* don't print name above graph */
  };
  

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.192
retrieving revision 1.1.2.217.2.193
diff -C2 -d -r1.1.2.217.2.192 -r1.1.2.217.2.193
*** desire.c	7 Aug 2007 07:34:56 -0000	1.1.2.217.2.192
--- desire.c	7 Aug 2007 18:46:38 -0000	1.1.2.217.2.193
***************
*** 1219,1224 ****
      }
      /* move the selected part to the end */
!     if (!nonhead) x->list = selhead;
!     else x->list = nonhead, nontail->g_next = selhead;
      /* add connections to binbuf */
      t_binbuf *buf = binbuf_new();
--- 1219,1223 ----
      }
      /* move the selected part to the end */
!     if (!nonhead) x->list = selhead; else {x->list = nonhead; nontail->g_next = selhead;}
      /* add connections to binbuf */
      t_binbuf *buf = binbuf_new();
***************
*** 1262,1265 ****
--- 1261,1265 ----
      pd_set_newest(oc);
      gobj_setcanvas(oc,x);
+     oc->dix->index = x->next_w_index++;
      return;
  bad:
***************
*** 2054,2058 ****
      gobj_setcanvas(y,x);
      y->g_next = 0;
!     y->dix->index = x->next_index++;
      if (!x->list) x->list = y; else {
  	//if (x->next_add<0) {
--- 2054,2058 ----
      gobj_setcanvas(y,x);
      y->g_next = 0;
!     y->dix->index = x->next_o_index++;
      if (!x->list) x->list = y; else {
  	//if (x->next_add<0) {
***************
*** 2860,2865 ****
  }
  
! /* save a "root" canvas to a file; cf. canvas_saveto() which saves the
!    body (and which is called recursively.) */
  static void canvas_savetofile(t_canvas *x, t_symbol *filename, t_symbol *dir) {
      t_binbuf *b = binbuf_new();
--- 2860,2864 ----
  }
  
! /* save a "root" canvas to a file; cf. canvas_saveto() which saves the body (and which is called recursively.) */
  static void canvas_savetofile(t_canvas *x, t_symbol *filename, t_symbol *dir) {
      t_binbuf *b = binbuf_new();
***************
*** 6025,6033 ****
  	if (c==gatom_class) {
  		t_gatom *g = (t_gatom *)x;
! 		if (g->atom.a_type==A_SYMBOL) {
! 			sys_mgui(g,"set","s",g->atom.a_symbol);
! 		} else {
! 			sys_mgui(g,"set","f",g->atom.a_float);
! 		}
  	}
  	if (object_table->exists(self)) {
--- 6024,6029 ----
  	if (c==gatom_class) {
  		t_gatom *g = (t_gatom *)x;
! 		if (g->atom.a_type==A_SYMBOL) sys_mgui(g,"set","s",g->atom.a_symbol);
! 		else                          sys_mgui(g,"set","f",g->atom.a_float);
  	}
  	if (object_table->exists(self)) {