[PD-cvs] externals/miXed/toxy plustot.c,1.3,1.4 plustot.qlist.c,1.2,1.3 tot.c,1.6,1.7 widget.c,1.12,1.13 widgettype.c,1.10,1.11

Krzysztof Czaja krzyszcz at users.sourceforge.net
Tue Jan 11 11:33:26 CET 2005


Update of /cvsroot/pure-data/externals/miXed/toxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23957/toxy

Modified Files:
	plustot.c plustot.qlist.c tot.c widget.c widgettype.c 
Log Message:
svf~: args parsing; prepend/Append: bang handling; seq: pause, continue, goto; many maxmode changes

Index: plustot.qlist.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/plustot.qlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plustot.qlist.c	10 Dec 2004 20:47:06 -0000	1.2
--- plustot.qlist.c	11 Jan 2005 10:33:23 -0000	1.3
***************
*** 57,62 ****
  	t_binbuf *bb = ((t_qlist *)booty)->x_binbuf;
  #ifdef PLUSTOT_QLIST_DEBUG
! 	post("booty '%s' at %x:", class_getname(*(t_pd *)booty), (int)booty);
! 	binbuf_print(bb);
  #endif
  	return (bb);
--- 57,63 ----
  	t_binbuf *bb = ((t_qlist *)booty)->x_binbuf;
  #ifdef PLUSTOT_QLIST_DEBUG
! 	loudbug_post("booty '%s' at %x:",
! 		     class_getname(*(t_pd *)booty), (int)booty);
! 	loudbug_postbinbuf(bb);
  #endif
  	return (bb);

Index: widgettype.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/widgettype.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** widgettype.c	21 Dec 2004 11:32:13 -0000	1.10
--- widgettype.c	11 Jan 2005 10:33:23 -0000	1.11
***************
*** 62,66 ****
  static void widgettype_free(t_masterwidget *mw, t_widgettype *wt)
  {
!     fprintf(stderr, "widgettype free... ");
      dict_unbind(mw->mw_typemap, (t_pd *)wt, wt->wt_typekey);
      props_freeall(wt->wt_options);
--- 62,66 ----
  static void widgettype_free(t_masterwidget *mw, t_widgettype *wt)
  {
!     loudbug_startpost("widgettype free... ");
      dict_unbind(mw->mw_typemap, (t_pd *)wt, wt->wt_typekey);
      props_freeall(wt->wt_options);
***************
*** 69,73 ****
      scriptlet_free(wt->wt_freescript);
      pd_free((t_pd *)wt);
!     fprintf(stderr, "done\n");
  }
  #endif
--- 69,73 ----
      scriptlet_free(wt->wt_freescript);
      pd_free((t_pd *)wt);
!     loudbug_post("done");
  }
  #endif
***************
*** 142,146 ****
  	mw->mw_parsedtype = typeval;
  #ifdef WIDGETTYPE_DEBUG
! 	post("adding widget type '%s'", typeval->wt_typekey->s_name);
  #endif
  	scriptlet_reset(typeval->wt_iniscript);
--- 142,146 ----
  	mw->mw_parsedtype = typeval;
  #ifdef WIDGETTYPE_DEBUG
! 	loudbug_post("adding widget type '%s'", typeval->wt_typekey->s_name);
  #endif
  	scriptlet_reset(typeval->wt_iniscript);
***************
*** 218,222 ****
      {
  #ifdef WIDGETTYPE_VERBOSE
! 	post("using a separate %s's definition file", s->s_name);
  #endif
  	if (!scriptlet_isempty(mwsp))
--- 218,222 ----
      {
  #ifdef WIDGETTYPE_VERBOSE
! 	loudbug_post("using a separate %s's definition file", s->s_name);
  #endif
  	if (!scriptlet_isempty(mwsp))
***************
*** 230,234 ****
  		scriptlet_append(masterwidget->mw_setupscript, mwsp);
  	    }
! 	    else bug("widgettype_doload");
  	    scriptlet_free(sp);
  	}
--- 230,234 ----
  		scriptlet_append(masterwidget->mw_setupscript, mwsp);
  	    }
! 	    else loudbug_bug("widgettype_doload");
  	    scriptlet_free(sp);
  	}
***************
*** 377,381 ****
      {
  #ifdef WIDGETTYPE_VERBOSE
! 	post("using file 'setup.wid'");
  #endif
      }
--- 377,381 ----
      {
  #ifdef WIDGETTYPE_VERBOSE
! 	loudbug_post("using file 'setup.wid'");
  #endif
      }
***************
*** 411,415 ****
      else
      {
! 	bug("masterwidget_validate 1");
  	rcresult = SCRIPTLET_BADFILE;
      }
--- 411,415 ----
      else
      {
! 	loudbug_bug("masterwidget_validate 1");
  	rcresult = SCRIPTLET_BADFILE;
      }
***************
*** 422,426 ****
  	    scriptlet_push(sp);
  	else
! 	    bug("masterwidget_validate 2");
  	scriptlet_free(sp);
      }
--- 422,426 ----
  	    scriptlet_push(sp);
  	else
! 	    loudbug_bug("masterwidget_validate 2");
  	scriptlet_free(sp);
      }

Index: widget.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** widget.c	21 Dec 2004 11:32:13 -0000	1.12
--- widget.c	11 Jan 2005 10:33:23 -0000	1.13
***************
*** 22,26 ****
  
  #ifdef KRZYSZCZ
! //#define WIDGET_DEBUG
  //#define TOW_DEBUG
  //#define WIDGET_PROFILE
--- 22,26 ----
  
  #ifdef KRZYSZCZ
! #define WIDGET_DEBUG
  //#define TOW_DEBUG
  //#define WIDGET_PROFILE
***************
*** 160,167 ****
  static void widget_profile(t_widget *x)
  {
!     fputs("total time in ms:\n", stderr);
!     fprintf(stderr, "handler get %g\n", widgetprofile_handlerslice[0] * 1000.);
!     fprintf(stderr, "handler eval %g\n", widgetprofile_handlerslice[1] * 1000.);
!     fprintf(stderr, "handler push %g\n", widgetprofile_handlerslice[2] * 1000.);
  }
  
--- 160,167 ----
  static void widget_profile(t_widget *x)
  {
!     loudbug_post("total time in ms:");
!     loudbug_post("\thandler get %g", widgetprofile_handlerslice[0] * 1000.);
!     loudbug_post("\thandler eval %g", widgetprofile_handlerslice[1] * 1000.);
!     loudbug_post("\thandler push %g", widgetprofile_handlerslice[2] * 1000.);
  }
  
***************
*** 199,203 ****
      if (glist && glist != x->x_glist)
      {
! 	bug("widget_getcvpathname");
  	x->x_glist = glist;
      }
--- 199,203 ----
      if (glist && glist != x->x_glist)
      {
! 	loudbug_bug("widget_getcvpathname");
  	x->x_glist = glist;
      }
***************
*** 222,256 ****
  }
  
- /* pity cannot set sys_printtostderr... */
- static void widget_postatoms(FILE *fp, char *msg, int ac, t_atom *av)
- {
-     if (fp)
-     {
- 	fputs(msg, fp);
- 	while (ac--)
- 	{
- 	    char buf[80];
- 	    atom_string(av, buf, 80);
- 	    fputc(' ', fp);
- 	    fputs(buf, fp);
- 	    av++;
- 	}
- 	fputc('\n', fp);
-     }
-     else
-     {
- 	startpost(msg);
- 	while (ac--)
- 	{
- 	    if (av->a_type == A_FLOAT)
- 		postfloat(av->a_w.w_float);
- 	    else if (av->a_type == A_SYMBOL)
- 		poststring(av->a_w.w_symbol->s_name);
- 	    av++;
- 	}
- 	endpost();
-     }
- }
- 
  /* If Tk widget creation fails, gui will send the '_failure' message
     to the Pd widget object, asking the receiving object to transform
--- 222,225 ----
***************
*** 274,278 ****
      t_atom *arg = props_getall(x->x_arguments, &narg);
      if (widget_transforming++)
! 	bug("widget_transtick");
      binbuf_addv(bb, "sss", gensym("widget"), x->x_type, x->x_name);
      if (narg) binbuf_add(bb, narg, arg);
--- 243,247 ----
      t_atom *arg = props_getall(x->x_arguments, &narg);
      if (widget_transforming++)
! 	loudbug_bug("widget_transtick");
      binbuf_addv(bb, "sss", gensym("widget"), x->x_type, x->x_name);
      if (narg) binbuf_add(bb, narg, arg);
***************
*** 384,388 ****
      }
      else if (!scriptlet_isempty(x->x_optscript))
! 	bug("widget_pushoptions");
  }
  
--- 353,357 ----
      }
      else if (!scriptlet_isempty(x->x_optscript))
! 	loudbug_bug("widget_pushoptions");
  }
  
***************
*** 396,400 ****
  	    scriptlet_vpush(x->x_transient, "typeinit");
  	else if (*widgettype_getinitializer(x->x_typedef, &sz) && sz > 0)
! 	    bug("widget_pushinits (type)");
      }
      if (scriptlet_evaluate(x->x_iniscript, x->x_transient, 0,
--- 365,369 ----
  	    scriptlet_vpush(x->x_transient, "typeinit");
  	else if (*widgettype_getinitializer(x->x_typedef, &sz) && sz > 0)
! 	    loudbug_bug("widget_pushinits (type)");
      }
      if (scriptlet_evaluate(x->x_iniscript, x->x_transient, 0,
***************
*** 402,406 ****
  	scriptlet_vpush(x->x_transient, "iteminit");
      else if (!scriptlet_isempty(x->x_iniscript))
! 	bug("widget_pushinits (instance)");
  }
  
--- 371,375 ----
  	scriptlet_vpush(x->x_transient, "iteminit");
      else if (!scriptlet_isempty(x->x_iniscript))
! 	loudbug_bug("widget_pushinits (instance)");
  }
  
***************
*** 415,419 ****
  	    scriptlet_push(x->x_transient);
  	else if (*widgettype_getconstructor(x->x_typedef, &sz) && sz > 0)
! 	    bug("widget_pushconstructors (type)");
      }
  }
--- 384,388 ----
  	    scriptlet_push(x->x_transient);
  	else if (*widgettype_getconstructor(x->x_typedef, &sz) && sz > 0)
! 	    loudbug_bug("widget_pushconstructors (type)");
      }
  }
***************
*** 429,433 ****
  	    scriptlet_push(x->x_transient);
  	else if (*widgettype_getdestructor(x->x_typedef, &sz) && sz > 0)
! 	    bug("widget_pushdestructors (type)");
      }
  }
--- 398,402 ----
  	    scriptlet_push(x->x_transient);
  	else if (*widgettype_getdestructor(x->x_typedef, &sz) && sz > 0)
! 	    loudbug_bug("widget_pushdestructors (type)");
      }
  }
***************
*** 607,611 ****
      else
      {
! 	bug("widget_addprops");
  	return (0);
      }
--- 576,580 ----
      else
      {
! 	loudbug_bug("widget_addprops");
  	return (0);
      }
***************
*** 853,857 ****
      else
      {
! 	bug("widget_resettype");
  	return (0);
      }
--- 822,826 ----
      else
      {
! 	loudbug_bug("widget_resettype");
  	return (0);
      }
***************
*** 863,875 ****
  }
  
! static void widget__failure(t_widget *x, t_symbol *s, int ac, t_atom *av)
  {
- #if 0
-     /* moved to the gui side -- supporting special chars in error message */
-     startpost("tcl error:");
-     postatom(ac, av);
-     endpost();
- #endif
      loud_error((t_pd *)x, "creation failure");
      x->x_vised = 0;
      clock_delay(x->x_transclock, 0);
--- 832,841 ----
  }
  
! static void widget__failure(t_widget *x)
  {
      loud_error((t_pd *)x, "creation failure");
+     /* details printed at the gui side, in order to support special chars
+        in error message */
+     loud_errand((t_pd *)x, "see standard error for details");
      x->x_vised = 0;
      clock_delay(x->x_transclock, 0);
***************
*** 881,886 ****
  {
  #ifdef WIDGET_DEBUG
!     post("config %x %s \"%s\" %g %g",
! 	 (int)x, target->s_name, bg->s_name, fw, fh);
  #endif
      x->x_width = (int)fw;
--- 847,852 ----
  {
  #ifdef WIDGET_DEBUG
!     loudbug_post("config %x %s \"%s\" %g %g",
! 		 (int)x, target->s_name, bg->s_name, fw, fh);
  #endif
      x->x_width = (int)fw;
***************
*** 894,900 ****
  {
  #ifdef WIDGET_DEBUG
!     startpost("value:");
!     postatom(ac, av);
!     endpost();
  #endif
      /* FIXME */
--- 860,866 ----
  {
  #ifdef WIDGET_DEBUG
!     loudbug_startpost("value:");
!     loudbug_postatom(ac, av);
!     loudbug_endpost();
  #endif
      /* FIXME */
***************
*** 980,984 ****
      {
  #if 0
! 	post("motion %g %g", av[0].a_w.w_float, av[1].a_w.w_float);
  #endif
  	if (x->x_cvtarget->s_thing)
--- 946,950 ----
      {
  #if 0
! 	loudbug_post("motion %g %g", av[0].a_w.w_float, av[1].a_w.w_float);
  #endif
  	if (x->x_cvtarget->s_thing)
***************
*** 1002,1005 ****
--- 968,983 ----
  
  #ifdef WIDGET_DEBUG
+ static void widgetbug_postprops(char *msg, t_props *pp)
+ {
+     int ac;
+     t_atom *av = props_getall(pp, &ac);
+     if (av)
+     {
+ 	loudbug_startpost(msg);
+ 	loudbug_postatom(ac, av);
+ 	loudbug_endpost();
+     }
+ }
+ 
  static void widget_debug(t_widget *x)
  {
***************
*** 1010,1058 ****
      static char bempty[] = "<empty>";
      char *bp, *key;
!     fprintf(stderr, "containing glist: %x\n", (int)x->x_glist);
!     fprintf(stderr, "cv pathname%s %s\n",
! 	    (pn ? ":" : ""), (pn ? pn->s_name : "unknown"));
!     fprintf(stderr, "my pathname%s %s\n",
! 	    (mn ? ":" : ""), (mn ? mn->s_name : "unknown"));
!     if (ap = props_getall(widgettype_getoptions(x->x_typedef), &nopt))
! 	widget_postatoms(stderr, "default options:", nopt, ap);
!     if (ap = props_getall(x->x_options, &nopt))
! 	widget_postatoms(stderr, "instance options:", nopt, ap);
!     if (ap = props_getall(widgettype_gethandlers(x->x_typedef), &nopt))
! 	widget_postatoms(stderr, "default handlers:", nopt, ap);
!     if (ap = props_getall(x->x_handlers, &nopt))
! 	widget_postatoms(stderr, "instance handlers:", nopt, ap);
!     if (ap = props_getall(widgettype_getarguments(x->x_typedef), &nopt))
! 	widget_postatoms(stderr, "default arguments:", nopt, ap);
!     if (ap = props_getall(x->x_arguments, &nopt))
! 	widget_postatoms(stderr, "instance arguments:", nopt, ap);
!     fprintf(stderr, "dictionary:\n");
      bp = props_firstvalue(x->x_arguments, &key);
      while (bp)
      {
! 	fprintf(stderr, "\t%s: \"%s\"\n", key, bp);
  	bp = props_nextvalue(x->x_arguments, &key);
      }
      bp = scriptlet_getcontents(x->x_transient, &sz);
!     fprintf(stderr, "transient buffer (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = scriptlet_getcontents(x->x_optscript, &sz);
!     fprintf(stderr, "option buffer (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = widgettype_getconstructor(x->x_typedef, &sz);
!     fprintf(stderr, "type constructor (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = widgettype_getdestructor(x->x_typedef, &sz);
!     fprintf(stderr, "type destructor (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = widgettype_getinitializer(x->x_typedef, &sz);
!     fprintf(stderr, "type initializer (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = scriptlet_getcontents(x->x_iniscript, &sz);
!     fprintf(stderr, "instance initializer (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
      bp = masterwidget_getcontents(&sz);
!     fprintf(stderr, "setup definitions (size %d):\n\"%s\"\n",
! 	    sz, (bp ? bp : bempty));
  }
  #endif
--- 988,1028 ----
      static char bempty[] = "<empty>";
      char *bp, *key;
!     loudbug_post("containing glist: %x", (int)x->x_glist);
!     loudbug_post("cv pathname%s %s",
! 		 (pn ? ":" : ""), (pn ? pn->s_name : "unknown"));
!     loudbug_post("my pathname%s %s",
! 		 (mn ? ":" : ""), (mn ? mn->s_name : "unknown"));
!     widgetbug_postprops("default options:",
! 			widgettype_getoptions(x->x_typedef));
!     widgetbug_postprops("instance options:", x->x_options);
!     widgetbug_postprops("default handlers:",
! 			widgettype_gethandlers(x->x_typedef));
!     widgetbug_postprops("instance handlers:", x->x_handlers);
!     widgetbug_postprops("default arguments:",
! 			widgettype_getarguments(x->x_typedef));
!     widgetbug_postprops("instance arguments:", x->x_arguments);
!     loudbug_post("dictionary:");
      bp = props_firstvalue(x->x_arguments, &key);
      while (bp)
      {
! 	loudbug_post("\t%s: \"%s\"", key, bp);
  	bp = props_nextvalue(x->x_arguments, &key);
      }
      bp = scriptlet_getcontents(x->x_transient, &sz);
!     loudbug_post("transient buffer (size %d):\n\"%s\"", sz, (bp ? bp : bempty));
      bp = scriptlet_getcontents(x->x_optscript, &sz);
!     loudbug_post("option buffer (size %d):\n\"%s\"", sz, (bp ? bp : bempty));
      bp = widgettype_getconstructor(x->x_typedef, &sz);
!     loudbug_post("type constructor (size %d):\n\"%s\"", sz, (bp ? bp : bempty));
      bp = widgettype_getdestructor(x->x_typedef, &sz);
!     loudbug_post("type destructor (size %d):\n\"%s\"", sz, (bp ? bp : bempty));
      bp = widgettype_getinitializer(x->x_typedef, &sz);
!     loudbug_post("type initializer (size %d):\n\"%s\"", sz, (bp ? bp : bempty));
      bp = scriptlet_getcontents(x->x_iniscript, &sz);
!     loudbug_post("instance initializer (size %d):\n\"%s\"",
! 		 sz, (bp ? bp : bempty));
      bp = masterwidget_getcontents(&sz);
!     loudbug_post("setup definitions (size %d):\n\"%s\"",
! 		 sz, (bp ? bp : bempty));
  }
  #endif
***************
*** 1246,1250 ****
      pd_bind((t_pd *)x, w->x_cbtarget);
  #ifdef TOW_DEBUG
!     post("%s widget '%s' attached", w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  }
--- 1216,1221 ----
      pd_bind((t_pd *)x, w->x_cbtarget);
  #ifdef TOW_DEBUG
!     loudbug_post("%s widget '%s' attached",
! 		 w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  }
***************
*** 1258,1263 ****
  	{
  #ifdef TOW_DEBUG
! 	    post("%s widget '%s' detached by widget's destructor",
! 		 w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  	    pd_unbind((t_pd *)x, w->x_cbtarget);
--- 1229,1234 ----
  	{
  #ifdef TOW_DEBUG
! 	    loudbug_post("%s widget '%s' detached by widget's destructor",
! 			 w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  	    pd_unbind((t_pd *)x, w->x_cbtarget);
***************
*** 1271,1275 ****
  	we1 = we2;
      }
!     bug("tow_widgetdetach");
  }
  
--- 1242,1246 ----
  	we1 = we2;
      }
!     loudbug_bug("tow_widgetdetach");
  }
  
***************
*** 1311,1320 ****
  #ifdef TOW_DEBUG
  	if (!x->x_widgetlist)
! 	    post("%s widget '%s' not found",
! 		 x->x_type->s_name, x->x_name->s_name);
  #endif
      }
  #ifdef TOW_DEBUG
!     else post("glist '%s' not found", x->x_cvname->s_name);
  #endif
  }
--- 1282,1291 ----
  #ifdef TOW_DEBUG
  	if (!x->x_widgetlist)
! 	    loudbug_post("%s widget '%s' not found",
! 			 x->x_type->s_name, x->x_name->s_name);
  #endif
      }
  #ifdef TOW_DEBUG
!     else loudbug_post("glist '%s' not found", x->x_cvname->s_name);
  #endif
  }
***************
*** 1335,1340 ****
  	    {
  #ifdef TOW_DEBUG
! 		post("%s widget '%s' detached by tow's destructor",
! 		     w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  		if (te1)
--- 1306,1311 ----
  	    {
  #ifdef TOW_DEBUG
! 		loudbug_post("%s widget '%s' detached by tow's destructor",
! 			     w->x_type->s_name, w->x_cbtarget->s_name);
  #endif
  		if (te1)
***************
*** 1347,1351 ****
  	    te1 = te2;
  	}
! 	if (!te2) bug("tow_detach");
      }
  }
--- 1318,1322 ----
  	    te1 = te2;
  	}
! 	if (!te2) loudbug_bug("tow_detach");
      }
  }
***************
*** 1355,1359 ****
  {
      t_widgetentry *we;
!     fprintf(stderr, "attached widgets:\n");
      for (we = x->x_widgetlist; we; we = we->we_next)
      {
--- 1326,1330 ----
  {
      t_widgetentry *we;
!     loudbug_post("attached widgets:");
      for (we = x->x_widgetlist; we; we = we->we_next)
      {
***************
*** 1361,1365 ****
  	t_towentry *te;
  	int other = 0, found = 0;
! 	fprintf(stderr, "\t%s %s", w->x_type->s_name, w->x_cbtarget->s_name);
  	for (te = w->x_towlist; te; te = te->te_next)
  	    if (te->te_tow == x)
--- 1332,1336 ----
  	t_towentry *te;
  	int other = 0, found = 0;
! 	loudbug_startpost("\t%s %s", w->x_type->s_name, w->x_cbtarget->s_name);
  	for (te = w->x_towlist; te; te = te->te_next)
  	    if (te->te_tow == x)
***************
*** 1367,1374 ****
  	    else
  		other++;
! 	fprintf(stderr, " (%d other tow%s)\n", other, (other == 1 ? "" : "s"));
  	if (found != 1)
! 	    fprintf(stderr, "BUG: listed %d times in widget's towlist\n",
! 		    found);
      }
  }
--- 1338,1344 ----
  	    else
  		other++;
! 	loudbug_post(" (%d other tow%s)", other, (other == 1 ? "" : "s"));
  	if (found != 1)
! 	    loudbug_bug("listed %d times in widget's towlist", found);
      }
  }
***************
*** 1379,1383 ****
      t_tow *t1, *t2;
  #ifdef TOW_DEBUG
!     startpost("updating towlist...");
  #endif
      for (t1 = 0, t2 = towlist; t2; t2 = t2->x_next)
--- 1349,1353 ----
      t_tow *t1, *t2;
  #ifdef TOW_DEBUG
!     loudbug_startpost("updating towlist...");
  #endif
      for (t1 = 0, t2 = towlist; t2; t2 = t2->x_next)
***************
*** 1390,1394 ****
  		towlist = t2->x_next;
  #ifdef TOW_DEBUG
! 	    post("ok");
  #endif
  	    break;
--- 1360,1364 ----
  		towlist = t2->x_next;
  #ifdef TOW_DEBUG
! 	    loudbug_post("ok");
  #endif
  	    break;
***************
*** 1481,1485 ****
  		    gensym("redefine"), 0);
      class_addmethod(widget_class, (t_method)widget__failure,
! 		    gensym("_failure"), A_GIMME, 0);
      class_addmethod(widget_class, (t_method)widget__config,
  		    gensym("_config"),
--- 1451,1455 ----
  		    gensym("redefine"), 0);
      class_addmethod(widget_class, (t_method)widget__failure,
! 		    gensym("_failure"), 0);
      class_addmethod(widget_class, (t_method)widget__config,
  		    gensym("_config"),

Index: plustot.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/plustot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plustot.c	10 Dec 2004 20:47:06 -0000	1.3
--- plustot.c	11 Jan 2005 10:33:23 -0000	1.4
***************
*** 100,105 ****
      {
  #ifdef PLUSTOT_DEBUG
! 	fprintf(stderr, "plustin_create '%s' over %x\n",
! 		(id ? id->s_name : "default"), (int)interp);
  #endif
  	tin->tin_interp = interp;
--- 100,105 ----
      {
  #ifdef PLUSTOT_DEBUG
! 	loudbug_post("plustin_create '%s' over %x",
! 		     (id ? id->s_name : "default"), (int)interp);
  #endif
  	tin->tin_interp = interp;
***************
*** 119,124 ****
  #ifdef PLUSTOT_DEBUG
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
!     fprintf(stderr, "plustin_delete '%s' over %x\n",
! 	    (id ? id->s_name : "default"), (int)tin->tin_interp);
  #endif
      Tcl_Preserve(tin->tin_interp);
--- 119,124 ----
  #ifdef PLUSTOT_DEBUG
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
!     loudbug_post("plustin_delete '%s' over %x",
! 		 (id ? id->s_name : "default"), (int)tin->tin_interp);
  #endif
      Tcl_Preserve(tin->tin_interp);
***************
*** 291,295 ****
  	plusbob_preserve((t_plusbob *)tin);
      }
!     else bug("plustob_attach");
  }
  
--- 291,295 ----
  	plusbob_preserve((t_plusbob *)tin);
      }
!     else loudbug_bug("plustob_attach");
  }
  
***************
*** 460,465 ****
  	{
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr, "growing +To %d -> %d\n",
! 		    tob->tob_elbufsize, count);
  #endif
  	    tob->tob_elbuf =
--- 460,464 ----
  	{
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_post("growing +To %d -> %d", tob->tob_elbufsize, count);
  #endif
  	    tob->tob_elbuf =
***************
*** 577,582 ****
  	    int n = count;
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr, "growing +To %d -> %d\n",
! 		    tob->tob_elbufsize, count);
  #endif
  	    tob->tob_elbuf =
--- 576,580 ----
  	    int n = count;
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_post("growing +To %d -> %d", tob->tob_elbufsize, count);
  #endif
  	    tob->tob_elbuf =
***************
*** 695,699 ****
      else
      {
! 	bug("plusvar_create");
  	goto varfailed2;
      }
--- 693,697 ----
      else
      {
! 	loudbug_bug("plusvar_create");
  	goto varfailed2;
      }
***************
*** 780,788 ****
  #ifdef PLUSTOT_DEBUGREFCOUNTS
  	    if (var->var_index)
! 		fprintf(stderr, "vv %x plusvar_postset [%s(%s)]\n",
! 			(int)tob->tob_value, var->var_name, var->var_index);
  	    else
! 		fprintf(stderr, "vv %x plusvar_postset [%s]\n",
! 			(int)tob->tob_value, var->var_name);
  #endif
  	}
--- 778,787 ----
  #ifdef PLUSTOT_DEBUGREFCOUNTS
  	    if (var->var_index)
! 		loudbug_post("vv %x plusvar_postset [%s(%s)]",
! 			     (int)tob->tob_value, var->var_name,
! 			     var->var_index);
  	    else
! 		loudbug_post("vv %x plusvar_postset [%s]",
! 			     (int)tob->tob_value, var->var_name);
  #endif
  	}
***************
*** 933,937 ****
  	    freebytes(ps, sizeof(*ps));
  	}
! 	else bug("plusstring_release");
      }
  }
--- 932,936 ----
  	    freebytes(ps, sizeof(*ps));
  	}
! 	else loudbug_bug("plusstring_release");
      }
  }
***************
*** 1013,1018 ****
  {
  #ifdef PLUSTOT_DEBUG
!     fprintf(stderr, "plusproxy_free (%s %d)\n",
! 	    (pp->pp_var ? pp->pp_var->var_name : "empty"), pp->pp_ndx);
  #endif
      if (pp->pp_var)
--- 1012,1017 ----
  {
  #ifdef PLUSTOT_DEBUG
!     loudbug_post("plusproxy_free (%s %d)",
! 		 (pp->pp_var ? pp->pp_var->var_name : "empty"), pp->pp_ndx);
  #endif
      if (pp->pp_var)
***************
*** 1067,1075 ****
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
      t_symbol *glname = plustin_getglistname(tin);
!     fprintf(stderr, "+proxy %d, glist %x\n",
! 	    pp->pp_ndx, (int)((t_plustot *)pp->pp_master)->x_glist);
!     fprintf(stderr, "  plustin '%s' (%s) over %x\n",
! 	    (id ? id->s_name : "default"),
! 	    (glname ? glname->s_name : "<anonymous>"), (int)tin->tin_interp);
  }
  #endif
--- 1066,1074 ----
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
      t_symbol *glname = plustin_getglistname(tin);
!     loudbug_post("+proxy %d, glist %x",
! 		 pp->pp_ndx, (int)((t_plustot *)pp->pp_master)->x_glist);
!     loudbug_post("  plustin '%s' (%s) over %x", (id ? id->s_name : "default"),
! 		 (glname ? glname->s_name : "<anonymous>"),
! 		 (int)tin->tin_interp);
  }
  #endif
***************
*** 1095,1099 ****
  	else buf[size] = 0;
  	strncpy(buf, tp->start, size);
! 	fprintf(stderr, "%s ", buf);
      }
  #endif
--- 1094,1098 ----
  	else buf[size] = 0;
  	strncpy(buf, tp->start, size);
! 	loudbug_startpost("%s ", buf);
      }
  #endif
***************
*** 1161,1165 ****
  		{
  #ifdef PLUSTOT_DEBUG
! 		    fprintf(stderr, "(inlet %d) ", inno);
  #endif
  		    if (inno >= x->x_nproxies)
--- 1160,1164 ----
  		{
  #ifdef PLUSTOT_DEBUG
! 		    loudbug_startpost("(inlet %d) ", inno);
  #endif
  		    if (inno >= x->x_nproxies)
***************
*** 1182,1186 ****
  		{
  		    PLUSDEBUG_ENDPOST("plustot_usevariable");
! 		    bug("plustot_usevariable");
  		    goto badvariable;
  		}
--- 1181,1185 ----
  		{
  		    PLUSDEBUG_ENDPOST("plustot_usevariable");
! 		    loudbug_bug("plustot_usevariable");
  		    goto badvariable;
  		}
***************
*** 1258,1262 ****
  		    strncpy(buf, tp->start, sz);
  		    buf[sz] = 0;
! 		    fprintf(stderr, "simple word's text:  %s\n", buf);
  		}
  #endif
--- 1257,1261 ----
  		    strncpy(buf, tp->start, sz);
  		    buf[sz] = 0;
! 		    loudbug_post("simple word's text:  %s", buf);
  		}
  #endif
***************
*** 1290,1294 ****
  		strncpy(buf, tp->start, sz);
  		buf[sz] = 0;
! 		fprintf(stderr, "other type (%d):  %s\n", tp->type, buf);
  	    }
  #endif
--- 1289,1293 ----
  		strncpy(buf, tp->start, sz);
  		buf[sz] = 0;
! 		loudbug_post("other type (%d):  %s", tp->type, buf);
  	    }
  #endif
***************
*** 1308,1312 ****
      int nvars;
  #ifdef PLUSTOT_DEBUG
!     if (!doit) fprintf(stderr, "variables: ");
  #endif
      nvars = plustot_doparsevariables(x, interp, buf, len, parsep, doit);
--- 1307,1311 ----
      int nvars;
  #ifdef PLUSTOT_DEBUG
!     if (!doit) loudbug_startpost("variables: ");
  #endif
      nvars = plustot_doparsevariables(x, interp, buf, len, parsep, doit);
***************
*** 1316,1323 ****
  	if (nvars > 0)
  	{
! 	    fprintf(stderr, "\n%d variable substitutions\n", nvars);
! 	    fprintf(stderr, "%d inlets requested\n", x->x_nproxies);
  	}
! 	else if (nvars == 0) fprintf(stderr, "none\n");
      }
  #endif
--- 1315,1322 ----
  	if (nvars > 0)
  	{
! 	    loudbug_post("\n%d variable substitutions", nvars);
! 	    loudbug_post("%d inlets requested", x->x_nproxies);
  	}
! 	else if (nvars == 0) loudbug_post("none");
      }
  #endif
***************
*** 1356,1360 ****
  	else
  	{
! 	    bug("plustot_makeproxies");
  	    goto proxiesfailed;
  	}
--- 1355,1359 ----
  	else
  	{
! 	    loudbug_bug("plustot_makeproxies");
  	    goto proxiesfailed;
  	}
***************
*** 1397,1401 ****
  	    int n = nwords;
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr, "growing words %d -> %d\n", x->x_maxwords, nwords);
  #endif
  	    x->x_words = grow_nodata(&n, &x->x_maxwords, x->x_words,
--- 1396,1400 ----
  	    int n = nwords;
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_post("growing words %d -> %d", x->x_maxwords, nwords);
  #endif
  	    x->x_words = grow_nodata(&n, &x->x_maxwords, x->x_words,
***************
*** 1424,1428 ****
  	    int n = nargs;
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr, "growing argv %d -> %d\n", x->x_maxargs, nargs);
  #endif
  	    x->x_argv = grow_nodata(&n, &x->x_maxargs, x->x_argv,
--- 1423,1427 ----
  	    int n = nargs;
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_post("growing argv %d -> %d", x->x_maxargs, nargs);
  #endif
  	    x->x_argv = grow_nodata(&n, &x->x_maxargs, x->x_argv,
***************
*** 1439,1443 ****
  	else if (nargs < x->x_maxargs)
  	{
! 	    bug("plustot_resetargs");  /* LATER rethink */
  	    plustot_initwords(x);
  	    plustot_initargs(x);
--- 1438,1442 ----
  	else if (nargs < x->x_maxargs)
  	{
! 	    loudbug_bug("plustot_resetargs");  /* LATER rethink */
  	    plustot_initwords(x);
  	    plustot_initargs(x);
***************
*** 1458,1462 ****
  	char buf[TCL_UTF_MAX];
  #ifdef PLUSTOT_DEBUG
! 	fprintf(stderr, "arguments:\n");
  #endif
  	for (i = 1, tp = x->x_tailparse.tokenPtr;
--- 1457,1461 ----
  	char buf[TCL_UTF_MAX];
  #ifdef PLUSTOT_DEBUG
! 	loudbug_post("arguments:");
  #endif
  	for (i = 1, tp = x->x_tailparse.tokenPtr;
***************
*** 1464,1472 ****
  	{
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr,
! 		    "  %s token: type %d[%d], having %d[%d] component%s\n",
! 		    loud_ordinal(i), tp->type, tp[1].type,
! 		    tp->numComponents, tp[1].numComponents,
! 		    (tp->numComponents > 1 ? "s" : ""));
  #endif
  	    ncomponents = tp->numComponents;
--- 1463,1470 ----
  	{
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_post("  %s token: type %d[%d], having %d[%d] component%s",
! 			 loud_ordinal(i), tp->type, tp[1].type,
! 			 tp->numComponents, tp[1].numComponents,
! 			 (tp->numComponents > 1 ? "s" : ""));
  #endif
  	    ncomponents = tp->numComponents;
***************
*** 1606,1610 ****
  	Tcl_Token *tp;
  #ifdef PLUSTOT_DEBUG
! 	fprintf(stderr, "arguments:\n");
  #endif
  	for (i = 1, tp = x->x_tailparse.tokenPtr;
--- 1604,1608 ----
  	Tcl_Token *tp;
  #ifdef PLUSTOT_DEBUG
! 	loudbug_post("arguments:");
  #endif
  	for (i = 1, tp = x->x_tailparse.tokenPtr;
***************
*** 1613,1619 ****
  	    int result;
  #ifdef PLUSTOT_DEBUG
! 	    fprintf(stderr, "  %s token: type %d[%d], having %d component%s",
! 		    loud_ordinal(i), tp->type, tp[1].type,
! 		    tp->numComponents, (tp->numComponents > 1 ? "s" : ""));
  #endif
  	    result = Tcl_EvalTokensStandard(interp, tp + 1, tp->numComponents);
--- 1611,1618 ----
  	    int result;
  #ifdef PLUSTOT_DEBUG
! 	    loudbug_startpost("  %s token: type %d[%d], having %d component%s",
! 			      loud_ordinal(i), tp->type, tp[1].type,
! 			      tp->numComponents,
! 			      (tp->numComponents > 1 ? "s" : ""));
  #endif
  	    result = Tcl_EvalTokensStandard(interp, tp + 1, tp->numComponents);
***************
*** 1626,1632 ****
  		    Tcl_ResetResult(interp);
  #ifdef PLUSTOT_DEBUG
! 		    fprintf(stderr, ", %sshared: '%s'\n",
! 			    (Tcl_IsShared(x->x_argv[i]) ? "" : "not "),
! 			    Tcl_GetString(x->x_argv[i]));
  #endif
  		}
--- 1625,1631 ----
  		    Tcl_ResetResult(interp);
  #ifdef PLUSTOT_DEBUG
! 		    loudbug_post(", %sshared: '%s'",
! 				 (Tcl_IsShared(x->x_argv[i]) ? "" : "not "),
! 				 Tcl_GetString(x->x_argv[i]));
  #endif
  		}
***************
*** 1788,1795 ****
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
      t_symbol *glname = plustin_getglistname(tin);
!     fprintf(stderr, "+tot, glist %x\n", (int)x->x_glist);
!     fprintf(stderr, "  plustin '%s' (%s) over %x\n",
! 	    (id ? id->s_name : "default"),
! 	    (glname ? glname->s_name : "<anonymous>"), (int)tin->tin_interp);
      if (x->x_mainproxy)
  	plusproxy_debug(x->x_mainproxy);
--- 1787,1794 ----
      t_symbol *id = plusenv_getid((t_plusenv *)tin);
      t_symbol *glname = plustin_getglistname(tin);
!     loudbug_post("+tot, glist %x", (int)x->x_glist);
!     loudbug_post("  plustin '%s' (%s) over %x", (id ? id->s_name : "default"),
! 		 (glname ? glname->s_name : "<anonymous>"),
! 		 (int)tin->tin_interp);
      if (x->x_mainproxy)
  	plusproxy_debug(x->x_mainproxy);

Index: tot.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/tot.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tot.c	10 Dec 2004 20:47:06 -0000	1.6
--- tot.c	11 Jan 2005 10:33:23 -0000	1.7
***************
*** 109,113 ****
      else
      {
! 	bug("tot_getcvname");
  	return (gensym("???"));
      }
--- 109,113 ----
      else
      {
! 	loudbug_bug("tot_getcvname");
  	return (gensym("???"));
      }
***************
*** 290,295 ****
  #ifdef TOT_DEBUG
      t_symbol *pn = tot_getpathname(x, 0);
!     post("tot__vised %s %g (pathname %s) ", s->s_name, f,
! 	 (pn ? pn->s_name : "unknown"));
  #endif
      if (!x->x_visedpathname)
--- 290,295 ----
  #ifdef TOT_DEBUG
      t_symbol *pn = tot_getpathname(x, 0);
!     loudbug_post("tot__vised %s %g (pathname %s) ", s->s_name, f,
! 		 (pn ? pn->s_name : "unknown"));
  #endif
      if (!x->x_visedpathname)
***************
*** 311,321 ****
      int sz;
      char *bp;
!     post("containing glist: %x", x->x_glist);
!     post("destination: %s", tot_getcvname(x)->s_name);
!     post("pathname%s %s", (pn ? ":" : ""), (pn ? pn->s_name : "unknown"));
      bp = scriptlet_getbuffer(x->x_transient, &sz);
!     post("transient buffer (size %d):\n\"%s\"", sz, bp);
      bp = scriptlet_getbuffer(x->x_persistent, &sz);
!     post("persistent buffer (size %d):\n\"%s\"", sz, bp);
  }
  #endif
--- 311,322 ----
      int sz;
      char *bp;
!     loudbug_post("containing glist: %x", x->x_glist);
!     loudbug_post("destination: %s", tot_getcvname(x)->s_name);
!     loudbug_post("pathname%s %s", (pn ? ":" : ""),
! 		 (pn ? pn->s_name : "unknown"));
      bp = scriptlet_getbuffer(x->x_transient, &sz);
!     loudbug_post("transient buffer (size %d):\n\"%s\"", sz, bp);
      bp = scriptlet_getbuffer(x->x_persistent, &sz);
!     loudbug_post("persistent buffer (size %d):\n\"%s\"", sz, bp);
  }
  #endif
***************
*** 395,399 ****
  	    }
  	}
! 	else bug("tot_attach");
      }
  }
--- 396,400 ----
  	    }
  	}
! 	else loudbug_bug("tot_attach");
      }
  }
***************
*** 462,466 ****
  	    ts->ts_gotmotion = 1;
  	}
! 	else bug("totspy_anything");
      }
      if (ts->ts_on)
--- 463,467 ----
  	    ts->ts_gotmotion = 1;
  	}
! 	else loudbug_bug("totspy_anything");
      }
      if (ts->ts_on)





More information about the Pd-cvs mailing list