pd/src g_all_guis.c,1.1.1.4.2.4.2.1,1.1.1.4.2.4.2.2 g_array.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_bang.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 g_canvas.c,1.1.1.4.2.7.2.1,1.1.1.4.2.7.2.2 g_editor.c,1.1.1.4.2.3.2.1,1.1.1.4.2.3.2.2 g_graph.c,1.1.1.3.2.3,1.1.1.3.2.3.2.1 g_io.c,1.1.1.1.16.2,1.1.1.1.16.2.2.1 g_text.c,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2 - Pd-cvs

6 Mar 2004


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25259
Modified Files:
      Tag: impd_0_37
    g_all_guis.c g_array.c g_bang.c g_canvas.c g_editor.c 
    g_graph.c g_io.c g_text.c 
Log Message:
deleting some more code
Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.1.1.4.2.4.2.1
retrieving revision 1.1.1.4.2.4.2.2
diff -C2 -d -r1.1.1.4.2.4.2.1 -r1.1.1.4.2.4.2.2
*** g_all_guis.c	5 Mar 2004 19:27:51 -0000	1.1.1.4.2.4.2.1
--- g_all_guis.c	6 Mar 2004 22:19:41 -0000	1.1.1.4.2.4.2.2
***************
*** 72,122 ****
  char *iemgui_vu_scale_str[]=
  {
!     "",
!     "<-99",
!     "",
!     "",
!     "",
!     "-50",
!     "",
!     "",
!     "",
!     "-30",
!     "",
!     "",
!     "",
!     "-20",
!     "",
!     "",
!     "",
!     "-12",
!     "",
!     "",
!     "",
!     "-6",
!     "",
!     "",
!     "",
!     "-2",
!     "",
!     "",
!     "",
!     "-0dB",
!     "",
!     "",
!     "",
!     "+2",
!     "",
!     "",
!     "",
!     "+6",
!     "",
!     "",
!     "",
!     ">+12",
!     "",
!     "",
!     "",
!     "",
!     "",
  };
--- 72,86 ----
  char *iemgui_vu_scale_str[]=
  {
!     "", "<-99", "", "",
!     "",  "-50", "", "",
!     "",  "-30", "", "",
!     "",  "-20", "", "",
!     "",  "-12", "", "",
!     "",   "-6", "", "",
!     "",   "-2", "", "",
!     "", "-0dB", "", "",
!     "",   "+2", "", "",
!     "",   "+6", "", "",
!     "", ">+12", "", "", "", "", "",
  };
Index: g_array.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_array.c,v
retrieving revision 1.1.1.3.2.2
retrieving revision 1.1.1.3.2.2.2.1
diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1
*** g_array.c	12 Sep 2003 20:55:31 -0000	1.1.1.3.2.2
--- g_array.c	6 Mar 2004 22:19:41 -0000	1.1.1.3.2.2.2.1
***************
*** 287,298 ****
  {
      float xval, yval, ypix, wpix;
!     if (xonset >= 0)
!     	xval = *(float *)(elem + xonset);
!     else xval = indx * xinc;
!     if (yonset >= 0)
!     	yval = *(float *)(elem + yonset);
!     else yval = 0;
      ypix = glist_ytopixels(glist, basey + yval);
!     if (wonset >= 0)
      {
      	    /* found "w" field which controls linewidth. */
--- 287,294 ----
  {
      float xval, yval, ypix, wpix;
!     if (xonset>=0) xval = *(float *)(elem+xonset); else xval = indx*xinc;
!     if (yonset>=0) yval = *(float *)(elem+yonset); else yval = 0;
      ypix = glist_ytopixels(glist, basey + yval);
!     if (wonset>=0)
      {
      	    /* found "w" field which controls linewidth. */
Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
retrieving revision 1.1.1.3.2.2.2.1
retrieving revision 1.1.1.3.2.2.2.2
diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2
*** g_bang.c	5 Mar 2004 19:27:51 -0000	1.1.1.3.2.2.2.1
--- g_bang.c	6 Mar 2004 22:19:41 -0000	1.1.1.3.2.2.2.2
***************
*** 47,51 ****
      t_canvas *canvas=glist_getcanvas(glist);
!     sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n",
         canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
         !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol);
--- 47,51 ----
      t_canvas *canvas=glist_getcanvas(glist);
!     sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n",
         canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
         !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol);
***************
*** 68,72 ****
      t_canvas *canvas=glist_getcanvas(glist);
!     sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n",
         canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
         !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol);
--- 68,72 ----
      t_canvas *canvas=glist_getcanvas(glist);
!     sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n",
         canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
         !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol);
***************
*** 83,88 ****
  {
      t_canvas *canvas=glist_getcanvas(glist);
! 
!     sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x);
      sys_vgui(".x%x.c delete %xBUT\n", canvas, x);
      sys_vgui(".x%x.c delete %xLABEL\n", canvas, x);
--- 83,87 ----
  {
      t_canvas *canvas=glist_getcanvas(glist);
!     sys_vgui("bang_erase .x%x.c %x\n", canvas, x);
      sys_vgui(".x%x.c delete %xBUT\n", canvas, x);
      sys_vgui(".x%x.c delete %xLABEL\n", canvas, x);
***************
*** 248,265 ****
  static void bng_bang(t_bng *x)/*wird nur mehr gesendet, wenn snd != rcv*/
  {
!     if(!x->x_gui.x_isa.x_locked)
!     {
! 	bng_set(x);
! 	bng_bout1(x);
!     }
  }
static void bng_bang2(t_bng *x)/*wird immer gesendet, wenn moeglich*/
  {
!     if(!x->x_gui.x_isa.x_locked)
!     {
! 	bng_set(x);
! 	bng_bout2(x);
!     }
  }
--- 247,256 ----
  static void bng_bang(t_bng *x)/*wird nur mehr gesendet, wenn snd != rcv*/
  {
!     if(!x->x_gui.x_isa.x_locked) {bng_set(x); bng_bout1(x);}
  }
static void bng_bang2(t_bng *x)/*wird immer gesendet, wenn moeglich*/
  {
!     if(!x->x_gui.x_isa.x_locked) {bng_set(x); bng_bout2(x);}
  }
***************
*** 283,288 ****
  static void bng_click(t_bng *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt)
  {
!     bng_set(x);
!     bng_bout2(x);
  }
--- 274,278 ----
  static void bng_click(t_bng *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt)
  {
!     bng_set(x); bng_bout2(x);
  }
***************
*** 294,321 ****
  }
! static void bng_float(t_bng *x, t_floatarg f)
! {bng_bang2(x);}
! 
! static void bng_symbol(t_bng *x, t_symbol *s)
! {bng_bang2(x);}
! 
! static void bng_pointer(t_bng *x, t_gpointer *gp)
! {bng_bang2(x);}
! 
! static void bng_list(t_bng *x, t_symbol *s, int ac, t_atom *av)
! {
!     bng_bang2(x);
! }
! 
! static void bng_anything(t_bng *x, t_symbol *s, int argc, t_atom *argv)
! {bng_bang2(x);}
static void bng_loadbang(t_bng *x)
  {
!     if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit)
!     {
!         bng_set(x);
! 	bng_bout2(x);
!     }
  }
--- 284,296 ----
  }
! static void bng_float(t_bng *x, t_floatarg f)     {bng_bang2(x);}
! static void bng_symbol(t_bng *x, t_symbol *s)     {bng_bang2(x);}
! static void bng_pointer(t_bng *x, t_gpointer *gp) {bng_bang2(x);}
! static void bng_list(t_bng *x, t_symbol *s, int ac, t_atom *av)         {bng_bang2(x);}
! static void bng_anything(t_bng *x, t_symbol *s, int argc, t_atom *argv) {bng_bang2(x);}
static void bng_loadbang(t_bng *x)
  {
!     if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) {bng_set(x); bng_bout2(x);}
  }
Index: g_canvas.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v
retrieving revision 1.1.1.4.2.7.2.1
retrieving revision 1.1.1.4.2.7.2.2
diff -C2 -d -r1.1.1.4.2.7.2.1 -r1.1.1.4.2.7.2.2
*** g_canvas.c	5 Mar 2004 19:27:51 -0000	1.1.1.4.2.7.2.1
--- g_canvas.c	6 Mar 2004 22:19:41 -0000	1.1.1.4.2.7.2.2
***************
*** 154,166 ****
  }
! void canvas_setcurrent(t_canvas *x)
! {
!     pd_pushsym(&x->gl_pd);
! }
! 
! void canvas_unsetcurrent(t_canvas *x)
! {
!     pd_popsym(&x->gl_pd);
! }
t_canvasenvironment *canvas_getenv(t_canvas *x)
--- 154,159 ----
  }
! void canvas_setcurrent(t_canvas *x)  {pd_pushsym(&x->gl_pd);}
! void canvas_unsetcurrent(t_canvas *x) {pd_popsym(&x->gl_pd);}
t_canvasenvironment *canvas_getenv(t_canvas *x)
***************
*** 862,874 ****
      t_linetraverser t;
      t_outconnect *oc;
! //    fprintf(stderr,".x%x.c\n",glist_getcanvas(x));
!     {
!     	linetraverser_start(&t, x);
!     	while (oc = linetraverser_next(&t)) {
! 	    int x1=t.tr_lx1, y1=t.tr_ly1;
! 	    int x2=t.tr_lx2, y2=t.tr_ly2;
! 	    sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n",
! 		glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2);
! 	}
      }
  }
--- 855,864 ----
      t_linetraverser t;
      t_outconnect *oc;
!     linetraverser_start(&t, x);
!     while (oc = linetraverser_next(&t)) {
! 	int x1=t.tr_lx1, y1=t.tr_ly1;
! 	int x2=t.tr_lx2, y2=t.tr_ly2;
! 	sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n",
! 	    glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2);
      }
  }
***************
*** 878,885 ****
      t_linetraverser t;
      t_outconnect *oc;
- 
      linetraverser_start(&t, x);
!     while (oc = linetraverser_next(&t))
!     {
      	if (t.tr_ob == text || t.tr_ob2 == text) {
        int x1=t.tr_lx1, y1=t.tr_ly1;
--- 868,873 ----
      t_linetraverser t;
      t_outconnect *oc;
      linetraverser_start(&t, x);
!     while (oc = linetraverser_next(&t)) {
      	if (t.tr_ob == text || t.tr_ob2 == text) {
        int x1=t.tr_lx1, y1=t.tr_ly1;
***************
*** 1156,1163 ****
      /* return true if the "canvas" object is an abstraction (so we don't
      save its contents, fogr example.)  */
! int canvas_isabstraction(t_canvas *x)
! {
!     return (x->gl_env != 0);
! }
/* return true if the "canvas" object is a "table". */
--- 1144,1148 ----
      /* return true if the "canvas" object is an abstraction (so we don't
      save its contents, fogr example.)  */
! int canvas_isabstraction(t_canvas *x) {return (x->gl_env != 0);}
/* return true if the "canvas" object is a "table". */
Index: g_editor.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v
retrieving revision 1.1.1.4.2.3.2.1
retrieving revision 1.1.1.4.2.3.2.2
diff -C2 -d -r1.1.1.4.2.3.2.1 -r1.1.1.4.2.3.2.2
*** g_editor.c	5 Mar 2004 19:27:51 -0000	1.1.1.4.2.3.2.1
--- g_editor.c	6 Mar 2004 22:19:41 -0000	1.1.1.4.2.3.2.2
***************
*** 460,475 ****
      	}
      }
!     if (mode == UCUT_TEXT)
!     {
! 	buf->u_objectbuf = canvas_docopy(x);
!     }
!     else if (mode == UCUT_CUT)
!     {
!     	buf->u_objectbuf = 0;
!     }
!     else if (mode == UCUT_CLEAR)
!     {
! 	buf->u_objectbuf = canvas_docopy(x);
!     }
      return (buf);
  }
--- 460,466 ----
      	}
      }
!     if      (mode == UCUT_TEXT)  {buf->u_objectbuf = canvas_docopy(x);}
!     else if (mode == UCUT_CUT)   {buf->u_objectbuf = 0;}
!     else if (mode == UCUT_CLEAR) {buf->u_objectbuf = canvas_docopy(x);}
      return (buf);
  }
***************
*** 527,536 ****
      else if (action == UNDO_FREE)
      {
!     	if (buf->u_objectbuf)
! 	    binbuf_free(buf->u_objectbuf);
!     	if (buf->u_reconnectbuf)
! 	    binbuf_free(buf->u_reconnectbuf);
!     	if (buf->u_redotextbuf)
! 	    binbuf_free(buf->u_redotextbuf);
      	t_freebytes(buf, sizeof(*buf));
      }
--- 518,524 ----
      else if (action == UNDO_FREE)
      {
!     	if (buf->u_objectbuf)	 binbuf_free(buf->u_objectbuf);
!     	if (buf->u_reconnectbuf) binbuf_free(buf->u_reconnectbuf);
!     	if (buf->u_redotextbuf)	 binbuf_free(buf->u_redotextbuf);
      	t_freebytes(buf, sizeof(*buf));
      }
***************
*** 1261,1268 ****
      	    else closest2 = 0, hotspot2 = x21;
!     	    if (closest1 >= noutlet1)
!     	    	closest1 = noutlet1 - 1;
!     	    if (closest2 >= ninlet2)
!     	    	closest2 = ninlet2 - 1;
if (canvas_isconnected (x, ob1, closest1, ob2, closest2))
--- 1249,1254 ----
      	    else closest2 = 0, hotspot2 = x21;
!     	    if (closest1 >= noutlet1)  	closest1 = noutlet1-1;
!     	    if (closest2 >= ninlet2)  	closest2 = ninlet2-1;
if (canvas_isconnected (x, ob1, closest1, ob2, closest2))
***************
*** 1447,1458 ****
      }
  #ifdef MACOSX
! 	if (keynum == 30)
! 	    keynum = 0, gotkeysym = gensym("Up");
! 	else if (keynum == 31)
! 	    keynum = 0, gotkeysym = gensym("Down");
! 	else if (keynum == 28)
! 	    keynum = 0, gotkeysym = gensym("Left");
! 	else if (keynum == 29)
! 	    keynum = 0, gotkeysym = gensym("Right");
  #endif
      if (keynumsym->s_thing && down)
--- 1433,1440 ----
      }
  #ifdef MACOSX
! 	if      (keynum == 30) keynum = 0, gotkeysym = gensym("Up");
! 	else if (keynum == 31) keynum = 0, gotkeysym = gensym("Down");
! 	else if (keynum == 28) keynum = 0, gotkeysym = gensym("Left");
! 	else if (keynum == 29) keynum = 0, gotkeysym = gensym("Right");
  #endif
      if (keynumsym->s_thing && down)
***************
*** 1517,1527 ****
      /* post("motion %d %d", xpos, ypos); */
      int mod = fmod;
!     if (!x->gl_editor)
!     {
!     	bug("editor");
!     	return;
!     }
      sys_vgui(".x%x.c delete y\n",x);
! 	      
      glist_setlastxy(x, xpos, ypos);
      if (x->gl_editor->e_onmotion == MA_MOVE)
--- 1499,1505 ----
      /* post("motion %d %d", xpos, ypos); */
      int mod = fmod;
!     if (!x->gl_editor) {bug("editor"); return;}
      sys_vgui(".x%x.c delete y\n",x);
! 
      glist_setlastxy(x, xpos, ypos);
      if (x->gl_editor->e_onmotion == MA_MOVE)
***************
*** 1674,1679 ****
  {
      int myindex1 = 0;
!     if (!canvas_findbuf || !canvas_whichfind)
!     	return;
      if (!canvas_dofind(canvas_whichfind, &myindex1))
      {
--- 1652,1656 ----
  {
      int myindex1 = 0;
!     if (!canvas_findbuf || !canvas_whichfind) return;
      if (!canvas_dofind(canvas_whichfind, &myindex1))
      {
***************
*** 1737,1764 ****
      	{
      	    if (seltail)
!     	    {
!     	    	seltail->g_next = y;
!     	    	seltail = y;
!     	    	y->g_next = 0;
!     	    }
      	    else
!     	    {
!     	    	selhead = seltail = y;
!     	    	seltail->g_next = 0;
!     	    }
      	}
      	else
      	{
      	    if (nontail)
!     	    {
!     	    	nontail->g_next = y;
!     	    	nontail = y;
!     	    	y->g_next = 0;
!     	    }
      	    else
!     	    {
!     	    	nonhead = nontail = y;
!     	    	nontail->g_next = 0;
!     	    }
      	}
      }
--- 1714,1727 ----
      	{
      	    if (seltail)
!     	    {seltail->g_next = y; seltail = y; y->g_next = 0;}
      	    else
!     	    {selhead = seltail = y; seltail->g_next = 0;}
      	}
      	else
      	{
      	    if (nontail)
!     	    {nontail->g_next = y; nontail = y; y->g_next = 0;}
      	    else
!     	    {nonhead = nontail = y; nontail->g_next = 0;}
      	}
      }
Index: g_graph.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v
retrieving revision 1.1.1.3.2.3
retrieving revision 1.1.1.3.2.3.2.1
diff -C2 -d -r1.1.1.3.2.3 -r1.1.1.3.2.3.2.1
*** g_graph.c	25 Nov 2003 19:19:57 -0000	1.1.1.3.2.3
--- g_graph.c	6 Mar 2004 22:19:41 -0000	1.1.1.3.2.3.2.1
***************
*** 168,189 ****
      t_gobj *g = 0, *g9 = 0;
      float f1 = 0, f2 = 0;
!     if (g1)
!     	f1 = gobj_getxforsort(g1);
!     if (g2)
!     	f2 = gobj_getxforsort(g2);
!     while (1)
!     {
!     	if (g1)
! 	{
! 	    if (g2)
! 	    {
! 	    	if (f1 <= f2)
! 		    goto put1;
! 		else goto put2;
! 	    }
! 	    else goto put1;	
! 	}
! 	else if (g2)
! 	    goto put2;
    else break;
      put1:
--- 168,177 ----
      t_gobj *g = 0, *g9 = 0;
      float f1 = 0, f2 = 0;
!     if (g1) f1 = gobj_getxforsort(g1);
!     if (g2) f2 = gobj_getxforsort(g2);
!     while (1) {
! 	if (g1 && g2) {if (f1 <= f2) goto put1; else goto put2;}
! 	else if (g1) goto put1;
! 	else if (g2) goto put2;
    else break;
      put1:
Index: g_io.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_io.c,v
retrieving revision 1.1.1.1.16.2
retrieving revision 1.1.1.1.16.2.2.1
diff -C2 -d -r1.1.1.1.16.2 -r1.1.1.1.16.2.2.1
*** g_io.c	25 Nov 2003 19:19:57 -0000	1.1.1.1.16.2
--- g_io.c	6 Mar 2004 22:19:41 -0000	1.1.1.1.16.2.2.1
***************
*** 62,93 ****
static void vinlet_bang(t_vinlet *x)
! {
!     outlet_bang(x->x_obj.ob_outlet);
! }
static void vinlet_pointer(t_vinlet *x, t_gpointer *gp)
! {
!     outlet_pointer(x->x_obj.ob_outlet, gp);
! }
static void vinlet_float(t_vinlet *x, t_float f)
! {
!     outlet_float(x->x_obj.ob_outlet, f);
! }
static void vinlet_symbol(t_vinlet *x, t_symbol *s)
! {
!     outlet_symbol(x->x_obj.ob_outlet, s);
! }
static void vinlet_list(t_vinlet *x, t_symbol *s, int argc, t_atom *argv)
! {
!     outlet_list(x->x_obj.ob_outlet, s, argc, argv);
! }
static void vinlet_anything(t_vinlet *x, t_symbol *s, int argc, t_atom *argv)
! {
!     outlet_anything(x->x_obj.ob_outlet, s, argc, argv);
! }
static void vinlet_free(t_vinlet *x)
--- 62,81 ----
static void vinlet_bang(t_vinlet *x)
!            {outlet_bang(x->x_obj.ob_outlet);}
static void vinlet_pointer(t_vinlet *x, t_gpointer *gp)
!            {outlet_pointer(x->x_obj.ob_outlet, gp);}
static void vinlet_float(t_vinlet *x, t_float f)
!            {outlet_float(x->x_obj.ob_outlet, f);}
static void vinlet_symbol(t_vinlet *x, t_symbol *s)
!            {outlet_symbol(x->x_obj.ob_outlet, s);}
static void vinlet_list(t_vinlet *x, t_symbol *s, int argc, t_atom *argv)
! 	   {outlet_list(x->x_obj.ob_outlet, s, argc, argv);}
static void vinlet_anything(t_vinlet *x, t_symbol *s, int argc, t_atom *argv)
! 	   {outlet_anything(x->x_obj.ob_outlet, s, argc, argv);}
static void vinlet_free(t_vinlet *x)
***************
*** 329,360 ****
static void voutlet_bang(t_voutlet *x)
! {
!     outlet_bang(x->x_parentoutlet);
! }
static void voutlet_pointer(t_voutlet *x, t_gpointer *gp)
! {
!     outlet_pointer(x->x_parentoutlet, gp);
! }
static void voutlet_float(t_voutlet *x, t_float f)
! {
!     outlet_float(x->x_parentoutlet, f);
! }
static void voutlet_symbol(t_voutlet *x, t_symbol *s)
! {
!     outlet_symbol(x->x_parentoutlet, s);
! }
static void voutlet_list(t_voutlet *x, t_symbol *s, int argc, t_atom *argv)
! {
!     outlet_list(x->x_parentoutlet, s, argc, argv);
! }
static void voutlet_anything(t_voutlet *x, t_symbol *s, int argc, t_atom *argv)
! {
!     outlet_anything(x->x_parentoutlet, s, argc, argv);
! }
static void voutlet_free(t_voutlet *x)
--- 317,336 ----
static void voutlet_bang(t_voutlet *x)
!             {outlet_bang(x->x_parentoutlet);}
static void voutlet_pointer(t_voutlet *x, t_gpointer *gp)
!             {outlet_pointer(x->x_parentoutlet, gp);}
static void voutlet_float(t_voutlet *x, t_float f)
!             {outlet_float(x->x_parentoutlet, f);}
static void voutlet_symbol(t_voutlet *x, t_symbol *s)
!             {outlet_symbol(x->x_parentoutlet, s);}
static void voutlet_list(t_voutlet *x, t_symbol *s, int argc, t_atom *argv)
!             {outlet_list(x->x_parentoutlet, s, argc, argv);}
static void voutlet_anything(t_voutlet *x, t_symbol *s, int argc, t_atom *argv)
!             {outlet_anything(x->x_parentoutlet, s, argc, argv);}
static void voutlet_free(t_voutlet *x)
Index: g_text.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_text.c,v
retrieving revision 1.1.1.4.2.2.2.1
retrieving revision 1.1.1.4.2.2.2.2
diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2
*** g_text.c	5 Mar 2004 19:27:52 -0000	1.1.1.4.2.2.2.1
--- g_text.c	6 Mar 2004 22:19:41 -0000	1.1.1.4.2.2.2.2
***************
*** 184,241 ****
  }
! void canvas_bng(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("bng"));
! }
! 
! void canvas_toggle(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("tgl"));
! }
! 
! void canvas_vslider(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("vsl"));
! }
! 
! void canvas_hslider(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("hsl"));
! }
! 
! void canvas_hdial(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("hdl"));
! }
! 
! void canvas_vdial(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("vdl"));
! }
! 
! void canvas_hradio(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("hradio"));
! }
! 
! void canvas_vradio(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("vradio"));
! }
! 
! void canvas_vumeter(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("vu"));
! }
! 
! void canvas_mycnv(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("cnv"));
! }
! void canvas_numbox(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
! {
!     canvas_iemguis(gl, gensym("nbx"));
! }
/* iemlib */
--- 184,202 ----
  }
! #define CONSTR(name1,name2) \
! 	void canvas_##name1(t_glist *gl, t_symbol *s, int argc, t_atom *argv) \
! 		{ canvas_iemguis(gl, gensym(name2)); }
! CONSTR(bng,     "bng");
! CONSTR(toggle,  "tgl");
! CONSTR(vslider, "vsl");
! CONSTR(hslider, "hsl");
! CONSTR(vdial,   "vdl");
! CONSTR(hdial,   "hdl");
! CONSTR(vradio,  "vradio");
! CONSTR(hradio,  "hradio");
! CONSTR(vumeter, "vu");
! CONSTR(mycnv,   "cnv");
! CONSTR(numbox,  "nbx");
/* iemlib */
***************
*** 523,530 ****
      if (x->a_draglo != 0 || x->a_draghi != 0)
      {
! 	if (f < x->a_draglo)
!     	    f = x->a_draglo;
! 	if (f > x->a_draghi)
!     	    f = x->a_draghi;
      }
      gatom_float(x, f);
--- 484,489 ----
      if (x->a_draglo != 0 || x->a_draghi != 0)
      {
! 	if (f < x->a_draglo) f = x->a_draglo;
! 	if (f > x->a_draghi) f = x->a_draghi;
      }
      gatom_float(x, f);
***************
*** 1158,1162 ****
  {
      sys_vgui("%s_erase .x%x.c %sR\n", text_classname(x), glist_getcanvas(glist), tag);
!     glist_eraseiofor(glist, x, tag);
  }
--- 1117,1121 ----
  {
      sys_vgui("%s_erase .x%x.c %sR\n", text_classname(x), glist_getcanvas(glist), tag);
!     sys_vgui("io_erase .x%x.c %sBASE\n",glist_getcanvas(glist),tag);
  }