aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/envgen.c17
-rw-r--r--gui/fatom.h58
-rw-r--r--gui/gcanvas.c20
-rw-r--r--gui/image.c12
-rw-r--r--gui/toddle.c34
-rw-r--r--gui/w_envgen.h36
6 files changed, 96 insertions, 81 deletions
diff --git a/gui/envgen.c b/gui/envgen.c
index 79346fc..ce79491 100644
--- a/gui/envgen.c
+++ b/gui/envgen.c
@@ -2,7 +2,7 @@
#include <m_pd.h>
-//#define DEBUG
+#define DEBUG(x) x
/* ------------------------ envgen~ ----------------------------- */
#define NONE 0
@@ -37,6 +37,7 @@ char dumpy[2000];
void envgen_resize(t_envgen* x,int ns)
{
+ DEBUG(post("envgen_"););
if (ns > x->args) {
int newargs = ns*sizeof(t_float);
@@ -50,6 +51,7 @@ void envgen_resize(t_envgen* x,int ns)
void envgen_totaldur(t_envgen* x,t_float dur)
{
+ DEBUG(post("envgen_"););
int i;
float f = dur/x->duration[x->last_state];
@@ -65,6 +67,7 @@ void envgen_totaldur(t_envgen* x,t_float dur)
static void envgen_dump(t_envgen* e)
{
+ DEBUG(post("envgen_"););
t_atom argv[50];
int argc= 0;
t_atom* a = argv;
@@ -83,6 +86,7 @@ static void envgen_dump(t_envgen* e)
void envgen_init(t_envgen *x,int argc,t_atom* argv)
{
+ DEBUG(post("envgen_"););
t_float* dur;
t_float* val;
t_float tdur = 0;
@@ -127,6 +131,7 @@ void envgen_init(t_envgen *x,int argc,t_atom* argv)
void envgen_list(t_envgen *x,t_symbol* s, int argc,t_atom* argv)
{
+ DEBUG(post("envgen_"););
envgen_init(x,argc,argv);
if (glist_isvisible(x->w.glist)) {
envgen_drawme(x, x->w.glist, 0);
@@ -135,12 +140,14 @@ void envgen_list(t_envgen *x,t_symbol* s, int argc,t_atom* argv)
void envgen_setresize(t_envgen *x, t_floatarg f)
{
+ DEBUG(post("envgen_setresize"););
x->resizeable = f;
}
void envgen_float(t_envgen *x, t_floatarg f)
{
+ DEBUG(post("envgen_float"););
int state = 0;
float val;
@@ -166,6 +173,7 @@ void envgen_float(t_envgen *x, t_floatarg f)
void envgen_bang(t_envgen *x)
{
+ DEBUG(post("envgen_bang"););
t_atom a[2];
SETFLOAT(a,x->finalvalues[NONE]);
@@ -188,6 +196,7 @@ void envgen_bang(t_envgen *x)
}
void envgen_release(t_envgen* x) {
+ DEBUG(post("envgen_release"););
t_atom a[2];
float del = x->duration[x->x_state] - x->duration[x->x_state-1];
if (x->x_state <= x->sustain_state) {
@@ -201,6 +210,7 @@ void envgen_release(t_envgen* x) {
static void envgen_sustain(t_envgen *x, t_floatarg f)
{
+ DEBUG(post("envgen_sustain"););
if (f > 0 && f < x->last_state)
x->sustain_state = f;
else
@@ -210,6 +220,7 @@ static void envgen_sustain(t_envgen *x, t_floatarg f)
static void envgen_tick(t_envgen* x)
{
+ DEBUG(post("envgen_tick"););
t_atom a[2];
x->x_state++;
if (x->x_state <= x->last_state && x->x_state != x->sustain_state) {
@@ -225,12 +236,14 @@ static void envgen_tick(t_envgen* x)
static void envgen_freeze(t_envgen* x, t_floatarg f)
{
+ DEBUG(post("envgen_freeze"););
x->x_freeze = f;
}
static void bindsym(t_pd* x,t_symbol* o,t_symbol* s)
{
+ DEBUG(post("bindsym"););
if (o != &s_) pd_unbind(x,o);
o = s;
pd_bind(x,s);
@@ -238,6 +251,7 @@ static void bindsym(t_pd* x,t_symbol* o,t_symbol* s)
static void *envgen_new(t_symbol *s,int argc,t_atom* argv)
{
+ DEBUG(post("envgen_new"););
t_envgen *x = (t_envgen *)pd_new(envgen_class);
x->args = STATES;
@@ -315,6 +329,7 @@ t_widgetbehavior envgen_widgetbehavior;
void envgen_setup(void)
{
+ DEBUG(post("envgen_setup"););
envgen_class = class_new(gensym("envgen"), (t_newmethod)envgen_new, 0,
sizeof(t_envgen), 0,A_GIMME,0);
diff --git a/gui/fatom.h b/gui/fatom.h
index 9f2dbac..c94c89b 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%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, 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%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, 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%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, text_ypix(&x->x_obj, glist),
onset + IOWIDTH, text_ypix(&x->x_obj, glist) + 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, 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%x.c create rectangle %d %d %d %d -tags %xhandle\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xhandle\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%x.c coords %xhandle %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %xhandle %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%x.c.s%x\n",glist_getcanvas(glist),x);
+ sys_vgui("destroy .x%lx.c.s%x\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%x.c.s%x \
+ sys_vgui("scale .x%lx.c.s%x \
-sliderlength 10 \
-showvalue 0 \
-length %d \
@@ -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%x.c.s%x \
+ sys_vgui("scale .x%lx.c.s%x \
-sliderlength 10 \
-showvalue 0 \
-length %d \
@@ -145,7 +145,7 @@ 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%x.c.s%x \
+ sys_vgui("checkbutton .x%lx.c.s%x \
-command { fatom_cb%x $fatom_val%x} -variable fatom_val%x -text \"%s\" \
-bg %s \
-activebackground %s \
@@ -158,7 +158,7 @@ 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%x.c.s%x%d \
+ 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);
}
/* TODO pack them */
@@ -167,14 +167,14 @@ 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%x.c.s%x%d \
+ 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);
}
/* TODO pack them */
} else {
x->x_rect_width = 32;
x->x_rect_height = 140;
- sys_vgui("scale .x%x.c.s%x \
+ sys_vgui("scale .x%lx.c.s%x \
-sliderlength 10 \
-showvalue 0 \
-length 131 \
@@ -185,11 +185,11 @@ static void create_widget(t_fatom *x, t_glist *glist)
/* set the start value */
if (!strcmp(x->x_type->s_name,"checkbutton")) {
if (x->x_val)
- sys_vgui(".x%x.c.s%x select\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%x select\n",canvas,x,x->x_val);
else
- sys_vgui(".x%x.c.s%x deselect\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%x deselect\n",canvas,x,x->x_val);
} else
- sys_vgui(".x%x.c.s%x set %f\n",canvas,x,x->x_val);
+ sys_vgui(".x%lx.c.s%x set %f\n",canvas,x,x->x_val);
}
@@ -206,12 +206,12 @@ static void fatom_drawme(t_fatom *x, t_glist *glist, int firsttime)
create_widget(x,glist);
x->x_glist = canvas;
post("create window to hold widget");
- sys_vgui(".x%x.c create window %d %d -anchor nw -window .x%x.c.s%x -tags %xS\n",
+ sys_vgui(".x%lx.c create window %d %d -anchor nw -window .x%lx.c.s%x -tags %xS\n",
canvas,text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)+2,x->x_glist,x,x);
}
else {
- sys_vgui(".x%x.c coords %xS \
+ sys_vgui(".x%lx.c coords %xS \
%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%x.c.s%x\n",glist_getcanvas(glist),x);
+ sys_vgui("destroy .x%lx.c.s%x\n",glist_getcanvas(glist),x);
- sys_vgui(".x%x.c delete %xS\n",glist_getcanvas(glist), x);
+ sys_vgui(".x%lx.c delete %xS\n",glist_getcanvas(glist), x);
/* inlets and outlets */
- sys_vgui(".x%x.c delete %xi%d\n",glist_getcanvas(glist),x,0);
- sys_vgui(".x%x.c delete %xo%d\n",glist_getcanvas(glist),x,0);
- sys_vgui(".x%x.c delete %xhandle\n",glist_getcanvas(glist),x,0);
+ 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);
}
@@ -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%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_rect_width, text_ypix(&x->x_obj, glist) + x->x_rect_height);
@@ -281,7 +281,7 @@ static void fatom_select(t_gobj *z, t_glist *glist, int state)
{
t_fatom *x = (t_fatom *)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),
@@ -289,7 +289,7 @@ static void fatom_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);
}
@@ -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%x.c.s%x select\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%x select\n",x->x_glist,x,f);
else
- sys_vgui(".x%x.c.s%x deselect\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%x deselect\n",x->x_glist,x,f);
} else
- sys_vgui(".x%x.c.s%x set %f\n",x->x_glist,x,f);
+ sys_vgui(".x%lx.c.s%x set %f\n",x->x_glist,x,f);
}
outlet_float(x->x_obj.ob_outlet,f);
}
diff --git a/gui/gcanvas.c b/gui/gcanvas.c
index f5661d1..a2af592 100644
--- a/gui/gcanvas.c
+++ b/gui/gcanvas.c
@@ -49,28 +49,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%x.c create rectangle \
+ 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);
}
static void move_object(void* cv,void* o,int c,int x, int y,int w,int h) {
- sys_vgui(".x%x.c coords %x%d %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %x%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%x.c itemconfigure %x%d -fill %s\n", cv,
+ sys_vgui(".x%lx.c itemconfigure %x%d -fill %s\n", cv,
o, c,color);
}
static void delete_object(void* cv,void* o,int c) {
- sys_vgui(".x%x.c delete %x%d\n",
+ sys_vgui(".x%lx.c delete %x%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%x.c create line \
+ 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);
}
@@ -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%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, 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%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, 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%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, x->x_obj.te_ypix,
onset + IOWIDTH, x->x_obj.te_ypix + 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, 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%x.c delete %xo%d\n",glist_getcanvas(glist),x,n);
+ sys_vgui(".x%lx.c delete %xo%d\n",glist_getcanvas(glist),x,n);
}
}
diff --git a/gui/image.c b/gui/image.c
index 471867b..87e18b3 100644
--- a/gui/image.c
+++ b/gui/image.c
@@ -30,7 +30,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime)
fname, MAXPDSTRING);
sys_vgui("image create photo img%x -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);
@@ -39,7 +39,7 @@ void image_drawme(t_image *x, t_glist *glist, int firsttime)
*/
}
else {
- sys_vgui(".x%x.c coords %xS %d %d\n",
+ 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));
}
@@ -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%x.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %xS\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%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);
@@ -112,7 +112,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),
@@ -120,7 +120,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);
}
diff --git a/gui/toddle.c b/gui/toddle.c
index d7b9f31..24ade27 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%x.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 %xB\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%x.c delete %xB\n",
+ sys_vgui(".x%lx.c delete %xB\n",
glist_getcanvas(glist), x);
}
}
@@ -60,7 +60,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
{
if (firsttime) {
#if 0
- sys_vgui(".x%x.c create line \
+ sys_vgui(".x%lx.c create line \
%d %d %d %d %d %d %d %d %d %d -tags %xS\n",
glist_getcanvas(glist),
x->x_obj.te_xpos, x->x_obj.te_ypos,
@@ -71,13 +71,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
x);
#endif
- 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),
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%x.c create oval \
+ sys_vgui(".x%lx.c create oval \
%d %d %d %d -tags %xP\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,
@@ -86,7 +86,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime)
}
else {
#if 0
- sys_vgui(".x%x.c coords %xS \
+ sys_vgui(".x%lx.c coords %xS \
%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%x.c coords %xS \
+ sys_vgui(".x%lx.c coords %xS \
%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%x.c coords %xP \
+ sys_vgui(".x%lx.c coords %xP \
%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%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, 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%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, 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%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, x->x_obj.te_ypos,
onset + IOWIDTH, x->x_obj.te_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, 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%x.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %xS\n",
glist_getcanvas(glist), x);
- sys_vgui(".x%x.c delete %xP\n",
+ sys_vgui(".x%lx.c delete %xP\n",
glist_getcanvas(glist), x);
n = 1;
while (n--) {
- sys_vgui(".x%x.c delete %xi%d\n",glist_getcanvas(glist),x,n);
- sys_vgui(".x%x.c delete %xo%d\n",glist_getcanvas(glist),x,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);
}
}
@@ -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%x.c itemconfigure %xS -fill %s\n", glist,
+ sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist,
x, (state? "blue" : BACKGROUNDCOLOR));
}
diff --git a/gui/w_envgen.h b/gui/w_envgen.h
index f664d66..75cf9d7 100644
--- a/gui/w_envgen.h
+++ b/gui/w_envgen.h
@@ -23,13 +23,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%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->w.height - 1 + 2*BORDER,
onset + IOWIDTH, ypos + x->w.height + 2*BORDER,
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->w.height - 1 + 2*BORDER,
onset + IOWIDTH, ypos + x->w.height + 2*BORDER);
@@ -40,13 +40,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%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 - BORDER,
onset + IOWIDTH, ypos + 1 - BORDER,
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 - BORDER,
onset + IOWIDTH, ypos + 1 - BORDER);
@@ -134,7 +134,7 @@ 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%x.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 %xD%d",(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),
@@ -153,7 +153,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%x.c delete %xD%d\n",glist_getcanvas(glist),x,i);
+ sys_vgui(".x%lx.c delete %xD%d\n",glist_getcanvas(glist),x,i);
}
}
@@ -168,7 +168,7 @@ static void envgen_update_doodles(t_envgen *x, t_glist *glist)
static void envgen_delnum(t_envgen *x)
{
- sys_vgui(".x%x.c delete %xT\n",glist_getcanvas(x->w.glist),x);
+ sys_vgui(".x%lx.c delete %xT\n",glist_getcanvas(x->w.glist),x);
}
@@ -186,7 +186,7 @@ static void envgen_shownum(t_envgen *x,t_glist* glist)
envgen_delnum(x);
- sys_vgui(".x%x.c create text %d %d -text %fx%f -tags %xT\n",
+ sys_vgui(".x%lx.c create text %d %d -text %fx%f -tags %xT\n",
(unsigned int)glist_getcanvas(x->w.glist),
(int) (xpos+(x->duration[i] * xscale) + 12),
@@ -211,7 +211,7 @@ static void envgen_create(t_envgen *x, t_glist *glist)
xpos = text_xpix(&x->x_obj,glist);
ypos = (int) text_ypix(&x->x_obj,glist);
x->w.numclock = clock_new(x, (t_method) envgen_delnum);
- sys_vgui(".x%x.c create rectangle \
+ sys_vgui(".x%lx.c create rectangle \
%d %d %d %d -tags %xS -fill "BACKGROUNDCOLOR"\n",
glist_getcanvas(glist),
xpos-BORDER, ypos-BORDER,
@@ -221,7 +221,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%x.c create line",(unsigned int)glist_getcanvas(glist));
+ sprintf(buf,".x%lx.c create line",(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 +244,7 @@ int i;
int xpos = text_xpix(&x->x_obj,glist);
int ypos = text_ypix(&x->x_obj,glist);
- sys_vgui(".x%x.c coords %xS \
+ sys_vgui(".x%lx.c coords %xS \
%d %d %d %d\n",
glist_getcanvas(glist), x,
xpos - BORDER, ypos -BORDER,
@@ -254,7 +254,7 @@ int i;
xscale = x->w.width/x->duration[x->last_state];
yscale = x->w.height;
- sprintf(buf,".x%x.c coords %pP",(unsigned int)glist_getcanvas(glist),x);
+ sprintf(buf,".x%lx.c coords %pP",(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 +284,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%x.c delete %xS\n",
+ sys_vgui(".x%lx.c delete %xS\n",
glist_getcanvas(glist), x);
- sys_vgui(".x%x.c delete %pP\n",
+ sys_vgui(".x%lx.c delete %pP\n",
glist_getcanvas(glist), x);
- sys_vgui(".x%x.c delete %xi0\n",glist_getcanvas(glist),x);
- sys_vgui(".x%x.c delete %xo0\n",glist_getcanvas(glist),x);
- sys_vgui(".x%x.c delete %xo1\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);
envgen_delete_doodles(x,glist);
}
@@ -330,7 +330,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%x.c itemconfigure %xS -fill %s\n", glist,
+ sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist,
x, (state? "blue" : BACKGROUNDCOLOR));
}