aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2011-12-12 17:07:04 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2011-12-12 17:07:04 +0000
commit7f1a1c501a4616fc6bed6f780e9016cad4009748 (patch)
tree2c565498974a11e5c026ddf6998fdbb2396cd2c8
parent5d7d6504b91fc8ac4ada122e79906b92c8aa98c4 (diff)
replace all %x patterns with %lx to support 64-bit
svn path=/trunk/externals/ggee/; revision=15813
-rw-r--r--gui/envgen.c2
-rw-r--r--gui/fatom.h76
-rw-r--r--gui/gcanvas.c20
-rw-r--r--gui/image.c14
-rw-r--r--gui/toddle.c34
-rw-r--r--gui/w_envgen.h48
6 files changed, 99 insertions, 95 deletions
diff --git a/gui/envgen.c b/gui/envgen.c
index a52693f..88594da 100644
--- a/gui/envgen.c
+++ b/gui/envgen.c
@@ -254,7 +254,7 @@ static void *envgen_new(t_symbol *s,int argc,t_atom* argv)
x->args = STATES;
x->finalvalues = getbytes( x->args*sizeof(t_float));
x->duration = getbytes( x->args*sizeof(t_float));
- DEBUG(post("finalvalues %x",x->finalvalues););
+ DEBUG(post("finalvalues %lx",x->finalvalues););
/* widget */
diff --git a/gui/fatom.h b/gui/fatom.h
index e5258f7..1f7b30b 100644
--- a/gui/fatom.h
+++ b/gui/fatom.h
@@ -40,13 +40,13 @@ static void draw_inlets(t_fatom *x, t_glist *glist, int firsttime, int nin, int
{
int onset = text_xpix(&x->x_obj, glist) + (x->x_rect_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxo%d\n",
glist_getcanvas(glist),
onset, text_ypix(&x->x_obj, glist) + x->x_rect_height - 1,
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + x->x_rect_height,
x, i);
else
- sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxo%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, text_ypix(&x->x_obj, glist) + x->x_rect_height - 1,
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + x->x_rect_height);
@@ -57,13 +57,13 @@ static void draw_inlets(t_fatom *x, t_glist *glist, int firsttime, int nin, int
{
int onset = text_xpix(&x->x_obj, glist) + (x->x_rect_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxi%d\n",
glist_getcanvas(glist),
onset, text_ypix(&x->x_obj, glist),
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + 1,
x, i);
else
- sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxi%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, text_ypix(&x->x_obj, glist),
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + 1);
@@ -77,13 +77,13 @@ static void draw_handle(t_fatom *x, t_glist *glist, int firsttime) {
int onset = text_xpix(&x->x_obj, glist) + (x->x_rect_width - IOWIDTH+2);
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xhandle\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxhandle\n",
glist_getcanvas(glist),
onset, text_ypix(&x->x_obj, glist) + x->x_rect_height - 12,
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + x->x_rect_height-4,
x);
else
- sys_vgui(".x%lx.c coords %xhandle %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxhandle %d %d %d %d\n",
glist_getcanvas(glist), x,
onset, text_ypix(&x->x_obj, glist) + x->x_rect_height - 12,
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + x->x_rect_height-4);
@@ -93,12 +93,12 @@ static void create_widget(t_fatom *x, t_glist *glist)
{
t_canvas *canvas=glist_getcanvas(glist);
post("slider create widget");
- sys_vgui("destroy .x%lx.c.s%x\n",glist_getcanvas(glist),x);
+ sys_vgui("destroy .x%lx.c.s%lx\n",glist_getcanvas(glist),x);
if (!strcmp(x->x_type->s_name,"vslider")) {
x->x_rect_width = x->x_width+15;
x->x_rect_height = x->x_max-x->x_min+26;
- sys_vgui("scale .x%lx.c.s%x \
+ sys_vgui("scale .x%lx.c.s%lx \
-sliderlength 10 \
-showvalue 0 \
-length %d \
@@ -109,7 +109,7 @@ static void create_widget(t_fatom *x, t_glist *glist)
-bg %s \
-activebackground %s \
-troughcolor %s \
- -command fatom_cb%x\n",canvas,x,
+ -command fatom_cb%lx\n",canvas,x,
x->x_max-x->x_min+14,
x->x_max,
x->x_min,
@@ -121,7 +121,7 @@ static void create_widget(t_fatom *x, t_glist *glist)
} else if (!strcmp(x->x_type->s_name,"hslider")) {
x->x_rect_width = x->x_max-x->x_min + 24;
x->x_rect_height = x->x_width + 15;
- sys_vgui("scale .x%lx.c.s%x \
+ sys_vgui("scale .x%lx.c.s%lx \
-sliderlength 10 \
-showvalue 0 \
-length %d \
@@ -133,7 +133,7 @@ static void create_widget(t_fatom *x, t_glist *glist)
-bg %s \
-activebackground %s \
-troughcolor %s \
- -command fatom_cb%x\n",canvas,x,
+ -command fatom_cb%lx\n",canvas,x,
x->x_max-x->x_min+14,
x->x_min,
x->x_max,
@@ -145,8 +145,8 @@ static void create_widget(t_fatom *x, t_glist *glist)
} else if (!strcmp(x->x_type->s_name,"checkbutton")) {
x->x_rect_width = 32;
x->x_rect_height = 28;
- sys_vgui("checkbutton .x%lx.c.s%x \
- -command { fatom_cb%x $fatom_val%x} -variable fatom_val%x -text \"%s\" \
+ sys_vgui("checkbutton .x%lx.c.s%lx \
+ -command { fatom_cb%lx $fatom_val%lx} -variable fatom_val%lx -text \"%s\" \
-bg %s \
-activebackground %s \
\n",canvas,x,x,x,x,
@@ -158,8 +158,8 @@ static void create_widget(t_fatom *x, t_glist *glist)
x->x_rect_width = 8*20;
x->x_rect_height = 25;
for (i=0;i<8;i++) {
- sys_vgui("radiobutton .x%lx.c.s%x%d \
- -command { fatom_cb%x $fatom_val%x} -variable fatom_val%x -value %d\n",canvas,x,i,x,x,x,i);
+ sys_vgui("radiobutton .x%lx.c.s%lx%d \
+ -command { fatom_cb%lx $fatom_val%lx} -variable fatom_val%lx -value %d\n",canvas,x,i,x,x,x,i);
}
/* TODO pack them */
} else if (!strcmp(x->x_type->s_name,"vradio")) {
@@ -167,29 +167,29 @@ static void create_widget(t_fatom *x, t_glist *glist)
x->x_rect_width = 30;
x->x_rect_height = 20*8+5;
for (i=0;i<8;i++) {
- sys_vgui("radiobutton .x%lx.c.s%x%d \
- -command { fatom_cb%x $fatom_val%x} -variable fatom_val%x -value %d\n",canvas,x,i,x,x,x,i);
+ sys_vgui("radiobutton .x%lx.c.s%lx%d \
+ -command { fatom_cb%lx $fatom_val%lx} -variable fatom_val%lx -value %d\n",canvas,x,i,x,x,x,i);
}
/* TODO pack them */
} else {
x->x_rect_width = 32;
x->x_rect_height = 140;
- sys_vgui("scale .x%lx.c.s%x \
+ sys_vgui("scale .x%lx.c.s%lx \
-sliderlength 10 \
-showvalue 0 \
-length 131 \
-from 127 -to 0 \
- -command fatom_cb%x\n",canvas,x,x);
+ -command fatom_cb%lx\n",canvas,x,x);
}
/* set the start value */
if (!strcmp(x->x_type->s_name,"checkbutton")) {
if (x->x_val)
- sys_vgui(".x%lx.c.s%x select\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%lx select\n",canvas,x,x->x_val);
else
- sys_vgui(".x%lx.c.s%x deselect\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%lx deselect\n",canvas,x,x->x_val);
} else
- sys_vgui(".x%lx.c.s%x set %f\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%lx set %f\n",canvas,x,x->x_val);
}
@@ -202,16 +202,16 @@ static void fatom_drawme(t_fatom *x, t_glist *glist, int firsttime)
t_canvas *canvas=glist_getcanvas(glist);// x->x_glist;//glist_getcanvas(glist);
DEBUG(post("drawme %d",firsttime);)
if (firsttime) {
- DEBUG(post("glist %x canvas %x",x->x_glist,canvas));
+ DEBUG(post("glist %lx canvas %lx",x->x_glist,canvas));
create_widget(x,glist);
x->x_glist = canvas;
post("create window to hold widget");
- sys_vgui(".x%lx.c create window %d %d -anchor nw -window .x%lx.c.s%x -tags %xS\n",
+ sys_vgui(".x%lx.c create window %d %d -anchor nw -window .x%lx.c.s%lx -tags %lxS\n",
canvas,text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)+2,x->x_glist,x,x);
}
else {
- sys_vgui(".x%lx.c coords %xS \
+ sys_vgui(".x%lx.c coords %lxS \
%d %d\n",
canvas, x,
text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)+2);
@@ -227,15 +227,15 @@ static void fatom_erase(t_fatom* x,t_glist* glist)
int n;
DEBUG(post("erase");)
- sys_vgui("destroy .x%lx.c.s%x\n",glist_getcanvas(glist),x);
+ sys_vgui("destroy .x%lx.c.s%lx\n",glist_getcanvas(glist),x);
- sys_vgui(".x%lx.c delete %xS\n",glist_getcanvas(glist), x);
+ sys_vgui(".x%lx.c delete %lxS\n",glist_getcanvas(glist), x);
/* inlets and outlets */
- sys_vgui(".x%lx.c delete %xi%d\n",glist_getcanvas(glist),x,0);
- sys_vgui(".x%lx.c delete %xo%d\n",glist_getcanvas(glist),x,0);
- sys_vgui(".x%lx.c delete %xhandle\n",glist_getcanvas(glist),x,0);
+ sys_vgui(".x%lx.c delete %lxi%d\n",glist_getcanvas(glist),x,0);
+ sys_vgui(".x%lx.c delete %lxo%d\n",glist_getcanvas(glist),x,0);
+ sys_vgui(".x%lx.c delete %lxhandle\n",glist_getcanvas(glist),x,0);
}
@@ -266,7 +266,7 @@ static void fatom_displace(t_gobj *z, t_glist *glist,
x->x_obj.te_ypix += dy;
if (glist_isvisible(glist))
{
- sys_vgui(".x%lx.c coords %xSEL %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxSEL %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_rect_width, text_ypix(&x->x_obj, glist) + x->x_rect_height);
@@ -282,14 +282,14 @@ static void fatom_select(t_gobj *z, t_glist *glist, int state)
t_fatom *x = (t_fatom *)z;
if (state) {
sys_vgui(".x%lx.c create rectangle \
-%d %d %d %d -tags %xSEL -outline blue\n",
+%d %d %d %d -tags %lxSEL -outline blue\n",
glist_getcanvas(glist),
text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
text_xpix(&x->x_obj, glist) + x->x_rect_width, text_ypix(&x->x_obj, glist) + x->x_rect_height,
x);
}
else {
- sys_vgui(".x%lx.c delete %xSEL\n",
+ sys_vgui(".x%lx.c delete %lxSEL\n",
glist_getcanvas(glist), x);
}
@@ -350,11 +350,11 @@ static void fatom_float(t_fatom* x,t_floatarg f)
if (glist_isvisible(x->x_glist)) {
if (!strcmp(x->x_type->s_name,"checkbutton")) {
if (x->x_val)
- sys_vgui(".x%lx.c.s%x select\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%lx select\n",x->x_glist,x,f);
else
- sys_vgui(".x%lx.c.s%x deselect\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%lx deselect\n",x->x_glist,x,f);
} else
- sys_vgui(".x%lx.c.s%x set %f\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%lx set %f\n",x->x_glist,x,f);
}
outlet_float(x->x_obj.ob_outlet,f);
}
@@ -411,13 +411,13 @@ static void *fatom_new(t_fatom* x,t_floatarg max, t_floatarg min, t_floatarg h,t
/* bind to a symbol for slider callback (later make this based on the
filepath ??) */
- sprintf(buf,"fatom%x",x);
+ sprintf(buf,"fatom%lx",x);
x->x_sym = gensym(buf);
pd_bind(&x->x_obj.ob_pd, x->x_sym);
/* pipe startup code to slitk */
- sys_vgui("proc fatom_cb%x {val} {\n pdsend \"fatom%x f $val\"\n }\n",x,x);
+ sys_vgui("proc fatom_cb%lx {val} {\n pdsend \"fatom%lx f $val\"\n }\n",x,x);
outlet_new(&x->x_obj, &s_float);
return (x);
diff --git a/gui/gcanvas.c b/gui/gcanvas.c
index a2af592..1cf97fc 100644
--- a/gui/gcanvas.c
+++ b/gui/gcanvas.c
@@ -50,28 +50,28 @@ typedef struct _gcanvas
static void rectangle(void* cv,void* o,int c,int x, int y,int w,int h,char* color) {
sys_vgui(".x%lx.c create rectangle \
- %d %d %d %d -tags %x%d -fill %s\n",cv,x,y,x+w,y+h,o,c,color);
+ %d %d %d %d -tags %lx%d -fill %s\n",cv,x,y,x+w,y+h,o,c,color);
}
static void move_object(void* cv,void* o,int c,int x, int y,int w,int h) {
- sys_vgui(".x%lx.c coords %x%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lx%d %d %d %d %d\n",
cv,o,c,x,y,x+w,y+h);
}
static void color_object(void* cv,void* o,int c,char* color) {
- sys_vgui(".x%lx.c itemconfigure %x%d -fill %s\n", cv,
+ sys_vgui(".x%lx.c itemconfigure %lx%d -fill %s\n", cv,
o, c,color);
}
static void delete_object(void* cv,void* o,int c) {
- sys_vgui(".x%lx.c delete %x%d\n",
+ sys_vgui(".x%lx.c delete %lx%d\n",
cv, o,c);
}
static void line(void* cv,void* o,int c,int x,int y,int w,int h,char* color) {
sys_vgui(".x%lx.c create line \
- %d %d %d %d -tags %x%d -fill %s\n",cv,x,y,x+w,y+h,o,c,color);
+ %d %d %d %d -tags %lx%d -fill %s\n",cv,x,y,x+w,y+h,o,c,color);
}
static void gcanvas_draw_element(t_gcanvas *x,int num)
@@ -143,13 +143,13 @@ void gcanvas_drawme(t_gcanvas *x, t_glist *glist, int firsttime)
{
int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxo%d\n",
glist_getcanvas(glist),
onset, x->x_obj.te_ypix + x->x_height - 1,
onset + IOWIDTH, x->x_obj.te_ypix + x->x_height,
x, i);
else
- sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxo%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, x->x_obj.te_ypix + x->x_height - 1,
onset + IOWIDTH, x->x_obj.te_ypix + x->x_height);
@@ -161,13 +161,13 @@ void gcanvas_drawme(t_gcanvas *x, t_glist *glist, int firsttime)
{
int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxi%d\n",
glist_getcanvas(glist),
onset, x->x_obj.te_ypix,
onset + IOWIDTH, x->x_obj.te_ypix + 1,
x, i);
else
- sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxi%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, x->x_obj.te_ypix,
onset + IOWIDTH, x->x_obj.te_ypix + 1);
@@ -189,7 +189,7 @@ void gcanvas_erase(t_gcanvas* x,t_glist* glist)
n = 3;
while (n--) {
- sys_vgui(".x%lx.c delete %xo%d\n",glist_getcanvas(glist),x,n);
+ sys_vgui(".x%lx.c delete %lxo%d\n",glist_getcanvas(glist),x,n);
}
}
diff --git a/gui/image.c b/gui/image.c
index 87e18b3..cd4aa2a 100644
--- a/gui/image.c
+++ b/gui/image.c
@@ -29,8 +29,8 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime)
canvas_makefilename(glist_getcanvas(x->x_glist), x->x_fname->s_name,
fname, MAXPDSTRING);
- sys_vgui("image create photo img%x -file {%s}\n",x,fname);
- sys_vgui(".x%lx.c create image %d %d -image img%x -tags %xS\n",
+ sys_vgui("image create photo img%lx -file {%s}\n",x,fname);
+ sys_vgui(".x%lx.c create image %d %d -image img%lx -tags %lxS\n",
glist_getcanvas(glist),text_xpix(&x->x_obj, glist),
text_ypix(&x->x_obj, glist),x,x);
@@ -39,7 +39,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime)
*/
}
else {
- sys_vgui(".x%lx.c coords %xS %d %d\n",
+ sys_vgui(".x%lx.c coords %lxS %d %d\n",
glist_getcanvas(glist), x,
text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist));
}
@@ -50,7 +50,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%lx.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %lxS\n",
glist_getcanvas(glist), x);
}
@@ -99,7 +99,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%lx.c coords %xSEL %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxSEL %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);
@@ -113,14 +113,14 @@ static void image_select(t_gobj *z, t_glist *glist, int state)
t_image *x = (t_image *)z;
if (state) {
sys_vgui(".x%lx.c create rectangle \
-%d %d %d %d -tags %xSEL -outline blue\n",
+%d %d %d %d -tags %lxSEL -outline blue\n",
glist_getcanvas(glist),
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,
x);
}
else {
- sys_vgui(".x%lx.c delete %xSEL\n",
+ sys_vgui(".x%lx.c delete %lxSEL\n",
glist_getcanvas(glist), x);
}
diff --git a/gui/toddle.c b/gui/toddle.c
index 24ade27..a848ca5 100644
--- a/gui/toddle.c
+++ b/gui/toddle.c
@@ -43,12 +43,12 @@ void toddle_drawbang(t_toddle *x,t_glist *glist,int on)
{
if (glist_isvisible(glist)) {
if (on)
- sys_vgui(".x%lx.c create oval %d %d %d %d -fill %s -tags %xB\n",glist_getcanvas(glist),
+ sys_vgui(".x%lx.c create oval %d %d %d %d -fill %s -tags %lxB\n",glist_getcanvas(glist),
x->x_obj.te_xpos+1,x->x_obj.te_ypos+1,
x->x_obj.te_xpos + x->x_width -1,
x->x_obj.te_ypos + x->x_height -1,x->x_color->s_name,x);
else
- sys_vgui(".x%lx.c delete %xB\n",
+ sys_vgui(".x%lx.c delete %lxB\n",
glist_getcanvas(glist), x);
}
}
@@ -61,7 +61,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
if (firsttime) {
#if 0
sys_vgui(".x%lx.c create line \
-%d %d %d %d %d %d %d %d %d %d -tags %xS\n",
+%d %d %d %d %d %d %d %d %d %d -tags %lxS\n",
glist_getcanvas(glist),
x->x_obj.te_xpos, x->x_obj.te_ypos,
x->x_obj.te_xpos + x->x_width, x->x_obj.te_ypos,
@@ -72,13 +72,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
#endif
sys_vgui(".x%lx.c create rectangle \
-%d %d %d %d -tags %xS "BACKGROUND"\n",
+%d %d %d %d -tags %lxS "BACKGROUND"\n",
glist_getcanvas(glist),
x->x_obj.te_xpos, x->x_obj.te_ypos,
x->x_obj.te_xpos + x->x_width, x->x_obj.te_ypos + x->x_height,
x);
sys_vgui(".x%lx.c create oval \
-%d %d %d %d -tags %xP\n",glist_getcanvas(glist),
+%d %d %d %d -tags %lxP\n",glist_getcanvas(glist),
x->x_obj.te_xpos+1,x->x_obj.te_ypos+1,
x->x_obj.te_xpos + x->x_width -1,
x->x_obj.te_ypos + x->x_height -1,x);
@@ -86,7 +86,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
}
else {
#if 0
- sys_vgui(".x%lx.c coords %xS \
+ sys_vgui(".x%lx.c coords %lxS \
%d %d %d %d %d %d %d %d %d %d\n",
glist_getcanvas(glist), x,
x->x_obj.te_xpos, x->x_obj.te_ypos,
@@ -95,14 +95,14 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
x->x_obj.te_xpos, x->x_obj.te_ypos + x->x_height,
x->x_obj.te_xpos, x->x_obj.te_ypos);
#endif
- sys_vgui(".x%lx.c coords %xS \
+ sys_vgui(".x%lx.c coords %lxS \
%d %d %d %d\n",
glist_getcanvas(glist), x,
x->x_obj.te_xpos, x->x_obj.te_ypos,
x->x_obj.te_xpos + x->x_width, x->x_obj.te_ypos + x->x_height);
- sys_vgui(".x%lx.c coords %xP \
+ sys_vgui(".x%lx.c coords %lxP \
%d %d %d %d\n",glist_getcanvas(glist),x,
x->x_obj.te_xpos+1,x->x_obj.te_ypos+1,
x->x_obj.te_xpos + x->x_width-1,
@@ -118,13 +118,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
{
int onset = x->x_obj.te_xpos + (x->x_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxo%d\n",
glist_getcanvas(glist),
onset, x->x_obj.te_ypos + x->x_height - 1,
onset + IOWIDTH, x->x_obj.te_ypos + x->x_height,
x, i);
else
- sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxo%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, x->x_obj.te_ypos + x->x_height - 1,
onset + IOWIDTH, x->x_obj.te_ypos + x->x_height);
@@ -135,13 +135,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
{
int onset = x->x_obj.te_xpos + (x->x_width - IOWIDTH) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxi%d\n",
glist_getcanvas(glist),
onset, x->x_obj.te_ypos,
onset + IOWIDTH, x->x_obj.te_ypos + 1,
x, i);
else
- sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxi%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, x->x_obj.te_ypos,
onset + IOWIDTH, x->x_obj.te_ypos + 1);
@@ -157,17 +157,17 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
void toddle_erase(t_toddle* x,t_glist* glist)
{
int n;
- sys_vgui(".x%lx.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %lxS\n",
glist_getcanvas(glist), x);
- sys_vgui(".x%lx.c delete %xP\n",
+ sys_vgui(".x%lx.c delete %lxP\n",
glist_getcanvas(glist), x);
n = 1;
while (n--) {
- sys_vgui(".x%lx.c delete %xi%d\n",glist_getcanvas(glist),x,n);
- sys_vgui(".x%lx.c delete %xo%d\n",glist_getcanvas(glist),x,n);
+ sys_vgui(".x%lx.c delete %lxi%d\n",glist_getcanvas(glist),x,n);
+ sys_vgui(".x%lx.c delete %lxo%d\n",glist_getcanvas(glist),x,n);
}
}
@@ -204,7 +204,7 @@ static void toddle_displace(t_gobj *z, t_glist *glist,
static void toddle_select(t_gobj *z, t_glist *glist, int state)
{
t_toddle *x = (t_toddle *)z;
- sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist,
+ sys_vgui(".x%lx.c itemconfigure %lxS -fill %s\n", glist,
x, (state? "blue" : BACKGROUNDCOLOR));
}
diff --git a/gui/w_envgen.h b/gui/w_envgen.h
index 75cf9d7..1927679 100644
--- a/gui/w_envgen.h
+++ b/gui/w_envgen.h
@@ -1,9 +1,13 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
-#ifdef _WIN32
+
+#ifdef _MSC_VER
#pragma warning( disable : 4244 )
#pragma warning( disable : 4305 )
+#endif
+
+#ifdef _WIN32
#define abs fabs
#endif
@@ -23,13 +27,13 @@ static void draw_inlets(t_envgen *x, t_glist *glist, int firsttime, int nin, int
{
int onset = xpos + (x->w.width-2*BORDER) * i / nplus;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxo%d\n",
glist_getcanvas(glist),
onset, ypos + x->w.height - 1 + 2*BORDER,
onset + IOWIDTH, ypos + x->w.height + 2*BORDER,
x, i);
else
- sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxo%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, ypos + x->w.height - 1 + 2*BORDER,
onset + IOWIDTH, ypos + x->w.height + 2*BORDER);
@@ -40,13 +44,13 @@ static void draw_inlets(t_envgen *x, t_glist *glist, int firsttime, int nin, int
{
int onset = xpos + (x->w.width - IOWIDTH) * i / nplus - BORDER;
if (firsttime)
- sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxi%d\n",
glist_getcanvas(glist),
onset, ypos - BORDER,
onset + IOWIDTH, ypos + 1 - BORDER,
x, i);
else
- sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxi%d %d %d %d %d\n",
glist_getcanvas(glist), x, i,
onset, ypos - BORDER,
onset + IOWIDTH, ypos + 1 - BORDER);
@@ -134,12 +138,12 @@ static void envgen_create_doodles(t_envgen *x, t_glist *glist)
xpos = text_xpix(&x->x_obj,glist);
ypos = (int) (text_ypix(&x->x_obj,glist) + x->w.height);
for (i=0;i<=x->last_state;i++) {
- sprintf(guistr,".x%lx.c create oval %d %d %d %d -tags %xD%d",(unsigned int)glist_getcanvas(glist),
+ sprintf(guistr,".x%lx.c create oval %d %d %d %d -tags %lxD%d",(long unsigned int)glist_getcanvas(glist),
(int) (xpos+(x->duration[i] * xscale) - 2),
(int) (ypos - x->finalvalues[i]*yscale - 2),
(int) (xpos+(x->duration[i] * xscale)+2),
(int) (ypos - x->finalvalues[i]*yscale + 2),
- (unsigned int)x,i);
+ (long unsigned int)x,i);
if (i == x->w.grabbed) strcat(guistr," -fill red\n");
else strcat(guistr,"\n");
@@ -153,7 +157,7 @@ static void envgen_delete_doodles(t_envgen *x, t_glist *glist)
{
int i;
for (i=0;i<=x->w.numdoodles;i++) {
- sys_vgui(".x%lx.c delete %xD%d\n",glist_getcanvas(glist),x,i);
+ sys_vgui(".x%lx.c delete %lxD%d\n",glist_getcanvas(glist),x,i);
}
}
@@ -168,7 +172,7 @@ static void envgen_update_doodles(t_envgen *x, t_glist *glist)
static void envgen_delnum(t_envgen *x)
{
- sys_vgui(".x%lx.c delete %xT\n",glist_getcanvas(x->w.glist),x);
+ sys_vgui(".x%lx.c delete %lxT\n",glist_getcanvas(x->w.glist),x);
}
@@ -186,15 +190,15 @@ static void envgen_shownum(t_envgen *x,t_glist* glist)
envgen_delnum(x);
- sys_vgui(".x%lx.c create text %d %d -text %fx%f -tags %xT\n",
- (unsigned int)glist_getcanvas(x->w.glist),
+ sys_vgui(".x%lx.c create text %d %d -text %fx%f -tags %lxT\n",
+ (long unsigned int)glist_getcanvas(x->w.glist),
(int) (xpos+(x->duration[i] * xscale) + 12),
(int) (ypos - x->finalvalues[i]*yscale - 2),
x->finalvalues[i]*(x->max-x->min),
x->duration[i],
- (unsigned int)x);
+ (long unsigned int)x);
clock_delay(x->w.numclock,700);
}
@@ -212,7 +216,7 @@ static void envgen_create(t_envgen *x, t_glist *glist)
ypos = (int) text_ypix(&x->x_obj,glist);
x->w.numclock = clock_new(x, (t_method) envgen_delnum);
sys_vgui(".x%lx.c create rectangle \
-%d %d %d %d -tags %xS -fill "BACKGROUNDCOLOR"\n",
+%d %d %d %d -tags %lxS -fill "BACKGROUNDCOLOR"\n",
glist_getcanvas(glist),
xpos-BORDER, ypos-BORDER,
xpos + x->w.width+2*BORDER, ypos + x->w.height+2*BORDER,
@@ -221,7 +225,7 @@ static void envgen_create(t_envgen *x, t_glist *glist)
xscale = x->w.width/x->duration[x->last_state];
yscale = x->w.height;
- sprintf(buf,".x%lx.c create line",(unsigned int)glist_getcanvas(glist));
+ sprintf(buf,".x%lx.c create line",(long unsigned int)glist_getcanvas(glist));
for (i=0;i<=x->last_state;i++) {
sprintf(num," %d %d ",(int)(xpos + x->duration[i]*xscale),
(int)(ypos + x->w.height- x->finalvalues[i]*yscale));
@@ -244,7 +248,7 @@ int i;
int xpos = text_xpix(&x->x_obj,glist);
int ypos = text_ypix(&x->x_obj,glist);
- sys_vgui(".x%lx.c coords %xS \
+ sys_vgui(".x%lx.c coords %lxS \
%d %d %d %d\n",
glist_getcanvas(glist), x,
xpos - BORDER, ypos -BORDER,
@@ -254,7 +258,7 @@ int i;
xscale = x->w.width/x->duration[x->last_state];
yscale = x->w.height;
- sprintf(buf,".x%lx.c coords %pP",(unsigned int)glist_getcanvas(glist),x);
+ sprintf(buf,".x%lx.c coords %pP",(long unsigned int)glist_getcanvas(glist),x);
for (i=0;i<=x->last_state;i++) {
sprintf(num," %d %d ",(int)(xpos + x->duration[i]*xscale),
@@ -284,16 +288,16 @@ void envgen_drawme(t_envgen *x, t_glist *glist, int firsttime)
void envgen_erase(t_envgen* x,t_glist* glist)
{
int n;
- sys_vgui(".x%lx.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %lxS\n",
glist_getcanvas(glist), x);
sys_vgui(".x%lx.c delete %pP\n",
glist_getcanvas(glist), x);
- sys_vgui(".x%lx.c delete %xi0\n",glist_getcanvas(glist),x);
- sys_vgui(".x%lx.c delete %xo0\n",glist_getcanvas(glist),x);
- sys_vgui(".x%lx.c delete %xo1\n",glist_getcanvas(glist),x);
+ sys_vgui(".x%lx.c delete %lxi0\n",glist_getcanvas(glist),x);
+ sys_vgui(".x%lx.c delete %lxo0\n",glist_getcanvas(glist),x);
+ sys_vgui(".x%lx.c delete %lxo1\n",glist_getcanvas(glist),x);
envgen_delete_doodles(x,glist);
}
@@ -330,7 +334,7 @@ static void envgen_displace(t_gobj *z, t_glist *glist,
static void envgen_select(t_gobj *z, t_glist *glist, int state)
{
t_envgen *x = (t_envgen *)z;
- sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist,
+ sys_vgui(".x%lx.c itemconfigure %lxS -fill %s\n", glist,
x, (state? "blue" : BACKGROUNDCOLOR));
}
@@ -453,7 +457,7 @@ static int envgen_newclick(t_envgen *x, struct _glist *glist,
if (x->resizeable && (xpos > wxpos + x->w.width) &&
(ypos > wypos)) {
x->resizing = 1;
- return;
+ return (0);
}
x->w.shift = shift;