From d0076cf63e92a3ae669c56d4875cd8c985988033 Mon Sep 17 00:00:00 2001 From: musil Date: Wed, 3 Aug 2011 23:57:15 +0000 Subject: changed sys_vgui('%x') to sys_vgui('%lx') svn path=/trunk/externals/iem/iemgui/; revision=15196 --- src/cube_sphere.c | 71 ++++++++++++------------- src/hfadl_scale.c | 22 ++++---- src/hfadr_scale.c | 22 ++++---- src/iem_event.c | 10 ++-- src/iem_image.c | 20 +++---- src/iem_vu.c | 142 ++++++++++++++++++++++++------------------------- src/numberbox_matrix.c | 62 ++++++++++----------- src/room_sim_2d.c | 55 ++++++++++--------- src/room_sim_3d.c | 75 +++++++++++++------------- src/sym_dial.c | 76 +++++++++++++------------- src/vfad_scale.c | 2 +- 11 files changed, 277 insertions(+), 280 deletions(-) (limited to 'src') diff --git a/src/cube_sphere.c b/src/cube_sphere.c index 583ad4f..2d06945 100644 --- a/src/cube_sphere.c +++ b/src/cube_sphere.c @@ -146,21 +146,21 @@ void cube_sphere_draw_new(t_cube_sphere *x, t_glist *glist) int i, n=x->x_n_src; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol, x); - sys_vgui(".x%x.c create oval %d %d %d %d -fill #%6.6x -tags %xCIRC_AQ\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -fill #%6.6x -tags %lxCIRC_AQ\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, x->x_gui.x_bcol, x); - sys_vgui(".x%x.c create oval %d %d %d %d -tags %xCIRC_WK\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -tags %lxCIRC_WK\n", canvas, x2-2*r3, y2-2*r3, x2+2*r3, y2+2*r3, x); - sys_vgui(".x%x.c create oval %d %d %d %d -tags %xCIRC_PK\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -tags %lxCIRC_PK\n", canvas, x2-r3, y2-r3, x2+r3, y2+r3, x); - sys_vgui(".x%x.c create oval %d %d %d %d -tags %xCIRC_NP\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -tags %lxCIRC_NP\n", canvas, x2-2, y2-2, x2+2, y2+2, x); if(x->x_null) { - sys_vgui(".x%x.c create text %d %d -text {+} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC0\n", + sys_vgui(".x%lx.c create text %d %d -text {+} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC0\n", canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], x->x_fontsize, x->x_col_src[0], x); } @@ -169,8 +169,8 @@ void cube_sphere_draw_new(t_cube_sphere *x, t_glist *glist) for(i=0; ix_vis_src[i]) - sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n", + sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n", canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i+1, x->x_fontsize, x->x_col_src[i], x, i); } @@ -187,20 +187,20 @@ void cube_sphere_draw_move(t_cube_sphere *x, t_glist *glist) int i, n=x->x_n_src; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); - sys_vgui(".x%x.c coords %xCIRC_AQ %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxCIRC_AQ %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); - sys_vgui(".x%x.c coords %xCIRC_WK %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxCIRC_WK %d %d %d %d\n", canvas, x, x2-2*r3, y2-2*r3, x2+2*r3, y2+2*r3); - sys_vgui(".x%x.c coords %xCIRC_PK %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxCIRC_PK %d %d %d %d\n", canvas, x, x2-r3, y2-r3, x2+r3, y2+r3); - sys_vgui(".x%x.c coords %xCIRC_NP %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxCIRC_NP %d %d %d %d\n", canvas, x, x2-2, y2-2, x2+2, y2+2); for(i=0; ix_vis_src[i]) - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); } } @@ -210,16 +210,16 @@ void cube_sphere_draw_erase(t_cube_sphere* x, t_glist* glist) int i, n; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); - sys_vgui(".x%x.c delete %xCIRC_AQ\n", canvas, x); - sys_vgui(".x%x.c delete %xCIRC_WK\n", canvas, x); - sys_vgui(".x%x.c delete %xCIRC_PK\n", canvas, x); - sys_vgui(".x%x.c delete %xCIRC_NP\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxCIRC_AQ\n", canvas, x); + sys_vgui(".x%lx.c delete %lxCIRC_WK\n", canvas, x); + sys_vgui(".x%lx.c delete %lxCIRC_PK\n", canvas, x); + sys_vgui(".x%lx.c delete %lxCIRC_NP\n", canvas, x); n = x->x_n_src; for(i=0; ix_vis_src[i]) - sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i); + sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, i); } } @@ -227,7 +227,7 @@ void cube_sphere_draw_select(t_cube_sphere* x, t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); } @@ -314,7 +314,7 @@ static void cube_sphere_motion(t_cube_sphere *x, t_floatarg dx, t_floatarg dy) x->x_pix_src_x[sel] = rad + xx; } cube_sphere_out_sel(x); - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]); } } @@ -405,7 +405,7 @@ static void cube_sphere_src_font(t_cube_sphere *x, t_floatarg ff) for(i=0; ix_vis_src[i]) - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fs); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fs); } } } @@ -439,7 +439,7 @@ static void cube_sphere_src_dp(t_cube_sphere *x, t_symbol *s, int argc, t_atom * x->x_pix_src_x[i] = x->x_radius - (int)(delta*sin(phi) + 0.49999f); x->x_pix_src_y[i] = x->x_radius - (int)(delta*cos(phi) + 0.49999f); if(glist_isvisible(x->x_gui.x_glist) && x->x_vis_src[i]) - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); } } @@ -488,7 +488,7 @@ static void cube_sphere_size(t_cube_sphere *x, t_floatarg size) if(glist_isvisible(x->x_gui.x_glist)) { (*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); + canvas_fixlinesfor(x->x_gui.x_glist, (t_text*)x); } } @@ -515,15 +515,15 @@ static void cube_sphere_vis(t_cube_sphere *x, t_symbol *s, int argc, t_atom *arg if(newstate && !oldstate) { if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n", + sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n", canvas, xpos+x->x_pix_src_x[iindex], ypos+x->x_pix_src_y[iindex], iindex+1, x->x_fontsize, x->x_col_src[iindex], x, iindex); } else if(!newstate && oldstate) { if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, iindex); + sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, iindex); } x->x_vis_src[iindex] = newstate; } @@ -536,15 +536,15 @@ static void cube_sphere_vis(t_cube_sphere *x, t_symbol *s, int argc, t_atom *arg if(newstate && !oldstate) { if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n", + sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n", canvas, xpos+x->x_pix_src_x[iindex], ypos+x->x_pix_src_y[iindex], iindex+1, x->x_fontsize, x->x_col_src[iindex], x, iindex); } else if(!newstate && oldstate) { if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, iindex); + sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, iindex); } x->x_vis_src[iindex] = newstate; } @@ -569,7 +569,7 @@ static void cube_sphere_sphere_col(t_cube_sphere *x, t_floatarg fcol) x->x_gui.x_bcol = my_iemgui_color_hex[col]; } if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c itemconfigure %xCIRC_AQ -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); + sys_vgui(".x%lx.c itemconfigure %lxCIRC_AQ -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } static void cube_sphere_frame_col(t_cube_sphere *x, t_floatarg fcol) @@ -590,7 +590,7 @@ static void cube_sphere_frame_col(t_cube_sphere *x, t_floatarg fcol) x->x_gui.x_fcol = my_iemgui_color_hex[col]; } if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); } @@ -618,7 +618,7 @@ static void cube_sphere_src_col(t_cube_sphere *x, t_symbol *s, int argc, t_atom x->x_col_src[src_index] = my_iemgui_color_hex[col]; } if((x->x_vis_src[src_index]) && glist_isvisible(x->x_gui.x_glist)) - sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, src_index, x->x_col_src[src_index]); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -fill #%6.6x\n", canvas, x, src_index, x->x_col_src[src_index]); } } } @@ -755,7 +755,6 @@ void cube_sphere_setup(void) { cube_sphere_class = class_new(gensym("cube_sphere"), (t_newmethod)cube_sphere_new, (t_method)cube_sphere_ff, sizeof(t_cube_sphere), 0, A_GIMME, 0); -// class_addcreator((t_newmethod)cube_sphere_new, gensym("cube_sphere"), A_GIMME, 0); class_addmethod(cube_sphere_class, (t_method)cube_sphere_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); class_addmethod(cube_sphere_class, (t_method)cube_sphere_motion, gensym("motion"), diff --git a/src/hfadl_scale.c b/src/hfadl_scale.c index 1e928c6..56317ec 100644 --- a/src/hfadl_scale.c +++ b/src/hfadl_scale.c @@ -34,13 +34,13 @@ static void hfadl_scale_draw_new(t_hfadl_scale *x, t_glist *glist) int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("image create photo %xPHOTOIMAGE -format gif -data {%s} -width %d -height %d\n", + sys_vgui("image create photo %lxPHOTOIMAGE -format gif -data {%s} -width %d -height %d\n", x, x->x_gif, x->x_gui.x_w, x->x_gui.x_h); - sys_vgui(".x%x.c create image %d %d -image %xPHOTOIMAGE -tags %xPHOTO\n", + sys_vgui(".x%lx.c create image %d %d -image %lxPHOTOIMAGE -tags %lxPHOTO\n", canvas, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2-1, x, x); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos+1, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); @@ -52,10 +52,10 @@ static void hfadl_scale_draw_move(t_hfadl_scale *x, t_glist *glist) int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xPHOTO %d %d\n", + sys_vgui(".x%lx.c coords %lxPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2-1); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos+1, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); @@ -66,9 +66,9 @@ static void hfadl_scale_draw_erase(t_hfadl_scale* x, t_glist* glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); - sys_vgui("image delete %xPHOTOIMAGE\n", x); - sys_vgui(".x%x.c delete %xPHOTO\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); + sys_vgui("image delete %lxPHOTOIMAGE\n", x); + sys_vgui(".x%lx.c delete %lxPHOTO\n", canvas, x); } static void hfadl_scale_draw_select(t_hfadl_scale* x, t_glist* glist) @@ -80,12 +80,12 @@ static void hfadl_scale_draw_select(t_hfadl_scale* x, t_glist* glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos+1, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); } else - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); } static void hfadl_scale_draw(t_hfadl_scale *x, t_glist *glist, int mode) @@ -127,7 +127,7 @@ static void hfadl_scale_color(t_hfadl_scale *x, t_symbol *s, int argc, t_atom *a x->x_gui.x_lcol = (-1 - i) & 0xffffff; my_iemgui_change_scale_col(x->x_gif, x->x_gui.x_lcol); if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui("%xPHOTOIMAGE configure -data {%s}\n", x, x->x_gif); + sys_vgui("%lxPHOTOIMAGE configure -data {%s}\n", x, x->x_gif); } } diff --git a/src/hfadr_scale.c b/src/hfadr_scale.c index c7b8334..8a4e85a 100644 --- a/src/hfadr_scale.c +++ b/src/hfadr_scale.c @@ -33,13 +33,13 @@ static void hfadr_scale_draw_new(t_hfadr_scale *x, t_glist *glist) int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("image create photo %xPHOTOIMAGE -format gif -data {%s} -width %d -height %d\n", + sys_vgui("image create photo %lxPHOTOIMAGE -format gif -data {%s} -width %d -height %d\n", x, x->x_gif, x->x_gui.x_w, x->x_gui.x_h); - sys_vgui(".x%x.c create image %d %d -image %xPHOTOIMAGE -tags %xPHOTO\n", + sys_vgui(".x%lx.c create image %d %d -image %lxPHOTOIMAGE -tags %lxPHOTO\n", canvas, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2-1, x, x); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos-1, ypos+1, xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); @@ -51,10 +51,10 @@ static void hfadr_scale_draw_move(t_hfadr_scale *x, t_glist *glist) int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xPHOTO %d %d\n", + sys_vgui(".x%lx.c coords %lxPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2-1); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos-1, ypos+1, xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); @@ -65,9 +65,9 @@ static void hfadr_scale_draw_erase(t_hfadr_scale* x, t_glist* glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); - sys_vgui("image delete %xPHOTOIMAGE\n", x); - sys_vgui(".x%x.c delete %xPHOTO\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); + sys_vgui("image delete %lxPHOTOIMAGE\n", x); + sys_vgui(".x%lx.c delete %lxPHOTO\n", canvas, x); } static void hfadr_scale_draw_select(t_hfadr_scale* x, t_glist* glist) @@ -79,12 +79,12 @@ static void hfadr_scale_draw_select(t_hfadr_scale* x, t_glist* glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos-1, ypos+1, xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); } else - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); } static void hfadr_scale_draw(t_hfadr_scale *x, t_glist *glist, int mode) @@ -126,7 +126,7 @@ static void hfadr_scale_color(t_hfadr_scale *x, t_symbol *s, int argc, t_atom *a x->x_gui.x_lcol = (-1 - i) & 0xffffff; my_iemgui_change_scale_col(x->x_gif, x->x_gui.x_lcol); if(glist_isvisible(x->x_gui.x_glist)) - sys_vgui("%xPHOTOIMAGE configure -data {%s}\n", x, x->x_gif); + sys_vgui("%lxPHOTOIMAGE configure -data {%s}\n", x, x->x_gif); } } diff --git a/src/iem_event.c b/src/iem_event.c index 1ec50bf..b821052 100644 --- a/src/iem_event.c +++ b/src/iem_event.c @@ -53,7 +53,7 @@ static void iem_event_draw_new(t_iem_event *x, t_glist *glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline %s -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline %s -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_IVNT_COLOR_SELECTED, x); } static void iem_event_draw_move(t_iem_event *x, t_glist *glist) @@ -63,7 +63,7 @@ static void iem_event_draw_move(t_iem_event *x, t_glist *glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); } @@ -72,7 +72,7 @@ static void iem_event_draw_erase(t_iem_event* x, t_glist* glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); } static void iem_event_draw_select(t_iem_event *x, t_glist *glist) @@ -84,11 +84,11 @@ static void iem_event_draw_select(t_iem_event *x, t_glist *glist) t_int xpos=text_xpix(&x->x_gui.x_obj, glist); t_int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline %s -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline %s -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_IVNT_COLOR_SELECTED, x); } else - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); } void iem_event_draw(t_iem_event *x, t_glist *glist, int mode) diff --git a/src/iem_image.c b/src/iem_image.c index 66a2258..a4b94c3 100644 --- a/src/iem_image.c +++ b/src/iem_image.c @@ -113,16 +113,16 @@ static void iem_image_draw_new(t_iem_image *x, t_glist *glist) if(correct_name = iem_image_calc_size(x)) { - sys_vgui("image create photo %xPHOTOIMAGE -file {%s} -format gif -width %d -height %d\n", + sys_vgui("image create photo %lxPHOTOIMAGE -file {%s} -format gif -width %d -height %d\n", x, correct_name->s_name, x->x_gui.x_w, x->x_gui.x_h); - sys_vgui(".x%x.c create image %d %d -image %xPHOTOIMAGE -tags %xPHOTO\n", + sys_vgui(".x%lx.c create image %d %d -image %lxPHOTOIMAGE -tags %lxPHOTO\n", canvas, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2, x, x); x->x_have_image=1; } if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); } @@ -133,9 +133,9 @@ static void iem_image_draw_move(t_iem_image *x, t_glist *glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_have_image) - sys_vgui(".x%x.c coords %xPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2); + sys_vgui(".x%lx.c coords %lxPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } @@ -145,11 +145,11 @@ static void iem_image_draw_erase(t_iem_image* x, t_glist* glist) t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); if(x->x_have_image) { - sys_vgui("image delete %xPHOTOIMAGE\n", x); - sys_vgui(".x%x.c delete %xPHOTO\n", canvas, x); + sys_vgui("image delete %lxPHOTOIMAGE\n", x); + sys_vgui(".x%lx.c delete %lxPHOTO\n", canvas, x); x->x_have_image=0; } } @@ -163,12 +163,12 @@ static void iem_image_draw_select(t_iem_image* x, t_glist* glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, IEM_GUI_COLOR_SELECTED, x); } else - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); } static void iem_image_draw(t_iem_image *x, t_glist *glist, int mode) diff --git a/src/iem_vu.c b/src/iem_vu.c index 5e22b6c..1c3f0ca 100644 --- a/src/iem_vu.c +++ b/src/iem_vu.c @@ -89,7 +89,7 @@ static void iem_vu_update_rms(t_iem_vu *x, t_glist *glist) int ypos1=text_ypix(&x->x_gui.x_obj, glist)-1; int xpos=text_xpix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c coords %xRCOVER %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxRCOVER %d %d %d %d\n", glist_getcanvas(glist), x, xpos, ypos1, xpos+x->x_gui.x_w-1, ypos1 + 3*(IEM_VU_STEPS-x->x_rms)+1); } @@ -109,16 +109,16 @@ static void iem_vu_update_peak(t_iem_vu *x, t_glist *glist) int i=iem_vu_col[x->x_peak]; int j=ypos + 3*(IEM_VU_STEPS+1-x->x_peak) - 1; - sys_vgui(".x%x.c coords %xPLED %d %d %d %d\n", canvas, x, + sys_vgui(".x%lx.c coords %lxPLED %d %d %d %d\n", canvas, x, xpos, j, xpos+x->x_gui.x_w, j); - sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, my_iemgui_color_hex[i]); + sys_vgui(".x%lx.c itemconfigure %lxPLED -fill #%6.6x\n", canvas, x, my_iemgui_color_hex[i]); } else { int mid=xpos+x->x_gui.x_w/2; - sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); - sys_vgui(".x%x.c coords %xPLED %d %d %d %d\n", + sys_vgui(".x%lx.c itemconfigure %lxPLED -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); + sys_vgui(".x%lx.c coords %lxPLED %d %d %d %d\n", canvas, x, mid, ypos+20, mid, ypos+20); } } @@ -168,10 +168,10 @@ static void iem_vu_change_bkgd_col(t_iem_vu *x, t_glist *glist, int drw_new) if(glist_isvisible(glist) || drw_new) { - sys_vgui("%xBKGDIMAGE_PROTO put {%s} -to 0 0\n", x, x->x_bkgd_gif_bord); - sys_vgui("%xBKGDIMAGE_PROTO put {%s} -to 1 0\n", x, x->x_bkgd_gif_cent); - sys_vgui("%xBKGDIMAGE_PROTO put {%s} -to 2 0\n", x, x->x_bkgd_gif_cent); - sys_vgui("%xBKGDIMAGE_PROTO put {%s} -to 3 0\n", x, x->x_bkgd_gif_bord); + sys_vgui("%lxBKGDIMAGE_PROTO put {%s} -to 0 0\n", x, x->x_bkgd_gif_bord); + sys_vgui("%lxBKGDIMAGE_PROTO put {%s} -to 1 0\n", x, x->x_bkgd_gif_cent); + sys_vgui("%lxBKGDIMAGE_PROTO put {%s} -to 2 0\n", x, x->x_bkgd_gif_cent); + sys_vgui("%lxBKGDIMAGE_PROTO put {%s} -to 3 0\n", x, x->x_bkgd_gif_bord); } } @@ -183,32 +183,32 @@ static void iem_vu_draw_new(t_iem_vu *x, t_glist *glist) int mid=xpos+x->x_gui.x_w/2; int zoom=x->x_gui.x_w/4; - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxBASE\n", canvas, xpos-1, ypos-2, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h+2, x); - sys_vgui("image create photo %xBKGDIMAGE_PROTO -format gif -width %d -height %d\n", + sys_vgui("image create photo %lxBKGDIMAGE_PROTO -format gif -width %d -height %d\n", x, 5, 123); - sys_vgui("%xBKGDIMAGE_PROTO blank\n", x); + sys_vgui("%lxBKGDIMAGE_PROTO blank\n", x); iem_vu_change_bkgd_col(x, glist, 1); - sys_vgui("image create photo %xBKGDIMAGE -format gif -width %d -height %d\n", + sys_vgui("image create photo %lxBKGDIMAGE -format gif -width %d -height %d\n", x, x->x_gui.x_w, x->x_gui.x_h+3); - sys_vgui("%xBKGDIMAGE blank\n", x); - sys_vgui("%xBKGDIMAGE copy %xBKGDIMAGE_PROTO -zoom %d 1\n", x, x, zoom); - sys_vgui(".x%x.c create image %d %d -image %xBKGDIMAGE -tags %xBKGDPHOTO\n", + sys_vgui("%lxBKGDIMAGE blank\n", x); + sys_vgui("%lxBKGDIMAGE copy %lxBKGDIMAGE_PROTO -zoom %d 1\n", x, x, zoom); + sys_vgui(".x%lx.c create image %d %d -image %lxBKGDIMAGE -tags %lxBKGDPHOTO\n", canvas, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2, x, x); - sys_vgui("image create photo %xSCALEIMAGE -format gif -width %d -height %d\n", + sys_vgui("image create photo %lxSCALEIMAGE -format gif -width %d -height %d\n", x, x->x_scale_w, x->x_scale_h); - sys_vgui("%xSCALEIMAGE blank\n", x); + sys_vgui("%lxSCALEIMAGE blank\n", x); if(x->x_scale) { - sys_vgui(".x%x.c create image %d %d -image %xSCALEIMAGE -tags %xSCALEPHOTO\n", + sys_vgui(".x%lx.c create image %d %d -image %lxSCALEIMAGE -tags %lxSCALEPHOTO\n", canvas, xpos+x->x_gui.x_w+x->x_scale_w/2+2, ypos+x->x_gui.x_h/2+2, x, x); my_iemgui_change_scale_col(x->x_scale_gif, x->x_gui.x_lcol); - sys_vgui("%xSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); + sys_vgui("%lxSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); } - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xRCOVER\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %lxRCOVER\n", canvas, xpos, ypos-1, xpos+x->x_gui.x_w-1, ypos + 3*(IEM_VU_STEPS-x->x_rms), x->x_gui.x_bcol, x->x_gui.x_bcol, x); @@ -217,32 +217,32 @@ static void iem_vu_draw_new(t_iem_vu *x, t_glist *glist) int i=iem_vu_col[x->x_peak]; int j=ypos + 3*(IEM_VU_STEPS+1-x->x_peak) - 1; - sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xPLED\n", + sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill #%6.6x -tags %lxPLED\n", canvas, xpos, j, xpos+x->x_gui.x_w, j, 2, my_iemgui_color_hex[i], x); } else - sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xPLED\n", + sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill #%6.6x -tags %lxPLED\n", canvas, mid, ypos+10, mid, ypos+10, 2, x->x_gui.x_bcol, x); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", + sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ + -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, 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); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos-1, ypos + x->x_gui.x_h+1, xpos + IOWIDTH-1, ypos + x->x_gui.x_h+2, x, 0); - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos+x->x_gui.x_w-IOWIDTH, ypos + x->x_gui.x_h+1, xpos+x->x_gui.x_w, ypos + x->x_gui.x_h+2, x, 1); } if(!x->x_gui.x_fsf.x_rcv_able) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos-1, ypos-2, xpos + IOWIDTH-1, ypos-1, x, 0); - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos+x->x_gui.x_w-IOWIDTH, ypos-2, xpos+x->x_gui.x_w, ypos-1, x, 1); } @@ -255,34 +255,34 @@ static void iem_vu_draw_move(t_iem_vu *x, t_glist *glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos-1, ypos-2, xpos+x->x_gui.x_w,ypos+x->x_gui.x_h+2); - sys_vgui(".x%x.c coords %xBKGDPHOTO %d %d\n", + sys_vgui(".x%lx.c coords %lxBKGDPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w/2, ypos+x->x_gui.x_h/2); if(x->x_scale) { - sys_vgui(".x%x.c coords %xSCALEPHOTO %d %d\n", + sys_vgui(".x%lx.c coords %lxSCALEPHOTO %d %d\n", canvas, x, xpos+x->x_gui.x_w+x->x_scale_w/2+2, ypos+x->x_gui.x_h/2+2); } iem_vu_update_peak(x, glist); iem_vu_update_rms(x, glist); - sys_vgui(".x%x.c coords %xLABEL %d %d\n", + sys_vgui(".x%lx.c coords %lxLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxOUT%d %d %d %d %d\n", canvas, x, 0, xpos-1, ypos + x->x_gui.x_h+1, xpos + IOWIDTH-1, ypos + x->x_gui.x_h+2); - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxOUT%d %d %d %d %d\n", canvas, x, 1,xpos+x->x_gui.x_w-IOWIDTH, ypos + x->x_gui.x_h+1, xpos+x->x_gui.x_w, ypos + x->x_gui.x_h+2); } if(!x->x_gui.x_fsf.x_rcv_able) { - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxIN%d %d %d %d %d\n", canvas, x, 0, xpos-1, ypos-2, xpos + IOWIDTH-1, ypos-1); - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxIN%d %d %d %d %d\n", canvas, x, 1, xpos+x->x_gui.x_w-IOWIDTH, ypos-2, xpos+x->x_gui.x_w, ypos-1); } @@ -293,26 +293,26 @@ static void iem_vu_draw_erase(t_iem_vu* x,t_glist* glist) int i; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); - sys_vgui(".x%x.c delete %xBKGDPHOTO\n", canvas, x); - sys_vgui("image delete %xBKGDIMAGE\n", x); - sys_vgui("image delete %xBKGDIMAGE_PROTO\n", x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBKGDPHOTO\n", canvas, x); + sys_vgui("image delete %lxBKGDIMAGE\n", x); + sys_vgui("image delete %lxBKGDIMAGE_PROTO\n", x); if(x->x_scale) - sys_vgui(".x%x.c delete %xSCALEPHOTO\n", canvas, x); - sys_vgui("image delete %xSCALEIMAGE\n", x); + sys_vgui(".x%lx.c delete %lxSCALEPHOTO\n", canvas, x); + sys_vgui("image delete %lxSCALEIMAGE\n", x); - sys_vgui(".x%x.c delete %xPLED\n", canvas, x); - sys_vgui(".x%x.c delete %xRCOVER\n", canvas, x); - sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); + sys_vgui(".x%lx.c delete %lxPLED\n", canvas, x); + sys_vgui(".x%lx.c delete %lxRCOVER\n", canvas, x); + sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 1); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 1); } if(!x->x_gui.x_fsf.x_rcv_able) { - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 1); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 1); } } @@ -327,23 +327,23 @@ static void iem_vu_draw_config(t_iem_vu* x, t_glist* glist) if(x->x_gui.x_w != x->x_old_width) { x->x_old_width = x->x_gui.x_w; - sys_vgui("%xBKGDIMAGE blank\n", x); - sys_vgui("%xBKGDIMAGE configure -width %d -height %d\n", + sys_vgui("%lxBKGDIMAGE blank\n", x); + sys_vgui("%lxBKGDIMAGE configure -width %d -height %d\n", x, x->x_gui.x_w, x->x_gui.x_h+3); } - sys_vgui("%xBKGDIMAGE copy %xBKGDIMAGE_PROTO -zoom %d 1\n", x, x, zoom); + sys_vgui("%lxBKGDIMAGE copy %lxBKGDIMAGE_PROTO -zoom %d 1\n", x, x, zoom); my_iemgui_change_scale_col(x->x_scale_gif, x->x_gui.x_lcol); - sys_vgui("%xSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); + sys_vgui("%lxSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); - sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxLABEL -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(".x%x.c itemconfigure %xRCOVER -fill #%6.6x -outline #%6.6x\n", + sys_vgui(".x%lx.c itemconfigure %lxRCOVER -fill #%6.6x -outline #%6.6x\n", canvas, x, x->x_gui.x_bcol, x->x_gui.x_bcol); - sys_vgui(".x%x.c itemconfigure %xPLED -width %d\n", canvas, x, 2); + sys_vgui(".x%lx.c itemconfigure %lxPLED -width %d\n", canvas, x, 2); } } @@ -355,16 +355,16 @@ static void iem_vu_draw_io(t_iem_vu* x, t_glist* glist, int old_snd_rcv_flags) if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos-1, ypos-2, xpos + IOWIDTH-1, ypos-1, x, 0); - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos+x->x_gui.x_w-IOWIDTH, ypos-2, xpos+x->x_gui.x_w, ypos-1, x, 1); } if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) { - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 1); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 1); } } @@ -374,23 +374,23 @@ static void iem_vu_draw_select(t_iem_vu* x, t_glist* glist) if(x->x_gui.x_fsf.x_selected) { - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); if(x->x_scale) { my_iemgui_change_scale_col(x->x_scale_gif, IEM_GUI_COLOR_SELECTED); - sys_vgui("%xSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); + sys_vgui("%lxSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); } - sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxLABEL -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%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); if(x->x_scale) { my_iemgui_change_scale_col(x->x_scale_gif, x->x_gui.x_lcol); - sys_vgui("%xSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); + sys_vgui("%lxSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); } - sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); + sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); } } @@ -477,7 +477,7 @@ static void iem_vu_scale(t_iem_vu *x, t_floatarg fscale) { t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist); - sys_vgui(".x%x.c delete %xSCALEPHOTO\n", canvas, x); + sys_vgui(".x%lx.c delete %lxSCALEPHOTO\n", canvas, x); } } if(!x->x_scale && scale) @@ -489,10 +489,10 @@ static void iem_vu_scale(t_iem_vu *x, t_floatarg fscale) int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); - sys_vgui(".x%x.c create image %d %d -image %xSCALEIMAGE -tags %xSCALEPHOTO\n", + sys_vgui(".x%lx.c create image %d %d -image %lxSCALEIMAGE -tags %lxSCALEPHOTO\n", canvas, xpos+x->x_gui.x_w+x->x_scale_w/2+3, ypos+x->x_gui.x_h/2+2, x, x); my_iemgui_change_scale_col(x->x_scale_gif, x->x_gui.x_lcol); - sys_vgui("%xSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); + sys_vgui("%lxSCALEIMAGE configure -data {%s}\n", x, x->x_scale_gif); } } } @@ -531,7 +531,7 @@ void iem_vu_dialog(t_iem_vu *x, t_symbol *s, int argc, t_atom *argv) srl[0] = gensym("empty"); sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); - // post("srl-flag = %x", sr_flags); + // post("srl-flag = %lx", sr_flags); x->x_gui.x_fsf.x_snd_able = 0; x->x_gui.x_isa.x_loadinit = 0; x->x_gui.x_w = iem_vu_clip_width(w+1); diff --git a/src/numberbox_matrix.c b/src/numberbox_matrix.c index 1a4fd86..242c72a 100644 --- a/src/numberbox_matrix.c +++ b/src/numberbox_matrix.c @@ -235,7 +235,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) if(sl >= x->x_gui.x_w) cp += sl - x->x_gui.x_w + 1; sys_vgui( - ".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + ".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, ir, jc, IEM_GUI_NBXM_COLOR_EDITED, cp); x->x_buf[sl] = 0; } @@ -245,7 +245,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) k *= x->x_n_column; k += x->x_sel_column + 3; numberbox_matrix_ftoa(x, atom_getfloat(x->x_matrix+k), x->x_buf); - sys_vgui(".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, ir, jc, IEM_GUI_NBXM_COLOR_EDITED, x->x_buf); x->x_buf[0] = 0; } @@ -256,7 +256,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) k *= x->x_n_column; k += x->x_sel_column + 3; numberbox_matrix_ftoa(x, atom_getfloat(x->x_matrix+k), x->x_buf); - sys_vgui(".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, ir, jc, x->x_front_color->s_name, x->x_buf); x->x_buf[0] = 0; } @@ -274,7 +274,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) x->x_val = atom_getfloat(x->x_matrix+k); k++; numberbox_matrix_ftoa(x, x->x_val, x->x_buf); - sys_vgui(".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, i, j, x->x_front_color->s_name, x->x_buf); } } @@ -290,7 +290,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) x->x_val = atom_getfloat(x->x_matrix+k); k++; numberbox_matrix_ftoa(x, x->x_val, x->x_buf); - sys_vgui(".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, ir, j, x->x_front_color->s_name, x->x_buf); } } @@ -306,7 +306,7 @@ static void numberbox_matrix_draw_update(t_numberbox_matrix *x, t_glist *glist) x->x_val = atom_getfloat(x->x_matrix+k); k += c; numberbox_matrix_ftoa(x, x->x_val, x->x_buf); - sys_vgui(".x%x.c itemconfigure %xNUMBER_%d_%d -fill %s -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxNUMBER_%d_%d -fill %s -text {%s} \n", glist_getcanvas(glist), x, i, jc, x->x_front_color->s_name, x->x_buf); } } @@ -326,10 +326,10 @@ static void numberbox_matrix_draw_new(t_numberbox_matrix *x, t_glist *glist) r = x->x_n_row; c = x->x_n_column; for(i=0; ix_numwidth*i, ypos, xpos + x->x_numwidth*(i+1), ypos + x->x_gui.x_h*r, x, i); for(i=0; ix_gui.x_h*i, xpos + x->x_numwidth*c, ypos + x->x_gui.x_h*(i+1), x, i); k = 3; yy = ypos + hh; @@ -341,24 +341,24 @@ static void numberbox_matrix_draw_new(t_numberbox_matrix *x, t_glist *glist) x->x_val = atom_getfloat(x->x_matrix+k); k++; numberbox_matrix_ftoa(x, x->x_val, x->x_buf); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor c \ - -font {%s %d bold} -fill %s -tags %xNUMBER_%d_%d\n", canvas, xx, yy, + sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor c \ + -font {%s %d bold} -fill %s -tags %lxNUMBER_%d_%d\n", canvas, xx, yy, x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_front_color->s_name, x, i, j); xx += w; } yy += h; } - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xFRAME\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxFRAME\n", canvas, xpos, ypos, xpos + x->x_numwidth*c, ypos + x->x_gui.x_h*r, x); if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos, ypos + x->x_gui.x_h*r-1, xpos+IOWIDTH, ypos + x->x_gui.x_h*r, x, 0); if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos, ypos, xpos+IOWIDTH, ypos+1, @@ -378,10 +378,10 @@ static void numberbox_matrix_draw_move(t_numberbox_matrix *x, t_glist *glist) c = x->x_n_column; for(i=0; ix_numwidth*i, ypos, xpos + x->x_numwidth*(i+1), ypos + x->x_gui.x_h*r); for(i=0; ix_gui.x_h*i, xpos + x->x_numwidth*c, ypos + x->x_gui.x_h*(i+1)); yy = ypos + hh; @@ -390,22 +390,22 @@ static void numberbox_matrix_draw_move(t_numberbox_matrix *x, t_glist *glist) xx = xpos + hw; for(j=0; jx_numwidth*c, ypos + x->x_gui.x_h*r); if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxOUT%d %d %d %d %d\n", canvas, x, 0, xpos, ypos + x->x_gui.x_h*r-1, xpos+IOWIDTH, ypos + x->x_gui.x_h*r); if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxIN%d %d %d %d %d\n", canvas, x, 0, xpos, ypos, xpos+IOWIDTH, ypos+1); @@ -419,23 +419,23 @@ static void numberbox_matrix_draw_erase(t_numberbox_matrix* x, t_glist* glist) r = x->x_n_row; c = x->x_n_column; for(i=0; ix_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 0); if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); } static void numberbox_matrix_draw_select(t_numberbox_matrix *x, t_glist *glist) @@ -451,12 +451,12 @@ static void numberbox_matrix_draw_select(t_numberbox_matrix *x, t_glist *glist) 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 %xFRAME -outline %s\n", + sys_vgui(".x%lx.c itemconfigure %lxFRAME -outline %s\n", canvas, x, IEM_GUI_NBXM_COLOR_SELECTED); } else { - sys_vgui(".x%x.c itemconfigure %xFRAME -outline %s\n", + sys_vgui(".x%lx.c itemconfigure %lxFRAME -outline %s\n", canvas, x, IEM_GUI_NBXM_COLOR_NORMAL); } } @@ -469,21 +469,21 @@ static void numberbox_matrix_draw_io(t_numberbox_matrix* x,t_glist* glist, int o t_int r=x->x_n_row; if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos, ypos + x->x_gui.x_h*r-1, xpos+IOWIDTH, ypos + x->x_gui.x_h*r, x, 0); if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 0); if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos, ypos, xpos+IOWIDTH, ypos+1, x, 0); if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); } void numberbox_matrix_draw(t_numberbox_matrix *x, t_glist *glist, int mode) diff --git a/src/room_sim_2d.c b/src/room_sim_2d.c index b3b22b6..c2a9ceb 100644 --- a/src/room_sim_2d.c +++ b/src/room_sim_2d.c @@ -88,7 +88,7 @@ static void room_sim_2d_draw_update(t_room_sim_2d *x, t_glist *glist) dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy); } @@ -103,24 +103,24 @@ void room_sim_2d_draw_new(t_room_sim_2d *x, t_glist *glist) int fs=x->x_fontsize; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x); for(i=1; i<=n; i++) { - sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n", + sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n", canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fs, x->x_col_src[i], x, i); } - sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -outline #%6.6x -tags %lxHEAD\n", canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad, xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1, x->x_gui.x_fcol, x); dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n", + sys_vgui(".x%lx.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %lxNOSE\n", canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy, x->x_gui.x_fcol, x); @@ -134,21 +134,21 @@ void room_sim_2d_draw_move(t_room_sim_2d *x, t_glist *glist) int i, n; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); n = x->x_nr_src; for(i=1; i<=n; i++) { - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); } - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad, xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1); dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy); } @@ -158,14 +158,14 @@ void room_sim_2d_draw_erase(t_room_sim_2d* x, t_glist* glist) int i, n; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); n = x->x_nr_src; for(i=1; i<=n; i++) { - sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i); + sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, i); } - sys_vgui(".x%x.c delete %xHEAD\n", canvas, x); - sys_vgui(".x%x.c delete %xNOSE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxHEAD\n", canvas, x); + sys_vgui(".x%lx.c delete %lxNOSE\n", canvas, x); } void room_sim_2d_draw_select(t_room_sim_2d* x, t_glist* glist) @@ -177,11 +177,11 @@ void room_sim_2d_draw_select(t_room_sim_2d* x, t_glist* glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%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%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); } } @@ -271,12 +271,12 @@ static void room_sim_2d_motion(t_room_sim_2d *x, t_floatarg dx, t_floatarg dy) if(x->x_pix_src_y[0] > x->x_gui.x_h) x->x_pix_src_y[0] = x->x_gui.x_h; room_sim_2d_out_para(x); - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad, xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1); ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy); } @@ -295,7 +295,7 @@ static void room_sim_2d_motion(t_room_sim_2d *x, t_floatarg dx, t_floatarg dy) if(x->x_pix_src_y[sel] > x->x_gui.x_h) x->x_pix_src_y[sel] = x->x_gui.x_h; room_sim_2d_out_para(x); - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]); } } @@ -406,7 +406,7 @@ static void room_sim_2d_src_font(t_room_sim_2d *x, t_floatarg ff) for(i=1; i<=n; i++) { - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fs); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fs); } } @@ -458,7 +458,7 @@ static void room_sim_2d_set_src_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_at x->x_pix_src_x[i] = w2 - (int)(x->x_cnvrt_roomlx2pixh * xsrc + 0.49999f); x->x_pix_src_y[i] = h2 - (int)(x->x_cnvrt_roomlx2pixh * ysrc + 0.49999f); - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); } } @@ -499,12 +499,12 @@ static void room_sim_2d_set_head_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_a x->x_pix_src_x[0] = w2 - (int)(x->x_cnvrt_roomlx2pixh * xh + 0.49999f); x->x_pix_src_y[0] = h2 - (int)(x->x_cnvrt_roomlx2pixh * yh + 0.49999f); - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad, xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1); ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy); } @@ -582,7 +582,7 @@ static void room_sim_2d_room_col(t_room_sim_2d *x, t_floatarg fcol) col = 29; x->x_gui.x_bcol = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); + sys_vgui(".x%lx.c itemconfigure %lxBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } static void room_sim_2d_head_col(t_room_sim_2d *x, t_floatarg fcol) @@ -602,8 +602,8 @@ static void room_sim_2d_head_col(t_room_sim_2d *x, t_floatarg fcol) col = 29; x->x_gui.x_fcol = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); - sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); } static void room_sim_2d_src_col(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv) @@ -629,7 +629,7 @@ static void room_sim_2d_src_col(t_room_sim_2d *x, t_symbol *s, int argc, t_atom col = 29; x->x_col_src[j] = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]); } } } @@ -788,7 +788,6 @@ void room_sim_2d_setup(void) { room_sim_2d_class = class_new(gensym("room_sim_2d"), (t_newmethod)room_sim_2d_new, (t_method)room_sim_2d_ff, sizeof(t_room_sim_2d), 0, A_GIMME, 0); -// class_addcreator((t_newmethod)room_sim_2d_new, gensym("room_sim_2d"), A_GIMME, 0); class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_motion, gensym("motion"), diff --git a/src/room_sim_3d.c b/src/room_sim_3d.c index ba9d838..455e6ee 100644 --- a/src/room_sim_3d.c +++ b/src/room_sim_3d.c @@ -94,7 +94,7 @@ static void room_sim_3d_draw_update(t_room_sim_3d *x, t_glist *glist) dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy); } @@ -112,7 +112,7 @@ void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist) int fsi, fs=x->x_fontsize; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %lxBASE\n", canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x); for(i=1; i<=n; i++) @@ -120,26 +120,26 @@ void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist) fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \ - -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n", + sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \ + -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n", canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fsi, x->x_col_src[i], x, i); } - sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -outline #%6.6x -tags %lxHEAD\n", canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad, xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1, x->x_gui.x_fcol, x); rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0]; rad2 *= x->x_pix_rad; rad2 /= 8*H2; - sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD2\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -outline #%6.6x -tags %lxHEAD2\n", canvas, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2, xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1, x->x_gui.x_fcol, x); dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n", + sys_vgui(".x%lx.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %lxNOSE\n", canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy, x->x_gui.x_fcol, x); @@ -157,7 +157,7 @@ void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist) int fsi, fs=x->x_fontsize; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); n = x->x_nr_src; for(i=1; i<=n; i++) @@ -165,23 +165,23 @@ void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist) fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi); } - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad, xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1); rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0]; rad2 *= x->x_pix_rad; rad2 /= 8*H2; - sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2, xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1); dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy); } @@ -191,15 +191,15 @@ void room_sim_3d_draw_erase(t_room_sim_3d* x, t_glist* glist) int i, n; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); n = x->x_nr_src; for(i=1; i<=n; i++) { - sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i); + sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, i); } - sys_vgui(".x%x.c delete %xHEAD\n", canvas, x); - sys_vgui(".x%x.c delete %xHEAD2\n", canvas, x); - sys_vgui(".x%x.c delete %xNOSE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxHEAD\n", canvas, x); + sys_vgui(".x%lx.c delete %lxHEAD2\n", canvas, x); + sys_vgui(".x%lx.c delete %lxNOSE\n", canvas, x); } void room_sim_3d_draw_select(t_room_sim_3d* x, t_glist* glist) @@ -211,11 +211,11 @@ void room_sim_3d_draw_select(t_room_sim_3d* x, t_glist* glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%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%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); } } @@ -329,18 +329,18 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy) x->x_pix_src_y[0] = x->x_gui.x_h; } room_sim_3d_out_para(x); - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad, xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1); rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0]; rad2 *= x->x_pix_rad; rad2 /= 8*H2; - sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2, xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1); ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy); } @@ -358,7 +358,7 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy) fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, sel, fsi); } else { @@ -380,9 +380,9 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy) fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]); - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, sel, fsi); } } } @@ -511,7 +511,7 @@ static void room_sim_3d_src_font(t_room_sim_3d *x, t_floatarg ff) fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi); } } @@ -577,9 +577,9 @@ static void room_sim_3d_set_src_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_a fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i]; fsi *= fs; fsi /= 2*H2; - sys_vgui(".x%x.c coords %xSRC%d %d %d\n", + sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n", canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]); - sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi); } } @@ -626,18 +626,18 @@ static void room_sim_3d_set_head_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_ x->x_pix_src_y[0] = x->x_gui.x_h/2 - (int)(x->x_cnvrt_roomlx2pixh * yh + 0.49999f); x->x_pix_src_z[0] = (int)(x->x_cnvrt_roomlx2pixh * zh + 0.49999f); - sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad, xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1); rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0]; rad2 *= pixrad; rad2 /= 8*H2; - sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2, xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1); ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f); ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f); - sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n", canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0], xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy); } @@ -705,7 +705,7 @@ static void room_sim_3d_room_col(t_room_sim_3d *x, t_floatarg fcol) col = 29; x->x_gui.x_bcol = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); + sys_vgui(".x%lx.c itemconfigure %lxBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol) @@ -725,9 +725,9 @@ static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol) col = 29; x->x_gui.x_fcol = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); - sys_vgui(".x%x.c itemconfigure %xHEAD2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); - sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxHEAD2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); } static void room_sim_3d_src_col(t_room_sim_3d *x, t_symbol *s, int argc, t_atom *argv) @@ -753,7 +753,7 @@ static void room_sim_3d_src_col(t_room_sim_3d *x, t_symbol *s, int argc, t_atom col = 29; x->x_col_src[j] = my_iemgui_color_hex[col]; } - sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]); + sys_vgui(".x%lx.c itemconfigure %lxSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]); } } } @@ -927,7 +927,6 @@ void room_sim_3d_setup(void) { room_sim_3d_class = class_new(gensym("room_sim_3d"), (t_newmethod)room_sim_3d_new, (t_method)room_sim_3d_ff, sizeof(t_room_sim_3d), 0, A_GIMME, 0); -// class_addcreator((t_newmethod)room_sim_3d_new, gensym("room_sim_3d"), A_GIMME, 0); class_addmethod(room_sim_3d_class, (t_method)room_sim_3d_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); class_addmethod(room_sim_3d_class, (t_method)room_sim_3d_motion, gensym("motion"), diff --git a/src/sym_dial.c b/src/sym_dial.c index eaf925a..fd38337 100644 --- a/src/sym_dial.c +++ b/src/sym_dial.c @@ -45,10 +45,10 @@ static void sym_dial_draw_swap(t_sym_dial *x, t_glist *glist, int swap) { t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", + sys_vgui(".x%lx.c itemconfigure %lxBASE -fill #%6.6x\n", canvas, x, swap?x->x_gui.x_fcol:x->x_gui.x_bcol); - sys_vgui(".x%x.c itemconfigure %xSYMBOL -fill #%6.6x\n", + sys_vgui(".x%lx.c itemconfigure %lxSYMBOL -fill #%6.6x\n", canvas, x, swap?x->x_gui.x_bcol:x->x_gui.x_fcol); } @@ -91,7 +91,7 @@ static void sym_dial_draw_update(t_sym_dial *x, t_glist *glist) string[x->x_gui.x_w-1] = '~'; string[x->x_gui.x_w] = 0; } - sys_vgui(".x%x.c itemconfigure %xSYMBOL -fill #%6.6x -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %lxSYMBOL -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, string); @@ -115,7 +115,7 @@ static void sym_dial_draw_new(t_sym_dial *x, t_glist *glist) string[x->x_gui.x_w+1] = 0; } - sys_vgui(".x%x.c create polygon %d %d %d %d %d %d %d %d %d %d %d %d -outline #%6.6x -fill #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create polygon %d %d %d %d %d %d %d %d %d %d %d %d -outline #%6.6x -fill #%6.6x -tags %lxBASE\n", canvas, xpos-1, ypos, xpos + x->x_symwidth-4, ypos, xpos + x->x_symwidth, ypos+4, @@ -123,29 +123,29 @@ static void sym_dial_draw_new(t_sym_dial *x, t_glist *glist) xpos-1, ypos + x->x_gui.x_h, xpos+half-1, ypos+half, IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol, x); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", + sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ + -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, 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(".x%x.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xSYMBOL\n", + sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ + -font {%s %d bold} -fill #%6.6x -tags %lxSYMBOL\n", canvas, xpos+half+2, ypos+half+d, string, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fcol, x); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos, ypos + x->x_gui.x_h-1, xpos+IOWIDTH, ypos + x->x_gui.x_h, x, 0); - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos+x->x_symwidth-IOWIDTH, ypos + x->x_gui.x_h-1, xpos+x->x_symwidth, ypos + x->x_gui.x_h, x, 1); } if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos, ypos, xpos+IOWIDTH, ypos+1, x, 0); } @@ -156,30 +156,30 @@ static void sym_dial_draw_move(t_sym_dial *x, t_glist *glist) int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d %d %d %d %d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d %d %d %d %d %d %d %d %d\n", canvas, x, xpos-1, ypos, xpos + x->x_symwidth-4, ypos, xpos + x->x_symwidth, ypos+4, xpos + x->x_symwidth, ypos + x->x_gui.x_h, xpos-1, ypos + x->x_gui.x_h, xpos+half-1, ypos+half); - sys_vgui(".x%x.c coords %xLABEL %d %d\n", + sys_vgui(".x%lx.c coords %lxLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); - sys_vgui(".x%x.c coords %xSYMBOL %d %d\n", + sys_vgui(".x%lx.c coords %lxSYMBOL %d %d\n", canvas, x, xpos+half+2, ypos+half+d); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxOUT%d %d %d %d %d\n", canvas, x, 0, xpos, ypos + x->x_gui.x_h-1, xpos+IOWIDTH, ypos + x->x_gui.x_h); - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxOUT%d %d %d %d %d\n", canvas, x, 1, xpos+x->x_symwidth-IOWIDTH, ypos + x->x_gui.x_h-1, xpos+x->x_symwidth, ypos + x->x_gui.x_h); } if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %lxIN%d %d %d %d %d\n", canvas, x, 0, xpos, ypos, xpos+IOWIDTH, ypos+1); @@ -189,30 +189,30 @@ static void sym_dial_draw_erase(t_sym_dial* x,t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xBASE\n", canvas, x); - sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - sys_vgui(".x%x.c delete %xSYMBOL\n", canvas, x); + sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x); + sys_vgui(".x%lx.c delete %lxSYMBOL\n", canvas, x); if(!x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 1); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 1); } if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); } static void sym_dial_draw_config(t_sym_dial* 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", + sys_vgui(".x%lx.c itemconfigure %lxLABEL -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(".x%x.c itemconfigure %xSYMBOL -font {%s %d bold} -fill #%6.6x \n", + sys_vgui(".x%lx.c itemconfigure %lxSYMBOL -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, + sys_vgui(".x%lx.c itemconfigure %lxBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } @@ -224,12 +224,12 @@ static void sym_dial_draw_io(t_sym_dial* x,t_glist* glist, int old_snd_rcv_flags if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos, ypos + x->x_gui.x_h-1, xpos+IOWIDTH, ypos + x->x_gui.x_h, x, 0); - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n", canvas, xpos+x->x_symwidth-IOWIDTH, ypos + x->x_gui.x_h-1, xpos+x->x_symwidth, ypos + x->x_gui.x_h, @@ -237,17 +237,17 @@ static void sym_dial_draw_io(t_sym_dial* x,t_glist* glist, int old_snd_rcv_flags } if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) { - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 1); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxOUT%d\n", canvas, x, 1); } if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxIN%d\n", canvas, xpos, ypos, xpos+IOWIDTH, ypos+1, x, 0); if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); + sys_vgui(".x%lx.c delete %lxIN%d\n", canvas, x, 0); } static void sym_dial_draw_select(t_sym_dial *x, t_glist *glist) @@ -257,16 +257,16 @@ static void sym_dial_draw_select(t_sym_dial *x, t_glist *glist) if(x->x_gui.x_fsf.x_selected) { // pd_bind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym2); - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%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 %xSYMBOL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %lxSYMBOL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); } else { // pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym2); - sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); - sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); - sys_vgui(".x%x.c itemconfigure %xSYMBOL -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); + sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); + sys_vgui(".x%lx.c itemconfigure %lxSYMBOL -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); } } diff --git a/src/vfad_scale.c b/src/vfad_scale.c index 59bc5f1..2c875a1 100644 --- a/src/vfad_scale.c +++ b/src/vfad_scale.c @@ -1,4 +1,4 @@ -/* For information on usage and redistribution, and for a DISCLAIMER OF ALL +%lx/* For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */ -- cgit v1.2.1