diff options
Diffstat (limited to 'toxy')
| -rw-r--r-- | toxy/Makefile | 14 | ||||
| -rw-r--r-- | toxy/build_counter | 2 | ||||
| -rw-r--r-- | toxy/widget.c | 9 | ||||
| -rw-r--r-- | toxy/widgettype.c | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/toxy/Makefile b/toxy/Makefile index 44e8206..4ae80d2 100644 --- a/toxy/Makefile +++ b/toxy/Makefile @@ -1,13 +1,19 @@ ROOT_DIR = .. -WIQFILE = setup.wiq +WIDPATH = $(ROOT_DIR)/test/toxy/setup.wid +WIQFILE = $(notdir $(WIDPATH:.wid=.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"' > $@ +$(WIQFILE): $(WIDPATH) + @echo transferring widget definitions from \"$<\" to \"$@\" + @cat $< | sed \ +-e '1i// Do not edit this file (edit \"$<\", and run \"make\").' \ +-e '1i//' \ +-e '1i\"puts stderr [concat loading built-in widget definitions]\\n\"' \ +-e 's/\([\\\"]\)/\\\1/g' \ +-e 's/^.*$$/\"&\\n\"/' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ echo ERROR: quoteinitializer failed... $(WIQFILE) removed ; \ rm -f $(WIQFILE) ; fi diff --git a/toxy/build_counter b/toxy/build_counter index 553acb4..2c83711 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 7 +#define TOXY_BUILD 8 diff --git a/toxy/widget.c b/toxy/widget.c index 63797df..f75b991 100644 --- a/toxy/widget.c +++ b/toxy/widget.c @@ -239,6 +239,7 @@ static void widget_displace(t_gobj *z, t_glist *glist, int dx, int dy) canvas_fixlinesfor(glist_getcanvas(glist), t); } +/* LATER handle subitems */ static void widget_select(t_gobj *z, t_glist *glist, int flag) { t_widget *x = (t_widget *)z; @@ -313,7 +314,7 @@ static void widget_pushinits(t_widget *x) static void widget_getconfig(t_widget *x) { - sys_vgui("::toxy::itemgetconfig %s %s\n", + sys_vgui("::toxy::item_getconfig %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_cbtarget->s_name); } @@ -334,7 +335,7 @@ static void widget_vis(t_gobj *z, t_glist *glist, int vis) #endif widget_pushoptions(x, 0); widget_pushinits(x); - sys_vgui("::toxy::itemvis %s %s %s %s %s %s %g %g\n", + sys_vgui("::toxy::item_vis %s %s %s %s %s %s %g %g\n", x->x_tkclass->s_name, mypathname, x->x_cbtarget->s_name, x->x_name->s_name, x->x_varname->s_name, cvpathname, px1, py1); @@ -431,7 +432,7 @@ static t_widgetbehavior widget_behavior = static void widget_novis(t_widget *x) { - sys_vgui("::toxy::itemdestroy %s %s\n", + sys_vgui("::toxy::item_destroy %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_varname->s_name); } @@ -706,6 +707,7 @@ static void widget__failure(t_widget *x, t_symbol *s, int ac, t_atom *av) clock_delay(x->x_transclock, 0); } +/* LATER handle subitems */ static void widget__config(t_widget *x, t_symbol *target, t_symbol *bg, t_floatarg fw, t_floatarg fh, t_floatarg fst) { @@ -751,6 +753,7 @@ static void widget__callback(t_widget *x, t_symbol *s, int ac, t_atom *av) } /* see also widget_select() */ +/* LATER handle subitems */ static void widget__inout(t_widget *x, t_floatarg f) { int disable = (int)f && x->x_glist->gl_edit; diff --git a/toxy/widgettype.c b/toxy/widgettype.c index f9a6f46..4541947 100644 --- a/toxy/widgettype.c +++ b/toxy/widgettype.c @@ -2,8 +2,6 @@ * 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" |