Update of /cvsroot/pure-data/externals/iem/iemgui/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24267
Modified Files:
cube_sphere.c hfadl_scale.c hfadr_scale.c iem_event.c
iem_image.c iem_vu.c numberbox_matrix.c room_sim_2d.c
room_sim_3d.c sym_dial.c vfad_scale.c
Log Message:
query the objects real name instead of assuming that you already know it
Index: iem_vu.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/iem_vu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iem_vu.c 9 Feb 2007 09:44:06 -0000 1.3
--- iem_vu.c 31 Oct 2007 11:37:45 -0000 1.4
***************
*** 424,428 ****
binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_vu"), /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120,
srl[1], srl[2],
x->x_gui.x_ldx, x->x_gui.x_ldy,
--- 424,429 ----
binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120,
srl[1], srl[2],
x->x_gui.x_ldx, x->x_gui.x_ldy,
***************
*** 443,447 ****
binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_vu"), /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120,
srl[1], srl[2],
x->x_gui.x_ldx, x->x_gui.x_ldy,
--- 444,449 ----
binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120,
srl[1], srl[2],
x->x_gui.x_ldx, x->x_gui.x_ldy,
Index: cube_sphere.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/cube_sphere.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cube_sphere.c 14 Dec 2006 20:34:27 -0000 1.2
--- cube_sphere.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 262,266 ****
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("cube_sphere"));
if(x->x_null)
binbuf_addv(b, "iii", 0, x->x_radius, x->x_fontsize);
--- 262,267 ----
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)));
if(x->x_null)
binbuf_addv(b, "iii", 0, x->x_radius, x->x_fontsize);
Index: room_sim_2d.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/room_sim_2d.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** room_sim_2d.c 14 Dec 2006 20:34:27 -0000 1.2
--- room_sim_2d.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 218,222 ****
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("room_sim_2d"));
binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize);
c = x->x_gui.x_bcol;
--- 218,224 ----
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf))
! );
binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize);
c = x->x_gui.x_bcol;
Index: hfadl_scale.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/hfadl_scale.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hfadl_scale.c 14 Dec 2006 20:34:27 -0000 1.2
--- hfadl_scale.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 138,142 ****
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("hfadl_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
--- 138,143 ----
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
Index: room_sim_3d.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/room_sim_3d.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** room_sim_3d.c 14 Dec 2006 20:34:27 -0000 1.2
--- room_sim_3d.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 252,256 ****
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("room_sim_3d"));
binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize);
c = x->x_gui.x_bcol;
--- 252,258 ----
binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),
! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf))
! );
binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize);
c = x->x_gui.x_bcol;
Index: hfadr_scale.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/hfadr_scale.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hfadr_scale.c 14 Dec 2006 20:34:27 -0000 1.2
--- hfadr_scale.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 137,141 ****
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("hfadr_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
--- 137,142 ----
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
Index: iem_event.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/iem_event.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iem_event.c 14 Dec 2006 20:34:27 -0000 1.2
--- iem_event.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 129,133 ****
binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("ivnt"), x->x_gui.x_w, x->x_gui.x_h,
iem_symargstoint(&x->x_gui.x_isa), iem_fstyletoint(&x->x_gui.x_fsf),
srl[0], srl[1]);
--- 129,134 ----
binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gui.x_w, x->x_gui.x_h,
iem_symargstoint(&x->x_gui.x_isa), iem_fstyletoint(&x->x_gui.x_fsf),
srl[0], srl[1]);
***************
*** 150,154 ****
binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("ivnt"), x->x_gui.x_w, x->x_gui.x_h,
(*ip1)&IEM_INIT_ARGS_ALL, (*ip2)&IEM_FSTYLE_FLAGS_ALL,
srl[0], srl[1]);
--- 151,156 ----
binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gui.x_w, x->x_gui.x_h,
(*ip1)&IEM_INIT_ARGS_ALL, (*ip2)&IEM_FSTYLE_FLAGS_ALL,
srl[0], srl[1]);
Index: sym_dial.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/sym_dial.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sym_dial.c 14 Dec 2006 20:34:27 -0000 1.2
--- sym_dial.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 313,317 ****
binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("sdl"), x->x_gui.x_w, x->x_gui.x_h,
iem_symargstoint(&x->x_gui.x_isa), x->x_snd_flt0_sym1,
srl[0], srl[1], srl[2],
--- 313,318 ----
binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gui.x_w, x->x_gui.x_h,
iem_symargstoint(&x->x_gui.x_isa), x->x_snd_flt0_sym1,
srl[0], srl[1], srl[2],
***************
*** 339,343 ****
binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("sdl"), x->x_gui.x_w, x->x_gui.x_h,
(*ip1)&IEM_INIT_ARGS_ALL, x->x_snd_flt0_sym1,
srl[0], srl[1], srl[2],
--- 340,345 ----
binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gui.x_w, x->x_gui.x_h,
(*ip1)&IEM_INIT_ARGS_ALL, x->x_snd_flt0_sym1,
srl[0], srl[1], srl[2],
Index: numberbox_matrix.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/numberbox_matrix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** numberbox_matrix.c 14 Dec 2006 20:34:27 -0000 1.2
--- numberbox_matrix.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 528,532 ****
binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("nbxm"), x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h,
x->x_min, x->x_max, iem_symargstoint(&x->x_gui.x_isa),
srl[0], srl[1], x->x_front_color,
--- 528,533 ----
binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h,
x->x_min, x->x_max, iem_symargstoint(&x->x_gui.x_isa),
srl[0], srl[1], x->x_front_color,
***************
*** 550,554 ****
binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("nbxm"), x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h,
x->x_min, x->x_max, (*ip1)&IEM_INIT_ARGS_ALL,
srl[0], srl[1], x->x_front_color,
--- 551,556 ----
binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h,
x->x_min, x->x_max, (*ip1)&IEM_INIT_ARGS_ALL,
srl[0], srl[1], x->x_front_color,
Index: vfad_scale.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/vfad_scale.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vfad_scale.c 14 Dec 2006 20:34:27 -0000 1.2
--- vfad_scale.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 12,18 ****
#ifdef MSW
! #include <io.h>
#else
! #include <unistd.h>
#endif
--- 12,18 ----
#ifdef MSW
! # include <io.h>
#else
! # include <unistd.h>
#endif
***************
*** 137,141 ****
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("vfad_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
--- 137,142 ----
binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)|
((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2)));
binbuf_addv(b, ";");
Index: iem_image.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/iem_image.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iem_image.c 14 Dec 2006 20:34:27 -0000 1.2
--- iem_image.c 31 Oct 2007 11:37:45 -0000 1.3
***************
*** 194,203 ****
binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_image"), x->x_gifsym, iem_symargstoint(&x->x_gui.x_isa),
iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]);
else
binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_image"), 0, iem_symargstoint(&x->x_gui.x_isa),
iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]);
binbuf_addv(b, ";");
--- 194,205 ----
binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gifsym, iem_symargstoint(&x->x_gui.x_isa),
iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]);
else
binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! 0, iem_symargstoint(&x->x_gui.x_isa),
iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]);
binbuf_addv(b, ";");
***************
*** 220,229 ****
binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_image"), x->x_gifsym, (*ip1)&IEM_INIT_ARGS_ALL,
(*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]);
else
binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! gensym("iem_image"), 0, (*ip1)&IEM_INIT_ARGS_ALL,
(*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]);
binbuf_addv(b, ";");
--- 222,233 ----
binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! x->x_gifsym, (*ip1)&IEM_INIT_ARGS_ALL,
(*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]);
else
binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
! 0, (*ip1)&IEM_INIT_ARGS_ALL,
(*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]);
binbuf_addv(b, ";");