Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

externals/miXed/toxy Makefile,1.6,1.7 build_counter,1.8,1.9 tot.c,1.3,1.4
by Krzysztof Czaja 29 Mar '04

29 Mar '04

Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv597/toxy Modified Files: Makefile build_counter tot.c Log Message: toxy alpha10 Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 23 Mar 2004 12:07:22 -0000 1.6 --- Makefile 29 Mar 2004 17:09:53 -0000 1.7 *************** *** 10,16 **** @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\"/' > $@ --- 10,19 ---- @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\"/' > $@ Index: build_counter =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/build_counter,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build_counter 23 Mar 2004 12:07:22 -0000 1.8 --- build_counter 29 Mar 2004 17:09:53 -0000 1.9 *************** *** 1,3 **** #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 9 --- 1,3 ---- #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 10 Index: tot.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/tot.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tot.c 19 Feb 2004 22:23:18 -0000 1.3 --- tot.c 29 Mar 2004 17:09:53 -0000 1.4 *************** *** 1,3 **** ! /* Copyright (c) 2003 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 2003-2004 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 25,30 **** t_object x_ob; t_glist *x_glist; /* containing glist */ ! t_symbol *x_cvremote; /* null if containing glist is our destination */ ! t_symbol *x_cvname; t_symbol *x_cvpathname; /* see tot_getpathname() */ t_symbol *x_visedpathname; /* see tot__vised() */ --- 25,31 ---- t_object x_ob; t_glist *x_glist; /* containing glist */ ! t_symbol *x_dotname; /* "." (if explicit), ".parent", ".root", etc. */ ! t_symbol *x_cvname; /* destination name (if literal), or 0 */ ! t_symbol *x_cvremote; /* bindsym of the above */ t_symbol *x_cvpathname; /* see tot_getpathname() */ t_symbol *x_visedpathname; /* see tot__vised() */ *************** *** 55,58 **** --- 56,60 ---- t_atom ts_outbuf[TOTSPY_MAXSIZE]; t_outlet *ts_out3; + t_clock *ts_cleanupclock; /* also a tot-is-gone flag */ } t_totspy; *************** *** 66,80 **** static t_symbol *totps_query; static t_canvas *tot_getcanvas(t_tot *x, int complain) { t_canvas *cv = 0; ! t_glist *glist = ! (x->x_cvremote ? ! (t_glist *)pd_findbyclass(x->x_cvremote, canvas_class) : x->x_glist); if (glist) cv = glist_getcanvas(glist); else if (complain) ! loud_error((t_pd *)x, "bad canvas name '%s'", x->x_cvname->s_name); ! if (!x->x_warned && !x->x_cvremote) { x->x_warned = 1; --- 68,131 ---- static t_symbol *totps_query; + static t_symbol *totps_dotparent; /* holder of our containing glist's box */ + static t_symbol *totps_dotroot; /* our document's root canvas */ + static t_symbol *totps_dotowner; /* parent of .root */ + static t_symbol *totps_dottop; /* top-level canvas */ + + static t_glist *tot_getglist(t_tot *x) + { + t_glist *glist; + if (x->x_cvremote) + glist = (t_glist *)pd_findbyclass(x->x_cvremote, canvas_class); + else if (x->x_dotname == totps_dotparent) + glist = x->x_glist->gl_owner; + else if (x->x_dotname == totps_dotroot) + glist = canvas_getrootfor(x->x_glist); + else if (x->x_dotname == totps_dotowner) + { + if (glist = canvas_getrootfor(x->x_glist)) + glist = glist->gl_owner; + } + else if (x->x_dotname == totps_dottop) + { + glist = x->x_glist; + while (glist->gl_owner) glist = glist->gl_owner; + } + else + glist = x->x_glist; + return (glist); + } + + static t_symbol *tot_getcvname(t_tot *x) + { + t_glist *glist = tot_getglist(x); + t_symbol *cvname = (glist ? glist->gl_name : x->x_cvname); + if (cvname) + return (cvname); + else if (x->x_dotname) + return (x->x_dotname); + else + { + bug("tot_getcvname"); + return (gensym("???")); + } + } + static t_canvas *tot_getcanvas(t_tot *x, int complain) { t_canvas *cv = 0; ! t_glist *glist = tot_getglist(x); if (glist) cv = glist_getcanvas(glist); else if (complain) ! { ! if (x->x_dotname && *x->x_dotname->s_name) ! loud_error((t_pd *)x, "%s canvas does not exist", ! &x->x_dotname->s_name[1]); ! else ! loud_error((t_pd *)x, "bad canvas name '%s'", ! tot_getcvname(x)->s_name); ! } ! if (!x->x_warned) { x->x_warned = 1; *************** *** 259,263 **** char *bp; post("containing glist: %x", x->x_glist); ! post("destination: %s", x->x_cvname->s_name); post("pathname%s %s", (pn ? ":" : ""), (pn ? pn->s_name : "unknown")); bp = scriptlet_getbuffer(x->x_transient, &sz); --- 310,314 ---- 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); *************** *** 398,401 **** --- 449,454 ---- static void totspy_anything(t_totspy *ts, t_symbol *s, int ac, t_atom *av) { + if (ts->ts_cleanupclock) + return; if (s == totps_motion) { *************** *** 433,436 **** --- 486,498 ---- } + static void totspy_cleanuptick(t_totspy *ts) + { + if (ts->ts_target) + pd_unbind((t_pd *)ts, ts->ts_target); + if (ts->ts_cleanupclock) + clock_free(ts->ts_cleanupclock); + pd_free((t_pd *)ts); + } + static void totsink_anything(t_pd *x, t_symbol *s, int ac, t_atom *av) { *************** *** 446,451 **** scriptlet_free(x->x_transient); if (x->x_spy->ts_target) ! pd_unbind((t_pd *)x->x_spy, x->x_spy->ts_target); ! pd_free((t_pd *)x->x_spy); pd_free(x->x_guisink); } --- 508,519 ---- scriptlet_free(x->x_transient); if (x->x_spy->ts_target) ! { ! /* postpone unbinding, due to a danger of being deleted by ! a message to the canvas we spy on... */ ! x->x_spy->ts_cleanupclock = ! clock_new(x->x_spy, (t_method)totspy_cleanuptick); ! clock_delay(x->x_spy->ts_cleanupclock, 0); ! } ! else pd_free((t_pd *)x->x_spy); pd_free(x->x_guisink); } *************** *** 462,467 **** x->x_persistent = scriptlet_new((t_pd *)x, x->x_target, x->x_target, 0, x->x_glist, tot_cvhook); ! if (s1 && s1 != &s_ && strcmp(s1->s_name, ".")) { x->x_cvremote = canvas_makebindsym(x->x_cvname = s1); x->x_cvpathname = 0; --- 530,537 ---- x->x_persistent = scriptlet_new((t_pd *)x, x->x_target, x->x_target, 0, x->x_glist, tot_cvhook); ! if (s1 && s1 != &s_ && *s1->s_name != '.') { + x->x_dotname = 0; + x->x_warned = 1; x->x_cvremote = canvas_makebindsym(x->x_cvname = s1); x->x_cvpathname = 0; *************** *** 469,477 **** else { ! x->x_warned = (s1 && *s1->s_name == '.'); /* do not warn if explicit */ x->x_cvremote = 0; ! x->x_cvname = x->x_glist->gl_name; ! sprintf(buf, ".x%x.c", (int)x->x_glist); ! x->x_cvpathname = gensym(buf); } outlet_new((t_object *)x, &s_anything); --- 539,554 ---- else { ! t_glist *glist; ! x->x_dotname = (s1 && *s1->s_name == '.' ? s1 : 0); ! x->x_warned = (x->x_dotname != 0); /* do not warn if explicit */ ! x->x_cvname = 0; x->x_cvremote = 0; ! glist = tot_getglist(x); ! if (glist == x->x_glist) ! { ! sprintf(buf, ".x%x.c", (int)glist); ! x->x_cvpathname = gensym(buf); ! } ! else x->x_cvpathname = 0; } outlet_new((t_object *)x, &s_anything); *************** *** 507,510 **** --- 584,591 ---- totps_qpush = gensym("qpush"); totps_query = gensym("query"); + totps_dotparent = gensym(".parent"); + totps_dotroot = gensym(".root"); + totps_dotowner = gensym(".owner"); + totps_dottop = gensym(".top"); tot_class = class_new(gensym("tot"), (t_newmethod)tot_new,

1 0

externals/miXed/shared/hammer gui.c,1.1.1.1,1.2
by Krzysztof Czaja 29 Mar '04

29 Mar '04

Update of /cvsroot/pure-data/externals/miXed/shared/hammer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv597/shared/hammer Modified Files: gui.c Log Message: toxy alpha10 Index: gui.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/hammer/gui.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** gui.c 23 May 2003 12:29:52 -0000 1.1.1.1 --- gui.c 29 Mar 2004 17:09:52 -0000 1.2 *************** *** 1,3 **** ! /* Copyright (c) 2003 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 2003-2004 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 132,138 **** { sys_vgui("bind Canvas <<hammerfocusin>> \ ! {pd [concat %s _focus %%W 1 \\;]}\n", snk->g_gui->s_name); sys_vgui("bind Canvas <<hammerfocusout>> \ ! {pd [concat %s _focus %%W 0 \\;]}\n", snk->g_gui->s_name); } --- 132,140 ---- { sys_vgui("bind Canvas <<hammerfocusin>> \ ! {if {[hammergui_ispatcher %%W]} \ ! {pd [concat %s _focus %%W 1 \\;]}}\n", snk->g_gui->s_name); sys_vgui("bind Canvas <<hammerfocusout>> \ ! {if {[hammergui_ispatcher %%W]} \ ! {pd [concat %s _focus %%W 0 \\;]}}\n", snk->g_gui->s_name); } *************** *** 153,159 **** { sys_vgui("bind Canvas <<hammervised>> \ ! {pd [concat %s _vised %%W 1 \\;]}\n", snk->g_gui->s_name); sys_vgui("bind Canvas <<hammerunvised>> \ ! {pd [concat %s _vised %%W 0 \\;]}\n", snk->g_gui->s_name); } --- 155,163 ---- { sys_vgui("bind Canvas <<hammervised>> \ ! {if {[hammergui_ispatcher %%W]} \ ! {pd [concat %s _vised %%W 1 \\;]}}\n", snk->g_gui->s_name); sys_vgui("bind Canvas <<hammerunvised>> \ ! {if {[hammergui_ispatcher %%W]} \ ! {pd [concat %s _vised %%W 0 \\;]}}\n", snk->g_gui->s_name); } *************** *** 193,196 **** --- 197,211 ---- ps__vised, A_SYMBOL, A_FLOAT, 0); + /* Protect against pdCmd being called (via "Canvas <Destroy>" binding) + during Tcl_Finalize(). FIXME this should be a standard exit handler. */ + sys_gui("proc hammergui_exithook {cmd op} {proc pd {} {}}\n"); + sys_gui("trace add execution exit enter hammergui_exithook\n"); + + sys_gui("proc hammergui_ispatcher {cv} {\n"); + sys_gui(" if {[string range $cv 0 1] == \".x\""); + sys_gui(" && [string range $cv end-1 end] == \".c\"} {\n"); + sys_gui(" return 1} else {return 0}\n"); + sys_gui("}\n"); + sys_gui("proc hammergui_remouse {} {\n"); sys_gui(" bind all <<hammerdown>> {}\n");

1 0

externals/miXed/shared/common port.c,1.6,1.7
by Krzysztof Czaja 29 Mar '04

29 Mar '04

Update of /cvsroot/pure-data/externals/miXed/shared/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv597/shared/common Modified Files: port.c Log Message: toxy alpha10 Index: port.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/port.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** port.c 25 Feb 2004 10:54:42 -0000 1.6 --- port.c 29 Mar 2004 17:09:52 -0000 1.7 *************** *** 36,40 **** --- 36,46 ---- PORT_UNKNOWN, PORT_CORRUPT, PORT_FATAL }; + /* without access to sys_defaultfont, we just mimic defs from s_main.c */ + #ifdef MSW + #define PORT_DEFFONTSIZE 12. + #else #define PORT_DEFFONTSIZE 10. + #endif + #define PORT_XSTRETCH 1.25 #define PORT_YSTRETCH 1.1

1 0

packages/win32_inno pd.iss,1.7,1.8
by Hans-Christoph Steiner 29 Mar '04

29 Mar '04

Update of /cvsroot/pure-data/packages/win32_inno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11177 Modified Files: pd.iss Log Message: changed license to GPL, changed URL to pure-data.iem.at Index: pd.iss =================================================================== RCS file: /cvsroot/pure-data/packages/win32_inno/pd.iss,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pd.iss 24 Mar 2004 16:13:44 -0000 1.7 --- pd.iss 29 Mar 2004 03:18:20 -0000 1.8 *************** *** 6,15 **** AppVerName=Pure Data 0.37.1 AppPublisher=pure-data.org ! AppPublisherURL=http://www.pure-data.org ! AppSupportURL=http://www.pure-data.org/community/lists/ ! AppUpdatesURL=http://www.pure-data.org/downloads/ DefaultDirName={pf}\Pure Data DefaultGroupName=Pure Data ! LicenseFile=..\..\pd\LICENSE.txt Compression=zip/9 --- 6,15 ---- AppVerName=Pure Data 0.37.1 AppPublisher=pure-data.org ! AppPublisherURL=http://pure-data.iem.at ! AppSupportURL=http://pure-data.iem.at/community/lists/ ! AppUpdatesURL=http://pure-data.iem.at/downloads/ DefaultDirName={pf}\Pure Data DefaultGroupName=Pure Data ! LicenseFile=..\..\externals\maxlib\LICENSE Compression=zip/9 *************** *** 140,148 **** Source: noncvs\doc\5.reference\iemhelp\*.*; DestDir: {app}\doc\5.reference\iemhelp; Flags: ignoreversion ;abstractions ! Source: noncvs\abstractions\xp4pd\*.*; DestDir: {app}\abstractions\xp4pd Source: noncvs\abstractions\iemabs\*.*; DestDir: {app}\abstractions\iemabs [INI] ! Filename: {app}\pd.url; Section: InternetShortcut; Key: URL; String: http://www.pure-data.org [Icons] --- 140,148 ---- Source: noncvs\doc\5.reference\iemhelp\*.*; DestDir: {app}\doc\5.reference\iemhelp; Flags: ignoreversion ;abstractions ! Source: noncvs\abstractions\serendipd\*.*; DestDir: {app}\abstractions\serendiPd Source: noncvs\abstractions\iemabs\*.*; DestDir: {app}\abstractions\iemabs [INI] ! Filename: {app}\pd.url; Section: InternetShortcut; Key: URL; String: http://pure-data.iem.at [Icons]

1 0

externals/OSCx/doc OSC-help.pd,1.1.1.1,1.2 OSCroute-help.pd,1.3,1.4 dumpOSC-help.pd,1.1.1.1,1.2 sendOSC-help.pd,1.2,1.3 help-OSC.pd,1.1,NONE help-OSCroute.pd,1.1,NONE help-sendOSC.pd,1.1,NONE
by Hans-Christoph Steiner 29 Mar '04

29 Mar '04

Update of /cvsroot/pure-data/externals/OSCx/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6020 Modified Files: OSC-help.pd OSCroute-help.pd dumpOSC-help.pd sendOSC-help.pd Removed Files: help-OSC.pd help-OSCroute.pd help-sendOSC.pd Log Message: cleaned up OSC help and added reference to OSC-help.pd Index: sendOSC-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/doc/sendOSC-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sendOSC-help.pd 27 May 2003 19:14:14 -0000 1.2 --- sendOSC-help.pd 29 Mar 2004 02:44:29 -0000 1.3 *************** *** 1,60 **** ! #N canvas 496 472 848 467 10; ! #X obj 59 396 sendOSC; ! #X floatatom 59 423 5 0 0 0 - - -; ! #X msg 44 119 disconnect; ! #X msg 79 163 send /test/bla 1 2 3; ! #X msg 26 93 connect localhost 9999; ! #X msg 91 187 send /ix/bli 4 fuenf 6; ! #X msg 103 211 send /yps/blo 7.8 9.1 zehnkommaelf; ! #X text 8 142 ========================================; ! #X msg 274 92 connect localhost 10001; ! #X msg 149 301 typetags 1; ! #X msg 144 333 typetags 0; ! #X text 475 112 typetags; ! #X text 475 129 sendOSC now by default uses; ! #X text 477 145 typetags.; ! #X text 477 166 dumOSC on the other hand; ! #X text 477 186 should be able to interpret; ! #X text 478 208 this.; ! #X text 474 93 new (or again):; ! #X msg 423 294 [; ! #X msg 423 321 ]; ! #X msg 256 249 send /bla 1 2 3 \, send /bli 3 4 5 \, send /blo 4 5 ! 6; ! #X text 462 312 when last bundle is closed the buffer is sent.; ! #X text 463 333 so: first "[" \, then add messages with send /bla; ! #X text 466 351 open nested nudle etc \, close with "]"; ! #X floatatom 113 425 5 0 0 0 - - -; ! #X text 162 428 bundleDepth; ! #X text 24 11 sendOSC: send OSC formatted packet to network. at the ! moment over UDP only is supported.; ! #X text 28 38 supported int \, flot + string.; ! #X text 462 291 open / close bundles here.; ! #X text 465 372 watch the bundleDepth index change while you do this. ! ; ! #X text 231 299 switch usage of typetags; ! #X text 232 316 on/off.; ! #X text 231 332 default: on; ! #X text 465 392 MAX_BUNDLE_NESTING: 32; ! #X msg 315 154 send; ! #X msg 315 179 send /; ! #X msg 368 156 send /bang; ! #X msg 265 57 connect 192.168.0.255 5555; ! #X text 462 58 use something like this to broadcast on UDP; ! #X connect 0 0 1 0; ! #X connect 0 1 24 0; ! #X connect 2 0 0 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 8 0 0 0; ! #X connect 9 0 0 0; ! #X connect 10 0 0 0; ! #X connect 18 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 0 0; ! #X connect 34 0 0 0; ! #X connect 35 0 0 0; ! #X connect 36 0 0 0; ! #X connect 37 0 0 0; --- 1,62 ---- ! #N canvas 496 472 852 471 10; ! #X obj 59 396 sendOSC; ! #X floatatom 59 423 5 0 0 0 - - -; ! #X msg 44 119 disconnect; ! #X msg 79 163 send /test/bla 1 2 3; ! #X msg 26 93 connect localhost 9999; ! #X msg 91 187 send /ix/bli 4 fuenf 6; ! #X msg 103 211 send /yps/blo 7.8 9.1 zehnkommaelf; ! #X text 8 142 ========================================; ! #X msg 274 92 connect localhost 10001; ! #X msg 149 301 typetags 1; ! #X msg 144 333 typetags 0; ! #X text 475 112 typetags; ! #X text 475 129 sendOSC now by default uses; ! #X text 477 145 typetags.; ! #X text 477 166 dumOSC on the other hand; ! #X text 477 186 should be able to interpret; ! #X text 478 208 this.; ! #X text 474 93 new (or again):; ! #X msg 423 294 [; ! #X msg 423 321 ]; ! #X msg 256 249 send /bla 1 2 3 \, send /bli 3 4 5 \, send /blo 4 5 ! 6; ! #X text 462 312 when last bundle is closed the buffer is sent.; ! #X text 463 333 so: first "[" \, then add messages with send /bla; ! #X text 466 351 open nested nudle etc \, close with "]"; ! #X floatatom 113 425 5 0 0 0 - - -; ! #X text 162 428 bundleDepth; ! #X text 24 11 sendOSC: send OSC formatted packet to network. at the ! moment over UDP only is supported.; ! #X text 28 38 supported int \, flot + string.; ! #X text 462 291 open / close bundles here.; ! #X text 465 372 watch the bundleDepth index change while you do this. ! ; ! #X text 231 299 switch usage of typetags; ! #X text 232 316 on/off.; ! #X text 231 332 default: on; ! #X text 465 392 MAX_BUNDLE_NESTING: 32; ! #X msg 315 154 send; ! #X msg 315 179 send /; ! #X msg 368 156 send /bang; ! #X msg 265 57 connect 192.168.0.255 5555; ! #X text 462 58 use something like this to broadcast on UDP; ! #X text 607 435 for more info \, get help on:; ! #X obj 774 436 OSC; ! #X connect 0 0 1 0; ! #X connect 0 1 24 0; ! #X connect 2 0 0 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 8 0 0 0; ! #X connect 9 0 0 0; ! #X connect 10 0 0 0; ! #X connect 18 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 0 0; ! #X connect 34 0 0 0; ! #X connect 35 0 0 0; ! #X connect 36 0 0 0; ! #X connect 37 0 0 0; --- help-OSCroute.pd DELETED --- Index: OSCroute-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/doc/OSCroute-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSCroute-help.pd 31 May 2003 20:57:14 -0000 1.3 --- OSCroute-help.pd 29 Mar 2004 02:44:28 -0000 1.4 *************** *** 1,96 **** ! #N canvas 112 247 493 349 10; ! #X msg 20 72 version; ! #X obj 86 72 r rcvOSC; ! #X obj 86 109 OSCroute /test /ix /yps; ! #X obj 161 143 print ix; ! #X obj 242 142 print yps; ! #X obj 85 183 OSCroute /bla /bli /blo; ! #X obj 85 212 unpack f f f; ! #X floatatom 85 239 4 0 0 0 - - -; ! #X floatatom 124 239 4 0 0 0 - - -; ! #X floatatom 164 239 4 0 0 0 - - -; ! #X text 20 11 OSCroute works pretty much like route but outputs remainder ! of routing tag after match.; ! #X obj 68 143 print test; ! #X obj 241 212 print rejected; ! #N canvas 663 325 672 347 patternmatching 1; ! #X obj 26 242 OSCroute /freq; ! #X obj 150 242 OSCroute /freq; ! #X obj 272 241 OSCroute /freq; ! #X msg 81 115 /*/freq 23 45 67; ! #X obj 72 201 OSCroute /inst1 /inst2 /inst3; ! #X obj 26 266 unpack f f f; ! #X floatatom 26 287 3 0 0 0 - - -; ! #X floatatom 65 287 3 0 0 0 - - -; ! #X floatatom 105 287 3 0 0 0 - - -; ! #X obj 150 265 unpack f f f; ! #X floatatom 150 286 3 0 0 0 - - -; ! #X floatatom 189 286 3 0 0 0 - - -; ! #X floatatom 229 286 3 0 0 0 - - -; ! #X obj 272 265 unpack f f f; ! #X floatatom 272 286 3 0 0 0 - - -; ! #X floatatom 311 286 3 0 0 0 - - -; ! #X floatatom 351 286 3 0 0 0 - - -; ! #X msg 55 44 /inst1/freq 100 200 300; ! #X msg 64 66 /inst2/freq 111 222 333; ! #X msg 70 88 /inst3/freq 321 432 543; ! #X text 45 116 4->; ! #X text 37 89 3->; ! #X text 30 67 2->; ! #X text 22 45 1->; ! #X text 11 7 took me a while to figure this out \, somehow i always ! thought it should work the other way round:; ! #X msg 96 145 /inst[12]/freq 0 99 88; ! #X msg 119 174 /inst?/freq 22.33 44.55 66.77; ! #X text 367 48 well \, now it does \, crudely:; ! #X obj 375 130 OSCroute /*; ! #X msg 375 80 /test1/data 1 2 3; ! #X msg 401 103 /test2/data 3.4 5 1; ! #X obj 447 157 print rejected; ! #X obj 375 184 print routed; ! #X connect 0 0 5 0; ! #X connect 1 0 9 0; ! #X connect 2 0 13 0; ! #X connect 3 0 4 0; ! #X connect 4 0 0 0; ! #X connect 4 1 1 0; ! #X connect 4 2 2 0; ! #X connect 5 0 6 0; ! #X connect 5 1 7 0; ! #X connect 5 2 8 0; ! #X connect 9 0 10 0; ! #X connect 9 1 11 0; ! #X connect 9 2 12 0; ! #X connect 13 0 14 0; ! #X connect 13 1 15 0; ! #X connect 13 2 16 0; ! #X connect 17 0 4 0; ! #X connect 18 0 4 0; ! #X connect 19 0 4 0; ! #X connect 25 0 4 0; ! #X connect 26 0 4 0; ! #X connect 28 0 32 0; ! #X connect 28 1 31 0; ! #X connect 29 0 28 0; ! #X connect 30 0 28 0; ! #X restore 288 57 pd patternmatching; ! #X text 184 57 check here =>; ! #X text 239 235 last outlet emits all non-matches; ! #X text 252 269 -OSC patterns that didnt match; ! #X text 239 252 (like classic route):; ! #X text 252 280 -patterns not starting with /; ! #X text 252 294 -patterns starting with a number; ! #X text 325 324 2002-09-08 \, jdl xdv.org; ! #X connect 0 0 2 0; ! #X connect 1 0 2 0; ! #X connect 2 0 5 0; ! #X connect 2 0 11 0; ! #X connect 2 1 3 0; ! #X connect 2 1 5 0; ! #X connect 2 2 4 0; ! #X connect 2 2 5 0; ! #X connect 5 0 6 0; ! #X connect 5 3 12 0; ! #X connect 6 0 7 0; ! #X connect 6 1 8 0; ! #X connect 6 2 9 0; --- 1,98 ---- ! #N canvas 112 247 501 357 10; ! #X msg 20 72 version; ! #X obj 86 72 r rcvOSC; ! #X obj 86 109 OSCroute /test /ix /yps; ! #X obj 161 143 print ix; ! #X obj 242 142 print yps; ! #X obj 85 183 OSCroute /bla /bli /blo; ! #X obj 85 212 unpack f f f; ! #X floatatom 85 239 4 0 0 0 - - -; ! #X floatatom 124 239 4 0 0 0 - - -; ! #X floatatom 164 239 4 0 0 0 - - -; ! #X text 20 11 OSCroute works pretty much like route but outputs remainder ! of routing tag after match.; ! #X obj 68 143 print test; ! #X obj 241 212 print rejected; ! #N canvas 663 325 676 351 patternmatching 0; ! #X obj 26 242 OSCroute /freq; ! #X obj 150 242 OSCroute /freq; ! #X obj 272 241 OSCroute /freq; ! #X msg 81 115 /*/freq 23 45 67; ! #X obj 72 201 OSCroute /inst1 /inst2 /inst3; ! #X obj 26 266 unpack f f f; ! #X floatatom 26 287 3 0 0 0 - - -; ! #X floatatom 65 287 3 0 0 0 - - -; ! #X floatatom 105 287 3 0 0 0 - - -; ! #X obj 150 265 unpack f f f; ! #X floatatom 150 286 3 0 0 0 - - -; ! #X floatatom 189 286 3 0 0 0 - - -; ! #X floatatom 229 286 3 0 0 0 - - -; ! #X obj 272 265 unpack f f f; ! #X floatatom 272 286 3 0 0 0 - - -; ! #X floatatom 311 286 3 0 0 0 - - -; ! #X floatatom 351 286 3 0 0 0 - - -; ! #X msg 55 44 /inst1/freq 100 200 300; ! #X msg 64 66 /inst2/freq 111 222 333; ! #X msg 70 88 /inst3/freq 321 432 543; ! #X text 45 116 4->; ! #X text 37 89 3->; ! #X text 30 67 2->; ! #X text 22 45 1->; ! #X text 11 7 took me a while to figure this out \, somehow i always ! thought it should work the other way round:; ! #X msg 96 145 /inst[12]/freq 0 99 88; ! #X msg 119 174 /inst?/freq 22.33 44.55 66.77; ! #X text 367 48 well \, now it does \, crudely:; ! #X obj 375 130 OSCroute /*; ! #X msg 375 80 /test1/data 1 2 3; ! #X msg 401 103 /test2/data 3.4 5 1; ! #X obj 447 157 print rejected; ! #X obj 375 184 print routed; ! #X connect 0 0 5 0; ! #X connect 1 0 9 0; ! #X connect 2 0 13 0; ! #X connect 3 0 4 0; ! #X connect 4 0 0 0; ! #X connect 4 1 1 0; ! #X connect 4 2 2 0; ! #X connect 5 0 6 0; ! #X connect 5 1 7 0; ! #X connect 5 2 8 0; ! #X connect 9 0 10 0; ! #X connect 9 1 11 0; ! #X connect 9 2 12 0; ! #X connect 13 0 14 0; ! #X connect 13 1 15 0; ! #X connect 13 2 16 0; ! #X connect 17 0 4 0; ! #X connect 18 0 4 0; ! #X connect 19 0 4 0; ! #X connect 25 0 4 0; ! #X connect 26 0 4 0; ! #X connect 28 0 32 0; ! #X connect 28 1 31 0; ! #X connect 29 0 28 0; ! #X connect 30 0 28 0; ! #X restore 288 57 pd patternmatching; ! #X text 184 57 check here =>; ! #X text 239 235 last outlet emits all non-matches; ! #X text 252 269 -OSC patterns that didnt match; ! #X text 239 252 (like classic route):; ! #X text 252 280 -patterns not starting with /; ! #X text 252 294 -patterns starting with a number; ! #X text 325 324 2002-09-08 \, jdl xdv.org; ! #X text 28 318 for more info \, get help on:; ! #X obj 195 319 OSC; ! #X connect 0 0 2 0; ! #X connect 1 0 2 0; ! #X connect 2 0 5 0; ! #X connect 2 0 11 0; ! #X connect 2 1 3 0; ! #X connect 2 1 5 0; ! #X connect 2 2 4 0; ! #X connect 2 2 5 0; ! #X connect 5 0 6 0; ! #X connect 5 3 12 0; ! #X connect 6 0 7 0; ! #X connect 6 1 8 0; ! #X connect 6 2 9 0; Index: OSC-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/doc/OSC-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSC-help.pd 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- OSC-help.pd 29 Mar 2004 02:44:28 -0000 1.2 *************** *** 1,10 **** ! #N canvas 608 335 423 300 10; ! #X obj 21 149 sendOSC-help; ! #X obj 21 174 dumpOSC-help; ! #X obj 21 200 OSCroute-help; ! #X obj 17 43 OSC; ! #X msg 17 19 version; ! #X text 15 79 1 click sendOSC-help 2 click connect button 3 randomly ! click the 3 available messages 4 watch console; ! #X text 102 19 version 0.16; ! #X connect 4 0 3 0; --- 1,10 ---- ! #N canvas 608 335 471 304 12; ! #X obj 21 149 sendOSC-help; ! #X obj 21 174 dumpOSC-help; ! #X obj 21 200 OSCroute-help; ! #X obj 17 43 OSC; ! #X msg 17 19 version; ! #X text 15 79 1 click sendOSC-help 2 click connect button 3 randomly ! click the 3 available messages 4 watch console; ! #X text 102 19 version 0.16; ! #X connect 4 0 3 0; Index: dumpOSC-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/doc/dumpOSC-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dumpOSC-help.pd 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- dumpOSC-help.pd 29 Mar 2004 02:44:28 -0000 1.2 *************** *** 1,7 **** ! #N canvas 485 432 461 199 12; ! #X obj 17 105 print rcvOSC; ! #X obj 17 53 dumpOSC 9999; ! #X obj 45 78 s rcvOSC; ! #X text 15 7 dumpOSC listens on specified port / UDP \, outputs everything received on its only outlet. seems to be pretty stable.; ! #X connect 1 0 0 0; ! #X connect 1 0 2 0; --- 1,10 ---- ! #N canvas 485 432 465 203 12; ! #X obj 17 105 print rcvOSC; ! #X obj 17 53 dumpOSC 9999; ! #X obj 45 78 s rcvOSC; ! #X text 15 7 dumpOSC listens on specified port / UDP \, outputs everything ! received on its only outlet. seems to be pretty stable.; ! #X obj 417 163 OSC; ! #X text 194 163 for more info \, get help on:; ! #X connect 1 0 0 0; ! #X connect 1 0 2 0; --- help-OSC.pd DELETED --- --- help-sendOSC.pd DELETED ---

1 0

pd/src makefile.mingw,1.1.2.1,1.1.2.2
by carmen rocco 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18694 Modified Files: Tag: impd_0_37 makefile.mingw Log Message: redone - still needs extras~ & ASIO Index: makefile.mingw =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile.mingw,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** makefile.mingw 27 Mar 2004 16:32:12 -0000 1.1.2.1 --- makefile.mingw 28 Mar 2004 19:29:27 -0000 1.1.2.2 *************** *** 1,18 **** VPATH = ../obj:./ ! OBJ_DIR = ../obj ! BIN_DIR = ../bin ! INSTDIR = ../ PDEXEC = pd.exe GUINAME= pdtcl.dll DLLWRAP= dllwrap ! prefix = ../ ! GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\" MORECFLAGS = -g ! PADIR = ../portaudio INCPA = -I$(PADIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio -I../lib/asio ! INCLUDE = $(INCPA) GINCLUDE = $(INCLUDE) -I../tcl/include --- 1,18 ---- VPATH = ../obj:./ ! INSTDIR = .. ! OBJ_DIR = $(INSTDIR)/src ! BIN_DIR = $(INSTDIR)/bin ! PDEXEC = pd.exe GUINAME= pdtcl.dll DLLWRAP= dllwrap ! GFLAGS = -DINSTALL_PREFIX=\"$(INSTDIR)\" MORECFLAGS = -g ! PADIR = $(INSTDIR)/portaudio INCPA = -I$(PADIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio -I../lib/asio ! INCLUDE = GINCLUDE = $(INCLUDE) -I../tcl/include *************** *** 39,53 **** g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c \ ! m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_conf.c m_glob.c m_sched.c \ ! s_main.c s_inter.c s_file.c s_print.c \ ! s_loader.c s_path.c s_entry.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ ! d_delay.c d_resample.c \ ! x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ ! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ $(SYSSRC) --- 39,50 ---- g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c m_pd.c m_class.c m_obj.c m_atom.c m_memory.c \ ! m_binbuf.c m_conf.c m_glob.c m_sched.c s_main.c s_inter.c s_file.c \ ! s_print.c s_loader.c s_path.c s_entry.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ ! d_delay.c d_resample.c x_arithmetic.c x_connective.c x_interface.c \ ! x_midi.c x_misc.c x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c \ ! d_soundfile.c m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ $(SYSSRC) *************** *** 56,61 **** OBJ = $(SRC:.c=.o) GOBJ = $(GSRC:.c=.o) - PAOBJ = $(PASRC:.c=.o) SROBJ = $(SRSRC:.c=.o) OBJC = $(OBJ) $(PAOBJ) --- 53,58 ---- OBJ = $(SRC:.c=.o) GOBJ = $(GSRC:.c=.o) SROBJ = $(SRSRC:.c=.o) + PAOBJ = $(PASRC:.c=.o) OBJC = $(OBJ) $(PAOBJ) *************** *** 64,74 **** # ! .PHONY: pd gui all ! ! all: $(BIN_DIR)/$(PDEXEC) $(BIN_DIR)/$(PDDLL) $(BIN_DIR)/$(GUINAME) \ ! $(BIN_DIR)/pdsend.exe $(BIN_DIR)/pdreceive.exe $(BIN_DIR)/pd.tk ! bin: $(BIN_DIR)/$(PDEXEC) $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c --- 61,68 ---- # ! .PHONY: all ! all: $(OBJ_DIR)/$(GUINAME) $(OBJ_DIR)/$(PDDLL) $(OBJ_DIR)/$(PDEXEC)\ ! $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/pdreceive.exe $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c *************** *** 78,154 **** $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c ! pd: $(PDDLL) $(PDEXEC) ! ! gui: $(GUINAME) ! $(BIN_DIR)/pdsend.exe: u_pdsend.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend.exe u_pdsend.o $(LDFLAGS) ! $(BIN_DIR)/pdreceive.exe: u_pdreceive.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive.exe u_pdreceive.o $(LDFLAGS) ! $(BIN_DIR)/$(PDDLL): $(OBJC) ! cd ../obj; $(CC) $(DBG_CFLAGS) -o $(BIN_DIR)/pd.dll $(OBJC) $(LIB) $(LDFLAGS) ! cd ../obj; $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pd.def \ --output-lib=$(BIN_DIR)/pd.a --dllname=$(BIN_DIR)/pd.dll $(OBJC) $(LDFLAGS) ! $(BIN_DIR)/$(PDEXEC): s_entry.o ! cd ../obj; $(CC) $(DBG_CFLAGS) -o $(BIN_DIR)/$(PDEXEC) $(OBJ_DIR)/s_entry.o $(LIB) $(BIN_DIR)/pd.a $(LDFLAGS) ! ! $(BIN_DIR)/$(GUINAME): t_tkcmd.o ! cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(BIN_DIR)/pdtcl.a $(LDFLAGS) ! cd ../obj; $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pdtcl.def \ --output-lib=$(BIN_DIR)/pdtcl.a --dllname=$(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LDFLAGS) $(BIN_DIR)/pd.tk: u_main.tk ! echo set pd_nt > $(BIN_DIR)/pd.tk grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk - - $(BIN_DIR)/pdsend.exe: u_pdsend.o - $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend.exe u_pdsend.o $(LDFLAGS) - - INSTDIR = $(DESTDIR)/$(prefix) - MANINSTDIR = $(DESTDIR)/$(MANDIR) install: all - install -d $(INSTDIR)/lib/pd/bin - install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME) - install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk - install -m644 u_object.tk $(INSTDIR)/lib/pd/bin/u_object.tk install -d $(INSTDIR)/bin ! install -m755 $(PDEXEC) $(INSTDIR)/bin/pd ! install -m 755 $(BIN_DIR)/pdsend.exe $(INSTDIR)/bin/pdsend.exe ! install -m 755 $(BIN_DIR)/pdreceive.exe $(INSTDIR)/bin/pdreceive.exe ! cp -r ../doc $(INSTDIR)/lib/pd/ ! install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h ! install -d $(MANINSTDIR)/man1 ! gzip < ../man/pd.1 > $(MANINSTDIR)/man1/pd.1.gz ! chmod 644 $(MANINSTDIR)/man1/pd.1.gz ! gzip < ../man/pdsend.1 > $(MANINSTDIR)/man1/pdsend.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz ! gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz ! # extra docs ! install -m644 ../extra/*/*.pd $(INSTDIR)/lib/pd/doc/5.reference/ ! install -m644 ../extra/*help*.pd $(INSTDIR)/lib/pd/doc/5.reference/ ! # abstractions ! cd ../extra && \ ! install -m644 complex-mod~.pd hilbert~.pd rev*.pd $(INSTDIR)/lib/pd/extra ! local-clean: ! -rm -f ../obj/* $(BIN_DIR)/pd.exe $(BIN_DIR)/pd.dll $(BIN_DIR)/$(GUINAME) \ ! $(BIN_DIR)/pdsend.exe $(BIN_DIR)/pdreceive.exe m_stamp.c ! -rm -f *~ -rm -f makefile.dependencies touch makefile.dependencies chmod 666 makefile.dependencies - extra-clean: - -rm -f `find ../extra/ -name "*.pd_*"` - -rm -f tags - - clean: extra-clean local-clean - distclean: clean rm -rf config.cache config.log config.status makefile tags \ --- 72,116 ---- $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c ! $(PAOBJ) : %.o : %.c ! $(CC) $(CFLAGS) $(GFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.c ! $(OBJ_DIR)/pdsend.exe: u_pdsend.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/u_pdsend.o $(LDFLAGS) ! $(OBJ_DIR)/pdreceive.exe: u_pdreceive.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(OBJ_DIR)/pdreceive.exe $(OBJ_DIR)/u_pdreceive.o $(LDFLAGS) ! $(OBJ_DIR)/$(PDEXEC): s_entry.o ! cd $(OBJ_DIR); $(CC) -o $(OBJ_DIR)/$(PDEXEC) $(OBJ_DIR)/s_entry.o $(LIB) $(BIN_DIR)/pd.a $(LDFLAGS) ! ! $(OBJ_DIR)/$(PDDLL): $(OBJC) ! cd $(OBJ_DIR); $(CC) -o $(BIN_DIR)/pd.dll $(OBJC) $(BIN_DIR)/pdtcl.a $(LIB) $(LDFLAGS) ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pd.def \ --output-lib=$(BIN_DIR)/pd.a --dllname=$(BIN_DIR)/pd.dll $(OBJC) $(LDFLAGS) ! $(OBJ_DIR)/$(GUINAME): t_tkcmd.o ! cd $(OBJ_DIR); $(CC) $(INCLUDE) -o $(GUINAME) t_tkcmd.o $(LIB) $(LDFLAGS) ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pdtcl.def \ --output-lib=$(BIN_DIR)/pdtcl.a --dllname=$(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LDFLAGS) $(BIN_DIR)/pd.tk: u_main.tk ! echo set pd_nt 1 > $(BIN_DIR)/pd.tk grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk install: all install -d $(INSTDIR)/bin ! install $(OBJ_DIR)/$(PDEXEC) $(BIN_DIR)/$(PDEXEC) ! install -m644 u_object.tk $(BIN_DIR)/u_object.tk ! install -m 755 $(OBJ_DIR)/pdsend.exe $(BIN_DIR)/pdsend.exe ! install -m 755 $(OBJ_DIR)/pdreceive.exe $(BIN_DIR)/pdreceive.exe ! install -m644 ../extra/*/*.pd $(INSTDIR)/doc/5.reference/ ! clean: ! -rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll ! -rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o -rm -f makefile.dependencies touch makefile.dependencies chmod 666 makefile.dependencies distclean: clean rm -rf config.cache config.log config.status makefile tags \ *************** *** 164,173 **** uninstall: ! -rm -r $(INSTDIR)/lib/pd ! -rm $(INSTDIR)/bin/pd.exe ! -rm $(INSTDIR)/bin/pd.dll ! -rm $(INSTDIR)/bin/pdsend.exe ! -rm $(INSTDIR)/bin/pdreceive.exe ! -rm $(INSTDIR)/include/m_pd.h include makefile.dependencies --- 126,133 ---- uninstall: ! -rm $(INSTDIR)/bin/pd*.exe ! -rm $(INSTDIR)/bin/pd*.dll ! -rm $(INSTDIR)/bin/*.a ! -rm $(INSTDIR)/bin/*.def include makefile.dependencies

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.10,1.1.1.4.2.4.2.11 s_entry.c,1.1.1.2,1.1.1.2.4.1 s_inter.c,1.1.1.3.2.9,1.1.1.3.2.9.2.1 t_tkcmd.c,1.1.1.4.4.4,1.1.1.4.4.5
by carmen rocco 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32213 Modified Files: Tag: impd_0_37 g_all_guis.c s_entry.c s_inter.c t_tkcmd.c Log Message: merge mingw tweaks Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.9 retrieving revision 1.1.1.3.2.9.2.1 diff -C2 -d -r1.1.1.3.2.9 -r1.1.1.3.2.9.2.1 *** s_inter.c 21 Jan 2004 19:53:04 -0000 1.1.1.3.2.9 --- s_inter.c 28 Mar 2004 15:07:12 -0000 1.1.1.3.2.9.2.1 *************** *** 54,58 **** #ifndef WISHAPP ! #define WISHAPP "wish83.exe" #endif --- 54,58 ---- #ifndef WISHAPP ! #define WISHAPP "wish85.exe" #endif Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.1.1.4.4.4 retrieving revision 1.1.1.4.4.5 diff -C2 -d -r1.1.1.4.4.4 -r1.1.1.4.4.5 *** t_tkcmd.c 25 Mar 2004 07:56:15 -0000 1.1.1.4.4.4 --- t_tkcmd.c 28 Mar 2004 15:07:12 -0000 1.1.1.4.4.5 *************** *** 32,35 **** --- 32,36 ---- #pragma warning( disable : 4101 ) /* unused local variables */ #include "tk.h" + int main(int argc, char **argv) { return 0; } /* needed for mingw */ #endif Index: s_entry.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.4.1 diff -C2 -d -r1.1.1.2 -r1.1.1.2.4.1 *** s_entry.c 9 May 2003 16:03:44 -0000 1.1.1.2 --- s_entry.c 28 Mar 2004 15:07:12 -0000 1.1.1.2.4.1 *************** *** 6,51 **** int sys_main(int argc, char **argv); - /* WINBASEAPI PVOID WINAPI AddVectoredExceptionHandler( - ULONG FirstHandler, - PVECTORED_EXCEPTION_HANDLER VectoredHandler ); */ - - #ifdef MSW - #if 0 - #incldue "winbase.h" - - LONG NTAPI VectoredExceptionHandler(void *PEXCEPTION_POINTERS) - { - fprintf(stderr, "caught exception\n"); - return(EXCEPTION_CONTINUE_SEARCH); - } - - - int main(int argc, char **argv) - { - printf("Pd entry point\n"); - AddVectoredExceptionHandler( - ULONG FirstHandler, - PVECTORED_EXCEPTION_HANDLER VectoredHandler ); - - - #endif - - #if 1 - int main(int argc, char **argv) - { - __try - { - sys_main(argc, argv); - } - __finally - { - printf("caught an exception; stopping\n"); - } - } - #endif - #else /* not MSW */ int main(int argc, char **argv) { return (sys_main(argc, argv)); } ! #endif --- 6,12 ---- int sys_main(int argc, char **argv); int main(int argc, char **argv) { return (sys_main(argc, argv)); } ! 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.10 retrieving revision 1.1.1.4.2.4.2.11 diff -C2 -d -r1.1.1.4.2.4.2.10 -r1.1.1.4.2.4.2.11 *** g_all_guis.c 28 Mar 2004 08:21:42 -0000 1.1.1.4.2.4.2.10 --- g_all_guis.c 28 Mar 2004 15:07:12 -0000 1.1.1.4.2.4.2.11 *************** *** 20,23 **** --- 20,24 ---- #ifdef MSW #include <io.h> + #define snprintf _snprintf #else #include <unistd.h>

1 0

pd/src pthread.h,1.1.2.1,NONE sched.h,1.1.2.1,NONE semaphore.h,1.1.2.1,NONE
by carmen rocco 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8942 Removed Files: Tag: impd_0_37 pthread.h sched.h semaphore.h Log Message: not part of pd + win/cvs/samba/lin linebreaks slaughter: http://sources.redhat.com/pthreads-win32/ --- sched.h DELETED --- --- pthread.h DELETED --- --- semaphore.h DELETED ---

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.9,1.1.1.4.2.4.2.10 g_bang.c,1.1.1.3.2.2.2.8,1.1.1.3.2.2.2.9 g_graph.c,1.1.1.3.2.3.2.3,1.1.1.3.2.3.2.4 g_hdial.c,1.1.1.4.2.2.2.7,1.1.1.4.2.2.2.8 g_hslider.c,1.1.1.3.2.2.2.8,1.1.1.3.2.2.2.9 g_io.c,1.1.1.1.16.2.2.1,1.1.1.1.16.2.2.2 g_numbox.c,1.1.1.4.2.2.2.6,1.1.1.4.2.2.2.7 g_toggle.c,1.1.1.3.2.2.2.6,1.1.1.3.2.2.2.7
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20818 Modified Files: Tag: impd_0_37 g_all_guis.c g_bang.c g_graph.c g_hdial.c g_hslider.c g_io.c g_numbox.c g_toggle.c Log Message: bug fixes and deleting more code Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.6 retrieving revision 1.1.1.3.2.2.2.7 diff -C2 -d -r1.1.1.3.2.2.2.6 -r1.1.1.3.2.2.2.7 *** g_toggle.c 28 Mar 2004 07:21:18 -0000 1.1.1.3.2.2.2.6 --- g_toggle.c 28 Mar 2004 08:21:42 -0000 1.1.1.3.2.2.2.7 *************** *** 27,44 **** void toggle_draw(t_toggle *x, t_glist *glist, int mode) { ! switch(mode) { ! default: pd_upload((t_gobj *)x); sys_mgui((t_iemgui *)x,"toggle","draw",""); - /* fallthru */ - case IEM_GUI_DRAW_MODE_UPDATE: if(glist_isvisible(glist)) sys_mgui((t_iemgui *)x,"toggle","set","i",x->x_on!=0.0); - break; - case IEM_GUI_DRAW_MODE_ERASE: - sys_mgui((t_iemgui *)x,"toggle","erase",""); - break; - case IEM_GUI_DRAW_MODE_SELECT: - sys_mgui((t_iemgui *)x,"toggle","erase","i",x->x_gui.x_fsf.x_selected); - break; }} --- 27,37 ---- void toggle_draw(t_toggle *x, t_glist *glist, int mode) { ! if (mode==IEM_GUI_DRAW_MODE_ERASE) sys_mgui((t_iemgui *)x,"toggle","erase",""); ! else if (mode==IEM_GUI_DRAW_MODE_SELECT) ! sys_mgui((t_iemgui *)x,"toggle","select","i",x->x_gui.x_fsf.x_selected); ! else { pd_upload((t_gobj *)x); sys_mgui((t_iemgui *)x,"toggle","draw",""); if(glist_isvisible(glist)) sys_mgui((t_iemgui *)x,"toggle","set","i",x->x_on!=0.0); }} *************** *** 178,198 **** } - static void toggle_delta(t_toggle *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void toggle_pos(t_toggle *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void toggle_color(t_toggle *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void toggle_send(t_toggle *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - static void toggle_receive(t_toggle *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - static void toggle_label(t_toggle *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - static void toggle_label_font(t_toggle *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void toggle_label_pos(t_toggle *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void toggle_init(t_toggle *x, t_floatarg f) {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} --- 171,174 ---- *************** *** 255,280 **** void g_toggle_setup(void) { ! toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new, (t_method)toggle_ff, sizeof(t_toggle), 0, A_GIMME, 0); class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0); ! class_addbang(toggle_class, toggle_bang); ! class_addfloat(toggle_class, toggle_float); ! class_addmethod(toggle_class, (t_method)toggle_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(toggle_class, (t_method)toggle_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_loadbang, gensym("loadbang"), 0); ! class_addmethod(toggle_class, (t_method)toggle_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(toggle_class, (t_method)toggle_size, gensym("size"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_color, gensym("color"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(toggle_class, (t_method)toggle_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(toggle_class, (t_method)toggle_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(toggle_class, (t_method)toggle_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(toggle_class, (t_method)toggle_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(toggle_class, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0); toggle_widgetbehavior.w_getrectfn = toggle_getrect; toggle_widgetbehavior.w_displacefn = iemgui_displace; --- 231,251 ---- void g_toggle_setup(void) { ! t_class *c = toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new, (t_method)toggle_ff, sizeof(t_toggle), 0, A_GIMME, 0); class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0); ! class_addbang(c, toggle_bang); ! class_addfloat(c, toggle_float); ! class_addmethod(c, (t_method)toggle_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(c, (t_method)toggle_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(c, (t_method)toggle_loadbang, gensym("loadbang"), 0); ! class_addmethod(c, (t_method)toggle_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(c, (t_method)toggle_size, gensym("size"), A_GIMME, 0); ! ! iemgui_register_class(c); ! ! class_addmethod(c, (t_method)toggle_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0); toggle_widgetbehavior.w_getrectfn = toggle_getrect; toggle_widgetbehavior.w_displacefn = iemgui_displace; *************** *** 284,290 **** toggle_widgetbehavior.w_visfn = iemgui_vis; toggle_widgetbehavior.w_clickfn = toggle_newclick; ! class_setwidget(toggle_class, &toggle_widgetbehavior); ! class_sethelpsymbol(toggle_class, gensym("toggle")); ! class_setsavefn(toggle_class, toggle_save); ! class_setpropertiesfn(toggle_class, toggle_properties); } --- 255,261 ---- toggle_widgetbehavior.w_visfn = iemgui_vis; toggle_widgetbehavior.w_clickfn = toggle_newclick; ! class_setwidget(c, &toggle_widgetbehavior); ! class_sethelpsymbol(c, gensym("toggle")); ! class_setsavefn(c, toggle_save); ! class_setpropertiesfn(c, toggle_properties); } Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.3.2.3 retrieving revision 1.1.1.3.2.3.2.4 diff -C2 -d -r1.1.1.3.2.3.2.3 -r1.1.1.3.2.3.2.4 *** g_graph.c 28 Mar 2004 07:21:17 -0000 1.1.1.3.2.3.2.3 --- g_graph.c 28 Mar 2004 08:21:42 -0000 1.1.1.3.2.3.2.4 *************** *** 14,17 **** --- 14,19 ---- #include <string.h> + #define CLAMP(_var,_min,_max) { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } + /* ---------------------- forward definitions ----------------- */ *************** *** 831,838 **** { text_widgetbehavior.w_getrectfn(z, glist, &x21, &y21, &x22, &y22); ! if (x22 > x2) ! x2 = x22; ! if (y22 > y2) ! y2 = y22; } /* lie about whether we have our own window to affect gobj_getrect --- 833,838 ---- { text_widgetbehavior.w_getrectfn(z, glist, &x21, &y21, &x22, &y22); ! if (x2<x22) x2=x22; ! if (y2<y22) y2=y22; } /* lie about whether we have our own window to affect gobj_getrect *************** *** 848,855 **** continue; gobj_getrect(g, x, &x21, &y21, &x22, &y22); ! if (x22 > x2) ! x2 = x22; ! if (y22 > y2) ! y2 = y22; } x->gl_havewindow = hadwindow; --- 848,853 ---- continue; gobj_getrect(g, x, &x21, &y21, &x22, &y22); ! if (x2<x22) x2=x22; ! if (y2<y22) y2=y22; } x->gl_havewindow = hadwindow; *************** *** 947,956 **** if (!garray_getfloatarray(a, &nelem, &vec)) return; ! if (oldx < 0) oldx = 0; ! if (oldx >= nelem) ! oldx = nelem - 1; ! if (newx < 0) newx = 0; ! if (newx >= nelem) ! newx = nelem - 1; if (oldx < newx - 1) { --- 945,950 ---- if (!garray_getfloatarray(a, &nelem, &vec)) return; ! CLAMP(oldx,0,nelem-1); ! CLAMP(newx,0,nelem-1); if (oldx < newx - 1) { *************** *** 1047,1056 **** static void graph_dialog(t_glist *x, t_symbol *s, int argc, t_atom *argv) { ! t_float x1 = atom_getfloatarg(0, argc, argv); ! t_float y1 = atom_getfloatarg(1, argc, argv); ! t_float x2 = atom_getfloatarg(2, argc, argv); ! t_float y2 = atom_getfloatarg(3, argc, argv); ! t_float xpix = atom_getfloatarg(4, argc, argv); ! t_float ypix = atom_getfloatarg(5, argc, argv); if (x1 != x->gl_x1 || x2 != x->gl_x2 || y1 != x->gl_y1 || y2 != x->gl_y2) --- 1041,1046 ---- static void graph_dialog(t_glist *x, t_symbol *s, int argc, t_atom *argv) { ! t_float x1,y1,x2,y2,xpix,ypix; ! pd_scanargs(argc,argv,"ffffff",&x1,&y1,&x2,&y2,&xpix,&ypix); if (x1 != x->gl_x1 || x2 != x->gl_x2 || y1 != x->gl_y1 || y2 != x->gl_y2) Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.7 retrieving revision 1.1.1.4.2.2.2.8 diff -C2 -d -r1.1.1.4.2.2.2.7 -r1.1.1.4.2.2.2.8 *** g_hdial.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.2.2.7 --- g_hdial.c 28 Mar 2004 08:21:42 -0000 1.1.1.4.2.2.2.8 *************** *** 19,22 **** --- 19,24 ---- #include <math.h> + #define CLAMP(_var,_min,_max) { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } + t_widgetbehavior hradio_widgetbehavior; static t_class *hradio_class, *hradio_old_class; *************** *** 34,57 **** static void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! t_canvas *canvas=glist_getcanvas(glist); ! switch(mode) { ! case IEM_GUI_DRAW_MODE_UPDATE: ! if(glist_isvisible(glist)) { ! t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_set %x .x%x.c %d\n",x,canvas,x->x_on); } ! break; ! case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("radio_select %x .x%x.c %d\n", x, canvas, x->x_gui.x_fsf.x_selected); ! break; ! case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("radio_erase %x .x%x.c\n", x, canvas); ! break; ! default: ! pd_upload((t_gobj *)x); ! sys_vgui("radio_draw %x .x%x.c\n", x, canvas); ! sys_vgui("radio_set %x .x%x.c %d\n",x,canvas,x->x_on); ! break; ! }} /* ------------------------ hdl widgetbehaviour----------------------------- */ --- 36,49 ---- static void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! if (mode==IEM_GUI_DRAW_MODE_ERASE) { ! sys_mgui((t_iemgui *)x,"radio","erase",""); ! } else if (mode==IEM_GUI_DRAW_MODE_SELECT) { ! sys_mgui((t_iemgui *)x,"radio","select","i",x->x_gui.x_fsf.x_selected); ! } else { ! pd_upload((t_gobj *)x); ! sys_mgui((t_iemgui *)x,"radio","draw",""); ! sys_mgui((t_iemgui *)x,"radio","set","i",x->x_on); } ! } /* ------------------------ hdl widgetbehaviour----------------------------- */ *************** *** 138,144 **** else { ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } --- 130,134 ---- else { ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } *************** *** 150,157 **** int old=x->x_on_old; ! if(i < 0) ! i = 0; ! if(i >= x->x_number) ! i = x->x_number-1; if(x->x_on != x->x_on_old) { --- 140,144 ---- int old=x->x_on_old; ! CLAMP(i,0,x->x_number-1); if(x->x_on != x->x_on_old) { *************** *** 174,178 **** if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) { ! if((x->x_change)&&(x->x_on != x->x_on_old)) { SETFLOAT(x->x_at, (float)x->x_on_old); --- 161,165 ---- if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) { ! if(x->x_change && x->x_on!=x->x_on_old) { SETFLOAT(x->x_at, (float)x->x_on_old); *************** *** 200,208 **** { int i=(int)f; ! ! if(i < 0) ! i = 0; ! if(i >= x->x_number) ! i = x->x_number-1; if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) --- 187,191 ---- { int i=(int)f; ! CLAMP(i,0,x->x_number-1); if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) *************** *** 241,249 **** { int i=(int)f; ! ! if(i < 0) ! i = 0; ! if(i >= x->x_number) ! i = x->x_number-1; if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) --- 224,228 ---- { int i=(int)f; ! CLAMP(i,0,x->x_number-1); if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) *************** *** 292,302 **** t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! if (isvert(x)) { ! int yy = (int)ypos - (int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); ! hradio_fout(x, (float)(yy / x->x_gui.x_h)); ! } else { ! int xx = (int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); ! hradio_fout(x, (float)(xx / x->x_gui.x_w)); ! }} static int hradio_newclick(t_gobj *z, struct _glist *glist, --- 271,279 ---- t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! int val = isvert(x) ? ! ((int)ypos - (int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist))/x->x_gui.x_h : ! ((int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))/x->x_gui.x_h; ! hradio_fout(x, (float)(val)); ! } static int hradio_newclick(t_gobj *z, struct _glist *glist, *************** *** 318,332 **** { int n=(int)num; ! ! if(n < 1) ! n = 1; ! if(n > IEM_RADIO_MAX) ! n = IEM_RADIO_MAX; if(n != x->x_number) { (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE); x->x_number = n; ! if(x->x_on >= x->x_number) ! x->x_on = x->x_number - 1; x->x_on_old = x->x_on; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW); --- 295,304 ---- { int n=(int)num; ! CLAMP(n,1,IEM_RADIO_MAX); if(n != x->x_number) { (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE); x->x_number = n; ! CLAMP(x->x_on,0,x->x_number-1); x->x_on_old = x->x_on; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW); *************** *** 341,361 **** } - static void hradio_delta(t_hradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void hradio_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void hradio_color(t_hradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void hradio_send(t_hradio *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - static void hradio_receive(t_hradio *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - static void hradio_label(t_hradio *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - static void hradio_label_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void hradio_label_font(t_hradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void hradio_init(t_hradio *x, t_floatarg f) {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} --- 313,316 ---- *************** *** 367,374 **** { int bflcol[]={-262144, -1, -1}; ! int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; int ldx=0, ldy=-6, chg=1, num=8; int fs=8; - int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; t_symbol *srl[3]={0,0,0}; int isa,fstyle; --- 322,328 ---- { int bflcol[]={-262144, -1, -1}; ! int a=IEM_GUI_DEFAULTSIZE, on=0; int ldx=0, ldy=-6, chg=1, num=8; int fs=8; t_symbol *srl[3]={0,0,0}; int isa,fstyle; *************** *** 394,402 **** else { x->x_gui.x_fsf.x_font_style = 0; strcpy(x->x_gui.x_font, "courier"); } ! if(num < 1) num = 1; ! if(num > IEM_RADIO_MAX) num = IEM_RADIO_MAX; x->x_number = num; ! if(on < 0) on = 0; ! if(on >= x->x_number) on = x->x_number - 1; x->x_on = x->x_gui.x_isa.x_loadinit ? on : 0; x->x_on_old = x->x_on; --- 348,354 ---- else { x->x_gui.x_fsf.x_font_style = 0; strcpy(x->x_gui.x_font, "courier"); } ! CLAMP(num,1,IEM_RADIO_MAX); x->x_number = num; ! CLAMP(on,0,x->x_number-1); x->x_on = x->x_gui.x_isa.x_loadinit ? on : 0; x->x_on_old = x->x_on; *************** *** 413,417 **** iemgui_all_colfromload(&x->x_gui, bflcol); outlet_new(&x->x_gui.x_obj, &s_list); ! return (x); } --- 365,369 ---- iemgui_all_colfromload(&x->x_gui, bflcol); outlet_new(&x->x_gui.x_obj, &s_list); ! return x; } *************** *** 440,451 **** class_addmethod(c, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(c, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)hradio_color, gensym("color"), A_GIMME, 0); ! class_addmethod(c, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); class_addmethod(c, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); class_addmethod(c, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); --- 392,396 ---- class_addmethod(c, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! iemgui_register_class(c); class_addmethod(c, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); class_addmethod(c, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); *************** *** 460,471 **** class_addmethod(o, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); class_addmethod(o, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! class_addmethod(o, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(o, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(o, (t_method)hradio_color, gensym("color"), A_GIMME, 0); ! class_addmethod(o, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(o, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(o, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(o, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(o, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); class_addmethod(o, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); class_addmethod(o, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); --- 405,409 ---- class_addmethod(o, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); class_addmethod(o, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! iemgui_register_class(c); class_addmethod(o, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); class_addmethod(o, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.2.2.1 retrieving revision 1.1.1.1.16.2.2.2 diff -C2 -d -r1.1.1.1.16.2.2.1 -r1.1.1.1.16.2.2.2 *** g_io.c 6 Mar 2004 22:19:41 -0000 1.1.1.1.16.2.2.1 --- g_io.c 28 Mar 2004 08:21:42 -0000 1.1.1.1.16.2.2.2 *************** *** 148,156 **** while (nshift--) *f1++ = *f2++; } - #if 0 - if (tot < 5) post("in %x out %x n %x", in, out, n), tot++; - if (tot < 5) post("in[0] %f in[1] %f in[2] %f", in[0], in[1], in[2]); - #endif - while (n--) *out++ = *in++; x->x_fill = out; --- 148,151 ---- 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.9 retrieving revision 1.1.1.4.2.4.2.10 diff -C2 -d -r1.1.1.4.2.4.2.9 -r1.1.1.4.2.4.2.10 *** g_all_guis.c 28 Mar 2004 07:19:06 -0000 1.1.1.4.2.4.2.9 --- g_all_guis.c 28 Mar 2004 08:21:42 -0000 1.1.1.4.2.4.2.10 *************** *** 697,698 **** --- 697,723 ---- post("sys_mgui: can't send: buffer overflow"); } + + void iemgui2_send(void *x, t_symbol *s) {iemgui_send(x,(t_iemgui *)x,s);} + void iemgui2_receive(void *x, t_symbol *s) {iemgui_receive(x,(t_iemgui *)x,s);} + void iemgui2_label(void *x, t_symbol *s) {iemgui_label(x,(t_iemgui *)x,s);} + void iemgui2_label_pos(void *x, t_symbol *s, int ac, t_atom *av) + {iemgui_label_pos(x,(t_iemgui *)x, s, ac, av);} + void iemgui2_label_font(void *x, t_symbol *s, int ac, t_atom *av) + {iemgui_label_font(x,(t_iemgui *)x, s, ac, av);} + void iemgui2_delta(void *x, t_symbol *s, int ac, t_atom *av) + {iemgui_delta(x,(t_iemgui *)x, s, ac, av);} + void iemgui2_pos(void *x, t_symbol *s, int ac, t_atom *av) + {iemgui_pos(x,(t_iemgui *)x, s, ac, av);} + void iemgui2_color(void *x, t_symbol *s, int ac, t_atom *av) + {iemgui_color(x,(t_iemgui *)x, s, ac, av);} + + void iemgui_register_class (t_class *c) { + class_addmethod(c, (t_method)iemgui2_delta, gensym("delta"), A_GIMME, 0); + class_addmethod(c, (t_method)iemgui2_pos, gensym("pos"), A_GIMME, 0); + class_addmethod(c, (t_method)iemgui2_color, gensym("color"), A_GIMME, 0); + class_addmethod(c, (t_method)iemgui2_send, gensym("send"), A_DEFSYM, 0); + class_addmethod(c, (t_method)iemgui2_receive, gensym("receive"), A_DEFSYM, 0); + class_addmethod(c, (t_method)iemgui2_label, gensym("label"), A_DEFSYM, 0); + class_addmethod(c, (t_method)iemgui2_label_pos, gensym("label_pos"), A_GIMME, 0); + class_addmethod(c, (t_method)iemgui2_label_font, gensym("label_font"), A_GIMME, 0); + } Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.8 retrieving revision 1.1.1.3.2.2.2.9 diff -C2 -d -r1.1.1.3.2.2.2.8 -r1.1.1.3.2.2.2.9 *** g_hslider.c 28 Mar 2004 07:21:17 -0000 1.1.1.3.2.2.2.8 --- g_hslider.c 28 Mar 2004 08:21:42 -0000 1.1.1.3.2.2.2.9 *************** *** 23,26 **** --- 23,28 ---- #endif + #define CLAMP(_var,_min,_max) { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } + t_widgetbehavior hslider_widgetbehavior; static t_class *hslider_class; *************** *** 153,160 **** -----------output-range:----------- %g left: %g right: %g \ %d lin log %d %d empty %d \ ! %s %s \ ! %s %d %d \ ! %d %d \ ! %d %d %d\n", x->x_gui.x_w, IEM_SL_MINSIZE, x->x_gui.x_h, IEM_GUI_MINSIZE, x->x_min, x->x_max, 0.0,/*no_schedule*/ --- 155,159 ---- -----------output-range:----------- %g left: %g right: %g \ %d lin log %d %d empty %d \ ! %s %s %s %d %d %d %d %d %d %d\n", x->x_gui.x_w, IEM_SL_MINSIZE, x->x_gui.x_h, IEM_GUI_MINSIZE, x->x_min, x->x_max, 0.0,/*no_schedule*/ *************** *** 170,183 **** { double g; ! if(x->x_gui.x_isa.x_reverse) ! { ! if(f > x->x_min) f = x->x_min; ! if(f < x->x_max) f = x->x_max; ! } ! else ! { ! if(f > x->x_max) f = x->x_max; ! if(f < x->x_min) f = x->x_min; ! } g = (x->x_lin0_log1 ? log(f/x->x_min) : (f-x->x_min)) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); --- 169,176 ---- { double g; ! if(x->x_gui.x_isa.x_reverse) { ! CLAMP(f,x->x_max,x->x_min); } ! else { ! CLAMP(f,x->x_min,x->x_max); } g = (x->x_lin0_log1 ? log(f/x->x_min) : (f-x->x_min)) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); *************** *** 238,244 **** x->x_pos -= 100*(int)dy; x->x_val = x->x_pos; ! if(x->x_val > (100*x->x_gui.x_h - 100)) { ! x->x_val = 100*x->x_gui.x_h - 100; x->x_pos += 50; x->x_pos -= x->x_pos%100; --- 231,237 ---- x->x_pos -= 100*(int)dy; x->x_val = x->x_pos; ! if(x->x_val > 100*x->x_gui.x_h-100) { ! x->x_val = 100*x->x_gui.x_h-100; x->x_pos += 50; x->x_pos -= x->x_pos%100; *************** *** 250,256 **** x->x_pos += 100*(int)dx; x->x_val = x->x_pos; ! if(x->x_val > (100*x->x_gui.x_w - 100)) { ! x->x_val = 100*x->x_gui.x_w - 100; x->x_pos += 50; x->x_pos -= x->x_pos%100; --- 243,249 ---- x->x_pos += 100*(int)dx; x->x_val = x->x_pos; ! if(x->x_val > (100*x->x_gui.x_w-100)) { ! x->x_val = 100*x->x_gui.x_w-100; x->x_pos += 50; x->x_pos -= x->x_pos%100; *************** *** 273,289 **** t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { if (isvert(x)) { if(!x->x_steady) x->x_val = (int)(100.0 * (x->x_gui.x_h + text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist) - ypos)); ! if(x->x_val > (100*x->x_gui.x_h - 100)) ! x->x_val = 100*x->x_gui.x_h - 100; }else{ if(!x->x_steady) x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); ! if(x->x_val > (100*x->x_gui.x_w - 100)) ! x->x_val = 100*x->x_gui.x_w - 100; } ! if(x->x_val < 0) ! x->x_val = 0; x->x_pos = x->x_val; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); --- 266,280 ---- t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { + int max = isvert(x) ? 100*x->x_gui.x_h-100 : 100*x->x_gui.x_w-100; if (isvert(x)) { if(!x->x_steady) x->x_val = (int)(100.0 * (x->x_gui.x_h + text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist) - ypos)); ! if(x->x_val > max) x->x_val = max; }else{ if(!x->x_steady) x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); ! if(x->x_val > max) x->x_val = max; } ! if(x->x_val < 0) x->x_val = 0; x->x_pos = x->x_val; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); *************** *** 324,344 **** } - static void hslider_delta(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void hslider_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void hslider_color(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void hslider_send(t_hslider *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - static void hslider_receive(t_hslider *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - static void hslider_label(t_hslider *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - static void hslider_label_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void hslider_label_font(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void hslider_log(t_hslider *x) { --- 315,318 ---- *************** *** 479,491 **** class_addmethod(c, (t_method)hslider_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)hslider_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_range, gensym("range"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_color, gensym("color"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hslider_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hslider_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)hslider_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)hslider_label_font, gensym("label_font"), A_GIMME, 0); class_addmethod(c, (t_method)hslider_log, gensym("log"), 0); class_addmethod(c, (t_method)hslider_lin, gensym("lin"), 0); --- 453,457 ---- class_addmethod(c, (t_method)hslider_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)hslider_size, gensym("size"), A_GIMME, 0); ! iemgui_register_class(c); class_addmethod(c, (t_method)hslider_log, gensym("log"), 0); class_addmethod(c, (t_method)hslider_lin, gensym("lin"), 0); Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.8 retrieving revision 1.1.1.3.2.2.2.9 diff -C2 -d -r1.1.1.3.2.2.2.8 -r1.1.1.3.2.2.2.9 *** g_bang.c 28 Mar 2004 07:21:15 -0000 1.1.1.3.2.2.2.8 --- g_bang.c 28 Mar 2004 08:21:42 -0000 1.1.1.3.2.2.2.9 *************** *** 27,31 **** void bng_draw(t_bng *x, t_glist *glist, int mode) { - t_canvas *canvas=glist_getcanvas(glist); if (mode==IEM_GUI_DRAW_MODE_ERASE) sys_mgui((t_iemgui *)x,"bang","erase",""); --- 27,30 ---- *************** *** 195,220 **** } - static void bng_delta(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void bng_pos(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void bng_color(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void bng_send(t_bng *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - static void bng_receive(t_bng *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - static void bng_label(t_bng *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - static void bng_label_pos(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void bng_label_font(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void bng_init(t_bng *x, t_floatarg f) ! { ! x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; ! } ! static void bng_tick_hld(t_bng *x) {x->x_flashed = 0; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, 0);} --- 194,199 ---- } static void bng_init(t_bng *x, t_floatarg f) ! {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} static void bng_tick_hld(t_bng *x) {x->x_flashed = 0; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, 0);} *************** *** 281,307 **** void g_bang_setup(void) { ! bng_class = class_new(gensym("bng"), (t_newmethod)bng_new, ! (t_method)bng_ff, sizeof(t_bng), 0, A_GIMME, 0); ! class_addbang(bng_class, bng_bang); ! class_addfloat(bng_class, bng_float); ! class_addsymbol(bng_class, bng_symbol); ! class_addpointer(bng_class, bng_pointer); ! class_addlist(bng_class, bng_list); ! class_addanything(bng_class, bng_anything); ! class_addmethod(bng_class, (t_method)bng_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(bng_class, (t_method)bng_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_loadbang, gensym("loadbang"), 0); ! class_addmethod(bng_class, (t_method)bng_size, gensym("size"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_color, gensym("color"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(bng_class, (t_method)bng_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(bng_class, (t_method)bng_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(bng_class, (t_method)bng_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(bng_class, (t_method)bng_init, gensym("init"), A_FLOAT, 0); bng_widgetbehavior.w_getrectfn = bng_getrect; bng_widgetbehavior.w_displacefn = iemgui_displace; --- 260,279 ---- void g_bang_setup(void) { ! t_class *c = bng_class = class_new(gensym("bng"), (t_newmethod)bng_new, ! (t_method)bng_ff, sizeof(t_bng), 0, A_GIMME, 0); ! class_addbang(c, bng_bang); ! class_addfloat(c, bng_float); ! class_addsymbol(c, bng_symbol); ! class_addpointer(c, bng_pointer); ! class_addlist(c, bng_list); ! class_addanything(c, bng_anything); ! class_addmethod(c, (t_method)bng_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(c, (t_method)bng_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(c, (t_method)bng_loadbang, gensym("loadbang"), 0); ! class_addmethod(c, (t_method)bng_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0); ! class_addmethod(c, (t_method)bng_init, gensym("init"), A_FLOAT, 0); ! iemgui_register_class(c); bng_widgetbehavior.w_getrectfn = bng_getrect; bng_widgetbehavior.w_displacefn = iemgui_displace; Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.6 retrieving revision 1.1.1.4.2.2.2.7 diff -C2 -d -r1.1.1.4.2.2.2.6 -r1.1.1.4.2.2.2.7 *** g_numbox.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.2.2.6 --- g_numbox.c 28 Mar 2004 08:21:42 -0000 1.1.1.4.2.2.2.7 *************** *** 113,136 **** } ! void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! switch (mode) { ! case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("numbox_erase .x%x.c %x\n",canvas,x); break; ! case IEM_GUI_DRAW_MODE_SELECT: ! /* if(x->x_gui.x_fsf.x_selected && x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; CH ! clock_unset(x->x_clock_reset); ! }*/ ! /* fallthru */ ! default: ! pd_upload((t_gobj *)x); ! my_numbox_ftoa(x); ! sys_vgui("numbox_draw %x .x%x.c\n", x, canvas); ! post("numberbox: %d %d",(int)x->x_gui.x_fsf.x_selected,(int)x->x_gui.x_fsf.x_change); ! sys_vgui("numbox_select %x .x%x.c %d\n", x, canvas, ! (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change); break; ! } } --- 113,127 ---- } ! void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) { ! if (mode==IEM_GUI_DRAW_MODE_ERASE) ! sys_mgui((t_iemgui *)x,"numbox","erase",""); ! else if (mode==IEM_GUI_DRAW_MODE_SELECT) ! sys_mgui((t_iemgui *)x,"numbox","select","i", ! (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change); ! else {pd_upload((t_gobj *)x); ! my_numbox_ftoa(x); ! sys_mgui((t_iemgui *)x,"numbox","draw",""); ! sys_mgui((t_iemgui *)x,"numbox","select","i", ! (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change);} } *************** *** 142,146 **** { t_my_numbox* x = (t_my_numbox*)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); --- 133,136 ---- *************** *** 183,187 **** if(x->x_lin0_log1) { ! if((min == 0.0)&&(max == 0.0)) max = 1.0; if(max > 0.0) { if(min <= 0.0) min = 0.01*max; --- 173,177 ---- if(x->x_lin0_log1) { ! if(min==0.0 && max==0.0) max = 1.0; if(max > 0.0) { if(min <= 0.0) min = 0.01*max; *************** *** 333,338 **** static void my_numbox_log_height(t_my_numbox *x, t_floatarg lh) { ! if(lh < 10.0) ! lh = 10.0; x->x_log_height = (int)lh; if(x->x_lin0_log1) --- 323,327 ---- static void my_numbox_log_height(t_my_numbox *x, t_floatarg lh) { ! if(lh < 10.0) lh = 10.0; x->x_log_height = (int)lh; if(x->x_lin0_log1) *************** *** 355,366 **** w = (int)atom_getintarg(0, ac, av); ! if(w < 1) ! w = 1; x->x_gui.x_w = w; if(ac > 1) { h = (int)atom_getintarg(1, ac, av); ! if(h < 8) ! h = 8; x->x_gui.x_h = h; } --- 344,353 ---- w = (int)atom_getintarg(0, ac, av); ! if(w < 1) w = 1; x->x_gui.x_w = w; if(ac > 1) { h = (int)atom_getintarg(1, ac, av); ! if(h < 8) h = 8; x->x_gui.x_h = h; } *************** *** 369,378 **** } - static void my_numbox_delta(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - - static void my_numbox_pos(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void my_numbox_range(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) { --- 356,359 ---- *************** *** 384,418 **** } - static void my_numbox_color(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - - static void my_numbox_send(t_my_numbox *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - - static void my_numbox_receive(t_my_numbox *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - - static void my_numbox_label(t_my_numbox *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - - static void my_numbox_label_pos(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - - static void my_numbox_label_font(t_my_numbox *x, - t_symbol *s, int ac, t_atom *av) - { - int f = (int)atom_getintarg(1, ac, av); - - if(f < 4) - f = 4; - x->x_gui.x_fontsize = f; - f = (int)atom_getintarg(0, ac, av); - if((f < 0) || (f > 2)) - f = 0; - x->x_gui.x_fsf.x_font_style = f; - my_numbox_calc_fontwidth(x); - iemgui_label_font((void *)x, &x->x_gui, s, ac, av); - } - static void my_numbox_log(t_my_numbox *x) { --- 365,368 ---- *************** *** 471,476 **** int sl=strlen(x->x_buf)-1; ! if(sl < 0) ! sl = 0; x->x_buf[sl] = 0; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); --- 421,425 ---- int sl=strlen(x->x_buf)-1; ! if(sl < 0) sl = 0; x->x_buf[sl] = 0; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); *************** *** 503,507 **** int bflcol[]={-262144, -1, -1}; int w=5, h=14; ! int lilo=0, f=0, ldx=0, ldy=-6; int fs=10; int log_height=256; --- 452,456 ---- int bflcol[]={-262144, -1, -1}; int w=5, h=14; ! int lilo=0, ldx=0, ldy=-6; int fs=10; int log_height=256; *************** *** 524,529 **** } x->x_gui.x_draw = (t_iemfunptr)my_numbox_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0.0; --- 473,476 ---- *************** *** 532,537 **** if(log_height < 10) log_height = 10; x->x_log_height = log_height; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 479,484 ---- if(log_height < 10) log_height = 10; x->x_log_height = log_height; ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); *************** *** 586,598 **** class_addmethod(c, (t_method)my_numbox_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)my_numbox_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_range, gensym("range"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_color, gensym("color"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_label_font, gensym("label_font"), A_GIMME, 0); class_addmethod(c, (t_method)my_numbox_log, gensym("log"), 0); class_addmethod(c, (t_method)my_numbox_lin, gensym("lin"), 0); --- 533,538 ---- class_addmethod(c, (t_method)my_numbox_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)my_numbox_size, gensym("size"), A_GIMME, 0); ! /* !@#$ actually overrode label_font to do stuff related to width */ ! iemgui_register_class(c); class_addmethod(c, (t_method)my_numbox_log, gensym("log"), 0); class_addmethod(c, (t_method)my_numbox_lin, gensym("lin"), 0);

1 0

pd/src g_bang.c,1.1.1.3.2.2.2.7,1.1.1.3.2.2.2.8 g_canvas.c,1.1.1.4.2.7.2.5,1.1.1.4.2.7.2.6 g_editor.c,1.1.1.4.2.3.2.3,1.1.1.4.2.3.2.4 g_graph.c,1.1.1.3.2.3.2.2,1.1.1.3.2.3.2.3 g_hdial.c,1.1.1.4.2.2.2.6,1.1.1.4.2.2.2.7 g_hslider.c,1.1.1.3.2.2.2.7,1.1.1.3.2.2.2.8 g_mycanvas.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 g_numbox.c,1.1.1.4.2.2.2.5,1.1.1.4.2.2.2.6 g_rtext.c,1.1.1.2.2.6.2.3,1.1.1.2.2.6.2.4 g_text.c,1.1.1.4.2.2.2.4,1.1.1.4.2.2.2.5 g_toggle.c,1.1.1.3.2.2.2.5,1.1.1.3.2.2.2.6 g_vumeter.c,1.1.1.3.2.2.2.5
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10855 Modified Files: Tag: impd_0_37 g_bang.c g_canvas.c g_editor.c g_graph.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_rtext.c g_text.c g_toggle.c g_vumeter.c u_object.tk Log Message: introducing sys_mgui() and more bugs Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.5 retrieving revision 1.1.1.3.2.2.2.6 diff -C2 -d -r1.1.1.3.2.2.2.5 -r1.1.1.3.2.2.2.6 *** g_toggle.c 10 Mar 2004 06:00:11 -0000 1.1.1.3.2.2.2.5 --- g_toggle.c 28 Mar 2004 07:21:18 -0000 1.1.1.3.2.2.2.6 *************** *** 27,46 **** void toggle_draw(t_toggle *x, t_glist *glist, int mode) { - t_canvas *canvas=glist_getcanvas(glist); switch(mode) { ! default:{ pd_upload((t_gobj *)x); ! sys_vgui("toggle_draw %x .x%x.c\n", x, canvas); /* fallthru */ - } case IEM_GUI_DRAW_MODE_UPDATE: ! if(glist_isvisible(glist)) ! sys_vgui("toggle_set %x .x%x.c %d\n", x, canvas, x->x_on!=0.0); break; case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("toggle_erase .x%x.c %x\n", canvas, x); break; case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("toggle_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); break; }} --- 27,43 ---- void toggle_draw(t_toggle *x, t_glist *glist, int mode) { switch(mode) { ! default: pd_upload((t_gobj *)x); ! sys_mgui((t_iemgui *)x,"toggle","draw",""); /* fallthru */ case IEM_GUI_DRAW_MODE_UPDATE: ! if(glist_isvisible(glist)) sys_mgui((t_iemgui *)x,"toggle","set","i",x->x_on!=0.0); break; case IEM_GUI_DRAW_MODE_ERASE: ! sys_mgui((t_iemgui *)x,"toggle","erase",""); break; case IEM_GUI_DRAW_MODE_SELECT: ! sys_mgui((t_iemgui *)x,"toggle","erase","i",x->x_gui.x_fsf.x_selected); break; }} *************** *** 183,205 **** static void toggle_delta(t_toggle *x, t_symbol *s, int ac, t_atom *av) {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void toggle_pos(t_toggle *x, t_symbol *s, int ac, t_atom *av) {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void toggle_color(t_toggle *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void toggle_send(t_toggle *x, t_symbol *s) {iemgui_send(x, &x->x_gui, s);} - static void toggle_receive(t_toggle *x, t_symbol *s) {iemgui_receive(x, &x->x_gui, s);} - static void toggle_label(t_toggle *x, t_symbol *s) {iemgui_label((void *)x, &x->x_gui, s);} - static void toggle_label_font(t_toggle *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void toggle_label_pos(t_toggle *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} --- 180,195 ---- *************** *** 215,223 **** t_toggle *x = (t_toggle *)pd_new(toggle_class); int bflcol[]={-262144, -1, -1}; ! int a=IEM_GUI_DEFAULTSIZE, f=0; int ldx=0, ldy=-6; int fs=8; float on=0.0, nonzero=1.0; - char str[144]; int fstyle=0, isa=0; t_symbol *srl[3]={0,0,0}; --- 205,212 ---- t_toggle *x = (t_toggle *)pd_new(toggle_class); int bflcol[]={-262144, -1, -1}; ! int a=IEM_GUI_DEFAULTSIZE; int ldx=0, ldy=-6; int fs=8; float on=0.0, nonzero=1.0; int fstyle=0, isa=0; t_symbol *srl[3]={0,0,0}; *************** *** 231,239 **** nonzero = (float)atom_getfloatarg(13, argc, argv); x->x_gui.x_draw = (t_iemfunptr)toggle_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 220,226 ---- nonzero = (float)atom_getfloatarg(13, argc, argv); x->x_gui.x_draw = (t_iemfunptr)toggle_draw; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.4 retrieving revision 1.1.1.4.2.2.2.5 diff -C2 -d -r1.1.1.4.2.2.2.4 -r1.1.1.4.2.2.2.5 *** g_text.c 14 Mar 2004 22:33:54 -0000 1.1.1.4.2.2.2.4 --- g_text.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.2.2.5 *************** *** 663,667 **** { *xp = x1 - 1; ! *yp = y1 - 1 - sys_fontheight(glist_getfont(glist));; } else --- 663,667 ---- { *xp = x1 - 1; ! *yp = y1 - 1 - sys_fontheight(glist_getfont(glist)); } else *************** *** 887,891 **** rtext_select(y, state); if (glist_isvisible(glist) && text_shouldvis(x, glist)) { ! sys_vgui("%s_select .x%x.c %s %d\n", text_classname(x), glist, rtext_gettag(y), state); } } --- 887,891 ---- rtext_select(y, state); if (glist_isvisible(glist) && text_shouldvis(x, glist)) { ! sys_vgui("%s_select %s .x%x.c %d\n", text_classname(x), rtext_gettag(y),glist, state); } } *************** *** 1064,1069 **** char *tag, int x1, int y1, int x2, int y2) { ! sys_vgui("io_draw .x%x.c %s %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, x1, y1, x2-x1, y2-x1, obj_ninlets(ob), obj_noutlets(ob)); } --- 1064,1069 ---- char *tag, int x1, int y1, int x2, int y2) { ! sys_vgui("io_draw %s .x%x.c %d %d %d %d %d %d\n", ! tag, glist_getcanvas(glist), x1, y1, x2-x1, y2-x1, obj_ninlets(ob), obj_noutlets(ob)); } *************** *** 1076,1081 **** text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2); ob = pd_checkobject(&x->te_pd); ! sys_vgui("%s_draw .x%x.c %s %d %d %d %d %d %d\n", ! text_classname(x),glist,tag,x1,y1,x2-x1,y2-y1, ob?obj_ninlets(ob):0, ob?obj_noutlets(ob):0); } --- 1076,1081 ---- text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2); ob = pd_checkobject(&x->te_pd); ! sys_vgui("%s_draw %s .x%x.c %d %d %d %d %d %d\n", ! text_classname(x),tag,glist,x1,y1,x2-x1,y2-y1, ob?obj_ninlets(ob):0, ob?obj_noutlets(ob):0); } *************** *** 1083,1093 **** void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) { ! sys_vgui("io_erase .x%x.c %s\n",glist_getcanvas(glist),tag); } void text_eraseborder(t_text *x, t_glist *glist, char *tag) { ! sys_vgui("%s_erase .x%x.c %s\n", text_classname(x), glist_getcanvas(glist), tag); ! sys_vgui("io_erase .x%x.c %s\n",glist_getcanvas(glist),tag); } --- 1083,1093 ---- void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) { ! sys_vgui("io_erase %s .x%x.c\n",tag,glist_getcanvas(glist)); } void text_eraseborder(t_text *x, t_glist *glist, char *tag) { ! sys_vgui("%s_erase %s .x%x.c\n", text_classname(x), tag,glist_getcanvas(glist)); ! sys_vgui("io_erase %s .x%x.c\n",tag,glist_getcanvas(glist)); } Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.6 retrieving revision 1.1.1.4.2.2.2.7 diff -C2 -d -r1.1.1.4.2.2.2.6 -r1.1.1.4.2.2.2.7 *** g_hdial.c 10 Mar 2004 06:00:11 -0000 1.1.1.4.2.2.2.6 --- g_hdial.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.2.2.7 *************** *** 39,47 **** if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); } break; case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("bluebox_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); break; case IEM_GUI_DRAW_MODE_ERASE: --- 39,47 ---- if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_set %x .x%x.c %d\n",x,canvas,x->x_on); } break; case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("radio_select %x .x%x.c %d\n", x, canvas, x->x_gui.x_fsf.x_selected); break; case IEM_GUI_DRAW_MODE_ERASE: *************** *** 51,55 **** pd_upload((t_gobj *)x); sys_vgui("radio_draw %x .x%x.c\n", x, canvas); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); break; }} --- 51,55 ---- pd_upload((t_gobj *)x); sys_vgui("radio_draw %x .x%x.c\n", x, canvas); ! sys_vgui("radio_set %x .x%x.c %d\n",x,canvas,x->x_on); break; }} *************** *** 102,111 **** empty 0.0 empty 0.0 empty %d \ %d new-only new&old %d %d number: %d \ ! %s %s \ ! %s %d %d \ ! %d %d \ ! %d %d %d\n", ! x->x_gui.x_w, IEM_GUI_MINSIZE, ! 0,/*no_schedule*/ x->x_change, x->x_gui.x_isa.x_loadinit, -1, x->x_number, srl[0]->s_name, srl[1]->s_name, --- 102,107 ---- empty 0.0 empty 0.0 empty %d \ %d new-only new&old %d %d number: %d \ ! %s %s %s %d %d %d %d %d %d %d\n", ! x->x_gui.x_w, IEM_GUI_MINSIZE, 0, x->x_change, x->x_gui.x_isa.x_loadinit, -1, x->x_number, srl[0]->s_name, srl[1]->s_name, *************** *** 347,382 **** static void hradio_delta(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void hradio_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void hradio_color(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void hradio_send(t_hradio *x, t_symbol *s) {iemgui_send(x, &x->x_gui, s);} - static void hradio_receive(t_hradio *x, t_symbol *s) {iemgui_receive(x, &x->x_gui, s);} - static void hradio_label(t_hradio *x, t_symbol *s) {iemgui_label((void *)x, &x->x_gui, s);} - static void hradio_label_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void hradio_label_font(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} static void hradio_init(t_hradio *x, t_floatarg f) ! { ! x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; ! } ! ! static void hradio_double_change(t_hradio *x) ! {x->x_change = 1;} ! static void hradio_single_change(t_hradio *x) ! {x->x_change = 0;} static void *hradio_donew(t_symbol *s, int argc, t_atom *argv, t_hradio *x) --- 343,366 ---- static void hradio_delta(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} static void hradio_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} static void hradio_color(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} static void hradio_send(t_hradio *x, t_symbol *s) {iemgui_send(x, &x->x_gui, s);} static void hradio_receive(t_hradio *x, t_symbol *s) {iemgui_receive(x, &x->x_gui, s);} static void hradio_label(t_hradio *x, t_symbol *s) {iemgui_label((void *)x, &x->x_gui, s);} static void hradio_label_pos(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} static void hradio_label_font(t_hradio *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} static void hradio_init(t_hradio *x, t_floatarg f) ! {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} ! static void hradio_double_change(t_hradio *x) {x->x_change = 1;} ! static void hradio_single_change(t_hradio *x) {x->x_change = 0;} static void *hradio_donew(t_symbol *s, int argc, t_atom *argv, t_hradio *x) *************** *** 403,411 **** else iemgui_new_getnames(&x->x_gui, 4, 0); x->x_gui.x_draw = (t_iemfunptr)hradio_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 387,393 ---- else iemgui_new_getnames(&x->x_gui, 4, 0); x->x_gui.x_draw = (t_iemfunptr)hradio_draw; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.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_mycanvas.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.1 --- g_mycanvas.c 28 Mar 2004 07:21:17 -0000 1.1.1.3.2.2.2.2 *************** *** 307,317 **** } x->x_gui.x_draw = (t_iemfunptr)my_canvas_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(a < 1) a = 1; --- 307,313 ---- } x->x_gui.x_draw = (t_iemfunptr)my_canvas_draw; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(a < 1) a = 1; Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** u_object.tk 23 Mar 2004 02:17:42 -0000 1.1.2.11 --- u_object.tk 28 Mar 2004 07:21:18 -0000 1.1.2.12 *************** *** 69,74 **** # 0: creation # 1: resize (or move) ! ! proc wire_draw {canvas tag thick x1 y1 x2 y2} { global look set xys [list $x1 $y1 $x2 $y2] --- 69,73 ---- # 0: creation # 1: resize (or move) ! proc wire_draw {self canvas thick x1 y1 x2 y2} { [...966 lines suppressed...] ! proc vu_draw {self canvas} { ! global _ ! set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] ! set x1 $_($self:x1) ! set y1 $_($self:y1) ! set xs $_($self:w) ! set ys $_($self:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr 2*([string compare $_($self:rcv) empty]==0)] ! set outs 2 ! #[expr [string compare $_($self:snd) empty]==0] ! set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] ! set colour [parse_color $_($self:bcol)] ! bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs $colour ! } ! ! proc vu_erase {self canvas} { ! bluebox_erase $self $canvas } Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.6.2.3 retrieving revision 1.1.1.2.2.6.2.4 diff -C2 -d -r1.1.1.2.2.6.2.3 -r1.1.1.2.2.6.2.4 *** g_rtext.c 16 Mar 2004 21:55:55 -0000 1.1.1.2.2.6.2.3 --- g_rtext.c 28 Mar 2004 07:21:17 -0000 1.1.1.2.2.6.2.4 *************** *** 338,342 **** void rtext_erase(t_rtext *x) { ! sys_vgui(".x%x.c delete %s\n", glist_getcanvas(x->x_glist), x->x_tag); } --- 338,342 ---- void rtext_erase(t_rtext *x) { ! sys_vgui("pdtk_text_delete .x%x.c %s\n", glist_getcanvas(x->x_glist), x->x_tag); } Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.3.2.2 retrieving revision 1.1.1.3.2.3.2.3 diff -C2 -d -r1.1.1.3.2.3.2.2 -r1.1.1.3.2.3.2.3 *** g_graph.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.3.2.2 --- g_graph.c 28 Mar 2004 07:21:17 -0000 1.1.1.3.2.3.2.3 *************** *** 113,117 **** void glist_clear(t_glist *x) { ! t_gobj *y, *y2; int dspstate = canvas_suspend_dsp(); while (y = x->gl_list) --- 113,117 ---- void glist_clear(t_glist *x) { ! t_gobj *y; int dspstate = canvas_suspend_dsp(); while (y = x->gl_list) *************** *** 122,126 **** void glist_retext(t_glist *glist, t_text *y) { - t_canvas *c = glist_getcanvas(glist); /* check that we have built rtexts yet. LATER need a better test. */ if (glist->gl_editor && glist->gl_editor->e_rtext) --- 122,125 ---- Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.5 retrieving revision 1.1.1.3.2.2.2.6 diff -C2 -d -r1.1.1.3.2.2.2.5 -r1.1.1.3.2.2.2.6 *** g_vumeter.c 28 Mar 2004 04:18:18 -0000 1.1.1.3.2.2.2.5 --- g_vumeter.c 28 Mar 2004 07:21:18 -0000 1.1.1.3.2.2.2.6 *************** *** 157,163 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! sys_vgui("io_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos-1, ypos-2, x->x_gui.x_w+1, x->x_gui.x_h+2, 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); } --- 157,165 ---- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! pd_upload((t_gobj *)x); ! sys_mgui((t_iemgui *)x,"vu","draw",""); ! /* canvas, x, xpos-1, ypos-2, x->x_gui.x_w+1, x->x_gui.x_h+2, 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); + */ } *************** *** 597,604 **** x->x_gui.x_fsf.x_snd_able = 0; ! x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); - if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) - x->x_gui.x_fsf.x_rcv_able = 0; if (x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); --- 599,604 ---- x->x_gui.x_fsf.x_snd_able = 0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); if (x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.5 retrieving revision 1.1.1.4.2.7.2.6 diff -C2 -d -r1.1.1.4.2.7.2.5 -r1.1.1.4.2.7.2.6 *** g_canvas.c 16 Mar 2004 21:54:02 -0000 1.1.1.4.2.7.2.5 --- g_canvas.c 28 Mar 2004 07:21:16 -0000 1.1.1.4.2.7.2.6 *************** *** 274,283 **** while (outno == t->tr_nout) { ! t_gobj *y; t_object *ob = 0; ! if (!t->tr_ob) y = t->tr_x->gl_list; ! else y = t->tr_ob->ob_g.g_next; ! for (; y; y = y->g_next) ! if (ob = pd_checkobject(&y->g_pd)) break; if (!ob) return (0); t->tr_ob = ob; --- 274,280 ---- while (outno == t->tr_nout) { ! t_gobj *y = t->tr_ob ? y = t->tr_ob->ob_g.g_next : t->tr_x->gl_list; t_object *ob = 0; ! for (; y; y=y->g_next) {ob=pd_checkobject(&y->g_pd); if (ob) break;} if (!ob) return (0); t->tr_ob = ob; *************** *** 358,379 **** if (argc == 5) /* toplevel: x, y, w, h, font */ ! { ! xloc = atom_getintarg(0, argc, argv); ! yloc = atom_getintarg(1, argc, argv); ! width = atom_getintarg(2, argc, argv); ! height = atom_getintarg(3, argc, argv); ! font = atom_getintarg(4, argc, argv); ! } else if (argc == 6) /* subwindow: x, y, w, h, name, vis */ ! { ! xloc = atom_getintarg(0, argc, argv); ! yloc = atom_getintarg(1, argc, argv); ! width = atom_getintarg(2, argc, argv); ! height = atom_getintarg(3, argc, argv); ! s = atom_getsymbolarg(4, argc, argv); ! vis = atom_getintarg(5, argc, argv); ! } /* (otherwise assume we're being created from the menu.) */ - if (canvas_newdirectory->s_name[0]) { --- 355,362 ---- if (argc == 5) /* toplevel: x, y, w, h, font */ ! pd_scanargs(argc,argv,"iiiii",&xloc,&yloc,&width,&height,&font); else if (argc == 6) /* subwindow: x, y, w, h, name, vis */ ! pd_scanargs(argc,argv,"iiiisi",&xloc,&yloc,&width,&height,&s,&vis); /* (otherwise assume we're being created from the menu.) */ if (canvas_newdirectory->s_name[0]) { *************** *** 417,427 **** static void canvas_coords(t_glist *x, t_symbol *s, int argc, t_atom *argv) { ! x->gl_x1 = atom_getfloatarg(0, argc, argv); ! x->gl_y1 = atom_getfloatarg(1, argc, argv); ! x->gl_x2 = atom_getfloatarg(2, argc, argv); ! x->gl_y2 = atom_getfloatarg(3, argc, argv); ! x->gl_pixwidth = atom_getintarg(4, argc, argv); ! x->gl_pixheight = atom_getintarg(5, argc, argv); ! canvas_setgraph(x, atom_getintarg(6, argc, argv)); } --- 400,407 ---- static void canvas_coords(t_glist *x, t_symbol *s, int argc, t_atom *argv) { ! int graph; ! pd_scanargs(argc,argv,"ffffiii", ! &x->gl_x1,&x->gl_y1,&x->gl_x2,&x->gl_y2,&x->gl_pixwidth,&x->gl_pixheight,&graph); ! canvas_setgraph(x,graph); } *************** *** 495,507 **** void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { ! t_symbol *sym = atom_getsymbolarg(0, argc, argv); ! float x1 = atom_getfloatarg(1, argc, argv); ! float y1 = atom_getfloatarg(2, argc, argv); ! float x2 = atom_getfloatarg(3, argc, argv); ! float y2 = atom_getfloatarg(4, argc, argv); ! float px1 = atom_getfloatarg(5, argc, argv); ! float py1 = atom_getfloatarg(6, argc, argv); ! float px2 = atom_getfloatarg(7, argc, argv); ! float py2 = atom_getfloatarg(8, argc, argv); glist_addglist(g, sym, x1, y1, x2, y2, px1, py1, px2, py2); } --- 475,481 ---- void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { ! t_symbol *sym; ! float x1,y1,x2,y2,px1,py1,px2,py2; ! pd_scanargs(argc,argv,"sffffffff",&x1,&y1,&x2,&y2,&px1,&py1,&px2,&py2); glist_addglist(g, sym, x1, y1, x2, y2, px1, py1, px2, py2); } *************** *** 634,638 **** t_canvas *x = canvas_list; while (x) { - fprintf(stderr,"canvas=%08x\n",x); canvas_redraw(x); x->gl_mapped=0; canvas_map(x,1); --- 608,611 ---- *************** *** 715,719 **** void canvas_vis(t_canvas *x, t_floatarg f) { - char buf[30]; int flag = (f != 0); if (flag) --- 688,691 ---- *************** *** 861,866 **** 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); } } --- 833,838 ---- int x1=t.tr_lx1, y1=t.tr_ly1; int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw l%x .x%x.c %d %d %d %d %d\n", ! oc, glist_getcanvas(x), (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); } } *************** *** 875,880 **** 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); } } --- 847,852 ---- int x1=t.tr_lx1, y1=t.tr_ly1; int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw l%x .x%x.c %d %d %d %d %d\n", ! oc, glist_getcanvas(x), (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); } } *************** *** 1375,1424 **** class_addmethod(pd_canvasmaker, (t_method)canvas_new, gensym("canvas"), A_GIMME, 0); ! class_addmethod(canvas_class, (t_method)canvas_restore, ! gensym("restore"), A_GIMME, 0); ! class_addmethod(canvas_class, (t_method)canvas_coords, ! gensym("coords"), A_GIMME, 0); ! /* -------------------------- objects ----------------------------- */ ! class_addmethod(canvas_class, (t_method)canvas_obj, ! gensym("obj"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_msg, ! gensym("msg"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_floatatom, ! gensym("floatatom"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_symbolatom, ! gensym("symbolatom"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)glist_text, ! gensym("text"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)glist_glist, gensym("graph"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)glist_scalar, ! gensym("scalar"), A_GIMME, A_NULL); ! ! /* -------------- Thomas Musil's GUI objects ------------ */ ! class_addmethod(canvas_class, (t_method)canvas_bng, gensym("bng"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_toggle, gensym("toggle"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_vslider, gensym("vslider"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_hslider, gensym("hslider"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_hdial, gensym("hdial"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_vdial, gensym("vdial"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_hradio, gensym("hradio"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_vradio, gensym("vradio"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_vumeter, gensym("vumeter"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_mycnv, gensym("mycnv"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_numbox, gensym("numbox"), ! A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_guiext, gensym("guiext"), ! A_GIMME, A_NULL); /* ------------------------ gui stuff --------------------------- */ --- 1347,1373 ---- class_addmethod(pd_canvasmaker, (t_method)canvas_new, gensym("canvas"), A_GIMME, 0); ! #define DEF(_f_,_s_) class_addmethod(canvas_class, (t_method)_f_, gensym(_s_), A_GIMME, 0); ! DEF(canvas_restore,"restore"); ! DEF(canvas_coords,"coords"); /* -------------------------- objects ----------------------------- */ ! DEF(canvas_obj,"obj"); ! DEF(canvas_msg,"msg"); ! DEF(canvas_floatatom,"floatatom"); ! DEF(canvas_symbolatom,"symbolatom"); ! DEF(glist_text,"text"); ! DEF(glist_glist,"graph"); ! DEF(glist_scalar,"scalar"); ! DEF(canvas_bng,"bng"); ! DEF(canvas_toggle,"toggle"); ! DEF(canvas_vslider,"vslider"); ! DEF(canvas_hslider,"hslider"); ! DEF(canvas_hdial,"hdial"); ! DEF(canvas_vdial,"vdial"); ! DEF(canvas_hradio,"hradio"); ! DEF(canvas_vradio,"vradio"); ! DEF(canvas_vumeter,"vumeter"); ! DEF(canvas_mycnv,"mycnv"); ! DEF(canvas_numbox,"numbox"); ! DEF(canvas_guiext,"guiext"); /* ------------------------ gui stuff --------------------------- */ *************** *** 1435,1440 **** class_addmethod(canvas_class, (t_method)canvas_map, gensym("map"), A_FLOAT, A_NULL); ! // class_addmethod(canvas_class, (t_method)canvas_redraw, ! // gensym("redraw"), A_NULL); class_setpropertiesfn(canvas_class, graph_properties); --- 1384,1389 ---- class_addmethod(canvas_class, (t_method)canvas_map, gensym("map"), A_FLOAT, A_NULL); ! /* class_addmethod(canvas_class, (t_method)canvas_redraw, ! gensym("redraw"), A_NULL);*/ class_setpropertiesfn(canvas_class, graph_properties); Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.3 retrieving revision 1.1.1.4.2.3.2.4 diff -C2 -d -r1.1.1.4.2.3.2.3 -r1.1.1.4.2.3.2.4 *** g_editor.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.3.2.3 --- g_editor.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.3.2.4 *************** *** 30,35 **** /* ---------------- generic widget behavior ------------------------- */ ! void gobj_getrect(t_gobj *x, t_glist *glist, int *x1, int *y1, ! int *x2, int *y2) { if (x->g_pd->c_wb && x->g_pd->c_wb->w_getrectfn) --- 30,34 ---- /* ---------------- generic widget behavior ------------------------- */ ! void gobj_getrect(t_gobj *x, t_glist *glist, int *x1, int *y1, int *x2, int *y2) { if (x->g_pd->c_wb && x->g_pd->c_wb->w_getrectfn) *************** *** 433,437 **** { t_undo_cut *buf; - t_gobj *y; t_linetraverser t; t_outconnect *oc; --- 432,435 ---- *************** *** 736,751 **** void canvas_inlettip(t_canvas* x,t_object* ob,int closest,int xpos,int ypos) { if (!sys_tooltips) return; if (ob->ob_pd->c_firstin) closest--; if (closest < 0) ! sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%s\" -tags y\n", ! x, xpos, ypos,ob->ob_pd->c_firsttip->s_name); else ! sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%s\" -tags y\n", ! x, xpos, ypos-4,inlet_tip(ob->te_inlet,closest)); } - - /* check if a point lies in a gobj. */ int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, --- 734,748 ---- void canvas_inlettip(t_canvas* x,t_object* ob,int closest,int xpos,int ypos) { + int inlet=closest; if (!sys_tooltips) return; if (ob->ob_pd->c_firstin) closest--; if (closest < 0) ! sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%d: %s\" -tags y\n", ! x, xpos, ypos-4,inlet,ob->ob_pd->c_firsttip->s_name); else ! sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%d: %s\" -tags y\n", ! x, xpos, ypos-4,inlet,inlet_tip(ob->te_inlet,closest)); } /* check if a point lies in a gobj. */ int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, *************** *** 1080,1084 **** x->gl_editor->e_ywas = ypos; sys_vgui( ! "wire_draw .x%x.c x %d %d %d %d %d\n", x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos); } --- 1077,1081 ---- x->gl_editor->e_ywas = ypos; sys_vgui( ! "wire_draw x .x%x.c %d %d %d %d %d\n", x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos); } *************** *** 1213,1217 **** ywas = x->gl_editor->e_ywas; if (doit) sys_vgui(".x%x.c delete x\n", x); ! else sys_vgui("wire_draw .x%x.c x 1 %d %d %d %d\n", x, x->gl_editor->e_xwas, x->gl_editor->e_ywas, xpos, ypos); --- 1210,1214 ---- ywas = x->gl_editor->e_ywas; if (doit) sys_vgui(".x%x.c delete x\n", x); ! else sys_vgui("wire_draw x .x%x.c 1 %d %d %d %d\n", x, x->gl_editor->e_xwas, x->gl_editor->e_ywas, xpos, ypos); *************** *** 1274,1279 **** + IOMIDDLE; ly2 = y21; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (obj_issignaloutlet(ob1, closest1) ? 2 : 1), lx1, ly1, lx2, ly2); canvas_setundo(x, canvas_undo_connect, --- 1271,1276 ---- + IOMIDDLE; ly2 = y21; ! sys_vgui("wire_draw l%x .x%x.c %d %d %d %d %d\n", ! oc, glist_getcanvas(x), (obj_issignaloutlet(ob1, closest1) ? 2 : 1), lx1, ly1, lx2, ly2); canvas_setundo(x, canvas_undo_connect, *************** *** 1481,1492 **** } /* check for arrow keys */ ! else if (!strcmp(gotkeysym->s_name, "Up")) ! canvas_displaceselection(x, 0, shift ? -10 : -1); ! else if (!strcmp(gotkeysym->s_name, "Down")) ! canvas_displaceselection(x, 0, shift ? 10 : 1); ! else if (!strcmp(gotkeysym->s_name, "Left")) ! canvas_displaceselection(x, shift ? -10 : -1, 0); ! else if (!strcmp(gotkeysym->s_name, "Right")) ! canvas_displaceselection(x, shift ? 10 : 1, 0); } } --- 1478,1485 ---- } /* check for arrow keys */ ! else if (!strcmp(gotkeysym->s_name, "Up")) canvas_displaceselection(x, 0, shift ? -10 : -1); ! else if (!strcmp(gotkeysym->s_name, "Down")) canvas_displaceselection(x, 0, shift ? 10 : 1); ! else if (!strcmp(gotkeysym->s_name, "Left")) canvas_displaceselection(x, shift ? -10 : -1, 0); ! else if (!strcmp(gotkeysym->s_name, "Right")) canvas_displaceselection(x, shift ? 10 : 1, 0); } } *************** *** 1887,1891 **** static void canvas_dopaste(t_canvas *x, t_binbuf *b) { ! t_gobj *newgobj, *last, *g2; int dspstate = canvas_suspend_dsp(), nbox, count; --- 1880,1884 ---- static void canvas_dopaste(t_canvas *x, t_binbuf *b) { ! t_gobj *g2; int dspstate = canvas_suspend_dsp(), nbox, count; *************** *** 1983,1987 **** static void canvas_tidy(t_canvas *x) { ! t_gobj *y, *y2, *y3; int ax1, ay1, ax2, ay2, bx1, by1, bx2, by2; int histogram[NHIST], *ip, i, besthist, bestdist; --- 1976,1980 ---- static void canvas_tidy(t_canvas *x) { ! t_gobj *y, *y2; int ax1, ay1, ax2, ay2, bx1, by1, bx2, by2; int histogram[NHIST], *ip, i, besthist, bestdist; Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.7 retrieving revision 1.1.1.3.2.2.2.8 diff -C2 -d -r1.1.1.3.2.2.2.7 -r1.1.1.3.2.2.2.8 *** g_hslider.c 14 Mar 2004 22:33:54 -0000 1.1.1.3.2.2.2.7 --- g_hslider.c 28 Mar 2004 07:21:17 -0000 1.1.1.3.2.2.2.8 *************** *** 36,101 **** } - static void hslider_draw_update(t_hslider *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - if (glist_isvisible(glist)) - {sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, - isvert(x),x->x_gui.x_fcol);} - } - - static void hslider_draw_new(t_hslider *x, t_glist *glist) - { - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - t_canvas *canvas=glist_getcanvas(glist); - pd_upload(x); - sys_vgui("slider_draw %x .x%x.c\n", x, canvas); - sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x),x->x_gui.x_fcol); - } - - static void hslider_draw_move(t_hslider *x, t_glist *glist) - { - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - t_canvas *canvas=glist_getcanvas(glist); - pd_upload((t_gobj *)x); - sys_vgui("slider_draw %x .x%x.c\n", x, canvas); - sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val,isvert(x), x->x_gui.x_fcol); - } - - static void hslider_draw_erase(t_hslider* x,t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_erase .x%x.c %x\n", canvas, x); - } - - static void hslider_draw_config(t_hslider* x,t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", - canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, - x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); - sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x), x->x_gui.x_fcol); - sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - } - - static void hslider_draw_select(t_hslider *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, - x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); - } - static void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) hslider_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) hslider_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) hslider_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) hslider_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) hslider_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) hslider_draw_move(x, glist); } --- 36,50 ---- } static void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if (mode==IEM_GUI_DRAW_MODE_ERASE) { ! sys_mgui((t_iemgui *)x,"slider","erase",""); ! } else if (mode==IEM_GUI_DRAW_MODE_SELECT) { ! sys_mgui((t_iemgui *)x,"slider","select","i",x->x_gui.x_fsf.x_selected); ! } else { ! pd_upload((t_gobj *)x); ! sys_mgui((t_iemgui *)x,"slider","draw",""); ! sys_mgui((t_iemgui *)x,"slider","set","i",x->x_val); ! } } *************** *** 218,226 **** } ! static void hslider_set(t_hslider *x, t_floatarg f) /* bugfix */ { double g; ! ! if(x->x_gui.x_isa.x_reverse) /* bugfix */ { if(f > x->x_min) f = x->x_min; --- 167,174 ---- } ! static void hslider_set(t_hslider *x, t_floatarg f) { double g; ! if(x->x_gui.x_isa.x_reverse) { if(f > x->x_min) f = x->x_min; *************** *** 232,239 **** if(f < x->x_min) f = x->x_min; } ! if(x->x_lin0_log1) ! g = log(f/x->x_min)/x->x_k; ! else ! g = (f - x->x_min) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; --- 180,184 ---- if(f < x->x_min) f = x->x_min; } ! g = (x->x_lin0_log1 ? log(f/x->x_min) : (f-x->x_min)) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; *************** *** 243,254 **** static void hslider_bang(t_hslider *x) { ! double out; ! ! if(x->x_lin0_log1) ! out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); ! else ! out = (double)(x->x_val)*0.01*x->x_k + x->x_min; ! if((out < 1.0e-10)&&(out > -1.0e-10)) ! out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) --- 188,195 ---- static void hslider_bang(t_hslider *x) { ! double out = x->x_lin0_log1 ? ! x->x_min*exp(x->x_k*(double)(x->x_val)*0.01) : ! (double)(x->x_val)*0.01*x->x_k + x->x_min; ! if((out < 1.0e-10)&&(out > -1.0e-10)) out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) *************** *** 356,360 **** { t_hslider* x = (t_hslider *)z; - if(doit) { --- 297,300 ---- *************** *** 378,387 **** }} - static void hslider_delta(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - - static void hslider_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void hslider_range(t_hslider *x, t_symbol *s, int ac, t_atom *av) { --- 318,321 ---- *************** *** 390,408 **** } static void hslider_color(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void hslider_send(t_hslider *x, t_symbol *s) {iemgui_send(x, &x->x_gui, s);} - static void hslider_receive(t_hslider *x, t_symbol *s) {iemgui_receive(x, &x->x_gui, s);} - static void hslider_label(t_hslider *x, t_symbol *s) {iemgui_label((void *)x, &x->x_gui, s);} - static void hslider_label_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void hslider_label_font(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} --- 324,341 ---- } + static void hslider_delta(t_hslider *x, t_symbol *s, int ac, t_atom *av) + {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} + static void hslider_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) + {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} static void hslider_color(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} static void hslider_send(t_hslider *x, t_symbol *s) {iemgui_send(x, &x->x_gui, s);} static void hslider_receive(t_hslider *x, t_symbol *s) {iemgui_receive(x, &x->x_gui, s);} static void hslider_label(t_hslider *x, t_symbol *s) {iemgui_label((void *)x, &x->x_gui, s);} static void hslider_label_pos(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} static void hslider_label_font(t_hslider *x, t_symbol *s, int ac, t_atom *av) {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} *************** *** 421,432 **** static void hslider_init(t_hslider *x, t_floatarg f) ! { ! x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; ! } static void hslider_steady(t_hslider *x, t_floatarg f) ! { ! x->x_steady = (f==0.0)?0:1; ! } static void hslider_float(t_hslider *x, t_floatarg f) --- 354,361 ---- static void hslider_init(t_hslider *x, t_floatarg f) ! {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} static void hslider_steady(t_hslider *x, t_floatarg f) ! {x->x_steady = (f==0.0)?0:1;} static void hslider_float(t_hslider *x, t_floatarg f) *************** *** 471,475 **** int bflcol[]={-262144, -1, -1}; int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; ! int lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1, fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); int isa,fstyle; --- 400,404 ---- int bflcol[]={-262144, -1, -1}; int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; ! int lilo=0, ldx=-2, ldy=-6, v=0, steady=1, fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); int isa,fstyle; *************** *** 501,506 **** if((argc == 18)&&IS_A_FLOAT(argv,17)) steady=!!(int)atom_getintarg(17,argc,argv); x->x_gui.x_draw = (t_iemfunptr)hslider_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0; --- 430,433 ---- *************** *** 509,514 **** x->x_lin0_log1 = lilo; x->x_steady = steady; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 436,441 ---- x->x_lin0_log1 = lilo; x->x_steady = steady; ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.7 retrieving revision 1.1.1.3.2.2.2.8 diff -C2 -d -r1.1.1.3.2.2.2.7 -r1.1.1.3.2.2.2.8 *** g_bang.c 14 Mar 2004 22:33:54 -0000 1.1.1.3.2.2.2.7 --- g_bang.c 28 Mar 2004 07:21:15 -0000 1.1.1.3.2.2.2.8 *************** *** 28,48 **** void bng_draw(t_bng *x, t_glist *glist, int mode) { t_canvas *canvas=glist_getcanvas(glist); ! switch(mode) { ! default:{ ! pd_upload((t_gobj *)x); ! sys_vgui("bang_draw %x .x%x.c\n", x, canvas); } - case IEM_GUI_DRAW_MODE_UPDATE: - if(glist_isvisible(glist)) - sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", glist_getcanvas(glist), x, - pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); - break; - case IEM_GUI_DRAW_MODE_ERASE: - sys_vgui("bang_erase .x%x.c %x\n", canvas, x); - break; - case IEM_GUI_DRAW_MODE_SELECT: - sys_vgui("bang_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - break; - }} /* ------------------------ bng widgetbehaviour----------------------------- */ --- 28,37 ---- void bng_draw(t_bng *x, t_glist *glist, int mode) { t_canvas *canvas=glist_getcanvas(glist); ! if (mode==IEM_GUI_DRAW_MODE_ERASE) ! sys_mgui((t_iemgui *)x,"bang","erase",""); ! else if (mode==IEM_GUI_DRAW_MODE_SELECT) ! sys_mgui((t_iemgui *)x,"bang","select","i",x->x_gui.x_fsf.x_selected); ! else {pd_upload((t_gobj *)x); sys_mgui((t_iemgui *)x,"bang","draw","");} } /* ------------------------ bng widgetbehaviour----------------------------- */ *************** *** 51,55 **** { t_bng *x = (t_bng *)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); --- 40,43 ---- *************** *** 66,77 **** iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, ! gensym("bng"), x->x_gui.x_w, ! x->x_flashtime_hold, x->x_flashtime_break, ! iem_symargstoint(&x->x_gui.x_isa), ! srl[0], srl[1], srl[2], ! x->x_gui.x_ldx, x->x_gui.x_ldy, ! iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, ! bflcol[0], bflcol[1], bflcol[2]); binbuf_addv(b, ";"); } --- 54,65 ---- iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, ! gensym("bng"), x->x_gui.x_w, ! x->x_flashtime_hold, x->x_flashtime_break, ! iem_symargstoint(&x->x_gui.x_isa), ! srl[0], srl[1], srl[2], ! x->x_gui.x_ldx, x->x_gui.x_ldy, ! iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, ! bflcol[0], bflcol[1], bflcol[2]); binbuf_addv(b, ";"); } *************** *** 98,116 **** iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s BANG \ ! ----------dimensions(pix):----------- %d %d size: 0 0 empty \ ! --------flash-time(ms)(ms):--------- %d intrrpt: %d hold: %d \ ! %d empty empty %d %d empty %d \ ! %s %s \ ! %s %d %d \ ! %d %d \ ! %d %d %d\n", ! x->x_gui.x_w, IEM_GUI_MINSIZE, ! x->x_flashtime_break, x->x_flashtime_hold, 2,/*min_max_schedule+clip*/ ! -1, x->x_gui.x_isa.x_loadinit, -1, -1,/*no linlog, no multi*/ ! srl[0]->s_name, srl[1]->s_name, ! srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, ! x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, ! 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf); } --- 86,101 ---- iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s BANG " ! "----------dimensions(pix):----------- %d %d size: 0 0 empty " ! "--------flash-time(ms)(ms):--------- %d intrrpt: %d hold: %d " ! "%d empty empty %d %d empty %d " ! "%s %s %s %d %d %d %d %d %d %d\n", ! x->x_gui.x_w, IEM_GUI_MINSIZE, ! x->x_flashtime_break, x->x_flashtime_hold, 2, ! -1, x->x_gui.x_isa.x_loadinit, -1, -1, ! srl[0]->s_name, srl[1]->s_name, ! srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, ! x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, ! 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf); } *************** *** 133,137 **** } ! static void bng_bout1(t_bng *x)/*wird nur mehr gesendet, wenn snd != rcv*/ { if(!x->x_gui.x_fsf.x_put_in2out) --- 118,122 ---- } ! static void bng_bout2(t_bng *x) { if(!x->x_gui.x_fsf.x_put_in2out) *************** *** 141,150 **** } outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing && x->x_gui.x_fsf.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing); } ! static void bng_bout2(t_bng *x)/*wird immer gesendet, wenn moeglich*/ { if(!x->x_gui.x_fsf.x_put_in2out) { --- 126,137 ---- } outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); } ! static void bng_bang(t_bng *x) { + if(x->x_gui.x_isa.x_locked) return; + bng_set(x); if(!x->x_gui.x_fsf.x_put_in2out) { *************** *** 153,168 **** } outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); } ! ! 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);} } --- 140,150 ---- } outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing && x->x_gui.x_fsf.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing); } ! static void bng_bang2(t_bng *x) { ! if(x->x_gui.x_isa.x_locked) return; ! bng_set(x); ! bng_bout2(x); } *************** *** 174,191 **** int ftbreak = (int)atom_getintarg(3, argc, argv); int sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); - x->x_gui.x_w = iemgui_clip_size(a); x->x_gui.x_h = x->x_gui.x_w; bng_check_minmax(x, ftbreak, fthold); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } 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); ! } static int bng_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) --- 156,168 ---- int ftbreak = (int)atom_getintarg(3, argc, argv); int sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); x->x_gui.x_w = iemgui_clip_size(a); x->x_gui.x_h = x->x_gui.x_w; bng_check_minmax(x, ftbreak, fthold); ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, 0); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } 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);} static int bng_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) *************** *** 193,197 **** if(doit) bng_click((t_bng *)z, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! return (1); } --- 170,174 ---- if(doit) bng_click((t_bng *)z, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! return 1; } *************** *** 203,209 **** static void bng_loadbang(t_bng *x) ! { ! if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) {bng_set(x); bng_bout2(x);} ! } static void bng_size(t_bng *x, t_symbol *s, int ac, t_atom *av) --- 180,184 ---- static void bng_loadbang(t_bng *x) ! {if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) {bng_set(x); bng_bout2(x);}} static void bng_size(t_bng *x, t_symbol *s, int ac, t_atom *av) *************** *** 214,223 **** } - static void bng_delta(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - - static void bng_pos(t_bng *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void bng_flashtime(t_bng *x, t_symbol *s, int ac, t_atom *av) { --- 189,192 ---- *************** *** 226,229 **** --- 195,202 ---- } + static void bng_delta(t_bng *x, t_symbol *s, int ac, t_atom *av) + {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} + static void bng_pos(t_bng *x, t_symbol *s, int ac, t_atom *av) + {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} static void bng_color(t_bng *x, t_symbol *s, int ac, t_atom *av) {iemgui_color((void *)x, &x->x_gui, s, ac, av);} *************** *** 244,262 **** } ! static void bng_tick_hld(t_bng *x) ! { ! x->x_flashed = 0; ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); ! } ! ! static void bng_tick_brk(t_bng *x) ! { ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); ! } ! ! static void bng_tick_lck(t_bng *x) ! { ! x->x_gui.x_isa.x_locked = 0; ! } static void *bng_new(t_symbol *s, int argc, t_atom *argv) --- 217,226 ---- } ! static void bng_tick_hld(t_bng *x) {x->x_flashed = 0; ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, 0);} ! static void bng_tick_brk(t_bng *x) { ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, 0);} ! static void bng_tick_lck(t_bng *x) { ! x->x_gui.x_isa.x_locked = 0;} static void *bng_new(t_symbol *s, int argc, t_atom *argv) *************** *** 280,289 **** iemgui_new_getnames2(&x->x_gui, 4, srl[0], srl[1], srl[2]); x->x_gui.x_draw = (t_iemfunptr)bng_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; - x->x_flashed = 0; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 244,251 ---- iemgui_new_getnames2(&x->x_gui, 4, srl[0], srl[1], srl[2]); x->x_gui.x_draw = (t_iemfunptr)bng_draw; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! x->x_flashed = 0; ! x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; ! x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); *************** *** 291,295 **** strcpy(x->x_gui.x_font, "courier"); } if (x->x_gui.x_fsf.x_rcv_able) ! pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; --- 253,257 ---- strcpy(x->x_gui.x_font, "courier"); } if (x->x_gui.x_fsf.x_rcv_able) ! pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; *************** *** 329,334 **** class_addmethod(bng_class, (t_method)bng_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(bng_class, (t_method)bng_dialog, gensym("dialog"), ! A_GIMME, 0); class_addmethod(bng_class, (t_method)bng_loadbang, gensym("loadbang"), 0); class_addmethod(bng_class, (t_method)bng_size, gensym("size"), A_GIMME, 0); --- 291,295 ---- class_addmethod(bng_class, (t_method)bng_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(bng_class, (t_method)bng_dialog, gensym("dialog"), A_GIMME, 0); class_addmethod(bng_class, (t_method)bng_loadbang, gensym("loadbang"), 0); class_addmethod(bng_class, (t_method)bng_size, gensym("size"), A_GIMME, 0); Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.5 retrieving revision 1.1.1.4.2.2.2.6 diff -C2 -d -r1.1.1.4.2.2.2.5 -r1.1.1.4.2.2.2.6 *** g_numbox.c 14 Mar 2004 22:33:54 -0000 1.1.1.4.2.2.2.5 --- g_numbox.c 28 Mar 2004 07:21:17 -0000 1.1.1.4.2.2.2.6 *************** *** 21,24 **** --- 21,26 ---- #endif + #define CH post("%d: change=%d", __LINE__, (int)x->x_gui.x_fsf.x_change); + static void my_numbox_key(void *z, t_floatarg fkey); t_widgetbehavior my_numbox_widgetbehavior; *************** *** 31,35 **** if(x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); --- 33,37 ---- if(x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; CH glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); *************** *** 92,101 **** { int new_exp_index=x->x_gui.x_w-4, old_exp_index=bufsize-4; - for(i=0; i < 4; i++, new_exp_index++, old_exp_index++) x->x_buf[new_exp_index] = x->x_buf[old_exp_index]; x->x_buf[x->x_gui.x_w] = 0; } - } else --- 94,101 ---- *************** *** 113,262 **** } ! static void my_numbox_draw_update(t_my_numbox *x, t_glist *glist) ! { ! if (glist_isvisible(glist)) ! { ! if(x->x_gui.x_fsf.x_change) ! { ! if(x->x_buf[0]) ! { ! char *cp=x->x_buf; ! int sl = strlen(x->x_buf); ! ! x->x_buf[sl] = '>'; ! x->x_buf[sl+1] = 0; ! if(sl >= x->x_gui.x_w) ! cp += sl - x->x_gui.x_w + 1; ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", ! glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, cp); ! x->x_buf[sl] = 0; ! } ! else ! { ! my_numbox_ftoa(x); ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", ! glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, x->x_buf); ! x->x_buf[0] = 0; ! } ! } ! else ! { ! my_numbox_ftoa(x); ! sys_vgui( ! ".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", ! glist_getcanvas(glist), x, ! x->x_gui.x_fsf.x_selected? ! IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol, ! x->x_buf); ! x->x_buf[0] = 0; ! } ! } ! } ! ! static void my_numbox_draw_new(t_my_numbox *x, t_glist *glist) ! { ! int half=x->x_gui.x_h/2, d=1+x->x_gui.x_h/34; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! pd_upload(x); ! sys_vgui("numbox_draw %x .x%x.c\n", x, canvas); ! sys_vgui( ! ".x%x.c create line %d %d %d %d %d %d -fill #%6.6x -tags %xBASE2\n", ! canvas, xpos, ypos, ! xpos + half, ypos + half, ! xpos, ypos + x->x_gui.x_h, ! x->x_gui.x_fcol, x); ! my_numbox_ftoa(x); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xNUMBER\n", ! canvas, xpos+half+2, ypos+half+d, ! x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fcol, x); ! } ! ! static void my_numbox_draw_move(t_my_numbox *x, t_glist *glist) ! { ! int half = x->x_gui.x_h/2, d=1+x->x_gui.x_h/34; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! pd_upload(x); ! sys_vgui("numbox_draw %x .x%x.c\n", x, canvas); ! sys_vgui(".x%x.c coords %xBASE2 %d %d %d %d %d %d\n", ! canvas, x, xpos, ypos, ! xpos + half, ypos + half, ! xpos, ypos + x->x_gui.x_h); ! sys_vgui(".x%x.c coords %xNUMBER %d %d\n", ! canvas, x, xpos+half+2, ypos+half+d); ! } ! ! static void my_numbox_draw_erase(t_my_numbox* x,t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("numbox_erase .x%x.c %xBASE\n", canvas, x); ! sys_vgui(".x%x.c delete %xBASE2\n", canvas, x); ! sys_vgui(".x%x.c delete %xNUMBER\n", canvas, x); ! } ! ! static void my_numbox_draw_config(t_my_numbox* x,t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c itemconfigure %xNUMBER -font {%s %d bold} -fill #%6.6x \n", ! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, ! x, x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", canvas, ! x, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); ! } ! ! static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); ! ! if(x->x_gui.x_fsf.x_selected) ! { ! if(x->x_gui.x_fsf.x_change) ! { ! x->x_gui.x_fsf.x_change = 0; ! clock_unset(x->x_clock_reset); ! x->x_buf[0] = 0; ! (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); ! } ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", ! canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", ! canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", ! canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x\n", ! canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", ! canvas, x, IEM_GUI_COLOR_NORMAL); ! sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", ! canvas, x, x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", ! canvas, x, x->x_gui.x_lcol); ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x\n", ! canvas, x, x->x_gui.x_fcol); } } - void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) - { - if(mode == IEM_GUI_DRAW_MODE_UPDATE) my_numbox_draw_update(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_MOVE) my_numbox_draw_move(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_NEW) my_numbox_draw_new(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_SELECT) my_numbox_draw_select(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_ERASE) my_numbox_draw_erase(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_CONFIG) my_numbox_draw_config(x, glist); - else if(mode >= IEM_GUI_DRAW_MODE_IO) my_numbox_draw_move(x, glist); - } - /* ------------------------ nbx widgetbehaviour----------------------------- */ --- 113,138 ---- } ! void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) { t_canvas *canvas=glist_getcanvas(glist); ! switch (mode) { ! case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("numbox_erase .x%x.c %x\n",canvas,x); break; ! case IEM_GUI_DRAW_MODE_SELECT: ! /* if(x->x_gui.x_fsf.x_selected && x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; CH ! clock_unset(x->x_clock_reset); ! }*/ ! /* fallthru */ ! default: ! pd_upload((t_gobj *)x); ! my_numbox_ftoa(x); ! sys_vgui("numbox_draw %x .x%x.c\n", x, canvas); ! post("numberbox: %d %d",(int)x->x_gui.x_fsf.x_selected,(int)x->x_gui.x_fsf.x_change); ! sys_vgui("numbox_select %x .x%x.c %d\n", x, canvas, ! (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change); break; } } /* ------------------------ nbx widgetbehaviour----------------------------- */ *************** *** 278,286 **** int bflcol[3]; t_symbol *srl[3]; - iemgui_save(&x->x_gui, srl, bflcol); ! if(x->x_gui.x_fsf.x_change) ! { ! x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); --- 154,161 ---- int bflcol[3]; t_symbol *srl[3]; iemgui_save(&x->x_gui, srl, bflcol); ! /* ! if(x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; CH clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); *************** *** 288,292 **** } ! binbuf_addv(b, "ssiisiiffiisssiiiiiiifi", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("nbx"), x->x_gui.x_w, x->x_gui.x_h, --- 163,168 ---- } ! */ ! binbuf_addv(b, "ssiisiiffiisssiiiiiiifi", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("nbx"), x->x_gui.x_w, x->x_gui.x_h, *************** *** 334,338 **** if(x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); --- 210,214 ---- if(x->x_gui.x_fsf.x_change) { ! x->x_gui.x_fsf.x_change = 0; CH clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); *************** *** 392,397 **** x->x_log_height = log_height; my_numbox_calc_fontwidth(x); - /*if(my_numbox_check_minmax(x, min, max)) - my_numbox_bang(x);*/ my_numbox_check_minmax(x, min, max); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); --- 268,271 ---- *************** *** 404,411 **** static void my_numbox_motion(t_my_numbox *x, t_floatarg dx, t_floatarg dy) { ! double k2=1.0; ! ! if(x->x_gui.x_fsf.x_finemoved) ! k2 = 0.01; if(x->x_lin0_log1) x->x_val *= pow(x->x_k, -k2*dy); --- 278,282 ---- static void my_numbox_motion(t_my_numbox *x, t_floatarg dx, t_floatarg dy) { ! double k2= x->x_gui.x_fsf.x_finemoved ? 0.01 : 1.0; if(x->x_lin0_log1) x->x_val *= pow(x->x_k, -k2*dy); *************** *** 429,454 **** { t_my_numbox* x = (t_my_numbox *)z; - if(doit) { my_numbox_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! if(shift) ! x->x_gui.x_fsf.x_finemoved = 1; ! else ! x->x_gui.x_fsf.x_finemoved = 0; if(!x->x_gui.x_fsf.x_change) { clock_delay(x->x_clock_wait, 50); ! x->x_gui.x_fsf.x_change = 1; clock_delay(x->x_clock_reset, 3000); - /* glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.ob_g, - 0, my_numbox_key, 0, 0); */ - x->x_buf[0] = 0; } else { ! x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); --- 300,318 ---- { t_my_numbox* x = (t_my_numbox *)z; if(doit) { my_numbox_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! x->x_gui.x_fsf.x_finemoved = !! shift; if(!x->x_gui.x_fsf.x_change) { clock_delay(x->x_clock_wait, 50); ! x->x_gui.x_fsf.x_change = 1; CH clock_delay(x->x_clock_reset, 3000); x->x_buf[0] = 0; } else { ! x->x_gui.x_fsf.x_change = 0; CH clock_unset(x->x_clock_reset); glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); *************** *** 517,521 **** { (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - /*my_numbox_bang(x);*/ } } --- 381,384 ---- *************** *** 558,562 **** { (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - /*my_numbox_bang(x);*/ } } --- 421,424 ---- *************** *** 590,594 **** if (c == 0) { ! x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); --- 452,456 ---- if (c == 0) { ! x->x_gui.x_fsf.x_change = 0; CH clock_unset(x->x_clock_reset); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); *************** *** 618,622 **** x->x_val = atof(x->x_buf); x->x_buf[0] = 0; ! x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); my_numbox_clip(x); --- 480,484 ---- x->x_val = atof(x->x_buf); x->x_buf[0] = 0; ! x->x_gui.x_fsf.x_change = 0; CH clock_unset(x->x_clock_reset); my_numbox_clip(x); *************** *** 645,649 **** int log_height=256; double min=-1.0e+37, max=1.0e+37,v=0.0; - char str[144]; int isa,fstyle; t_symbol *srl[3]={0,0,0}; --- 507,510 ---- *************** *** 694,698 **** x->x_clock_reset = clock_new(x, (t_method)my_numbox_tick_reset); x->x_clock_wait = clock_new(x, (t_method)my_numbox_tick_wait); ! x->x_gui.x_fsf.x_change = 0; outlet_new(&x->x_gui.x_obj, &s_float); return (x); --- 555,559 ---- x->x_clock_reset = clock_new(x, (t_method)my_numbox_tick_reset); x->x_clock_wait = clock_new(x, (t_method)my_numbox_tick_wait); ! x->x_gui.x_fsf.x_change = 0; CH outlet_new(&x->x_gui.x_obj, &s_float); return (x); *************** *** 710,768 **** void g_numbox_setup(void) { ! my_numbox_class = class_new(gensym("nbx"), (t_newmethod)my_numbox_new, (t_method)my_numbox_free, sizeof(t_my_numbox), 0, A_GIMME, 0); class_addcreator((t_newmethod)my_numbox_new, gensym("my_numbox"), A_GIMME, 0); ! class_addbang(my_numbox_class,my_numbox_bang); ! class_addfloat(my_numbox_class,my_numbox_float); ! class_addlist(my_numbox_class, my_numbox_list); ! class_addmethod(my_numbox_class, (t_method)my_numbox_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_motion, gensym("motion"), A_FLOAT, A_FLOAT, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_dialog, ! gensym("dialog"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_loadbang, ! gensym("loadbang"), 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_set, ! gensym("set"), A_FLOAT, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_size, ! gensym("size"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_delta, ! gensym("delta"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_pos, ! gensym("pos"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_range, ! gensym("range"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_color, ! gensym("color"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_send, ! gensym("send"), A_DEFSYM, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_receive, ! gensym("receive"), A_DEFSYM, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_label, ! gensym("label"), A_DEFSYM, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_label_pos, ! gensym("label_pos"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_label_font, ! gensym("label_font"), A_GIMME, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_log, ! gensym("log"), 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_lin, ! gensym("lin"), 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_init, ! gensym("init"), A_FLOAT, 0); ! class_addmethod(my_numbox_class, (t_method)my_numbox_log_height, ! gensym("log_height"), A_FLOAT, 0); ! my_numbox_widgetbehavior.w_getrectfn = my_numbox_getrect; ! my_numbox_widgetbehavior.w_displacefn = iemgui_displace; ! my_numbox_widgetbehavior.w_selectfn = iemgui_select; ! my_numbox_widgetbehavior.w_activatefn = NULL; ! my_numbox_widgetbehavior.w_deletefn = iemgui_delete; ! my_numbox_widgetbehavior.w_visfn = iemgui_vis; ! my_numbox_widgetbehavior.w_clickfn = my_numbox_newclick; ! class_setwidget(my_numbox_class, &my_numbox_widgetbehavior); ! class_sethelpsymbol(my_numbox_class, gensym("numbox2")); ! class_setsavefn(my_numbox_class, my_numbox_save); ! class_setpropertiesfn(my_numbox_class, my_numbox_properties); } --- 571,612 ---- void g_numbox_setup(void) { ! t_class *c = my_numbox_class = class_new(gensym("nbx"), (t_newmethod)my_numbox_new, (t_method)my_numbox_free, sizeof(t_my_numbox), 0, A_GIMME, 0); class_addcreator((t_newmethod)my_numbox_new, gensym("my_numbox"), A_GIMME, 0); ! class_addbang(c,my_numbox_bang); ! class_addfloat(c,my_numbox_float); ! class_addlist(c, my_numbox_list); ! class_addmethod(c, (t_method)my_numbox_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(c, (t_method)my_numbox_motion, gensym("motion"), A_FLOAT, A_FLOAT, 0); ! class_addmethod(c, (t_method)my_numbox_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_loadbang, gensym("loadbang"), 0); ! class_addmethod(c, (t_method)my_numbox_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(c, (t_method)my_numbox_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_range, gensym("range"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_color, gensym("color"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_numbox_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_numbox_log, gensym("log"), 0); ! class_addmethod(c, (t_method)my_numbox_lin, gensym("lin"), 0); ! class_addmethod(c, (t_method)my_numbox_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(c, (t_method)my_numbox_log_height, gensym("log_height"), A_FLOAT, 0); ! my_numbox_widgetbehavior.w_getrectfn = my_numbox_getrect; ! my_numbox_widgetbehavior.w_displacefn = iemgui_displace; ! my_numbox_widgetbehavior.w_selectfn = iemgui_select; ! my_numbox_widgetbehavior.w_activatefn = NULL; ! my_numbox_widgetbehavior.w_deletefn = iemgui_delete; ! my_numbox_widgetbehavior.w_visfn = iemgui_vis; ! my_numbox_widgetbehavior.w_clickfn = my_numbox_newclick; ! class_setwidget(c, &my_numbox_widgetbehavior); ! class_sethelpsymbol(c, gensym("numbox2")); ! class_setsavefn(c, my_numbox_save); ! class_setpropertiesfn(c, my_numbox_properties); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2004