[PD-cvs] pd/src desire.c, 1.1.2.151, 1.1.2.152 desire.h, 1.1.2.24, 1.1.2.25

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c desire.h 
Log Message:
more removal of gl_ prefix


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -C2 -d -r1.1.2.24 -r1.1.2.25
*** desire.h	7 Sep 2006 00:07:45 -0000	1.1.2.24
--- desire.h	7 Sep 2006 00:13:08 -0000	1.1.2.25
***************
*** 87,111 ****
      t_object gl_obj;            /* header in case we're a glist */
      t_gobj *gl_list;            /* the actual data */
!     struct _gstub *gl_stub;     /* safe pointer handler */
!     int gl_valid;               /* incremented when pointers might be stale */
!     struct _glist *gl_owner;    /* parent glist, supercanvas, or 0 if none */
      /* width in pixels (on parent, if a graph) */
!     int gl_pixwidth, gl_pixheight;
      /* bounding rectangle in our own coordinates */
      float gl_x1,gl_y1;
      float gl_x2,gl_y2;
       /* screen coordinates when toplevel */
!     int gl_screenx1, gl_screeny1;
!     int gl_screenx2, gl_screeny2;
      /* origin for GOP rectangle */
!     int gl_xmargin, gl_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_editor *gl_editor;        /* editor structure when visible */
!     t_symbol *gl_name;          /* symbol bound here */
!     int gl_font;                /* nominal font size in points, e.g., 10 */
      struct _glist *gl_next;         /* link in list of toplevels */
!     t_canvasenvironment *gl_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" */
--- 87,111 ----
      t_object gl_obj;            /* header in case we're a glist */
      t_gobj *gl_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 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;
      /* 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_editor *editor;        /* editor structure when visible */
!     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" */

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.151
retrieving revision 1.1.2.152
diff -C2 -d -r1.1.2.151 -r1.1.2.152
*** desire.c	7 Sep 2006 00:07:44 -0000	1.1.2.151
--- desire.c	7 Sep 2006 00:13:06 -0000	1.1.2.152
***************
*** 350,355 ****
  t_canvasenvironment *canvas_getenv(t_canvas *x) {
      if (!x) bug("canvas_getenv");
!     while (!x->gl_env) if (!(x = x->gl_owner)) bug("t_canvasenvironment", x);
!     return x->gl_env;
  }
  
--- 350,355 ----
  t_canvasenvironment *canvas_getenv(t_canvas *x) {
      if (!x) bug("canvas_getenv");
!     while (!x->env) if (!(x = x->owner)) bug("t_canvasenvironment", x);
[...979 lines suppressed...]
      x->x_variables[0].gv_f = f;
--- 6680,6684 ----
      if (gs->gs_which != GP_GLIST) {pd_error(x, "append: lists only, not arrays"); return;}
      glist = gs->gs_un.gs_glist;
!     if (glist->valid != gp->gp_valid) {pd_error(x, "append: stale pointer"); return;}
      if (!nitems) return;
      x->x_variables[0].gv_f = f;
***************
*** 7730,7734 ****
  			(long)canvas_getindex(can,(t_gobj *)t.tr_ob2), (long)t.tr_inno);
  		sys_mgui((t_gobj *)self,"wires=","S",foo);
! 		sys_mgui(self,"name=","s",can->gl_name);
  		sys_mgui(self,"folder=","s",canvas_getenv(can)->ce_dir);
  	}
--- 7730,7734 ----
  			(long)canvas_getindex(can,(t_gobj *)t.tr_ob2), (long)t.tr_inno);
  		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);
  	}