diff options
Diffstat (limited to 'toxy')
| -rw-r--r-- | toxy/Makefile | 12 | ||||
| -rw-r--r-- | toxy/build_counter | 2 | ||||
| -rw-r--r-- | toxy/widget.c | 24 | ||||
| -rw-r--r-- | toxy/widgettype.c | 2 |
4 files changed, 26 insertions, 14 deletions
diff --git a/toxy/Makefile b/toxy/Makefile index a9b675c..44e8206 100644 --- a/toxy/Makefile +++ b/toxy/Makefile @@ -1,6 +1,14 @@ ROOT_DIR = .. -redefault: setup.wiq default -setup.wiq: $(ROOT_DIR)/test/toxy/setup.wid +WIQFILE = setup.wiq +redefault: checkwiq $(WIQFILE) default +checkwiq: + @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ + echo ERROR: empty file $(WIQFILE)... removed ; \ + rm -f $(WIQFILE) ; fi +$(WIQFILE): $(ROOT_DIR)/test/toxy/$(WIQFILE:.wiq=.wid) $(ROOT_DIR)/quoteinitializer $< \ '"puts stderr [concat loading built-in widget definitions]\n"' > $@ + @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ + echo ERROR: quoteinitializer failed... $(WIQFILE) removed ; \ + rm -f $(WIQFILE) ; fi include $(ROOT_DIR)/Makefile.common diff --git a/toxy/build_counter b/toxy/build_counter index 7f25b3b..553acb4 100644 --- a/toxy/build_counter +++ b/toxy/build_counter @@ -1,3 +1,3 @@ #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" -#define TOXY_BUILD 6 +#define TOXY_BUILD 7 diff --git a/toxy/widget.c b/toxy/widget.c index 9d1413a..63797df 100644 --- a/toxy/widget.c +++ b/toxy/widget.c @@ -270,7 +270,8 @@ static void widget_delete(t_gobj *z, t_glist *glist) static void widget_pushoptions(t_widget *x, int doit) { char *mypathname = widget_getmypathname(x, x->x_glist)->s_name; - if (scriptlet_evaluate(x->x_optscript, x->x_transient, 0, 0, 0, 0)) + if (scriptlet_evaluate(x->x_optscript, x->x_transient, 0, + 0, 0, x->x_arguments)) { #ifdef WIDGET_DEBUG int sz; @@ -532,8 +533,8 @@ static void widget_anything(t_widget *x, t_symbol *s, int ac, t_atom *av) { scriptlet_reset(x->x_auxscript); scriptlet_add(x->x_auxscript, 0, 0, hlen - 1, hp + 1); - if (scriptlet_evaluate(x->x_auxscript, x->x_transient, - 1, ac, av, 0)) + if (scriptlet_evaluate(x->x_auxscript, x->x_transient, 1, + ac, av, x->x_arguments)) scriptlet_push(x->x_transient); } else loud_nomethod((t_pd *)x, s); @@ -574,8 +575,8 @@ static void widget_float(t_widget *x, t_float f) SETFLOAT(&at, f); scriptlet_reset(x->x_auxscript); scriptlet_add(x->x_auxscript, 0, 0, ac - 1, av + 1); - if (scriptlet_evaluate(x->x_auxscript, - x->x_transient, 1, 1, &at, 0)) + if (scriptlet_evaluate(x->x_auxscript, x->x_transient, 1, + 1, &at, x->x_arguments)) scriptlet_push(x->x_transient); } } @@ -596,8 +597,8 @@ static void widget_symbol(t_widget *x, t_symbol *s) SETSYMBOL(&at, s); scriptlet_reset(x->x_auxscript); scriptlet_add(x->x_auxscript, 0, 0, ac - 1, av + 1); - if (scriptlet_evaluate(x->x_auxscript, - x->x_transient, 1, 1, &at, 0)) + if (scriptlet_evaluate(x->x_auxscript, x->x_transient, 1, + 1, &at, x->x_arguments)) scriptlet_push(x->x_transient); } } @@ -676,10 +677,11 @@ static void widget_tot(t_widget *x, t_symbol *s, int ac, t_atom *av) { if (ac) { - t_scriptlet *sp = x->x_transient; - scriptlet_reset(sp); - scriptlet_add(sp, 1, 1, ac, av); - scriptlet_push(sp); + scriptlet_reset(x->x_auxscript); + scriptlet_add(x->x_auxscript, 1, 1, ac, av); + if (scriptlet_evaluate(x->x_auxscript, x->x_transient, 1, + 0, 0, x->x_arguments)) + scriptlet_push(x->x_transient); } } diff --git a/toxy/widgettype.c b/toxy/widgettype.c index 4541947..f9a6f46 100644 --- a/toxy/widgettype.c +++ b/toxy/widgettype.c @@ -2,6 +2,8 @@ * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ +/* FIXME .#iprops crash */ + #include <stdio.h> #include <string.h> #include "m_pd.h" |