New upstream version 5.1.0upstream/5.1.0

1 files changed, 61 insertions, 33 deletions

diff --git a/app/bin/ctext.c b/app/bin/ctext.c
index 525b55a..ca0c7c7 100644
--- a/app/bin/ctext.c
+++ b/app/bin/ctext.c
@@ -1,6 +1,5 @@
 /** \file ctext.c
  *  Text command
- *
  */
 
 /*  XTrkCad - Model Railroad CAD
@@ -21,8 +20,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "track.h"
+#include "cundo.h"
+#include "fileio.h"
 #include "i18n.h"
+#include "messages.h"
+#include "param.h"
+#include "track.h"
+#include "wlib.h"
+#include "draw.h"
+#include "misc.h"
 
 track_p NewText( wIndex_t index, coOrd p, ANGLE_T angle, char * text, CSIZE_T textSize, wDrawColor color );
 
@@ -43,11 +49,13 @@ static struct {
 		coOrd cursPos0, cursPos1;
 		POS_T cursHeight;
 		POS_T textLen;
+		POS_T lastLineLen;
+		POS_T lastLineOffset;
 		coOrd pos;
 		ANGLE_T angle;
 		long size;
 		wIndex_t fontSizeInx;
-		char text[STR_SIZE];
+		char text[STR_LONG_SIZE];
         wDrawColor color;
 		} Dt;
 
@@ -70,31 +78,35 @@ static void TextDlgUpdate(
 		int inx,
 		void * context )
 {
-	coOrd size;
+	coOrd size, lastline;
 
 	switch (inx) {
 	case 0:
+	case 1:
 		if ( Dt.state == SHOW_TEXT) {
-			DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+			DrawMultiString( &tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0, NULL, NULL );
 			DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
 		}
 		UpdateFontSizeList( &Dt.size, (wList_p)textPLs[0].control, Dt.fontSizeInx );
 		/*wWinSetBusy( mainW, TRUE );*/
 		if ( Dt.state == SHOW_TEXT) {
-			DrawTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size );
+			DrawMultiLineTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size, &lastline);
 			Dt.textLen = size.x;
+			Dt.lastLineLen = lastline.x;
+			Dt.lastLineOffset = lastline.y;
 		}
-		DrawTextSize( &mainD, "X", NULL, Dt.size, TRUE, &size );
+		DrawTextSize( &mainD, "Aquilp", NULL, Dt.size, TRUE, &size );
 		Dt.cursHeight = size.y;
 		/*wWinSetBusy( mainW, FALSE );*/
 		if ( Dt.state == SHOW_TEXT) {
-			Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x+Dt.textLen;
-			Dt.cursPos1.y = Dt.pos.y+Dt.cursHeight;
+			Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x+Dt.lastLineLen;
+			Dt.cursPos1.y = Dt.pos.y+Dt.cursHeight+Dt.lastLineOffset;
 			DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-			DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+			DrawMultiString( &tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0, NULL, NULL );
 		}
         MainRedraw();
-		break;
+        MapRedraw();
+        break;
 	}
 }
 
@@ -105,7 +117,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 	unsigned char c;
 	wControl_p controls[3];
 	char * labels[2];
-	coOrd size;
+	coOrd size, lastline;
 
 	switch (action & 0xFF) {
 	case C_START:
@@ -114,6 +126,8 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 		Dt.len = 0;
 		Dt.textLen = 0;
 		Dt.text[0] = '\0';
+		Dt.lastLineLen = 0;
+		Dt.lastLineOffset = 0;
 
 		if (textPD.control == NULL)
 		{
@@ -122,14 +136,14 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 			ParamRegister(&textPG);
 			Dt.size = GetFontSize(Dt.fontSizeInx);
 		}
-		Dt.size = wSelectedFontSize();
+		Dt.size = (long)wSelectedFontSize();
 		Dt.fontSizeInx = GetFontSizeIndex(Dt.size);
 		ParamLoadControls(&textPG);
 		ParamGroupRecord( &textPG );
 
 		if (!inPlayback)
 			wWinSetBusy(mainW, TRUE);
-		DrawTextSize(&mainD, "X", NULL, Dt.size, TRUE, &size);
+		DrawTextSize(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size);
 		Dt.cursHeight = size.y;
 		if (!inPlayback)
 			wWinSetBusy(mainW, FALSE);
@@ -144,28 +158,28 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 		break;
 	case C_DOWN:
 		if (Dt.state != 0) {
-            //DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-			//DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
 		}
 		Dt.pos = pos;
-		Dt.cursPos0.y = Dt.cursPos1.y = pos.y;
-		Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.textLen;
+		Dt.cursPos0.y = Dt.cursPos1.y = pos.y + Dt.lastLineOffset;
+		Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.lastLineLen;
+		DrawTextSize(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size);  //In case fontsize change
+		Dt.cursHeight = size.y;
 		Dt.cursPos1.y += Dt.cursHeight;
 		DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-		DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+		DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL );
         Dt.state = SHOW_TEXT;
         MainRedraw();
+        MapRedraw();
 		return C_CONTINUE;
 	case C_MOVE:
-        //DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-		//DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
 		Dt.pos = pos;
-		Dt.cursPos0.y = Dt.cursPos1.y = pos.y;
-		Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.textLen;
+		Dt.cursPos0.y = Dt.cursPos1.y = pos.y + Dt.lastLineOffset;
+		Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.lastLineLen;
 		Dt.cursPos1.y += Dt.cursHeight;
 		DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, wDrawColorBlack );
-		DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+		DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL );
         MainRedraw();
+        MapRedraw();
         return C_CONTINUE;
 	case C_UP:
 		return C_CONTINUE;
@@ -175,7 +189,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 			return C_CONTINUE;
 		}
 		DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-		DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+		DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL );
 		c = (unsigned char)(action >> 8);
 		switch (c) {
 		case '\b':
@@ -187,11 +201,17 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 				wBeep();
 			}
 			break;
+		case '\n':    // Line Feed
+			if (Dt.len < sizeof Dt.text - 1 ) {
+				Dt.text[Dt.len++] = (char)c;
+				Dt.text[Dt.len] = '\000';
+			}
+			break;
 		case '\015':
 			UndoStart( _("Create Text"), "newText - CR" );
 			t = NewText( 0, Dt.pos, Dt.angle, Dt.text, (CSIZE_T)Dt.size, Dt.color );
 			UndoEnd();
-			DrawNewTrack(t); 
+			DrawNewTrack(t);
 			Dt.state = POSITION_TEXT;
 			InfoSubstituteControls( NULL, NULL );
 			return C_TERMINATE;
@@ -201,26 +221,33 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 				Dt.text[Dt.len] = '\000';
 			}
 		}
-        DrawTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size );
+        DrawMultiLineTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size, &lastline);
 		Dt.textLen = size.x;
-		Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x + Dt.textLen;
-		DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-		DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+		Dt.lastLineLen = lastline.x;
+		Dt.lastLineOffset = lastline.y;
+		Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x + Dt.lastLineLen;
+		Dt.cursPos0.y = Dt.cursPos1.y = Dt.pos.y + Dt.lastLineOffset;
+		DrawTextSize(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size);  //In case fontsize change
+		Dt.cursHeight = size.y;
+		Dt.cursPos1.y +=Dt.cursHeight;
+		MainRedraw();
+		MapRedraw();
+		//DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
+		//DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL );
 		return C_CONTINUE;
 	case C_REDRAW:
 		if (Dt.state == 1) {
 			DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
-			DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
+			DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL );
 		}
 		return C_CONTINUE;
 	case C_CANCEL:
 		if (Dt.state != POSITION_TEXT) {
-			//DrawString( &tempD, Dt.pos, 0.0, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color );
-			//DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
 			Dt.state = POSITION_TEXT;
 		}
 		InfoSubstituteControls( NULL, NULL );
 		MainRedraw();
+		MapRedraw();
 		return C_TERMINATE;
 	case C_OK:
 		if (Dt.state != POSITION_TEXT) {
@@ -235,6 +262,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 		}
 		InfoSubstituteControls( NULL, NULL );
         MainRedraw();
+        MapRedraw();
 		return C_TERMINATE;
 
 	case C_FINISH: