replace .x%x 32-bit only canvas id with .x%lx canvas id which supports 32-bit and 64-bit

svn path=/trunk/externals/unauthorized/; revision=15186

1 files changed, 45 insertions, 45 deletions

diff --git a/sonogram~.c b/sonogram~.c
index 18bf3c6..5454fff 100644
--- a/sonogram~.c
+++ b/sonogram~.c
@@ -431,10 +431,10 @@ static void *sonogram_do_update_part(void *tdata)
    }
 
    // set borders in black
-   SYS_VGUI3(".x%x.c itemconfigure %xSONOGRAM -outline #000000\n", canvas, x);
+   SYS_VGUI3(".x%lx.c itemconfigure %xSONOGRAM -outline #000000\n", canvas, x);
    if ( x->x_phaso )
    {
-      SYS_VGUI3(".x%x.c itemconfigure %xPHASOGRAM -outline #000000\n", canvas, x);
+      SYS_VGUI3(".x%lx.c itemconfigure %xPHASOGRAM -outline #000000\n", canvas, x);
    }
 
    // post("sonogram~ : child thread %d ended (nb_updated=%d)", (int)x->x_updatechild, x->x_nbupdated );
@@ -471,44 +471,44 @@ static void sonogram_update_part(t_sonogram *x, t_glist *glist, t_int bstart, t_
     // recreate the square if needed
     if ( ( bstart == 0 ) && ( bend == x->x_size-1 ) && !keepframe )
     {
-      SYS_VGUI3(".x%x.c delete %xSONOGRAM\n", canvas, x );
-      SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xSONOGRAM\n",
+      SYS_VGUI3(".x%lx.c delete %xSONOGRAM\n", canvas, x );
+      SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xSONOGRAM\n",
 	     glist_getcanvas(glist), x->x_xpos-1, x->x_ypos-1,
 	     x->x_xpos + x->x_size*x->x_zoom+1, 
              x->x_ypos + x->x_blocksize/2*x->x_zoom+1,
 	     x);
       SYS_VGUI2("image delete SONIMAGE%x\n", x );
-      SYS_VGUI3(".x%x.c delete ISONIMAGE%x\n", canvas, x );
+      SYS_VGUI3(".x%lx.c delete ISONIMAGE%x\n", canvas, x );
       SYS_VGUI4("image create photo SONIMAGE%x -format gif -width %d -height %d\n", 
                           x, x->x_size*x->x_zoom, x->x_blocksize/2*x->x_zoom );
       SYS_VGUI2("SONIMAGE%x blank\n", x);
-      SYS_VGUI6(".x%x.c create image %d %d -image SONIMAGE%x -tags ISONIMAGE%x\n", 
+      SYS_VGUI6(".x%lx.c create image %d %d -image SONIMAGE%x -tags ISONIMAGE%x\n", 
                           canvas, x->x_xpos+((x->x_size*x->x_zoom)/2), 
                           (x->x_ypos+((x->x_blocksize/2*x->x_zoom)/2)), x, x );
       if ( x->x_phaso )
       {
-          SYS_VGUI3(".x%x.c delete %xPHASOGRAM\n", canvas, x );
-          SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xPHASOGRAM\n",
+          SYS_VGUI3(".x%lx.c delete %xPHASOGRAM\n", canvas, x );
+          SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xPHASOGRAM\n",
 	     canvas, x->x_xpos-1, x->x_ypos+x->x_blocksize/2*x->x_zoom+2,
 	     x->x_xpos + x->x_size*x->x_zoom +1, 
              x->x_ypos + x->x_blocksize*x->x_zoom + 3,
 	     x);
           SYS_VGUI2("image delete FAZIMAGE%x\n", x );
-          SYS_VGUI3(".x%x.c delete IFAZIMAGE%x\n", canvas, x );
+          SYS_VGUI3(".x%lx.c delete IFAZIMAGE%x\n", canvas, x );
           SYS_VGUI4("image create photo FAZIMAGE%x -format gif -width %d -height %d\n", 
                           x, x->x_size*x->x_zoom, x->x_blocksize/2*x->x_zoom );
           SYS_VGUI2("FAZIMAGE%x blank\n", x);
-          SYS_VGUI6(".x%x.c create image %d %d -image FAZIMAGE%x -tags IFAZIMAGE%x\n", 
+          SYS_VGUI6(".x%lx.c create image %d %d -image FAZIMAGE%x -tags IFAZIMAGE%x\n", 
                           canvas, x->x_xpos+((x->x_size*x->x_zoom)/2), 
                           x->x_ypos+3*((x->x_blocksize/2*x->x_zoom)/2)+2, x, x );
       }
       canvas_fixlinesfor( canvas, (t_text*)x );
     }
     // set borders in red
-    SYS_VGUI3(".x%x.c itemconfigure %xSONOGRAM -outline #FF0000\n", canvas, x);
+    SYS_VGUI3(".x%lx.c itemconfigure %xSONOGRAM -outline #FF0000\n", canvas, x);
     if ( x->x_phaso )
     {
-       SYS_VGUI3(".x%x.c itemconfigure %xPHASOGRAM -outline #FF0000\n", canvas, x);
+       SYS_VGUI3(".x%lx.c itemconfigure %xPHASOGRAM -outline #FF0000\n", canvas, x);
     }
 
     // launch update thread
@@ -706,7 +706,7 @@ static void sonogram_paste_phase( t_sonogram* x)
 
     sonogram_update_part(x, x->x_glist, pxstart, pxstart+(si-1)-cxs, 0, 1, 1);
     // start a new capture
-    SYS_VGUI3( ".x%x.c delete %xCAPTURE\n", canvas, x );
+    SYS_VGUI3( ".x%lx.c delete %xCAPTURE\n", canvas, x );
     x->x_xstartcapture = x->x_xdraw; 
     x->x_ystartcapture = x->x_ydraw; 
     x->x_xendcapture = x->x_xdraw; 
@@ -722,7 +722,7 @@ static void sonogram_draw_new(t_sonogram *x, t_glist *glist)
    x->x_ypos=text_ypix(&x->x_obj, glist);
    if ( x->x_graphic )
    {
-    SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xSONOGRAM\n",
+    SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xSONOGRAM\n",
 	     canvas, x->x_xpos-1, x->x_ypos-1,
 	     x->x_xpos + x->x_size*x->x_zoom+1, 
              x->x_ypos + x->x_blocksize/2*x->x_zoom+1,
@@ -730,12 +730,12 @@ static void sonogram_draw_new(t_sonogram *x, t_glist *glist)
     SYS_VGUI4("image create photo SONIMAGE%x -format gif -width %d -height %d\n", 
                           x, x->x_size*x->x_zoom, x->x_blocksize/2*x->x_zoom );
     SYS_VGUI2("SONIMAGE%x blank\n", x);
-    SYS_VGUI6(".x%x.c create image %d %d -image SONIMAGE%x -tags ISONIMAGE%x\n", 
+    SYS_VGUI6(".x%lx.c create image %d %d -image SONIMAGE%x -tags ISONIMAGE%x\n", 
                           canvas, x->x_xpos+((x->x_size*x->x_zoom)/2), 
                           (x->x_ypos+((x->x_blocksize/2*x->x_zoom)/2)), x, x );
     if ( x->x_phaso )
     {
-          SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xPHASOGRAM\n",
+          SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FFFFFF -tags %xPHASOGRAM\n",
 	     canvas, x->x_xpos-1, x->x_ypos+x->x_blocksize/2*x->x_zoom+2,
 	     x->x_xpos + x->x_size*x->x_zoom +1, 
              x->x_ypos + x->x_blocksize*x->x_zoom + 3,
@@ -743,7 +743,7 @@ static void sonogram_draw_new(t_sonogram *x, t_glist *glist)
           SYS_VGUI4("image create photo FAZIMAGE%x -format gif -width %d -height %d\n", 
                           x, x->x_size*x->x_zoom, x->x_blocksize/2*x->x_zoom );
           SYS_VGUI2("FAZIMAGE%x blank\n", x);
-          SYS_VGUI6(".x%x.c create image %d %d -image FAZIMAGE%x -tags IFAZIMAGE%x\n", 
+          SYS_VGUI6(".x%lx.c create image %d %d -image FAZIMAGE%x -tags IFAZIMAGE%x\n", 
                           canvas, x->x_xpos+((x->x_size*x->x_zoom)/2), 
                           x->x_ypos+3*((x->x_blocksize/2*x->x_zoom)/2)+2, x, x );
     }
@@ -757,18 +757,18 @@ static void sonogram_draw_delete(t_sonogram *x, t_glist *glist)
 
     if ( x->x_graphic && glist_isvisible( glist ) )
     {
-       SYS_VGUI3( ".x%x.c delete %xCAPTURE\n", canvas, x );
-       SYS_VGUI3( ".x%x.c delete line %xREADSTART\n", canvas, x);
-       SYS_VGUI3( ".x%x.c delete line %xREADEND\n", canvas, x);
-       SYS_VGUI3( ".x%x.c delete line %xMODSTART\n", canvas, x);
-       SYS_VGUI3( ".x%x.c delete line %xMODEND\n", canvas, x);
-       SYS_VGUI3(".x%x.c delete %xSONOGRAM\n", canvas, x );
-       SYS_VGUI3(".x%x.c delete %xPHASOGRAM\n", canvas, x );
-       SYS_VGUI3(".x%x.c delete %xISONIMAGE\n", canvas, x );
+       SYS_VGUI3( ".x%lx.c delete %xCAPTURE\n", canvas, x );
+       SYS_VGUI3( ".x%lx.c delete line %xREADSTART\n", canvas, x);
+       SYS_VGUI3( ".x%lx.c delete line %xREADEND\n", canvas, x);
+       SYS_VGUI3( ".x%lx.c delete line %xMODSTART\n", canvas, x);
+       SYS_VGUI3( ".x%lx.c delete line %xMODEND\n", canvas, x);
+       SYS_VGUI3(".x%lx.c delete %xSONOGRAM\n", canvas, x );
+       SYS_VGUI3(".x%lx.c delete %xPHASOGRAM\n", canvas, x );
+       SYS_VGUI3(".x%lx.c delete %xISONIMAGE\n", canvas, x );
        SYS_VGUI2("image delete SONIMAGE%x\n", x );
        if ( x->x_phaso ) 
        {
-          SYS_VGUI3(".x%x.c delete %xIFAZIMAGE\n", canvas, x );
+          SYS_VGUI3(".x%lx.c delete %xIFAZIMAGE\n", canvas, x );
           SYS_VGUI2("image delete FAZIMAGE%x\n", x );
        }
     }
@@ -780,23 +780,23 @@ static void sonogram_draw_move(t_sonogram *x, t_glist *glist)
 
    if ( x->x_graphic && glist_isvisible( x->x_glist ) )
    {
-    SYS_VGUI7(".x%x.c coords %xSONOGRAM %d %d %d %d\n",
+    SYS_VGUI7(".x%lx.c coords %xSONOGRAM %d %d %d %d\n",
 	     canvas, x,
 	     x->x_xpos-1, x->x_ypos-1,
 	     x->x_xpos+x->x_size*x->x_zoom+1, 
              x->x_ypos+x->x_blocksize/2*x->x_zoom+1);
-    SYS_VGUI5(".x%x.c coords ISONIMAGE%x %d %d\n",
+    SYS_VGUI5(".x%lx.c coords ISONIMAGE%x %d %d\n",
 	     canvas, x,
              x->x_xpos+((x->x_size*x->x_zoom)/2), 
              (x->x_ypos+((x->x_blocksize/2*x->x_zoom)/2)) );
     if ( x->x_phaso )
     {
-      SYS_VGUI7(".x%x.c coords %xPHASOGRAM %d %d %d %d\n",
+      SYS_VGUI7(".x%lx.c coords %xPHASOGRAM %d %d %d %d\n",
 	     canvas, x,
 	     x->x_xpos-1, x->x_ypos+(x->x_blocksize/2*x->x_zoom)+1,
 	     x->x_xpos+x->x_size*x->x_zoom+1, 
              x->x_ypos+x->x_blocksize*x->x_zoom+3);
-      SYS_VGUI5(".x%x.c coords IFAZIMAGE%x %d %d\n",
+      SYS_VGUI5(".x%lx.c coords IFAZIMAGE%x %d %d\n",
 	     canvas, x,
              x->x_xpos+((x->x_size*x->x_zoom)/2), 
              x->x_ypos+3*((x->x_blocksize/2*x->x_zoom)/2)+2 );
@@ -814,18 +814,18 @@ static void sonogram_draw_select(t_sonogram* x,t_glist* glist)
     if(x->x_selected)
     {
         /* sets the item in blue */
-	SYS_VGUI3(".x%x.c itemconfigure %xSONOGRAM -outline #0000FF\n", canvas, x);
+	SYS_VGUI3(".x%lx.c itemconfigure %xSONOGRAM -outline #0000FF\n", canvas, x);
         if ( x->x_phaso )
         {
-	   SYS_VGUI3(".x%x.c itemconfigure %xPHASOGRAM -outline #0000FF\n", canvas, x);
+	   SYS_VGUI3(".x%lx.c itemconfigure %xPHASOGRAM -outline #0000FF\n", canvas, x);
         }
     }
     else
     {
-	SYS_VGUI3(".x%x.c itemconfigure %xSONOGRAM -outline #000000\n", canvas, x);
+	SYS_VGUI3(".x%lx.c itemconfigure %xSONOGRAM -outline #000000\n", canvas, x);
         if ( x->x_phaso )
         {
-	   SYS_VGUI3(".x%x.c itemconfigure %xPHASOGRAM -outline #000000\n", canvas, x);
+	   SYS_VGUI3(".x%lx.c itemconfigure %xPHASOGRAM -outline #000000\n", canvas, x);
         }
     }
    }
@@ -1003,8 +1003,8 @@ static void sonogram_motion(t_sonogram *x, t_floatarg dx, t_floatarg dy)
         (x->x_yendcapture+dy) <= x->x_ypos+x->x_blocksize*x->x_zoom ) { 
         x->x_yendcapture += dy; 
        }
-       SYS_VGUI3( ".x%x.c delete %xCAPTURE\n", canvas, x );
-       SYS_VGUI7( ".x%x.c create rectangle %d %d %d %d -outline #0000FF -tags %xCAPTURE\n",
+       SYS_VGUI3( ".x%lx.c delete %xCAPTURE\n", canvas, x );
+       SYS_VGUI7( ".x%lx.c create rectangle %d %d %d %d -outline #0000FF -tags %xCAPTURE\n",
                    canvas, x->x_xstartcapture, x->x_ystartcapture, x->x_xendcapture, x->x_yendcapture, x );
    }
 }
@@ -1098,7 +1098,7 @@ static int sonogram_click(t_gobj *z, struct _glist *glist,
                       (x->x_xendcapture-x->x_xpos)/x->x_zoom, 0, 1, 1);
        } 
        // start a new capture
-       SYS_VGUI3( ".x%x.c delete %xCAPTURE\n", canvas, x );
+       SYS_VGUI3( ".x%lx.c delete %xCAPTURE\n", canvas, x );
        x->x_xstartcapture = xpix; 
        x->x_ystartcapture = ypix; 
        x->x_xendcapture = xpix; 
@@ -1388,9 +1388,9 @@ static void sonogram_readstart(t_sonogram *x, t_floatarg fstart)
     if ( ( x->x_readstart < x->x_readend ) && ( x->x_readspeed < 0 ) ) x->x_readspeed = -x->x_readspeed;
     if ( x->x_graphic && glist_isvisible( x->x_glist ) )
     {
-       SYS_VGUI3( ".x%x.c delete line %xREADSTART\n",
+       SYS_VGUI3( ".x%lx.c delete line %xREADSTART\n",
                    canvas, x);
-       SYS_VGUI7( ".x%x.c create line %d %d %d %d -fill #FF0000 -tags %xREADSTART -width 3\n",
+       SYS_VGUI7( ".x%lx.c create line %d %d %d %d -fill #FF0000 -tags %xREADSTART -width 3\n",
                    canvas, x->x_xpos+(x->x_readstart*(x->x_size)/100 ),
                           x->x_ypos, x->x_xpos+(x->x_readstart*(x->x_size)/100 ), 
                           x->x_ypos+x->x_blocksize*x->x_zoom, x );
@@ -1413,9 +1413,9 @@ static void sonogram_modstart(t_sonogram *x, t_floatarg fstart)
     }
     if ( x->x_graphic && glist_isvisible( x->x_glist ) )
     {
-       SYS_VGUI3( ".x%x.c delete line %xMODSTART\n",
+       SYS_VGUI3( ".x%lx.c delete line %xMODSTART\n",
                    canvas, x);
-       SYS_VGUI7( ".x%x.c create line %d %d %d %d -fill #11E834 -tags %xMODSTART -width 3\n",
+       SYS_VGUI7( ".x%lx.c create line %d %d %d %d -fill #11E834 -tags %xMODSTART -width 3\n",
                    canvas, x->x_xpos+(x->x_modstart*(x->x_size)/100 ),
                           x->x_ypos, x->x_xpos+(x->x_modstart*(x->x_size)/100 ), 
                           x->x_ypos+x->x_blocksize*x->x_zoom, x );
@@ -1454,9 +1454,9 @@ static void sonogram_readend(t_sonogram *x, t_floatarg fend)
     if ( ( x->x_readstart < x->x_readend ) && ( x->x_readspeed < 0 ) ) x->x_readspeed = -x->x_readspeed;
     if ( x->x_graphic && glist_isvisible( x->x_glist ) )
     {
-       SYS_VGUI3( ".x%x.c delete line %xREADEND\n",
+       SYS_VGUI3( ".x%lx.c delete line %xREADEND\n",
                    canvas, x);
-       SYS_VGUI7( ".x%x.c create line %d %d %d %d -fill #FF0000 -tags %xREADEND -width 3\n",
+       SYS_VGUI7( ".x%lx.c create line %d %d %d %d -fill #FF0000 -tags %xREADEND -width 3\n",
                    canvas, x->x_xpos+(x->x_readend*(x->x_size)/100 ),
                           x->x_ypos, x->x_xpos+(x->x_readend*(x->x_size)/100 ), 
                           x->x_ypos+x->x_blocksize*x->x_zoom, x );
@@ -1479,9 +1479,9 @@ static void sonogram_modend(t_sonogram *x, t_floatarg fend)
     }
     if ( x->x_graphic && glist_isvisible( x->x_glist ) )
     {
-       SYS_VGUI3( ".x%x.c delete line %xMODEND\n",
+       SYS_VGUI3( ".x%lx.c delete line %xMODEND\n",
                    canvas, x);
-       SYS_VGUI7( ".x%x.c create line %d %d %d %d -fill #11E834 -tags %xMODEND -width 3\n",
+       SYS_VGUI7( ".x%lx.c create line %d %d %d %d -fill #11E834 -tags %xMODEND -width 3\n",
                    canvas, x->x_xpos+(x->x_modend*(x->x_size)/100 ),
                           x->x_ypos, x->x_xpos+(x->x_modend*(x->x_size)/100 ), 
                           x->x_ypos+x->x_blocksize*x->x_zoom, x );