From 326a75dc4c734cae2b00eda97af51cc5fd9e392f Mon Sep 17 00:00:00 2001
From: David Freese <w1hkj@w1hkj.com>
Date: Sun, 18 Nov 2012 06:01:12 -0600
Subject: [PATCH] REPEAT Macro

  * Corrected macro execution for UTF-8 implementation
  * Cleaned up macro methods - removed commented out code
---
 src/dialogs/fl_digi.cxx | 20 ++++++++++++--------
 src/misc/macros.cxx     | 10 ++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx
index fcc37e9a..35fdfe51 100644
--- a/src/dialogs/fl_digi.cxx
+++ b/src/dialogs/fl_digi.cxx
@@ -6303,7 +6303,7 @@ int get_tx_char(void)
 	if (active_modem == cw_modem && progdefaults.QSKadjust)
 		return szTestChar[2 * progdefaults.TestChar];
 
-	if ( progStatus.repeatMacro && progStatus.repeatIdleTime > 0 &&
+	if ( (progStatus.repeatMacro > -1) && (progStatus.repeatIdleTime > 0) &&
 		 !idling ) {
 		Fl::add_timeout(progStatus.repeatIdleTime, get_tx_char_idle);
 		idling = true;
@@ -6315,16 +6315,20 @@ int get_tx_char(void)
 	if ((c = tx_encoder.pop()) != -1)
 		return(c);
 
-	if (progStatus.repeatMacro > -1 && text2repeat.length()) {
-		char *repeat_content = &text2repeat[repeatchar];
-		tx_encoder.push(repeat_content);
+	if ((progStatus.repeatMacro > -1) && text2repeat.length()) {
+		string repeat_content;
 #if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR == 3
-		repeatchar += fl_utf8len1(*repeat_content);
+		int utf8size = fl_utf8len1(text2repeat[repeatchar]);
+		for (int i = 0; i < utf8size; i++)
+			repeat_content += text2repeat[repeatchar + i];
+		repeatchar += utf8size;
 #else
-		repeatchar += 1;
+		repeat_content += text2repeat[repeatchar];
+		repeatchar++;
 #endif
-		
-		if (repeatchar == text2repeat.length()) {
+		tx_encoder.push(repeat_content);
+
+		if (repeatchar >= text2repeat.length()) {
 			text2repeat.clear();
 			macros.repeat(progStatus.repeatMacro);
 		}
diff --git a/src/misc/macros.cxx b/src/misc/macros.cxx
index 12cf92b6..0f2aed47 100644
--- a/src/misc/macros.cxx
+++ b/src/misc/macros.cxx
@@ -195,7 +195,6 @@ static void pWPM(std::string &s, size_t &i, size_t endbracket)
 		if (number > 200) number = 200;
 		progdefaults.CWspeed = number;
 		sldrCWxmtWPM->value(number);
-printf("wpm %d\n", number);
 
 // second value = Farnsworth WPM
 		size_t pos;
@@ -207,7 +206,6 @@ printf("wpm %d\n", number);
 			if (number > 200) number = 200;
 			progdefaults.CWfarnsworth = number;
 			sldrCWfarnsworth->value(number);
-printf("fwpm %d\n", number);
 		}
 	}
 
@@ -1693,7 +1691,6 @@ static void pEXEC(std::string &s, size_t &i, size_t endbracket)
 	within_exec = true;
 	MACROTEXT m;
 	execstr = m.expandMacro(execstr, true);
-//	execstr.insert(0,ScriptsDir);
 	within_exec = false;
 
 	int pfd[2];
@@ -2232,7 +2229,7 @@ std::string MACROTEXT::expandMacro(std::string &s, bool recurse = false)
 		ToggleTXRX = false;
 	}
 //	mNbr = n;
-	expanded = s;//text[n];
+	expanded = s;
 	const MTAGS *pMtags;
 
 	xbeg = xend = -1;
@@ -2358,7 +2355,6 @@ void MACROTEXT::timed_execute()
 	TransmitText->clear();
 	text2send = expandMacro(exec_string);
 	TransmitText->add_text(text2send);
-//	TransmitText->addstr(text2send);
 	exec_string.clear();
 	active_modem->set_stopflag(false);
 	start_tx();
@@ -2379,7 +2375,6 @@ void MACROTEXT::execute(int n)
 
 	if (progStatus.repeatMacro == -1)
 		TransmitText->add_text( text2send );
-//		TransmitText->addstr( text2send );
 	else {
 		size_t p = std::string::npos;
 		text2send = text[n];
@@ -2388,7 +2383,6 @@ void MACROTEXT::execute(int n)
 		while ((p = text2send.find('>')) != std::string::npos)
 			text2send[p] = ']';
 		TransmitText->add_text( text2send );
-//		TransmitText->addstr( text2send );
 	}
 	text2send.clear();
 
@@ -2426,7 +2420,7 @@ void MACROTEXT::execute(int n)
 void MACROTEXT::repeat(int n)
 {
 	expandMacro(text[n]);
-	LOG_WARN("%s",text2repeat.c_str());
+	LOG_INFO("%s",text2repeat.c_str());
 	macro_idle_on = false;
 	if (idleTime) progStatus.repeatIdleTime = idleTime;
 }