[PD-cvs] externals/miXed/toxy Makefile,1.3,1.4 build_counter,1.5,1.6 widget.c,1.6,1.7 widgettype.c,1.4,1.5

[krzyszcz at users.sourceforge.net]

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

Modified Files:
	Makefile build_counter widget.c widgettype.c 
Log Message:
toxy alpha7

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	9 Mar 2004 12:41:22 -0000	1.3
--- Makefile	10 Mar 2004 10:55:56 -0000	1.4
***************
*** 1,6 ****
  ROOT_DIR = ..
! redefault: setup.wiq default
! setup.wiq: $(ROOT_DIR)/test/toxy/setup.wid
  	$(ROOT_DIR)/quoteinitializer $< \
  	    '"puts stderr [concat loading built-in widget definitions]\n"' > $@
  include $(ROOT_DIR)/Makefile.common
--- 1,14 ----
  ROOT_DIR = ..
! 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

Index: build_counter
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/build_counter,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build_counter	9 Mar 2004 12:41:22 -0000	1.5
--- build_counter	10 Mar 2004 10:55:57 -0000	1.6
***************
*** 1,3 ****
  #define TOXY_VERSION "0.1"
  #define TOXY_RELEASE "alpha"
! #define TOXY_BUILD 6
--- 1,3 ----
  #define TOXY_VERSION "0.1"
  #define TOXY_RELEASE "alpha"
! #define TOXY_BUILD 7

Index: widget.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** widget.c	9 Mar 2004 12:41:22 -0000	1.6
--- widget.c	10 Mar 2004 10:55:57 -0000	1.7
***************
*** 271,275 ****
  {
      char *mypathname = widget_getmypathname(x, x->x_glist)->s_name;
!     if (scriptlet_evaluate(x->x_optscript, x->x_transient, 0, 0, 0, 0))
      {
  #ifdef WIDGET_DEBUG
--- 271,276 ----
  {
      char *mypathname = widget_getmypathname(x, x->x_glist)->s_name;
!     if (scriptlet_evaluate(x->x_optscript, x->x_transient, 0,
! 			   0, 0, x->x_arguments))
      {
  #ifdef WIDGET_DEBUG
***************
*** 533,538 ****
  		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))
  		    scriptlet_push(x->x_transient);
  	    }
--- 534,539 ----
  		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, x->x_arguments))
  		    scriptlet_push(x->x_transient);
  	    }
***************
*** 575,580 ****
  	    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))
  		scriptlet_push(x->x_transient);
  	}
--- 576,581 ----
  	    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, x->x_arguments))
  		scriptlet_push(x->x_transient);
  	}
***************
*** 597,602 ****
  	    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))
  		scriptlet_push(x->x_transient);
  	}
--- 598,603 ----
  	    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, x->x_arguments))
  		scriptlet_push(x->x_transient);
  	}
***************
*** 677,684 ****
      if (ac)
      {
! 	t_scriptlet *sp = x->x_transient;
! 	scriptlet_reset(sp);
! 	scriptlet_add(sp, 1, 1, ac, av);
! 	scriptlet_push(sp);
      }
  }
--- 678,686 ----
      if (ac)
      {
! 	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);
      }
  }

Index: widgettype.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/toxy/widgettype.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** widgettype.c	9 Mar 2004 12:41:22 -0000	1.4
--- widgettype.c	10 Mar 2004 10:55:57 -0000	1.5
***************
*** 3,6 ****
--- 3,8 ----
   * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
  
+ /* FIXME .#iprops crash */
+ 
  #include <stdio.h>
  #include <string.h>