From 07ff4ebef1da1c7dd630507d09d20581daf2192c Mon Sep 17 00:00:00 2001
From: user <user@user-ThinkPad-X60.(none)>
Date: Fri, 8 May 2015 15:19:16 -0400
Subject: [PATCH] comment out more sys_vgui calls that have been ported to
gui_vmess
---
pd/src/g_radio.c | 48 +++++++++++++++++++++++-----------------------
pd/src/g_scalar.c | 16 ++++++++--------
pd/src/g_vumeter.c | 3 ++-
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/pd/src/g_radio.c b/pd/src/g_radio.c
index 3fa7b6adf..ecc221ebb 100644
--- a/pd/src/g_radio.c
+++ b/pd/src/g_radio.c
@@ -28,10 +28,10 @@ void radio_draw_update(t_gobj *client, t_glist *glist)
t_radio *x = (t_radio *)client;
if(!glist_isvisible(glist)) return;
t_canvas *canvas=glist_getcanvas(glist);
- sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -stroke #%6.6x\n",
- canvas, x, x->x_drawn, x->x_gui.x_bcol, x->x_gui.x_bcol);
- sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -stroke #%6.6x\n",
- canvas, x, x->x_on, x->x_gui.x_fcol, x->x_gui.x_fcol);
+ //sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -stroke #%6.6x\n",
+ // canvas, x, x->x_drawn, x->x_gui.x_bcol, x->x_gui.x_bcol);
+ //sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -stroke #%6.6x\n",
+ // canvas, x, x->x_on, x->x_gui.x_fcol, x->x_gui.x_fcol);
char fcol[8], bcol[8];
sprintf(fcol, "#%6.6x", x->x_gui.x_fcol);
sprintf(bcol, "#%6.6x", x->x_gui.x_bcol);
@@ -51,19 +51,19 @@ void radio_draw_new(t_radio *x, t_glist *glist)
for(i=0; i<n; i++) if (x->x_orient) {
if (i)
{
- sys_vgui(".x%lx.c create prect %d %d %d %d "
- "-stroke $pd_colors(iemgui_border) "
- "-tags {%lxBASE%d %lxBASE x%lx text iemgui border}\n",
- canvas, x1, yi, x1+d, yi, x, i, x, x);
+ //sys_vgui(".x%lx.c create prect %d %d %d %d "
+ //"-stroke $pd_colors(iemgui_border) "
+ //"-tags {%lxBASE%d %lxBASE x%lx text iemgui border}\n",
+ //canvas, x1, yi, x1+d, yi, x, i, x, x);
gui_vmess("gui_create_radio", "ssiiiiiii",
canvas_tag(canvas), gobj_tag(x), x1, yi, x1+d, yi, i, x1, y1);
}
- sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x "
- "-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}\n",
- canvas, x1+s, yi+s, x1+d-s, yi+d-s,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- x, i, x);
+ //sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x "
+ // "-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}\n",
+ // canvas, x1+s, yi+s, x1+d-s, yi+d-s,
+ // (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ // (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ // x, i, x);
char tagbuf[MAXPDSTRING];
sprintf(tagbuf, "x%lx", (long unsigned int)x);
char colorbuf[MAXPDSTRING];
@@ -76,19 +76,19 @@ void radio_draw_new(t_radio *x, t_glist *glist)
} else {
if (i)
{
- sys_vgui(".x%lx.c create prect %d %d %d %d "
- "-stroke $pd_colors(iemgui_border) "
- "-tags {%lxBASE%d %lxBASE x%lx text iemgui border}\n",
- canvas, xi, y1, xi, y1+d, x, i, x, x);
+ //sys_vgui(".x%lx.c create prect %d %d %d %d "
+ //"-stroke $pd_colors(iemgui_border) "
+ //"-tags {%lxBASE%d %lxBASE x%lx text iemgui border}\n",
+ //canvas, xi, y1, xi, y1+d, x, i, x, x);
gui_vmess("gui_create_radio", "ssiiiiiii", canvas_tag(canvas),
gobj_tag(x), xi, y1, xi, y1+d, i, x1, y1);
}
- sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x "
- "-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}\n",
- canvas, xi+s, y1+s, xi+d-s, y1+d-s,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- x, i, x);
+ //sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x "
+ // "-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}\n",
+ // canvas, xi+s, y1+s, xi+d-s, y1+d-s,
+ // (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ // (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ // x, i, x);
char colorbuf[MAXPDSTRING];
sprintf(colorbuf, "#%6.6x", x->x_gui.x_fcol);
gui_vmess("gui_create_radio_buttons", "sssiiiiiiii",
diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c
index 834947864..018f2afbf 100644
--- a/pd/src/g_scalar.c
+++ b/pd/src/g_scalar.c
@@ -482,20 +482,20 @@ void scalar_select(t_gobj *z, t_glist *owner, int state)
if (state)
{
x->sc_selected = owner;
- sys_vgui(".x%lx.c addtag selected withtag blankscalar%lx\n",
- glist_getcanvas(owner), x);
- sys_vgui(".x%lx.c addtag scalar_selected withtag {.scalar%lx}\n",
- glist_getcanvas(owner), x->sc_vec);
+ //sys_vgui(".x%lx.c addtag selected withtag blankscalar%lx\n",
+ // glist_getcanvas(owner), x);
+ //sys_vgui(".x%lx.c addtag scalar_selected withtag {.scalar%lx}\n",
+ // glist_getcanvas(owner), x->sc_vec);
gui_vmess("gui_text_select", "ss",
canvas_tag(glist_getcanvas(owner)), tagbuf);
}
else
{
x->sc_selected = 0;
- sys_vgui(".x%lx.c dtag blankscalar%lx selected\n",
- glist_getcanvas(owner), x);
- sys_vgui(".x%lx.c dtag .scalar%lx scalar_selected\n",
- glist_getcanvas(owner), x->sc_vec);
+ //sys_vgui(".x%lx.c dtag blankscalar%lx selected\n",
+ // glist_getcanvas(owner), x);
+ //sys_vgui(".x%lx.c dtag .scalar%lx scalar_selected\n",
+ // glist_getcanvas(owner), x->sc_vec);
gui_vmess("gui_text_deselect", "ss",
canvas_tag(glist_getcanvas(owner)), tagbuf);
}
diff --git a/pd/src/g_vumeter.c b/pd/src/g_vumeter.c
index 5d338fb9a..8b570ba46 100644
--- a/pd/src/g_vumeter.c
+++ b/pd/src/g_vumeter.c
@@ -301,6 +301,7 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
iemgui_base_draw_config(&x->x_gui);
}
+/* Not sure if this is necessary anymore */
static void vu_draw_select(t_vu* x,t_glist* glist)
{
t_canvas *canvas=glist_getcanvas(glist);
@@ -505,7 +506,7 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
}
}
i=IEM_VU_STEPS+1;
- sys_vgui(".x%lx.c delete %lxSCALE%d\n", canvas, x, i);
+ //sys_vgui(".x%lx.c delete %lxSCALE%d\n", canvas, x, i);
gui_vmess("gui_erase_vumeter_text", "ssi",
canvas_tag(canvas), gobj_tag(x), i);
}
--
GitLab