From 0e92c962dabd566146d84295041961856593eb90 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 19 Oct 2011 05:08:12 +0000 Subject: port to 0.43's pdsend proc in pd-gui svn path=/trunk/externals/tof/; revision=15622 --- src/folderpanel.c | 2 +- src/imagebang.c | 14 +++++++------- src/menubutton.c | 2 +- src/paramGui.h | 2 +- src/pmenu.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/folderpanel.c b/src/folderpanel.c index e4a5a8f..1de13b3 100644 --- a/src/folderpanel.c +++ b/src/folderpanel.c @@ -78,7 +78,7 @@ void folderpanel_setup(void) sys_gui("proc tof_folderpanel {target} {\n"); sys_gui(" set path [tk_chooseDirectory] \n"); sys_gui(" if {$path != \"\"} {\n"); - sys_gui(" pd [concat $target callback [pdtk_enquote $path]] \\;\n"); + sys_gui(" pdsend \"$target callback [pdtk_enquote $path]\"\n"); sys_gui(" }\n"); sys_gui("}\n"); diff --git a/src/imagebang.c b/src/imagebang.c index 9401736..238c7a8 100644 --- a/src/imagebang.c +++ b/src/imagebang.c @@ -116,7 +116,7 @@ static void imagebang_drawme(t_imagebang *x, t_glist *glist, int firsttime) { text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x->image_a,x->image_b,x); - sys_vgui("pd [concat %s _imagesize [image width %x_imagebang] [image height %x_imagebang] \\;]\n",x->receive->s_name,x->image_a,x->image_a); + sys_vgui("pdsend \"%s _imagesize [image width %x_imagebang] [image height %x_imagebang]\"\n",x->receive->s_name,x->image_a,x->image_a); } else { @@ -239,14 +239,14 @@ static void imagebang_free(t_imagebang *x) { // check first if variable has been unset and image is unused // then delete image and unset variable - DEBUG(sys_vgui("pd [concat DEBUG b in use [image inuse %x_imagebang] \\;]\n",x->image_b);) - DEBUG(sys_vgui("pd [concat DEBUG a in use [image inuse %x_imagebang] \\;]\n",x->image_a);) + DEBUG(sys_vgui("pdsend \"DEBUG b in use [image inuse %x_imagebang]\"\n",x->image_b);) + DEBUG(sys_vgui("pdsend \"DEBUG a in use [image inuse %x_imagebang]\"\n",x->image_a);) sys_vgui("if { [info exists %x_imagebang] == 1 && [image inuse %x_imagebang] == 0} { image delete %x_imagebang \n unset %x_imagebang\n} \n",x->image_b,x->image_b,x->image_b,x->image_b); sys_vgui("if { [info exists %x_imagebang] == 1 && [image inuse %x_imagebang] == 0} { image delete %x_imagebang \n unset %x_imagebang\n} \n",x->image_a,x->image_a,x->image_a,x->image_a); - DEBUG(sys_vgui("pd [concat DEBUG b exists [info exists %x_imagebang] \\;]\n",x->image_b);) - DEBUG(sys_vgui("pd [concat DEBUG a exists [info exists %x_imagebang] \\;]\n",x->image_a);) + DEBUG(sys_vgui("pdsend \"DEBUG b exists [info exists %x_imagebang] \"\n",x->image_b);) + DEBUG(sys_vgui("pdsend \"DEBUG a exists [info exists %x_imagebang] \"\n",x->image_a);) if (x->receive) { pd_unbind(&x->x_obj.ob_pd,x->receive); @@ -290,7 +290,7 @@ static void *imagebang_new(t_symbol *s, int argc, t_atom *argv) //sys_vgui("set %x_a \"%s\" \n",x,fname); // Create the image only if the class has not already loaded the same image (with the same symbolic path name) sys_vgui("if { [info exists %x_imagebang] == 0 } { image create photo %x_imagebang -file \"%s\"\n set %x_imagebang 1\n} \n",x->image_a,x->image_a,fname,x->image_a); - //sys_vgui("pd [concat test %x_imagebang \\;]\n",x->image_a); + //sys_vgui("pdsend {test %x_imagebang}\n",x->image_a); } else { post("Oups... [imagebang] could not find \"%s\"",image_a->s_name); } @@ -305,7 +305,7 @@ static void *imagebang_new(t_symbol *s, int argc, t_atom *argv) x->image_b = gensym(fname); //sys_vgui("set %x_b \"%s\" \n",x,fname); sys_vgui("if { [info exists %x_imagebang] == 0} { image create photo %x_imagebang -file \"%s\"\n set %x_imagebang 1\n} \n",x->image_b,x->image_b,fname,x->image_b); - //sys_vgui("pd [concat test %x_imagebang \\;]\n",x->image_b); + //sys_vgui("pdsend {test %x_imagebang}\n",x->image_b); } else { post("Oups... [imagebang] could not find \"%s\"",image_b->s_name); } diff --git a/src/menubutton.c b/src/menubutton.c index 05d22dc..ed141fc 100644 --- a/src/menubutton.c +++ b/src/menubutton.c @@ -474,7 +474,7 @@ static void *menubutton_new(t_symbol *s, int argc, t_atom *argv) pd_bind(&x->x_obj.ob_pd, x->x_sym); /* define proc in tcl/tk where "menubutton%p" is the receive, "callback" is the method, and "$index" is an argument. */ - sys_vgui("proc select%x {index} {\n pd [concat menubutton%p callback $index \\;]\n }\n",x,x); + sys_vgui("proc select%x {index} {\n pdsend \"menubutton%p callback $index \"\n }\n",x,x); outlet_new(&x->x_obj, &s_symbol); diff --git a/src/paramGui.h b/src/paramGui.h index 6e688df..c588307 100644 --- a/src/paramGui.h +++ b/src/paramGui.h @@ -351,7 +351,7 @@ static void paramGui_bang(t_paramGui *x) { // query for the mouse pointers position // one it is received, build the canvas x->waiting = 1; - sys_vgui("pd [concat %s motion [winfo pointerxy .] \\;]\n",x->receive->s_name); + sys_vgui("pdsend \"%s motion [winfo pointerxy .] \"\n",x->receive->s_name); } else { // Show canvas t_atom a; diff --git a/src/pmenu.c b/src/pmenu.c index f8d0664..212060f 100644 --- a/src/pmenu.c +++ b/src/pmenu.c @@ -325,8 +325,8 @@ static void *pmenu_new(t_symbol *s, int argc, t_atom *argv) pd_bind(&x->x_obj.ob_pd, x->callback); /* define proc in tcl/tk where "pmenu%p" is the receive, "callback" is the method, and "$index" is an argument. */ - //sys_vgui("proc select%x {index} {\n pd [concat pmenu%p callback $index \\;]\n }\n",x,x); - sys_vgui("proc select%x {index} {\n pd [concat %s callback $index \\;]\n }\n",x,pmenu_buffer); + //sys_vgui("proc select%x {index} {\n pdsend \"pmenu%p callback $index \"\n }\n",x,x); + sys_vgui("proc select%x {index} {\n pdsend \"%s callback $index \"\n }\n",x,pmenu_buffer); x->outlet1 = outlet_new(&x->x_obj, &s_float); x->outlet2 = outlet_new(&x->x_obj, &s_list); -- cgit v1.2.1