Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905
Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_bang.c g_dropper.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_toggle.c g_vumeter.c Log Message: changing x_snd,x_rcv semantics: NULL pointer replaces gensym("empty") and defenestrating x_snd_able, x_rcv_able
Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.22 retrieving revision 1.1.1.3.2.2.2.23 diff -C2 -d -r1.1.1.3.2.2.2.22 -r1.1.1.3.2.2.2.23 *** g_toggle.c 11 May 2004 23:04:47 -0000 1.1.1.3.2.2.2.22 --- g_toggle.c 12 May 2004 07:44:15 -0000 1.1.1.3.2.2.2.23 *************** *** 32,36 **** static void toggle_action(t_toggle *x) { outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, x->x_on); } --- 32,36 ---- static void toggle_action(t_toggle *x) { outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, x->x_on); } *************** *** 83,89 **** if (!x->x_nonzero) x->x_nonzero=1.0; iemgui_constrain(y); ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 83,87 ---- if (!x->x_nonzero) x->x_nonzero=1.0; iemgui_constrain(y); ! if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 102,106 **** static void toggle_free(t_toggle *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 100,104 ---- static void toggle_free(t_toggle *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } *************** *** 110,114 **** { t_class *c = toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new, ! (t_method)toggle_free, sizeof(t_toggle), 0, A_GIMME, 0); class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0); iemgui_subclass(c); --- 108,112 ---- { t_class *c = toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new, ! (t_method)toggle_free, sizeof(t_toggle), 0, A_GIMME, 0); class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0); iemgui_subclass(c);
Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.23 retrieving revision 1.1.1.4.2.2.2.24 diff -C2 -d -r1.1.1.4.2.2.2.23 -r1.1.1.4.2.2.2.24 *** g_hdial.c 11 May 2004 23:04:47 -0000 1.1.1.4.2.2.2.23 --- g_hdial.c 12 May 2004 07:44:15 -0000 1.1.1.4.2.2.2.24 *************** *** 52,56 **** SETFLOAT(x->x_at+1,b); outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); } --- 52,56 ---- SETFLOAT(x->x_at+1,b); outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); } *************** *** 58,62 **** static void radio_send(t_radio *x, float a) { outlet_float(x->x_gui.x_obj.ob_outlet,a); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing,a); } --- 58,62 ---- static void radio_send(t_radio *x, float a) { outlet_float(x->x_gui.x_obj.ob_outlet,a); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing,a); } *************** *** 153,159 **** iem_inttosymargs(y,isa); iemgui_constrain(y); ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 153,157 ---- iem_inttosymargs(y,isa); iemgui_constrain(y); ! if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 177,181 **** static void radio_ff(t_radio *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 175,179 ---- static void radio_ff(t_radio *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); }
Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.19 retrieving revision 1.1.1.3.2.2.2.20 diff -C2 -d -r1.1.1.3.2.2.2.19 -r1.1.1.3.2.2.2.20 *** g_vumeter.c 11 May 2004 23:04:47 -0000 1.1.1.3.2.2.2.19 --- g_vumeter.c 12 May 2004 07:44:15 -0000 1.1.1.3.2.2.2.20 *************** *** 105,110 **** iem_inttosymargs(y,isa); iemgui_constrain(y); ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if(y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 105,109 ---- iem_inttosymargs(y,isa); iemgui_constrain(y); ! if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 129,133 **** static void vu_free(t_vu *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 128,132 ---- static void vu_free(t_vu *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); }
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.29 retrieving revision 1.1.1.4.2.4.2.30 diff -C2 -d -r1.1.1.4.2.4.2.29 -r1.1.1.4.2.4.2.30 *** g_all_guis.c 11 May 2004 23:04:47 -0000 1.1.1.4.2.4.2.29 --- g_all_guis.c 12 May 2004 07:44:15 -0000 1.1.1.4.2.4.2.30 *************** *** 29,33 **** #define IEM_GUI_DEFAULTSIZE 15
! t_symbol *sym_empty;
EXTERN void iemgui_dodraw(t_iemgui *x) {x->x_draw(x,x->x_glist, 0);} --- 29,33 ---- #define IEM_GUI_DEFAULTSIZE 15
! t_symbol *s_empty;
EXTERN void iemgui_dodraw(t_iemgui *x) {x->x_draw(x,x->x_glist, 0);} *************** *** 60,67 ****
void iemgui_verify_snd_ne_rcv(t_iemgui *x) ! { ! x->x_put_in2out = 1; ! if(x->x_snd_able && x->x_rcv_able) x->x_put_in2out = x->x_snd != x->x_rcv; ! }
t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv) --- 60,64 ----
void iemgui_verify_snd_ne_rcv(t_iemgui *x) ! {x->x_put_in2out = !x->x_snd || !x->x_rcv || x->x_snd != x->x_rcv;}
t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv) *************** *** 91,95 **** { x->x_snd = canvas_realizedollar(x->x_glist, s); ! x->x_snd_able = !!strcmp(s->s_name, "empty"); iemgui_verify_snd_ne_rcv(x); iemgui_dodraw(x); --- 88,92 ---- { x->x_snd = canvas_realizedollar(x->x_glist, s); ! if (x->x_snd==s_empty) x->x_snd=0; iemgui_verify_snd_ne_rcv(x); iemgui_dodraw(x); *************** *** 99,114 **** { t_symbol *rcv = canvas_realizedollar(x->x_glist, s); ! int rcvable = !!strcmp(s->s_name, "empty"); ! if(rcvable) { if(rcv!=x->x_rcv) { ! if(x->x_rcv_able) pd_unbind((t_pd *)x, x->x_rcv); x->x_rcv = rcv; pd_bind((t_pd *)x, x->x_rcv); } ! } else if(!rcvable && x->x_rcv_able) { pd_unbind((t_pd *)x, x->x_rcv); x->x_rcv = rcv; } - x->x_rcv_able = rcvable; iemgui_verify_snd_ne_rcv(x); if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); --- 96,110 ---- { t_symbol *rcv = canvas_realizedollar(x->x_glist, s); ! if (rcv==s_empty) rcv=0; ! if(rcv) { if(rcv!=x->x_rcv) { ! if(x->x_rcv) pd_unbind((t_pd *)x, x->x_rcv); x->x_rcv = rcv; pd_bind((t_pd *)x, x->x_rcv); } ! } else if(!rcv && x->x_rcv) { pd_unbind((t_pd *)x, x->x_rcv); x->x_rcv = rcv; } iemgui_verify_snd_ne_rcv(x); if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); *************** *** 347,351 ****
void iemgui_subclass (t_class *c) { ! sym_empty = gensym("empty"); class_addmethod(c, (t_method)iemgui_delta, gensym("delta"), A_GIMME, 0); class_addmethod(c, (t_method)iemgui_pos, gensym("pos"), A_GIMME, 0); --- 343,347 ----
void iemgui_subclass (t_class *c) { ! s_empty = gensym("empty"); class_addmethod(c, (t_method)iemgui_delta, gensym("delta"), A_GIMME, 0); class_addmethod(c, (t_method)iemgui_pos, gensym("pos"), A_GIMME, 0); *************** *** 369,381 **** x->x_font_style = 0; x->x_fontsize = 8; ! x->x_selected = x->x_finemoved = x->x_put_in2out = x->x_change = x->x_lin0_log1 = x->x_steady = 0; ! x->x_snd = gensym("empty"); ! x->x_rcv = gensym("empty"); x->x_lab = gensym("empty"); x->x_bcol = 0xffffff; x->x_fcol = 0x000000; x->x_lcol = 0x000000; - x->x_snd_able = x->x_rcv_able = 0; x->x_lin0_log1 = 0; x->x_steady = 1; --- 365,377 ---- x->x_font_style = 0; x->x_fontsize = 8; ! x->x_put_in2out = 1; ! x->x_selected = x->x_finemoved = x->x_change = x->x_lin0_log1 = x->x_steady = 0; ! x->x_snd = 0; ! x->x_rcv = 0; x->x_lab = gensym("empty"); x->x_bcol = 0xffffff; x->x_fcol = 0x000000; x->x_lcol = 0x000000; x->x_lin0_log1 = 0; x->x_steady = 1;
Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.15 retrieving revision 1.1.1.3.2.2.2.16 diff -C2 -d -r1.1.1.3.2.2.2.15 -r1.1.1.3.2.2.2.16 *** g_mycanvas.c 11 May 2004 23:04:47 -0000 1.1.1.3.2.2.2.15 --- g_mycanvas.c 12 May 2004 07:44:15 -0000 1.1.1.3.2.2.2.16 *************** *** 30,34 **** static void my_canvas_get_pos(t_my_canvas *x) { ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) { x->x_at[0].a_w.w_float = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); --- 30,34 ---- static void my_canvas_get_pos(t_my_canvas *x) { ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) { x->x_at[0].a_w.w_float = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); *************** *** 66,72 **** x->x_at[0].a_type = x->x_at[1].a_type = A_FLOAT; //??? iemgui_constrain(y); ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 66,70 ---- x->x_at[0].a_type = x->x_at[1].a_type = A_FLOAT; //??? iemgui_constrain(y); ! if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 87,92 **** static void my_canvas_ff(t_my_canvas *x) { ! if(x->x_gui.x_rcv_able) ! pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 85,89 ---- static void my_canvas_ff(t_my_canvas *x) { ! if(x->x_gui.x_rcv) pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); gfxstub_deleteforkey(x); }
Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.26 retrieving revision 1.1.1.3.2.2.2.27 diff -C2 -d -r1.1.1.3.2.2.2.26 -r1.1.1.3.2.2.2.27 *** g_hslider.c 11 May 2004 23:04:47 -0000 1.1.1.3.2.2.2.26 --- g_hslider.c 12 May 2004 07:44:15 -0000 1.1.1.3.2.2.2.27 *************** *** 89,93 **** if (fabs(out) < 1.0e-10) out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, out); } --- 89,93 ---- if (fabs(out) < 1.0e-10) out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, out); } *************** *** 145,151 **** if (isvert(x)) slider_check_width(x, y->x_h); else slider_check_width(x, y->x_w); ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if(y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 145,149 ---- if (isvert(x)) slider_check_width(x, y->x_h); else slider_check_width(x, y->x_w); ! if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 166,170 **** static void slider_free(t_slider *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 164,168 ---- static void slider_free(t_slider *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); }
Index: g_dropper.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -C2 -d -r1.1.2.18 -r1.1.2.19 *** g_dropper.c 11 May 2004 23:04:47 -0000 1.1.2.18 --- g_dropper.c 12 May 2004 07:44:15 -0000 1.1.2.19 *************** *** 37,41 **** { outlet_symbol(x->x_gui.x_obj.ob_outlet, x->x_ds); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_symbol(x->x_gui.x_snd->s_thing, x->x_ds); } --- 37,41 ---- { outlet_symbol(x->x_gui.x_obj.ob_outlet, x->x_ds); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_symbol(x->x_gui.x_snd->s_thing, x->x_ds); } *************** *** 57,63 **** iem_inttosymargs(y,isa); y->x_h = y->x_w; ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); --- 57,61 ---- iem_inttosymargs(y,isa); y->x_h = y->x_w; ! if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); *************** *** 76,80 **** static void dropper_free(t_dropper *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } --- 74,78 ---- static void dropper_free(t_dropper *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); gfxstub_deleteforkey(x); }
Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.25 retrieving revision 1.1.1.3.2.2.2.26 diff -C2 -d -r1.1.1.3.2.2.2.25 -r1.1.1.3.2.2.2.26 *** g_bang.c 11 May 2004 23:04:47 -0000 1.1.1.3.2.2.2.25 --- g_bang.c 12 May 2004 07:44:15 -0000 1.1.1.3.2.2.2.26 *************** *** 53,57 **** if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); }
--- 53,57 ---- if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); }
*************** *** 62,66 **** if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing && x->x_gui.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing); } static void bng_bang2(t_bng *x) { --- 62,66 ---- if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing && x->x_gui.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing); } static void bng_bang2(t_bng *x) { *************** *** 102,109 **** y->x_h = y->x_w; bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold); - y->x_snd_able = y->x_snd!=sym_empty; - y->x_rcv_able = y->x_rcv!=sym_empty; - if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 102,107 ---- y->x_h = y->x_w; bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold); iemgui_constrain(y); + if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 128,132 **** static void bng_free(t_bng *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); clock_free(x->x_clock_lck); clock_free(x->x_clock_brk); --- 126,130 ---- static void bng_free(t_bng *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); clock_free(x->x_clock_lck); clock_free(x->x_clock_brk);
Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.21 retrieving revision 1.1.1.4.2.2.2.22 diff -C2 -d -r1.1.1.4.2.2.2.21 -r1.1.1.4.2.2.2.22 *** g_numbox.c 11 May 2004 23:04:47 -0000 1.1.1.4.2.2.2.21 --- g_numbox.c 12 May 2004 07:44:15 -0000 1.1.1.4.2.2.2.22 *************** *** 74,78 **** { outlet_float(x->x_gui.x_obj.ob_outlet, x->x_val); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, x->x_val); } --- 74,78 ---- { outlet_float(x->x_gui.x_obj.ob_outlet, x->x_val); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, x->x_val); } *************** *** 153,159 **** my_numbox_check_minmax(x); y->x_w = MAX(y->x_w,1); ! y->x_snd_able = y->x_snd!=sym_empty; ! y->x_rcv_able = y->x_rcv!=sym_empty; ! if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 153,157 ---- my_numbox_check_minmax(x); y->x_w = MAX(y->x_w,1); ! if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } *************** *** 179,183 **** static void my_numbox_free(t_my_numbox *x) { ! if(x->x_gui.x_rcv_able) pd_unbind((t_pd *)x, x->x_gui.x_rcv); clock_free(x->x_clock_reset); clock_free(x->x_clock_wait); --- 177,181 ---- static void my_numbox_free(t_my_numbox *x) { ! if(x->x_gui.x_rcv) pd_unbind((t_pd *)x, x->x_gui.x_rcv); clock_free(x->x_clock_reset); clock_free(x->x_clock_wait);
Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.24 retrieving revision 1.1.1.4.2.2.2.25 diff -C2 -d -r1.1.1.4.2.2.2.24 -r1.1.1.4.2.2.2.25 *** g_all_guis.h 11 May 2004 23:04:47 -0000 1.1.1.4.2.2.2.24 --- g_all_guis.h 12 May 2004 07:44:15 -0000 1.1.1.4.2.2.2.25 *************** *** 24,29 **** unsigned int x_loadinit:1, x_scale:1, x_flashed:1, x_locked:1; /* formerly x_fsf: */ ! unsigned int x_rcv_able:1, x_snd_able:1, x_selected:1, x_finemoved:1, ! x_put_in2out:1, x_change:1, x_lin0_log1:1, x_steady:1; int x_font_style, x_fontsize; int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */ --- 24,29 ---- unsigned int x_loadinit:1, x_scale:1, x_flashed:1, x_locked:1; /* formerly x_fsf: */ ! unsigned int x_selected:1,x_finemoved:1,x_put_in2out:1, ! x_change:1,x_lin0_log1:1,x_steady:1; int x_font_style, x_fontsize; int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */ *************** *** 142,146 **** EXTERN const char *iemgui_get_font(t_iemgui *self); EXTERN void iemgui_constrain(t_iemgui *x); ! EXTERN t_symbol *sym_empty; EXTERN int convert_color2(int x); EXTERN void iemgui_dodraw(t_iemgui *x); --- 142,146 ---- EXTERN const char *iemgui_get_font(t_iemgui *self); EXTERN void iemgui_constrain(t_iemgui *x); ! EXTERN t_symbol *s_empty; EXTERN int convert_color2(int x); EXTERN void iemgui_dodraw(t_iemgui *x);