diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index 28bda782ecaf31fcd916270efbfe6060af24a4dc..f4e723a62d9264697e6529be0a911b26260b2876 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -344,7 +344,8 @@ function pd_geo_string(w, h, x, y) {
// quick hack so that we can paste pd code from clipboard and
// have it affect an empty canvas' geometry
-function gui_change_patch_window_geometry(cid, w, h, x, y) {
+// requires nw.js API
+function gui_canvas_change_geometry(cid, w, h, x, y) {
patchwin[cid].width = w;
patchwin[cid].height = h + 23; // 23 is a kludge to account for menubar
patchwin[cid].x = x;
@@ -486,7 +487,8 @@ function menu_new () {
exports.menu_new = menu_new;
-function gui_close_window(cid) {
+// requires nw.js API
+function gui_window_close(cid) {
nw_close_window(patchwin[cid]);
// remove reference to the window from patchwin object
patchwin[cid] = null;
@@ -577,7 +579,7 @@ function gui_canvas_menuclose(cid_for_dialog, cid, force) {
}, 450);
}
-function gui_pd_quit_dialog() {
+function gui_quit_dialog() {
var reply = pd_window.window.confirm("Really quit?");
if (reply === true) {
pdsend("pd quit");
@@ -595,11 +597,13 @@ function menu_send(name) {
}
}
-function gui_set_editmode(cid, state) {
+// requires nw.js API (Menuitem)
+function gui_canvas_set_editmode(cid, state) {
patchwin[cid].window.set_editmode_checkbox(state !== 0 ? true : false);
}
-function gui_set_cordinspector(cid, state) {
+// requires nw.js API (Menuitem)
+function gui_canvas_set_cordinspector(cid, state) {
patchwin[cid].window.set_cord_inspector_checkbox(state !== 0 ? true : false);
}
@@ -1330,7 +1334,7 @@ function add_gobj_to_svg(svg, gobj) {
// In the future, it might make sense to combine the scalar and object
// creation, in which case a flag to toggle the offset would be appropriate.
-function gui_text_create_gobj(cid, tag, type, xpos, ypos, is_toplevel) {
+function gui_gobj_new(cid, tag, type, xpos, ypos, is_toplevel) {
var svg = get_item(cid, "patchsvg"), // id for the svg element
g,
transform_string;
@@ -1347,7 +1351,7 @@ function gui_text_create_gobj(cid, tag, type, xpos, ypos, is_toplevel) {
return g;
}
-function gui_text_drawborder(cid, tag, bgcolor, isbroken, x1, y1, x2, y2) {
+function gui_text_draw_border(cid, tag, bgcolor, isbroken, x1, y1, x2, y2) {
var g = get_gobj(cid, tag),
rect;
// isbroken means either
@@ -1365,7 +1369,7 @@ function gui_text_drawborder(cid, tag, bgcolor, isbroken, x1, y1, x2, y2) {
g.appendChild(rect);
}
-function gui_canvas_drawio(cid, parenttag, tag, x1, y1, x2, y2, basex, basey,
+function gui_gobj_draw_io(cid, parenttag, tag, x1, y1, x2, y2, basex, basey,
type, i, is_signal, is_iemgui) {
var xlet_class, xlet_id, rect, g = get_gobj(cid, parenttag);
if (is_iemgui) {
@@ -1395,7 +1399,7 @@ function gui_canvas_drawio(cid, parenttag, tag, x1, y1, x2, y2, basex, basey,
g.appendChild(rect);
}
-function gui_canvas_redraw_io(cid, parenttag, tag, x, y, type, i, basex, basey) {
+function gui_gobj_redraw_io(cid, parenttag, tag, x, y, type, i, basex, basey) {
var xlet = get_item(cid, tag + type + i);
// We have to check for null. Here's why...
// if you create a gatom:
@@ -1409,12 +1413,12 @@ function gui_canvas_redraw_io(cid, parenttag, tag, x, y, type, i, basex, basey)
}
}
-function gui_eraseio(cid, tag) {
+function gui_gobj_erase_io(cid, tag) {
var xlet = get_item(cid, tag);
xlet.parentNode.removeChild(xlet);
}
-function gui_configure_io(cid, tag, is_iemgui, is_signal, width) {
+function gui_gobj_configure_io(cid, tag, is_iemgui, is_signal, width) {
var xlet = get_item(cid, tag);
// We have to check for null here. Empty/broken object boxes
// can have "phantom" xlets as placeholders for connections
@@ -1437,15 +1441,15 @@ function gui_configure_io(cid, tag, is_iemgui, is_signal, width) {
}
}
-function gui_highlight_io(cid, tag) {
+function gui_gobj_highlight_io(cid, tag) {
var xlet = get_item(cid, tag);
- // must check for null (see gui_configure_io)
+ // must check for null (see gui_gobj_configure_io)
if (xlet !== null) {
xlet.classList.add("xlet_selected");
}
}
-function gui_message_drawborder(cid,tag,width,height) {
+function gui_message_draw_border(cid,tag,width,height) {
var g = get_gobj(cid, tag),
p_array = [0,0,
width+4, 0,
@@ -1484,7 +1488,7 @@ function gui_message_redraw_border(cid,tag,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p1
}
-function gui_atom_drawborder(cid,tag,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) {
+function gui_atom_draw_border(cid,tag,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) {
var p_array = [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12],
g = get_gobj(cid, tag),
polygon;
@@ -1550,7 +1554,7 @@ function gui_canvas_delete_line(cid, tag) {
}
}
-function gui_canvas_updateline(cid,tag,x1,y1,x2,y2,yoff) {
+function gui_canvas_update_line(cid,tag,x1,y1,x2,y2,yoff) {
var halfx = parseInt((x2 - x1)/2),
halfy = parseInt((y2 - y1)/2),
cord = get_item(cid, tag),
@@ -1812,7 +1816,7 @@ function gui_canvas_displace_withtag(name, dx, dy) {
//}
}
-function gui_create_selection_rectangle(cid, x1, y1, x2, y2) {
+function gui_canvas_draw_selection(cid, x1, y1, x2, y2) {
var svg = get_item(cid, "patchsvg"),
rect,
points_array = [x1 + 0.5, y1 + 0.5,
@@ -1831,21 +1835,21 @@ function gui_create_selection_rectangle(cid, x1, y1, x2, y2) {
svg.appendChild(rect);
}
-function gui_move_selection_rectangle(cid, x1, y1, x2, y2) {
+function gui_canvas_move_selection(cid, x1, y1, x2, y2) {
var rect = get_item(cid, "selection_rectangle"),
points_array = [x1 + 0.5, y1 + 0.5, x2 + 0.5, y1 + 0.5,
x2 + 0.5, y2 + 0.5, x1 + 0.5, y2 + 0.5];
configure_item(rect, { points: points_array });
}
-function gui_hide_selection_rectangle(cid) {
+function gui_canvas_hide_selection(cid) {
var rect = get_item(cid, "selection_rectangle");
rect.parentElement.removeChild(rect);
}
// iemguis
-function gui_create_bng(cid, tag, cx, cy, radius) {
+function gui_bng_new(cid, tag, cx, cy, radius) {
var g = get_gobj(cid, tag),
circle = create_item(cid, "circle", {
cx: cx,
@@ -1881,7 +1885,7 @@ function gui_bng_configure(cid, tag, x_color, cx, cy, r) {
});
}
-function gui_create_toggle(cid, tag, x_color, width, state, p1,p2,p3,p4,p5,p6,p7,p8,basex,basey) {
+function gui_toggle_new(cid, tag, x_color, width, state, p1,p2,p3,p4,p5,p6,p7,p8,basex,basey) {
var g = get_gobj(cid, tag),
points_array,
cross1, cross2;
@@ -1960,10 +1964,10 @@ function numbox_data_string(w, h) {
}
// Todo: send fewer parameters from c
-function gui_create_numbox(cid, tag, x_color, x, y, w, h, is_toplevel) {
+function gui_numbox_new(cid, tag, x_color, x, y, w, h, is_toplevel) {
// numbox doesn't have a standard iemgui border,
// so we must create its gobj manually
- var g = gui_text_create_gobj(cid, tag, "iemgui", x, y, is_toplevel),
+ var g = gui_gobj_new(cid, tag, "iemgui", x, y, is_toplevel),
data,
border;
data = numbox_data_string(w, h);
@@ -1985,7 +1989,7 @@ function gui_numbox_coords(cid, tag, w, h) {
});
}
-function gui_numbox_drawtext(cid,tag,text,font_size,x_color,xpos,ypos,basex,basey) {
+function gui_numbox_draw_text(cid,tag,text,font_size,x_color,xpos,ypos,basex,basey) {
// kludge alert -- I'm not sure why I need to add half to the ypos
// below. But it works for most font sizes.
var g = get_gobj(cid, tag),
@@ -2002,7 +2006,7 @@ function gui_numbox_drawtext(cid,tag,text,font_size,x_color,xpos,ypos,basex,base
g.appendChild(svg_text);
}
-function gui_update_numbox(cid, tag, x_fcolor, x_bgcolor, font_name, font_size, font_weight) {
+function gui_numbox_update(cid, tag, x_fcolor, x_bgcolor, font_name, font_size, font_weight) {
var b = get_item(cid, tag + "border"),
text = get_item(cid, tag + "text"),
label = get_item(cid, tag + "label");
@@ -2014,14 +2018,14 @@ function gui_update_numbox(cid, tag, x_fcolor, x_bgcolor, font_name, font_size,
}
}
-function gui_update_numbox_text_position(cid, tag, x, y) {
+function gui_numbox_update_text_position(cid, tag, x, y) {
var text = get_item(cid, tag + "text");
configure_item(text, {
transform: "translate( " + x + "," + ((y + y*0.5)|0) + ")"
});
}
-function gui_create_slider(cid,tag,x_color,p1,p2,p3,p4,basex, basey) {
+function gui_slider_new(cid,tag,x_color,p1,p2,p3,p4,basex, basey) {
var g = get_gobj(cid, tag),
indicator;
indicator = create_item(cid, "line", {
@@ -2055,7 +2059,7 @@ function gui_slider_indicator_color(cid, tag, x_color) {
});
}
-function gui_create_radio(cid,tag,p1,p2,p3,p4,i,basex,basey) {
+function gui_radio_new(cid,tag,p1,p2,p3,p4,i,basex,basey) {
var g = get_gobj(cid, tag),
cell;
cell = create_item(cid, "line", {
@@ -2072,7 +2076,7 @@ function gui_create_radio(cid,tag,p1,p2,p3,p4,i,basex,basey) {
g.appendChild(cell);
}
-function gui_create_radio_buttons(cid,tag,x_color,p1,p2,p3,p4,basex,basey,i,state) {
+function gui_radio_create_buttons(cid,tag,x_color,p1,p2,p3,p4,basex,basey,i,state) {
var g = get_gobj(cid, tag),
b;
b = create_item(cid, "rect", {
@@ -2120,7 +2124,7 @@ function gui_radio_update(cid,tag,x_fgcolor,prev,next) {
});
}
-function gui_create_vumeter_text(cid,tag,x_color,xpos,ypos,text,index,basex,basey, font_size, font_weight) {
+function gui_vumeter_draw_text(cid,tag,x_color,xpos,ypos,text,index,basex,basey, font_size, font_weight) {
var g = get_gobj(cid, tag),
svg_text = create_item(cid, "text", {
x: xpos - basex,
@@ -2144,7 +2148,7 @@ function gui_create_vumeter_text(cid,tag,x_color,xpos,ypos,text,index,basex,base
// c) recreate all the missing labels
// To get on to other work we just parrot the insanity here,
// and silently ignore calls to update non-existent text.
-function gui_update_vumeter_text(cid, tag, text, font, selected, x_color, i) {
+function gui_vumeter_update_text(cid, tag, text, font, selected, x_color, i) {
var svg_text = get_item(cid, tag + "text_" + i);
if (!selected) {
// Hack...
@@ -2159,12 +2163,12 @@ function gui_vumeter_text_coords(cid, tag, i, xpos, ypos, basex, basey) {
configure_item(t, { x: xpos - basex, y: ypos - basey });
}
-function gui_erase_vumeter_text(cid, tag, i) {
+function gui_vumeter_erase_text(cid, tag, i) {
var t = get_item(cid, tag + "text_" + i);
t.parentNode.removeChild(t);
}
-function gui_create_vumeter_steps(cid,tag,x_color,p1,p2,p3,p4,width,index,basex,basey,i) {
+function gui_vumeter_create_steps(cid,tag,x_color,p1,p2,p3,p4,width,index,basex,basey,i) {
var g = get_gobj(cid, tag),
l;
l = create_item(cid, "line", {
@@ -2179,12 +2183,12 @@ function gui_create_vumeter_steps(cid,tag,x_color,p1,p2,p3,p4,width,index,basex,
g.appendChild(l);
}
-function gui_update_vumeter_steps(cid, tag, i, width) {
+function gui_vumeter_update_steps(cid, tag, i, width) {
var step = get_item(cid, tag + "led_" + i);
configure_item(step, { "stroke-width": width });
}
-function gui_update_vumeter_step_coords(cid,tag,i,x1,y1,x2,y2,basex,basey) {
+function gui_vumeter_update_step_coords(cid,tag,i,x1,y1,x2,y2,basex,basey) {
var l = get_item(cid, tag + "led_" + i);
configure_item(l, {
x1: x1 - basex,
@@ -2194,7 +2198,7 @@ function gui_update_vumeter_step_coords(cid,tag,i,x1,y1,x2,y2,basex,basey) {
});
}
-function gui_create_vumeter_rect(cid,tag,x_color,p1,p2,p3,p4,basex,basey) {
+function gui_vumeter_draw_rect(cid,tag,x_color,p1,p2,p3,p4,basex,basey) {
var g = get_gobj(cid, tag),
rect;
rect = create_item(cid, "rect", {
@@ -2209,7 +2213,7 @@ function gui_create_vumeter_rect(cid,tag,x_color,p1,p2,p3,p4,basex,basey) {
g.appendChild(rect);
}
-function gui_update_vumeter_rect(cid, tag, x_color) {
+function gui_vumeter_update_rect(cid, tag, x_color) {
var r = get_item(cid, tag + "rect");
configure_item(r, { fill: x2h(x_color), stroke: x2h(x_color) });
}
@@ -2227,12 +2231,12 @@ function gui_vumeter_border_size(cid, tag, width, height) {
}
}
-function gui_update_vumeter_peak(cid, tag, width) {
+function gui_vumeter_update_peak_width(cid, tag, width) {
var r = get_item(cid, tag + "rect");
configure_item(r, { "stroke-width": width });
}
-function gui_create_vumeter_peak(cid,tag,color,p1,p2,p3,p4,width,basex,basey) {
+function gui_vumeter_draw_peak(cid,tag,color,p1,p2,p3,p4,width,basex,basey) {
var g = get_gobj(cid, tag),
line;
line = create_item(cid, "line", {
@@ -2269,26 +2273,9 @@ function gui_vumeter_update_peak(cid,tag,x_color,p1,p2,p3,p4,basex,basey) {
});
}
-// Think about merging with gui_text_drawborder
-function gui_iemgui_drawborder(cid, tag, bgcolor, x1, y1, x2, y2) {
- var g = get_gobj(cid, tag),
- rect;
- rect = create_item(cid, "rect", {
- width: x2 - x1,
- height: y2 - y1,
- fill: bgcolor,
- stroke: "black",
- "shape-rendering": "optimizeSpeed",
- "stroke-width": 1,
- class: "border"
- //id: tag + "border"
- });
- g.appendChild(rect);
-}
-
-function gui_iemgui_base_color(cid, tag, color) {
+function gui_iemgui_base_color(cid, tag, x_color) {
var b = get_gobj(cid, tag).querySelector(".border");
- configure_item(b, { fill: color });
+ configure_item(b, { fill: x2h(x_color) });
}
function gui_iemgui_move_and_resize(cid, tag, x1, y1, x2, y2) {
@@ -2441,7 +2428,7 @@ function gui_iemgui_label_show_drag_handle(cid, tag, state, x, y) {
}
}
-function gui_create_mycanvas(cid,tag,x_color,x1,y1,x2_vis,y2_vis,x2,y2) {
+function gui_mycanvas_new(cid,tag,x_color,x1,y1,x2_vis,y2_vis,x2,y2) {
var rect_vis, rect, g;
rect_vis = create_item(cid, "rect", {
width: x2_vis - x1,
@@ -2468,7 +2455,7 @@ function gui_create_mycanvas(cid,tag,x_color,x1,y1,x2_vis,y2_vis,x2,y2) {
g.appendChild(rect);
}
-function gui_update_mycanvas(cid, tag, x_color, selected) {
+function gui_mycanvas_update(cid, tag, x_color, selected) {
var r = get_item(cid, tag + "rect"),
h = get_item(cid, tag + "drag_handle");
configure_item(r, {
@@ -2484,7 +2471,7 @@ function gui_mycanvas_coords(cid, tag, vis_width, vis_height, select_width, sele
configure_item(h, { width: select_width, height: select_height });
}
-function gui_create_scalar(cid, tag, isselected, t1, t2, t3, t4, t5, t6,
+function gui_scalar_new(cid, tag, isselected, t1, t2, t3, t4, t5, t6,
is_toplevel) {
// we should probably use create_gobj here, but we"re doing some initial
// scaling that normal gobjs don't need...
@@ -2559,7 +2546,7 @@ function gui_scalar_draw_select_rect(cid, tag, state, x1, y1, x2, y2, basex, bas
}
}
-function gui_create_scalar_group(cid, tag, parent_tag, attr_array) {
+function gui_scalar_draw_group(cid, tag, parent_tag, attr_array) {
var parent_elem = get_item(cid, parent_tag),
g;
if (attr_array === undefined) {
@@ -3047,7 +3034,7 @@ function gui_graph_tick_label(cid, tag, x, y, text, font, font_size, font_weight
function gui_canvas_drawredrect(cid, x1, y1, x2, y2) {
var svgelem = get_item(cid, "patchsvg"),
- g = gui_text_create_gobj(cid, cid, "gop_rect", x1, y1, 1),
+ g = gui_gobj_new(cid, cid, "gop_rect", x1, y1, 1),
r;
r = create_item(cid, "rect", {
width: x2 - x1,
@@ -3088,7 +3075,7 @@ function gui_canvas_redrect_coords(cid, x1, y1, x2, y2) {
// For clarity, this probably shouldn't be a gobj. Also, it might be easier to
// make it a div that lives on top of the patchsvg
-function gui_create_cord_inspector(cid) {
+function gui_cord_inspector_new(cid) {
var g = get_gobj(cid, "cord_inspector"),
ci_rect = create_item(cid, "rect", { id: "cord_inspector_rect" }),
ci_poly = create_item(cid, "polygon", { id: "cord_inspector_polygon" }),
@@ -3129,7 +3116,7 @@ function gui_cord_inspector_update(cid, text, basex, basey, bg_size, y1, y2, mov
svg_text.textContent = text;
}
-function gui_erase_cord_inspector(cid) {
+function gui_cord_inspector_erase(cid) {
var ci = get_gobj(cid, "cord_inspector");
if (ci !== null) {
ci.parentNode.removeChild(ci);
@@ -3277,7 +3264,7 @@ function gui_font_dialog_change_size(did, font_size) {
}
}
-function gui_create_array(did, count) {
+function gui_array_new(did, count) {
var attr_array = [{
array_gfxstub: did,
array_name: "array" + count,
@@ -3524,7 +3511,7 @@ function gui_textarea(cid, tag, type, x, y, width_spec, height_spec, text,
// To solve this, we use 'visibility' instead of 'display', since it
// still uses the hidden item when calculating the bbox.
// (We can probably solve this problem by throwing in yet another
- // gui_canvas_getscroll, but this seems like the right way to go
+ // gui_canvas_get_scroll, but this seems like the right way to go
// anyway.)
configure_item(gobj, { visibility: "hidden" });
p = patchwin[cid].window.document.createElement("p");
@@ -3674,12 +3661,12 @@ var getscroll_var = {};
// mouse. In that case this setTimeout could keep the
// graphics from displaying until the user releases the mouse,
// which would be a buggy UI
-function gui_canvas_getscroll(cid) {
+function gui_canvas_get_scroll(cid) {
clearTimeout(getscroll_var[cid]);
getscroll_var[cid] = setTimeout(do_getscroll, 250, cid);
}
-exports.gui_canvas_getscroll = gui_canvas_getscroll;
+exports.gui_canvas_get_scroll = gui_canvas_get_scroll;
// handling the selection
function gui_lower(cid, tag) {
diff --git a/pd/src/g_all_guis.c b/pd/src/g_all_guis.c
index 800eb26369ffdfda0882344492bcd3be4fa5f165..9f30af6eb7be49171adc521e922e8a46fc49e391 100644
--- a/pd/src/g_all_guis.c
+++ b/pd/src/g_all_guis.c
@@ -1079,7 +1079,7 @@ void iemgui_draw_io(t_iemgui *x, int old_sr_flags)
for (i=0; i<n; i++)
{
sprintf(tagbuf, "%so%d", iem_get_tag(canvas, x), i);
- gui_vmess("gui_canvas_drawio", "xxsiiiiiisiii", canvas,
+ gui_vmess("gui_gobj_draw_io", "xxsiiiiiisiii", canvas,
x, tagbuf,
x1+i*k, y2-1, x1+i*k + IOWIDTH, y2, x1, y1, "o", i,
0, 1);
@@ -1090,7 +1090,7 @@ void iemgui_draw_io(t_iemgui *x, int old_sr_flags)
for (i=0; i<n; i++)
{
sprintf(tagbuf, "%so%d", iem_get_tag(canvas, x), i);
- gui_vmess("gui_eraseio", "xs",
+ gui_vmess("gui_gobj_erase_io", "xs",
canvas, tagbuf);
}
}
@@ -1104,7 +1104,7 @@ void iemgui_draw_io(t_iemgui *x, int old_sr_flags)
for (i=0; i<n; i++)
{
sprintf(tagbuf, "%si%d", iem_get_tag(canvas, x), i);
- gui_vmess("gui_canvas_drawio", "xxsiiiiiisiii", canvas,
+ gui_vmess("gui_gobj_draw_io", "xxsiiiiiisiii", canvas,
x, tagbuf,
x1+i*k, y1, x1+i*k + IOWIDTH, y1+1, x1, y1, "i", i,
0, 1);
@@ -1115,7 +1115,7 @@ void iemgui_draw_io(t_iemgui *x, int old_sr_flags)
for (i=0; i<n; i++)
{
sprintf(tagbuf, "%si%d", iem_get_tag(canvas, x), i);
- gui_vmess("gui_eraseio", "xs",
+ gui_vmess("gui_gobj_erase_io", "xs",
canvas, tagbuf);
}
}
@@ -1172,18 +1172,18 @@ void iemgui_base_draw_new(t_iemgui *x) {
c->c_wb->w_getrectfn((t_gobj *)x,x->x_glist,&x1,&y1,&x2,&y2);
//iemgui_getrect_draw(x, &x1, &y1, &x2, &y2);
gop_redraw=gr;
- gui_vmess("gui_text_create_gobj", "xxsiii", canvas, x,
- "iemgui", x1, y1, glist_istoplevel(x->x_glist));
char colorbuf[MAXPDSTRING];
sprintf(colorbuf, "#%6.6x", x->x_bcol);
- gui_vmess("gui_text_drawborder", "xxsiiiii",
+ gui_vmess("gui_gobj_new", "xxsiii", canvas, x,
+ "iemgui", x1, y1, glist_istoplevel(x->x_glist));
+ gui_vmess("gui_text_draw_border", "xxsiiiii",
canvas,
x,
colorbuf,
0,
x1, y1, x2, y2);
- gui_vmess("gui_iemgui_base_color", "xxs",
- canvas, x, colorbuf);
+ gui_vmess("gui_iemgui_base_color", "xxx",
+ canvas, x, x->x_bcol);
}
void iemgui_base_draw_move(t_iemgui *x) {
diff --git a/pd/src/g_array.c b/pd/src/g_array.c
index ae7fd8305bce39498bd71214b40351a80b9feff2..385b8d3188e5c9ab83b55e1db41b468d941f98e3 100644
--- a/pd/src/g_array.c
+++ b/pd/src/g_array.c
@@ -511,7 +511,7 @@ void canvas_menuarray(t_glist *canvas)
pd_vmess(&x->gl_pd, gensym("editmode"), "i", 1);
//char cmdbuf[200];
gcount++;
- gui_vmess("gui_create_array", "si",
+ gui_vmess("gui_array_new", "si",
gfxstub_new2(&x->gl_pd, x),
gcount);
//sprintf(cmdbuf, "pdtk_array_dialog %%s array%d 100 3 1 .x%lx black black\n",
diff --git a/pd/src/g_bang.c b/pd/src/g_bang.c
index 14aca4280b34f6f6f8451423883f004ecfca9590..38bd2bb4d729dd9e45a97c5e3ec3bb5923a816c0 100644
--- a/pd/src/g_bang.c
+++ b/pd/src/g_bang.c
@@ -52,7 +52,7 @@ void bng_draw_new(t_bng *x, t_glist *glist)
// "-tags {%lxBUT x%lx text iemgui border}\n",
// canvas, cx, cy, cr, x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol,
// x, x);
- gui_vmess("gui_create_bng", "xxfff",
+ gui_vmess("gui_bng_new", "xxfff",
canvas,
&x->x_gui,
cx - x1,
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index f6959a72511b8960de02ee37da2b42c6773f8c49..9163f030caa753f1e4de0e04b58d321da3925e46 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -162,7 +162,7 @@ static void canvas_nlet_conf (t_canvas *x, int type) {
/* this is rather confusing, but the canvas_cnct_[xlet]_tag already
includes the type and index concatenated to the end. */
- gui_vmess("gui_configure_io", "xsiii",
+ gui_vmess("gui_gobj_configure_io", "xsiii",
x, type == 'o' ? x->gl_editor->canvas_cnct_outlet_tag :
x->gl_editor->canvas_cnct_inlet_tag,
isiemgui, issignal, 1);
@@ -170,7 +170,7 @@ static void canvas_nlet_conf (t_canvas *x, int type) {
void canvas_getscroll (t_canvas *x) {
//sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",(long)x);
- gui_vmess("gui_canvas_getscroll", "x", x);
+ gui_vmess("gui_canvas_get_scroll", "x", x);
}
/* ---------------- generic widget behavior ------------------------- */
@@ -2504,7 +2504,7 @@ void canvas_vis(t_canvas *x, t_floatarg f)
if (glist_isvisible(x))
canvas_map(x, 0);
canvas_destroy_editor(x);
- gui_vmess("gui_close_window", "x", x);
+ gui_vmess("gui_window_close", "x", x);
// delete properties windows of objects in the patcher we're closing
g = x->gl_list;
while (g)
@@ -3380,7 +3380,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
(t_text *)&ob->ob_g);
sprintf(x->gl_editor->canvas_cnct_outlet_tag,
"%so%d", rtext_gettag(yr), closest);
- gui_vmess("gui_highlight_io", "xs",
+ gui_vmess("gui_gobj_highlight_io", "xs",
x,
x->gl_editor->canvas_cnct_outlet_tag);
@@ -3439,7 +3439,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
gobj_filter_highlight_behavior((t_text *)&ob->ob_g);
sprintf(x->gl_editor->canvas_cnct_inlet_tag,
"%si%d", rtext_gettag(yr), closest);
- gui_vmess("gui_highlight_io", "xs",
+ gui_vmess("gui_gobj_highlight_io", "xs",
x,
x->gl_editor->canvas_cnct_inlet_tag);
inlet_issignal = obj_issignalinlet(ob,closest);
@@ -3688,7 +3688,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
//buf->u_redo = (t_undo_sel *)canvas_undo_set_selection(x);
//canvas_undo_add(x, 11, "selection", buf);
}
- gui_vmess("gui_create_selection_rectangle", "xiiii", x,
+ gui_vmess("gui_canvas_draw_selection", "xiiii", x,
xpos, ypos, xpos, ypos);
x->gl_editor->e_xwas = xpos;
x->gl_editor->e_ywas = ypos;
@@ -3847,13 +3847,13 @@ void canvas_updateconnection(t_canvas *x, int lx1, int ly1, int lx2, int ly2,
if (tag)
{
sprintf(cord_tag, "l%lx", (long unsigned int)tag);
- gui_vmess("gui_canvas_updateline", "xsiiiii",
+ gui_vmess("gui_canvas_update_line", "xsiiiii",
x, cord_tag,
lx1, ly1, lx2, ly2, yoff);
}
else
{
- gui_vmess("gui_canvas_updateline", "xsiiiii",
+ gui_vmess("gui_canvas_update_line", "xsiiiii",
x, "newcord",
lx1, ly1, lx2, ly2, yoff);
}
@@ -4523,7 +4523,7 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
"%si%d",
rtext_gettag(y),
closest2);
- gui_vmess("gui_highlight_io", "xs",
+ gui_vmess("gui_gobj_highlight_io", "xs",
x,
x->gl_editor->canvas_cnct_inlet_tag);
@@ -4604,12 +4604,12 @@ static void canvas_doregion(t_canvas *x, int xpos, int ypos, int doit)
loy = x->gl_editor->e_ywas, hiy = ypos;
else hiy = x->gl_editor->e_ywas, loy = ypos;
canvas_selectinrect(x, lox, loy, hix, hiy);
- gui_vmess("gui_hide_selection_rectangle", "x", x);
+ gui_vmess("gui_canvas_hide_selection", "x", x);
x->gl_editor->e_onmotion = MA_NONE;
}
else
{
- gui_vmess("gui_move_selection_rectangle", "xiiii",
+ gui_vmess("gui_canvas_move_selection", "xiiii",
x,
x->gl_editor->e_xwas, x->gl_editor->e_ywas, xpos, ypos);
}
@@ -5023,7 +5023,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
{
canvas_setcursor(x, down ?
CURSOR_RUNMODE_NOTHING : CURSOR_EDITMODE_NOTHING);
- gui_vmess("gui_set_editmode", "xi",
+ gui_vmess("gui_canvas_set_editmode", "xi",
x,
down ? 0 : 1);
if(x->gl_editor && x->gl_editor->gl_magic_glass)
@@ -5317,7 +5317,7 @@ void glob_verifyquit(void *dummy, t_floatarg f)
}
if (f == 0 && sys_perf)
{
- gui_vmess("gui_pd_quit_dialog", "");
+ gui_vmess("gui_quit_dialog", "");
}
else
{
@@ -6109,7 +6109,7 @@ static void canvas_dopaste(t_canvas *x, t_binbuf *b)
x->gl_screeny2 = screeny1 + screeny2;
//canvas_setbounds(x, screenx1, screeny1,
// screenx1+screenx2, screeny1+screeny2);
- gui_vmess("gui_change_patch_window_geometry", "xiiii",
+ gui_vmess("gui_canvas_change_geometry", "xiiii",
x,
(int)(x->gl_screenx2 - x->gl_screenx1),
(int)(x->gl_screeny2 - x->gl_screeny1),
@@ -7141,7 +7141,7 @@ void canvas_editmode(t_canvas *x, t_floatarg fyesplease)
if (glist_isvisible(x))
{
int edit = !glob_ctrl && x->gl_edit;
- gui_vmess("gui_set_editmode", "xi",
+ gui_vmess("gui_canvas_set_editmode", "xi",
glist_getcanvas(x),
edit);
}
@@ -7167,7 +7167,7 @@ void canvas_magicglass(t_canvas *x, t_floatarg fyesplease)
magicGlass_setOn(x->gl_editor->gl_magic_glass, 0);
magicGlass_hide(x->gl_editor->gl_magic_glass);
}
- gui_vmess("gui_set_cordinspector", "xi",
+ gui_vmess("gui_canvas_set_cordinspector", "xi",
glist_getcanvas(x),
magicGlass_isOn(x->gl_editor->gl_magic_glass));
}
diff --git a/pd/src/g_graph.c b/pd/src/g_graph.c
index 69f96bfbac577bb5eb71c9b74fb414bebd9e1248..82abc96b465d35c91ad4ba31e2e04c273e94e730 100644
--- a/pd/src/g_graph.c
+++ b/pd/src/g_graph.c
@@ -504,7 +504,7 @@ void canvas_resortinlets(t_canvas *x)
// "$signal_nlet" : "$pd_colors_control_nlet)"));
sprintf(xlet_tag, "%si%d", rtext_gettag(rt), i);
char xlet_tag[MAXPDSTRING];
- gui_vmess("gui_configure_io", "xsiii",
+ gui_vmess("gui_gobj_configure_io", "xsiii",
x,
xlet_tag,
0,
@@ -902,7 +902,7 @@ static void graph_vis(t_gobj *gr, t_glist *parent_glist, int vis)
int xpix, ypix;
xpix = text_xpix(&x->gl_obj, parent_glist);
ypix = text_ypix(&x->gl_obj, parent_glist);
- gui_vmess("gui_text_create_gobj", "xssiii",
+ gui_vmess("gui_gobj_new", "xssiii",
glist_getcanvas(x->gl_owner),
tag, "graph", xpix, ypix, 1);
if (canvas_showtext(x))
@@ -934,7 +934,7 @@ static void graph_vis(t_gobj *gr, t_glist *parent_glist, int vis)
{
if (vis && gobj_shouldvis(gr, parent_glist))
{
- gui_vmess("gui_text_drawborder", "xssiiiii",
+ gui_vmess("gui_text_draw_border", "xssiiiii",
glist_getcanvas(x->gl_owner),
tag,
"none",
@@ -964,7 +964,7 @@ static void graph_vis(t_gobj *gr, t_glist *parent_glist, int vis)
char tagbuf[MAXPDSTRING];
sprintf(tagbuf, "%sR", tag);
- gui_vmess("gui_text_drawborder", "xssiiiii",
+ gui_vmess("gui_text_draw_border", "xssiiiii",
glist_getcanvas(x->gl_owner),
tag,
"none",
diff --git a/pd/src/g_magicglass.c b/pd/src/g_magicglass.c
index 6b0e951ebf179f9fa7321ff842ec3fd2c186bdbb..3c73bb0681106e9e83f0133bd26740e27ac77ad1 100644
--- a/pd/src/g_magicglass.c
+++ b/pd/src/g_magicglass.c
@@ -108,9 +108,9 @@ void magicGlass_updateText(t_magicGlass *x, int moved)
void magicGlass_drawNew(t_magicGlass *x)
{
- gui_vmess("gui_text_create_gobj", "xssiii",
+ gui_vmess("gui_gobj_new", "xssiii",
x->x_c, "cord_inspector", "cord_inspector", 0, 0, 0);
- gui_vmess("gui_create_cord_inspector", "x",
+ gui_vmess("gui_cord_inspector_new", "x",
x->x_c);
magicGlass_updateText(x, 0);
clock_delay(x->x_flashClock, MG_CLOCK_FLASH_DELAY);
@@ -119,7 +119,7 @@ void magicGlass_drawNew(t_magicGlass *x)
void magicGlass_undraw(t_magicGlass *x)
{
//fprintf(stderr,"magicglass_undraw\n");
- gui_vmess("gui_erase_cord_inspector", "x",
+ gui_vmess("gui_cord_inspector_erase", "x",
x->x_c);
}
diff --git a/pd/src/g_mycanvas.c b/pd/src/g_mycanvas.c
index 67ce8061324604ddddee839db49ed701e99b55d9..e7eafdb8dae2d23554d27f6700fb6a204d71038e 100644
--- a/pd/src/g_mycanvas.c
+++ b/pd/src/g_mycanvas.c
@@ -25,9 +25,9 @@ void my_canvas_draw_new(t_my_canvas *x, t_glist *glist)
int x1=text_xpix(&x->x_gui.x_obj, glist);
int y1=text_ypix(&x->x_gui.x_obj, glist);
- gui_vmess("gui_text_create_gobj", "xxsiii", canvas,
+ gui_vmess("gui_gobj_new", "xxsiii", canvas,
x, "iemgui", x1, y1, glist_istoplevel(canvas));
- gui_vmess("gui_create_mycanvas", "xxxiiiiii", canvas,
+ gui_vmess("gui_mycanvas_new", "xxxiiiiii", canvas,
x, x->x_gui.x_bcol, x1, y1, x1+x->x_vis_w, y1+x->x_vis_h,
x1+x->x_gui.x_w, y1+x->x_gui.x_h);
}
@@ -49,7 +49,7 @@ void my_canvas_draw_config(t_my_canvas* x, t_glist* glist)
t_canvas *canvas=glist_getcanvas(glist);
int isselected;
isselected = x->x_gui.x_selected == canvas && x->x_gui.x_glist == canvas;
- gui_vmess("gui_update_mycanvas", "xxxi",
+ gui_vmess("gui_mycanvas_update", "xxxi",
canvas, x, x->x_gui.x_bcol, isselected);
}
diff --git a/pd/src/g_numbox.c b/pd/src/g_numbox.c
index 37e2e71fe0c399dfd8edd9f59ded2fbdb4fbf8e6..28982d86e7af407b2fae2e7098ec8391505cff32 100644
--- a/pd/src/g_numbox.c
+++ b/pd/src/g_numbox.c
@@ -162,7 +162,7 @@ static void my_numbox_draw_new(t_my_numbox *x, t_glist *glist)
int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_numwidth;
int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h;
- gui_vmess("gui_create_numbox", "xxxiiiii",
+ gui_vmess("gui_numbox_new", "xxxiiiii",
canvas,
x,
x->x_gui.x_bcol,
@@ -181,7 +181,7 @@ static void my_numbox_draw_new(t_my_numbox *x, t_glist *glist)
// x->x_gui.x_fcol, x, x);
}
my_numbox_ftoa(x);
- gui_vmess("gui_numbox_drawtext", "xxsixiiii",
+ gui_vmess("gui_numbox_draw_text", "xxsixiiii",
canvas,
x,
x->x_buf,
@@ -215,7 +215,7 @@ static void my_numbox_draw_move(t_my_numbox *x, t_glist *glist)
x2 - x1,
y2 - y1);
- gui_vmess("gui_update_numbox_text_position", "xxii",
+ gui_vmess("gui_numbox_update_text_position", "xxii",
canvas,
x,
half + 2,
@@ -226,7 +226,7 @@ static void my_numbox_draw_config(t_my_numbox* x,t_glist* glist)
{
t_canvas *canvas=glist_getcanvas(glist);
int issel = x->x_gui.x_selected == canvas && x->x_gui.x_glist == canvas;
- gui_vmess("gui_update_numbox", "xxxxsii",
+ gui_vmess("gui_numbox_update", "xxxxsii",
canvas,
x,
x->x_gui.x_fcol,
diff --git a/pd/src/g_radio.c b/pd/src/g_radio.c
index 90c665871582b8123fbd44fd587c0eed8afd7910..cea78ac10f4b0903bcac05976fa7abce9332a2cd 100644
--- a/pd/src/g_radio.c
+++ b/pd/src/g_radio.c
@@ -51,10 +51,10 @@ void radio_draw_new(t_radio *x, t_glist *glist)
{
if (i)
{
- gui_vmess("gui_create_radio", "xxiiiiiii",
+ gui_vmess("gui_radio_new", "xxiiiiiii",
canvas, x, x1, yi, x1+d, yi, i, x1, y1);
}
- gui_vmess("gui_create_radio_buttons", "xxxiiiiiiii",
+ gui_vmess("gui_radio_create_buttons", "xxxiiiiiiii",
canvas, x,
x->x_gui.x_fcol,
x1+s, yi+s, x1+d-s, yi+d-s, x1, y1, i, x->x_on==i);
@@ -65,10 +65,10 @@ void radio_draw_new(t_radio *x, t_glist *glist)
{
if (i)
{
- gui_vmess("gui_create_radio", "xxiiiiiii", canvas,
+ gui_vmess("gui_radio_new", "xxiiiiiii", canvas,
x, xi, y1, xi, y1+d, i, x1, y1);
}
- gui_vmess("gui_create_radio_buttons", "xxxiiiiiiii",
+ gui_vmess("gui_radio_create_buttons", "xxxiiiiiiii",
canvas, x,
x->x_gui.x_fcol,
xi+s, y1+s, xi+d-s, yi+d-s, x1, y1, i, x->x_on==i);
diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c
index a2477b17fa1ae022f4d38b613ea5233aa8bbf0d8..b685bf4e1beff4d82cb1861a7c51b388e933549c 100644
--- a/pd/src/g_scalar.c
+++ b/pd/src/g_scalar.c
@@ -812,7 +812,7 @@ void scalar_doconfigure(t_gobj *xgobj, t_glist *owner)
(int)glist_ytopixels(owner, basey));
char groupbuf[MAXPDSTRING];
- // Quick hack to make gui_create_scalar_group more general (so we
+ // Quick hack to make gui_scalar_draw_group more general (so we
// don't have to tack on "gobj" manually)
@@ -820,7 +820,7 @@ void scalar_doconfigure(t_gobj *xgobj, t_glist *owner)
//sprintf(tagbuf, "scalar%lxgobj", (long unsigned int)x->sc_vec);
//sprintf(groupbuf, "dgroup%lx.%lx", (long unsigned int)templatecanvas,
// (long unsigned int)x->sc_vec);
- //gui_vmess("gui_create_scalar_group", "xss",
+ //gui_vmess("gui_scalar_draw_group", "xss",
// glist_getcanvas(owner), groupbuf, tagbuf);
for (y = templatecanvas->gl_list; y; y = y->g_next)
@@ -870,7 +870,7 @@ static void scalar_groupvis(t_scalar *x, t_glist *owner, t_template *template,
char parentbuf[MAXPDSTRING];
sprintf(parentbuf, "dgroup%lx.%lx", (long unsigned int)parent,
(long unsigned int)x->sc_vec);
- gui_start_vmess("gui_create_scalar_group", "xss",
+ gui_start_vmess("gui_scalar_draw_group", "xss",
glist_getcanvas(owner), tagbuf, parentbuf);
svg_grouptogui(gl, template, x->sc_vec);
gui_end_vmess();
@@ -976,7 +976,7 @@ static void scalar_vis(t_gobj *z, t_glist *owner, int vis)
understand "None"-- instead we must send an empty symbol.) */
char tagbuf[MAXPDSTRING];
sprintf(tagbuf, "scalar%lx", (long unsigned int)x->sc_vec);
- gui_vmess("gui_create_scalar", "xsiffffiii",
+ gui_vmess("gui_scalar_new", "xsiffffiii",
glist_getcanvas(owner),
tagbuf,
glist_isselected(owner, &x->sc_gobj),
@@ -985,12 +985,12 @@ static void scalar_vis(t_gobj *z, t_glist *owner, int vis)
(int)glist_ytopixels(owner, basey),
glist_istoplevel(owner));
char groupbuf[MAXPDSTRING];
- // Quick hack to make gui_create_scalar_group more general (so we
+ // Quick hack to make gui_scalar_draw_group more general (so we
// don't have to tack on "gobj" manually)
sprintf(tagbuf, "scalar%lxgobj", (long unsigned int)x->sc_vec);
sprintf(groupbuf, "dgroup%lx.%lx", (long unsigned int)templatecanvas,
(long unsigned int)x->sc_vec);
- gui_vmess("gui_create_scalar_group", "xss",
+ gui_vmess("gui_scalar_draw_group", "xss",
glist_getcanvas(owner), groupbuf, tagbuf);
}
diff --git a/pd/src/g_slider.c b/pd/src/g_slider.c
index 69b649dda9c3565542d354983abd3a604df47238..d8b33955139326ee69571ce2823f2246632fd327 100644
--- a/pd/src/g_slider.c
+++ b/pd/src/g_slider.c
@@ -63,11 +63,11 @@ static void slider_draw_new(t_slider *x, t_glist *glist)
else r = x1+3 + (x->x_val + 50)/100;
iemgui_base_draw_new(&x->x_gui);
if (x->x_orient) {
- gui_vmess("gui_create_slider", "xxxiiiiii",
+ gui_vmess("gui_slider_new", "xxxiiiiii",
canvas, x,
x->x_gui.x_fcol, x1+2, r, x2-2, r, x1, y1);
} else {
- gui_vmess("gui_create_slider", "xxxiiiiii",
+ gui_vmess("gui_slider_new", "xxxiiiiii",
canvas, x,
x->x_gui.x_fcol, r, y1+2, r, y2-2, x1, y1);
}
diff --git a/pd/src/g_text.c b/pd/src/g_text.c
index e9ed90b0809abacd1b60b0faf71f339590cb7c1e..6c6814fdb4f9baa331f096ffae37c74e0c39813b 100644
--- a/pd/src/g_text.c
+++ b/pd/src/g_text.c
@@ -1778,7 +1778,7 @@ static void text_vis(t_gobj *z, t_glist *glist, int vis)
// make a group
text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2);
- gui_vmess("gui_text_create_gobj", "xssiii",
+ gui_vmess("gui_gobj_new", "xssiii",
glist_getcanvas(glist),
rtext_gettag(y), type, x1, y1, glist_istoplevel(glist));
@@ -1990,14 +1990,14 @@ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime,
issignal = obj_issignaloutlet(ob,i);
/* need to send issignal and is_iemgui here... */
- gui_vmess("gui_canvas_drawio", "xssiiiiiisiii",
+ gui_vmess("gui_gobj_draw_io", "xssiiiiiisiii",
glist_getcanvas(glist), rtext_gettag(y), tag,
onset, y2 - 2, onset + IOWIDTH, y2, x1, y1, "o", i,
issignal, 0);
}
else
{
- gui_vmess("gui_canvas_redraw_io", "xssiisiii",
+ gui_vmess("gui_gobj_redraw_io", "xssiisiii",
glist_getcanvas(glist), rtext_gettag(y), tag,
onset, y2 - 2, "o", i, x1, y1);
}
@@ -2011,7 +2011,7 @@ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime,
{
//fprintf(stderr,"glist_drawiofor i firsttime\n");
issignal = obj_issignalinlet(ob,i);
- gui_vmess("gui_canvas_drawio", "xssiiiiiisiii",
+ gui_vmess("gui_gobj_draw_io", "xssiiiiiisiii",
glist_getcanvas(glist), rtext_gettag(y), tag,
onset, y1, onset + IOWIDTH, y1 + EXTRAPIX, x1, y1, "i", i,
issignal, 0);
@@ -2019,7 +2019,7 @@ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime,
else
{
//fprintf(stderr,"glist_drawiofor i firsttime\n");
- gui_vmess("gui_canvas_redraw_io", "xssiisiii",
+ gui_vmess("gui_gobj_redraw_io", "xssiisiii",
glist_getcanvas(glist), rtext_gettag(y), tag,
onset, y1, "i", i, x1, y1);
}
@@ -2160,7 +2160,7 @@ void text_drawborder(t_text *x, t_glist *glist,
}
if (firsttime)
{
- gui_vmess("gui_text_drawborder", "xssiiiii",
+ gui_vmess("gui_text_draw_border", "xssiiiii",
glist_getcanvas(glist), tag, "none",
broken, x1, y1, x2, y2);
@@ -2181,7 +2181,7 @@ void text_drawborder(t_text *x, t_glist *glist,
{
if (firsttime)
{
- gui_vmess("gui_message_drawborder", "xsii",
+ gui_vmess("gui_message_draw_border", "xsii",
glist_getcanvas(glist), tag, x2 - x1, y2 - y1);
}
else
@@ -2212,7 +2212,7 @@ void text_drawborder(t_text *x, t_glist *glist,
// (selected ? "$pd_colors(selection)" : "$pd_colors(atom_box_border)"),
// tag, tag, (selected ? "selected" : ""));
/* These coords can be greatly simplified... */
- gui_vmess("gui_atom_drawborder", "xsiiiiiiiiiiii",
+ gui_vmess("gui_atom_draw_border", "xsiiiiiiiiiiii",
glist_getcanvas(glist), tag,
x1-x1, y1-y1, x2-4-x1, y1-y1, x2-x1,
y1+4-y1, x2-x1, y2-y1, x1-x1, y2-y1, x1-x1, y1-y1);
diff --git a/pd/src/g_toggle.c b/pd/src/g_toggle.c
index b3e813423ba38ee136817b9a169285cd2ca3184c..29d9693461186ff68aa125fe18c57d5669c914b0 100644
--- a/pd/src/g_toggle.c
+++ b/pd/src/g_toggle.c
@@ -42,7 +42,7 @@ void toggle_draw_new(t_toggle *x, t_glist *glist)
int col = (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol;
iemgui_base_draw_new(&x->x_gui);
- gui_vmess("gui_create_toggle", "xxxiiiiiiiiiiii", canvas,
+ gui_vmess("gui_toggle_new", "xxxiiiiiiiiiiii", canvas,
x, x->x_gui.x_fcol, w,
(x->x_on != 0.0),
x1+w+1, y1+w+1, x2-w-1, y2-w-1,
diff --git a/pd/src/g_vumeter.c b/pd/src/g_vumeter.c
index 94fa7a095e7ca4bb6f77f5f983a5bd1bf27f9b4d..8e46cae5ba7eed2a93c4a990a3850d8ec1121b7f 100644
--- a/pd/src/g_vumeter.c
+++ b/pd/src/g_vumeter.c
@@ -142,7 +142,7 @@ static void vu_draw_new(t_vu *x, t_glist *glist)
if((i&3)==1 && (x->x_scale))
{
// not handling font size yet
- gui_vmess("gui_create_vumeter_text", "xxxiisiiiis",
+ gui_vmess("gui_vumeter_draw_text", "xxxiisiiiis",
canvas, x,
x->x_gui.x_lcol, end+1, yyy+k3+2, iemgui_vu_scale_str[i/4],
i, x1, y1,
@@ -152,15 +152,15 @@ static void vu_draw_new(t_vu *x, t_glist *glist)
led_col = iemgui_vu_col[i];
if (i<=IEM_VU_STEPS)
{
- gui_vmess("gui_create_vumeter_steps", "xxxiiiiiiiii",
+ gui_vmess("gui_vumeter_create_steps", "xxxiiiiiiiii",
canvas, x, iemgui_color_hex[led_col], quad1+1,
yyy+2, quad3, yyy+2, x->x_led_size, index, x1, y1, i);
}
}
- gui_vmess("gui_create_vumeter_rect", "xxxiiiiii",
+ gui_vmess("gui_vumeter_draw_rect", "xxxiiiiii",
canvas, x,
x->x_gui.x_bcol, quad1+1, y1+1, quad3, y1+1 + k1*IEM_VU_STEPS, x1, y1);
- gui_vmess("gui_create_vumeter_peak", "xxxiiiiiii",
+ gui_vmess("gui_vumeter_draw_peak", "xxxiiiiiii",
canvas, x,
x->x_gui.x_bcol, mid+1, y1+12, mid+1, y1+12, x->x_led_size, x1, y1);
x->x_updaterms = x->x_updatepeak = 1;
@@ -185,7 +185,7 @@ static void vu_draw_move(t_vu *x, t_glist *glist)
for(i=1; i<=IEM_VU_STEPS; i++)
{
yyy = k4 + k1*(k2-i);
- gui_vmess("gui_update_vumeter_step_coords", "xxiiiiiii",
+ gui_vmess("gui_vumeter_update_step_coords", "xxiiiiiii",
canvas, x, i, quad1+1, yyy+2, quad3, yyy+2,
x1, y1);
//if(((i+2)&3) && (x->x_scale))
@@ -216,7 +216,7 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
{
if (i <= IEM_VU_STEPS)
{
- gui_vmess("gui_update_vumeter_steps", "xxii",
+ gui_vmess("gui_vumeter_update_steps", "xxii",
canvas, x, i, x->x_led_size);
}
//if((i&3)==1)
@@ -224,14 +224,14 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
{
int isselected = x->x_gui.x_selected == canvas &&
x->x_gui.x_glist == canvas && x->x_scale;
- gui_vmess("gui_update_vumeter_text", "xxssixi",
+ gui_vmess("gui_vumeter_update_text", "xxssixi",
canvas, x, iemgui_vu_scale_str[i/4],
iemgui_font(&x->x_gui), isselected, x->x_gui.x_lcol, i);
}
}
- gui_vmess("gui_update_vumeter_rect", "xxx",
+ gui_vmess("gui_vumeter_update_rect", "xxx",
canvas, x, x->x_gui.x_bcol);
- gui_vmess("gui_update_vumeter_peak", "xxi",
+ gui_vmess("gui_vumeter_update_peak_width", "xxi",
canvas, x, x->x_led_size);
iemgui_base_draw_config(&x->x_gui);
}
@@ -435,12 +435,12 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
/* if((i+2)&3) */
if((i&3)==1)
{
- gui_vmess("gui_erase_vumeter_text", "xxi",
+ gui_vmess("gui_vumeter_erase_text", "xxi",
canvas, x, i);
}
}
i=IEM_VU_STEPS+1;
- gui_vmess("gui_erase_vumeter_text", "xxi",
+ gui_vmess("gui_vumeter_erase_text", "xxi",
canvas, x, i);
}
}
@@ -460,7 +460,7 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
yyy = k4 + k1*(k2-i);
if((i&3)==1)
{
- gui_vmess("gui_create_vumeter_text", "xxxiisiii",
+ gui_vmess("gui_vumeter_draw_text", "xxxiisiii",
canvas, x, x->x_gui.x_lcol,
end+1, yyy+k3+2, iemgui_vu_scale_str[i/4],
i, end, yyy);
@@ -468,7 +468,7 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
}
i = IEM_VU_STEPS + 1;
yyy = k4 + k1*(k2-i);
- gui_vmess("gui_create_vumeter_text", "xxxiisiii",
+ gui_vmess("gui_vumeter_draw_text", "xxxiisiii",
canvas, x, x->x_gui.x_lcol,
end+1, yyy+k3+2, iemgui_vu_scale_str[i/4],
i, end, yyy);