From 256751cbc0043584f6bbedef8140e17360640b2a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 1 Aug 2011 17:35:10 +0000 Subject: replace .x%x 32-bit only canvas id with .x%lx canvas id which supports 32-bit and 64-bit svn path=/trunk/externals/moonlib/; revision=15186 --- gamme.c | 28 ++++++++++++++-------------- image.c | 20 ++++++++++---------- mknob.c | 56 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/gamme.c b/gamme.c index 8545a78..81583c3 100644 --- a/gamme.c +++ b/gamme.c @@ -125,13 +125,13 @@ static void draw_inlets(t_gamme *x, t_glist *glist, int firsttime, int nin, int { int onset = xpos + (x->x_width - IOWIDTH) * i / nplus; if (firsttime) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n", glist_getcanvas(glist), onset, ypos + x->x_height - 1, onset + IOWIDTH, ypos + x->x_height, x, i); else - sys_vgui(".x%x.c coords %xo%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n", glist_getcanvas(glist), x, i, onset, ypos + x->x_height - 1, onset + IOWIDTH, ypos + x->x_height); @@ -142,13 +142,13 @@ static void draw_inlets(t_gamme *x, t_glist *glist, int firsttime, int nin, int { int onset = xpos + (x->x_width - IOWIDTH) * i / nplus; if (firsttime) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xi%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n", glist_getcanvas(glist), onset, ypos, onset + IOWIDTH, ypos + 1, x, i); else - sys_vgui(".x%x.c coords %xi%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n", glist_getcanvas(glist), x, i, onset, ypos, onset + IOWIDTH, ypos + 1); @@ -166,7 +166,7 @@ void gamme_drawme(t_gamme *x, t_glist *glist, int firsttime) int ypos=text_ypix(&x->x_obj, glist); if (firsttime) { - sys_vgui(".x%x.c create rectangle \ + sys_vgui(".x%lx.c create rectangle \ %d %d %d %d -tags %xS "BACKGROUND"\n", glist_getcanvas(glist), xpos, ypos, @@ -175,7 +175,7 @@ void gamme_drawme(t_gamme *x, t_glist *glist, int firsttime) } else { - sys_vgui(".x%x.c coords %xS \ + sys_vgui(".x%lx.c coords %xS \ %d %d %d %d\n", glist_getcanvas(glist), x, xpos, ypos, @@ -193,13 +193,13 @@ void gamme_drawme(t_gamme *x, t_glist *glist, int firsttime) if (firsttime) { color=x->x_notes[i]? (ISWHITE(i)?SELWHITECOLOR:SELBLACKCOLOR): (ISWHITE(i)?WHITECOLOR:BLACKCOLOR); - sys_vgui(".x%x.c create rectangle \ + sys_vgui(".x%lx.c create rectangle \ %d %d %d %d -tags %x%s -fill %s\n", glist_getcanvas(glist),xi1,yi1,xi2,yi2, x,NoteNames[i],color); } else { - sys_vgui(".x%x.c coords %x%s \ + sys_vgui(".x%lx.c coords %x%s \ %d %d %d %d\n", glist_getcanvas(glist),x,NoteNames[i],xi1,yi1,xi2,yi2); } @@ -214,18 +214,18 @@ void gamme_erase(t_gamme* x,t_glist* glist) int n; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c delete %xS\n",canvas, x); + sys_vgui(".x%lx.c delete %xS\n",canvas, x); for(n=0;n<12;n++) - sys_vgui(".x%x.c delete %x%s\n",canvas,x,NoteNames[n]); + sys_vgui(".x%lx.c delete %x%s\n",canvas,x,NoteNames[n]); n = 1; while (n--) { - sys_vgui(".x%x.c delete %xi%d\n",canvas,x,n); + sys_vgui(".x%lx.c delete %xi%d\n",canvas,x,n); } n = 3; while (n--) { - sys_vgui(".x%x.c delete %xo%d\n",canvas,x,n); + sys_vgui(".x%lx.c delete %xo%d\n",canvas,x,n); } } @@ -263,7 +263,7 @@ static void gamme_displace(t_gobj *z, t_glist *glist, static void gamme_select(t_gobj *z, t_glist *glist, int state) { t_gamme *x = (t_gamme *)z; - sys_vgui(".x%x.c itemconfigure %xS -fill %s\n", glist, + sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist, x, (state? "blue" : BACKGROUNDCOLOR)); } @@ -345,7 +345,7 @@ void gamme_set(t_gamme *x,t_floatarg note,t_floatarg on) (ISWHITE(notei)?WHITECOLOR:BLACKCOLOR); if(glist_isvisible(x->x_glist)) - sys_vgui(".x%x.c itemconfigure %x%s -fill %s\n", canvas, + sys_vgui(".x%lx.c itemconfigure %x%s -fill %s\n", canvas, x, NoteNames[notei],color); x->x_n=0; diff --git a/image.c b/image.c index c019c21..9f320e1 100644 --- a/image.c +++ b/image.c @@ -47,10 +47,10 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime) { if (firsttime) { if(x->x_type) { - sys_vgui(".x%x.c create image %d %d -tags %xS\n", + sys_vgui(".x%lx.c create image %d %d -tags %xS\n", glist_getcanvas(glist), text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x); - sys_vgui(".x%x.c itemconfigure %xS -image %s\n", + sys_vgui(".x%lx.c itemconfigure %xS -image %s\n", glist_getcanvas(glist),x,x->x_image->s_name); } else { @@ -60,7 +60,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime) x->x_localimage=1; } if(fname) sys_vgui("img%x configure -file %s\n",x,fname); - sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", + sys_vgui(".x%lx.c create image %d %d -image img%x -tags %xS\n", glist_getcanvas(glist), text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,x); } @@ -69,7 +69,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime) */ } else { - sys_vgui(".x%x.c coords %xS \ + sys_vgui(".x%lx.c coords %xS \ %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)); @@ -81,7 +81,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime) void image_erase(t_image* x,t_glist* glist) { int n; - sys_vgui(".x%x.c delete %xS\n", + sys_vgui(".x%lx.c delete %xS\n", glist_getcanvas(glist), x); } @@ -112,7 +112,7 @@ static void image_displace(t_gobj *z, t_glist *glist, t_image *x = (t_image *)z; x->x_obj.te_xpix += dx; x->x_obj.te_ypix += dy; - sys_vgui(".x%x.c coords %xSEL %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xSEL %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height); @@ -125,7 +125,7 @@ static void image_select(t_gobj *z, t_glist *glist, int state) { t_image *x = (t_image *)z; if (state) { - sys_vgui(".x%x.c create rectangle \ + sys_vgui(".x%lx.c create rectangle \ %d %d %d %d -tags %xSEL -outline blue\n", glist_getcanvas(glist), text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), @@ -133,7 +133,7 @@ static void image_select(t_gobj *z, t_glist *glist, int state) x); } else { - sys_vgui(".x%x.c delete %xSEL\n", + sys_vgui(".x%lx.c delete %xSEL\n", glist_getcanvas(glist), x); } @@ -210,7 +210,7 @@ void image_open(t_gobj *z,t_symbol* file) } sys_vgui("img%x blank\n",x); sys_vgui("img%x configure -file %s\n",x,fname); - if(oldtype) sys_vgui(".x%x.c itemconfigure %xS -image img%x\n", + if(oldtype) sys_vgui(".x%lx.c itemconfigure %xS -image img%x\n", glist_getcanvas(x->x_glist),x,x); } } @@ -235,7 +235,7 @@ void image_set(t_gobj *z,t_symbol* image) x->x_type=1; if(glist_isvisible(x->x_glist)) { - sys_vgui(".x%x.c itemconfigure %xS -image %s\n", + sys_vgui(".x%lx.c itemconfigure %xS -image %s\n", glist_getcanvas(x->x_glist),x,x->x_image->s_name); } } diff --git a/mknob.c b/mknob.c index b4a3a88..fd2e8cb 100644 --- a/mknob.c +++ b/mknob.c @@ -75,7 +75,7 @@ static void mknob_update_knob(t_mknob *x, t_glist *glist) xpc=miniradius*cos(angle-M_PI/2); ypc=miniradius*sin(angle-M_PI/2); - sys_vgui(".x%x.c coords %xKNOB %d %d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xKNOB %d %d %d %d %d %d\n", canvas,x,xp,yp,xc+xpc,yc+ypc,xc-xpc,yc-ypc); } @@ -89,7 +89,7 @@ static void mknob_draw_update(t_mknob *x, t_glist *glist) { if(!x->x_thick) { - sys_vgui(".x%x.c itemconfigure %xKNOB -width 7\n", canvas, x); + sys_vgui(".x%lx.c itemconfigure %xKNOB -width 7\n", canvas, x); x->x_thick = 1; } } @@ -97,7 +97,7 @@ static void mknob_draw_update(t_mknob *x, t_glist *glist) { if(x->x_thick) { - sys_vgui(".x%x.c itemconfigure %xKNOB -width 3\n", canvas, x); + sys_vgui(".x%lx.c itemconfigure %xKNOB -width 3\n", canvas, x); x->x_thick = 0; } }*/ @@ -113,25 +113,25 @@ static void mknob_draw_new(t_mknob *x, t_glist *glist) int yc=ypos+x->x_gui.x_w/2; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c create oval %d %d %d %d -fill #%6.6x -tags %xBASE\n", + sys_vgui(".x%lx.c create oval %d %d %d %d -fill #%6.6x -tags %xBASE\n", canvas,xpos,ypos,xpos + x->x_gui.x_w, ypos + x->x_gui.x_w, x->x_gui.x_bcol,x); - sys_vgui(".x%x.c create polygon %d %d %d %d %d %d -fill #%6.6x -tags %xKNOB\n", + sys_vgui(".x%lx.c create polygon %d %d %d %d %d %d -fill #%6.6x -tags %xKNOB\n", glist_getcanvas(glist), xc,ypos,xc-4,yc,xc+4,yc,x->x_gui.x_fcol,x); mknob_update_knob(x,glist); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ + sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\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 %xOUT%d\n", canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, 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 %xIN%d\n", canvas, xpos+ x->x_gui.x_w/2-3, ypos, xpos+ x->x_gui.x_w/2+4, ypos+1, x, 0);*/ } @@ -143,20 +143,20 @@ static void mknob_draw_move(t_mknob *x, t_glist *glist) int r = xpos + (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xBASE %d %d %d %d\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_w); mknob_update_knob(x,glist); - sys_vgui(".x%x.c coords %xLABEL %d %d\n", + sys_vgui(".x%lx.c coords %xLABEL %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 %xOUT%d %d %d %d %d\n", canvas, x, 0, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w); 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 %xIN%d %d %d %d %d\n", canvas, x, 0, xpos+ x->x_gui.x_w/2-3, ypos, xpos+ x->x_gui.x_w/2+4, ypos+1);*/ @@ -166,25 +166,25 @@ static void mknob_draw_erase(t_mknob* 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 %xKNOB\n", canvas, x); - sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); + sys_vgui(".x%lx.c delete %xBASE\n", canvas, x); + sys_vgui(".x%lx.c delete %xKNOB\n", canvas, x); + sys_vgui(".x%lx.c delete %xLABEL\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%lx.c delete %xOUT%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 %xIN%d\n", canvas, x, 0);*/ } static void mknob_draw_config(t_mknob* 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 %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); - sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); - sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); + sys_vgui(".x%lx.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); + sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } static void mknob_draw_io(t_mknob* x,t_glist* glist, int old_snd_rcv_flags) @@ -194,17 +194,17 @@ static void mknob_draw_io(t_mknob* x,t_glist* glist, int old_snd_rcv_flags) t_canvas *canvas=glist_getcanvas(glist); /*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 %xOUT%d\n", canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, 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 %xOUT%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 %xIN%d\n", canvas, xpos+ x->x_gui.x_w/2-3, ypos, xpos+ x->x_gui.x_w/2+4, 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 %xIN%d\n", canvas, x, 0);*/ } static void mknob_draw_select(t_mknob* x,t_glist* glist) @@ -214,14 +214,14 @@ static void mknob_draw_select(t_mknob* x,t_glist* glist) if(x->x_gui.x_fsf.x_selected) { //pd_bind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); - 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%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); } else { //pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); - 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%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); + sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); } } -- cgit v1.2.1