From 9771899e2c14ea5df58eb7e293c3016d4cccb4a8 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Mon, 31 Aug 2015 22:31:35 -0400
Subject: [PATCH] fixed regression where trailing space was added to object/msg
box text
---
pd/nw/pdgui.js | 5 +++++
pd/src/g_rtext.c | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index e83185024..9434f198e 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -2178,6 +2178,10 @@ function gui_text_new(canvasname, myname, type, isselected, x, y, text, font) {
id: myname + 'text'
});
+ // trim off any extraneous leading/trailing whitespace. Because of
+ // the way binbuf_gettext works we almost always have a trailing
+ // whitespace.
+ text = text.trim();
// fill svg_text with tspan content by splitting on '\n'
text_to_tspans(canvasname, svg_text, text);
@@ -3721,6 +3725,7 @@ function select_text(cid, elem) {
function gui_textarea(cid, tag, type, x, y, max_char_width, text, font_size, state) {
//gui_post("x/y is " + x + '/' + y);
//gui_post("state? " + state);
+console.log("fuck butts... do we have a trailing space? " + ((text.slice(-1) === ' ') ? "Yes" : "No"));
gui_post("tag is " + tag);
var range, svg_view;
var gobj = get_gobj(cid, tag);
diff --git a/pd/src/g_rtext.c b/pd/src/g_rtext.c
index 2865cfcfa..37ec63ebf 100644
--- a/pd/src/g_rtext.c
+++ b/pd/src/g_rtext.c
@@ -334,7 +334,12 @@ static void rtext_senditup(t_rtext *x, int action, int *widthp, int *heightp,
}
else ncolumns = widthspec_c;
- // add a null character at the end of the string (for u8_charnum)
+ // add a null character at the end of the string --for u8_charnum
+ // _and_ for the new gui_vmess calls which don't use the %.*s syntax.
+ // Because of the way binbuf_gettext works, we should always have
+ // a space before this null character. But I'm not 100% sure this
+ // space is guaranteed to be there, so we'll just filter it out on
+ // the GUI side for now.
tempbuf[outchars_b++] = '\0';
// The following is an enormous hack to get the box width to match size 12px
--
GitLab