For commit ebc8976

the wrong stash was used.  Reapplying missing part of patch.

closes ticket:2824

Revert "Speed up text rendering for console messages by rendering to pixmaps instead of re-rendering the strings themselves for every display frame."

This reverts commit aaedaab.

Author: vexed

lib/framework/wzapp.cpp

@@ -220,6 +220,8 @@ void WzMainWindow::initializeGL()
 	QtGameWidget::initializeGL();
 }
 
+#if 0
+// Re-enable when Qt's font rendering is improved.
 void WzMainWindow::drawPixmap(int XPos, int YPos, QPixmap *pix)
 {
 	QPainter painter(context()->device());
@@ -229,6 +231,7 @@ void WzMainWindow::drawPixmap(int XPos, int YPos, QPixmap *pix)
 	rendStatesRendModeHack();  // rendStates.rendMode = REND_ALPHA;
 	pie_SetRendMode(REND_OPAQUE);		// beat state machinery into submission
 }
+#endif
 
 void WzMainWindow::resizeGL(int width, int height)
 {

lib/framework/wzapp.h

@@ -90,7 +90,10 @@ class WzMainWindow : public QtGameWidget
 	void setFontSize(float size);
 	int ticks() { return tickCount.elapsed(); }
 	void setReadyToPaint() { notReadyToPaint = false; }
+#if 0
+	// Re-enable when Qt's font rendering is improved.
 	void drawPixmap(int XPos, int YPos, QPixmap *pix);
+#endif
 
 public slots:
 	void tick();

src/console.cpp

@@ -22,12 +22,6 @@
 	Functions for the in-game console.
 */
 
-#include <QtCore/QString>
-#include <QtGui/QPixmap>
-#include <QtGui/QPainter>
-#include "lib/framework/wzapp.h"
-// **NOTE: Qt headers must be before platform specific headers!
-
 #include "lib/framework/frame.h"
 #include "lib/framework/input.h"
 #include "lib/gamelib/gtime.h"
@@ -61,11 +55,11 @@ struct CONSOLE
 /* Definition of a message */
 struct CONSOLE_MESSAGE
 {
-	QPixmap				*cache;						// Text of the message
-	QString				text;						// Text of the message
+	char				text[MAX_CONSOLE_STRING_LENGTH];		// Text of the message
 	UDWORD				timeAdded;								// When was it added to our list?
-	int				id;
-	int				player;						// Player who sent this message or SYSTEM_MESSAGE
+	UDWORD				JustifyType;
+	UDWORD				id;
+	SDWORD				player;						// Player who sent this message or SYSTEM_MESSAGE
 	CONSOLE_MESSAGE *               psNext;
 };
 
@@ -122,12 +116,14 @@ static UDWORD	consoleVisibleLines;
 /** Whether new messages are allowed to be added */
 static int allowNewMessages;
 
+/** What's the default justification? */
+static CONSOLE_TEXT_JUSTIFICATION	defJustification;
+
 static UDWORD	messageId;	// unique ID
 
 /// Global string for new console messages.
 char ConsoleString[MAX_CONSOLE_TMP_STRING_LENGTH];
 
-static PIELIGHT getConsoleTextColor(SDWORD player);
 
 /**
 	Specify how long messages will stay on screen.
@@ -137,28 +133,12 @@ static void	setConsoleMessageDuration(UDWORD time)
 	messageDuration = time;
 }
 
-void	consoleInit()
-{
-	int i;
-
-	for (i = 0; i < MAX_CONSOLE_MESSAGES; i++)
-	{
-		consoleStorage[i].cache = NULL;
-	}
-}
-
 /** Sets the system up */
 void	initConsoleMessages( void )
 {
-	int i, TextLineSize = iV_GetTextLineSize();
+	int TextLineSize = iV_GetTextLineSize();
 	messageIndex = 0;
 
-	for (i = 0; i < MAX_CONSOLE_MESSAGES; i++)
-	{
-		delete consoleStorage[i].cache;
-		consoleStorage[i].cache = NULL;
-	}
-
 	/* Console can extend to half screen height */
 	if (TextLineSize)
 	{
@@ -195,6 +175,9 @@ void	initConsoleMessages( void )
 	/* Turn on the console display */
 	enableConsoleDisplay(true);
 
+	/* Set left justification as default */
+	setDefaultConsoleJust(LEFT_JUSTIFY);
+
 	/*	Set up the console size and postion
 		x,y,width */
 	setConsoleSizePos(16, 16, pie_GetVideoBufferWidth()-32);
@@ -232,6 +215,7 @@ void	toggleConsoleDrop( void )
 bool addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType,
 							   SDWORD player)
 {
+	int textLength;
 	CONSOLE_MESSAGE	*psMessage;
 
 	/* Just don't add it if there's too many already */
@@ -246,34 +230,49 @@ bool addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusTy
 		return false ;
 	}
 
+	/* Is the string too long? */
+	textLength = strlen(messageText);
+
+	ASSERT( textLength<MAX_CONSOLE_STRING_LENGTH,
+		"Attempt to add a message to the console that exceeds MAX_CONSOLE_STRING_LENGTH" );
+
+	/* Are we using a defualt justification? */
+	if(jusType == DEFAULT_JUSTIFY)
+	{
+		/* Then set it */
+		jusType = defJustification;
+	}
+
 	debug(LOG_CONSOLE, "(to player %d): %s", (int)player, messageText);
 
 	consoleStorage[messageIndex].player = player;
 
-	/* Draw the text of the message */
-	PIELIGHT color(getConsoleTextColor(player));
-	delete consoleStorage[messageIndex].cache;
-	consoleStorage[messageIndex].cache = new QPixmap(mainConsole.width, iV_GetTextLineSize());
-	consoleStorage[messageIndex].cache->fill(QColor(16, 16, 128, 128));	// FIXME, and fix pie_TransBoxFill, to not use hardcoded numbers
-	consoleStorage[messageIndex].text = QString::fromUtf8(messageText);
-	QPainter painter(consoleStorage[messageIndex].cache);
-	painter.setPen(QColor(color.byte.r, color.byte.g, color.byte.b, color.byte.a));
 	/* Precalculate and store (quicker!) the indent for justified text */
-	QTextOption opts;
 	switch(jusType)
 	{
-	case DEFAULT_JUSTIFY:
+		/* Allign to left edge of screen */
 	case LEFT_JUSTIFY:
-		opts.setAlignment(Qt::AlignLeft);
+			consoleStorage[messageIndex].JustifyType = FTEXT_LEFTJUSTIFY;
 		break;
+
+		/* Allign to right edge of screen */
 	case RIGHT_JUSTIFY:
-		opts.setAlignment(Qt::AlignRight);
+			consoleStorage[messageIndex].JustifyType = FTEXT_RIGHTJUSTIFY;
 		break;
+
+		/* Allign to centre of the screen,NOT TO CENTRE OF CONSOLE!!!!!! */
 	case CENTRE_JUSTIFY:
-		opts.setAlignment(Qt::AlignHCenter);
+			consoleStorage[messageIndex].JustifyType = FTEXT_CENTRE;
+		break;
+		/* Gone tits up by the looks of it */
+	default:
+		debug( LOG_FATAL, "Weirdy type of text justification for console print" );
+		abort();
 		break;
 	}
-	painter.drawText(QRect(0, 0, mainConsole.width, iV_GetTextLineSize()), consoleStorage[messageIndex].text, opts);
+
+	/* Copy over the text of the message */
+	sstrcpy(consoleStorage[messageIndex].text, messageText);
 
 	/* Set the time when it was added - this might not be needed */
 	consoleStorage[messageIndex].timeAdded = gameTime2;
@@ -417,35 +416,35 @@ void	flushConsoleMessages( void )
 }
 
 /** Sets console text color depending on message type */
-static PIELIGHT getConsoleTextColor(SDWORD player)
+static void setConsoleTextColor(SDWORD player)
 {
 	// System messages
-	if (player == SYSTEM_MESSAGE)
+	if(player == SYSTEM_MESSAGE)
 	{
-		return WZCOL_CONS_TEXT_SYSTEM;
+		iV_SetTextColour(WZCOL_CONS_TEXT_SYSTEM);
 	}
 	else if (player == NOTIFY_MESSAGE)
 	{
-		return WZCOL_YELLOW;
+		iV_SetTextColour(WZCOL_YELLOW);
 	}
 	else
 	{
 		// Don't use friend-foe colors in the lobby
-		if (bEnemyAllyRadarColor && (GetGameMode() == GS_NORMAL))
+		if(bEnemyAllyRadarColor && (GetGameMode() == GS_NORMAL))
 		{
-			if (aiCheckAlliances(player,selectedPlayer))
+			if(aiCheckAlliances(player,selectedPlayer))
 			{
-				return WZCOL_CONS_TEXT_USER_ALLY;
+				iV_SetTextColour(WZCOL_CONS_TEXT_USER_ALLY);
 			}
 			else
 			{
-				return WZCOL_CONS_TEXT_USER_ENEMY;
+				iV_SetTextColour(WZCOL_CONS_TEXT_USER_ENEMY);
 			}
 		}
 		else
 		{
 			// Friend-foe is off
-			return WZCOL_CONS_TEXT_USER;
+			iV_SetTextColour(WZCOL_CONS_TEXT_USER);
 		}
 	}
 }
@@ -515,18 +514,47 @@ static int displayOldMessages(void)
 	{
 		/* Get the line pitch */
 		linePitch = iV_GetTextLineSize();
+
+		/* How big a box is necessary? */
+		/* GET RID OF THE MAGIC NUMBERS BELOW */
+		iV_TransBoxFill(mainConsole.topX - CON_BORDER_WIDTH,mainConsole.topY-mainConsole.textDepth-CON_BORDER_HEIGHT,
+			mainConsole.topX+mainConsole.width ,mainConsole.topY+((count)*linePitch)+CON_BORDER_HEIGHT-linePitch);
+	}
+	/*
+	if(count)
+	{
+		sprintf(buildData,"%s,%s",__TIME__,__DATE__);
+
+		buildWidth = iV_GetTextWidth(buildData);
+
+		iV_DrawText(buildData,((mainConsole.topX+mainConsole.width) - buildWidth - 16),
+			mainConsole.topY);
 	}
+	*/
 	MesY = mainConsole.topY;
 	/* Render what we found */
 	for(i=count-1; i>0; i--)
 	{
+		/* Set text color depending on message type */
+		setConsoleTextColor(consoleStorage[history[i]].player);
+
 		/* Draw the text string */
-		WzMainWindow::instance()->drawPixmap(mainConsole.topX, MesY, consoleStorage[history[i]].cache);
-		MesY += iV_GetTextLineSize();
+		MesY = iV_DrawFormattedText(consoleStorage[history[i]].text,
+                                    mainConsole.topX,
+                                    MesY,
+                                    mainConsole.width,
+                                    consoleStorage[history[i]].JustifyType);
 	}
 
+	/* Set text color depending on message type */
+	setConsoleTextColor(consoleStorage[history[0]].player);
+
 	/* Draw the top one */
-	WzMainWindow::instance()->drawPixmap(mainConsole.topX, MesY, consoleStorage[history[0]].cache);
+	iV_DrawFormattedText(consoleStorage[history[0]].text,
+	                     mainConsole.topX,
+	                     MesY,
+	                     mainConsole.width,
+	                     consoleStorage[history[0]].JustifyType);
 
 	/* Return how much to drop the existing console by... Fix this for lines>screenWIDTH */
 	if(count)
@@ -587,7 +615,7 @@ void	displayConsoleMessages( void )
 		     psMessage && consoleVisibleLines > 0 && exceed < 4; // ho ho ho!!!
 		     psMessage = psMessage->psNext)
 		{
-			if (iV_GetTextWidth(psMessage->text.toAscii().constData()) > mainConsole.width)
+			if (iV_GetTextWidth(psMessage->text) > mainConsole.width)
 			{
 				++exceed;
 			}
@@ -605,6 +633,9 @@ void	displayConsoleMessages( void )
 		{
 			clipDepth = (pie_GetVideoBufferHeight() - linePitch);
 		}
+
+		iV_TransBoxFill(mainConsole.topX - CON_BORDER_WIDTH,mainConsole.topY-mainConsole.textDepth-CON_BORDER_HEIGHT+drop+1,
+			mainConsole.topX+mainConsole.width ,clipDepth);
 	}
 
 	/* Stop when we've drawn enough or we're at the end */
@@ -614,9 +645,13 @@ void	displayConsoleMessages( void )
 	     psMessage && numProcessed < consoleVisibleLines && MesY < pie_GetVideoBufferHeight() - linePitch;
 	     psMessage = psMessage->psNext)
 	{
+
+		/* Set text color depending on message type */
+		setConsoleTextColor(psMessage->player);
+
  		/* Draw the text string */
-		WzMainWindow::instance()->drawPixmap(mainConsole.topX, MesY, psMessage->cache);
-		MesY += iV_GetTextLineSize();
+		MesY = iV_DrawFormattedText(psMessage->text, mainConsole.topX, MesY,
+									mainConsole.width, psMessage->JustifyType);
 
 		/* Move on */
 		++numProcessed;
@@ -640,6 +675,23 @@ void	enableConsoleDisplay(bool state)
 	bConsoleDisplayEnabled = state;
 }
 
+/** Sets the default justification for text */
+void	setDefaultConsoleJust(CONSOLE_TEXT_JUSTIFICATION defJ)
+{
+	switch(defJ)
+	{
+	case LEFT_JUSTIFY:
+	case RIGHT_JUSTIFY:
+	case CENTRE_JUSTIFY:
+		defJustification = defJ;
+		break;
+	default:
+		debug( LOG_FATAL, "Weird default text justification for console" );
+		abort();
+		break;
+	}
+}
+
 /** Allows positioning of the console on screen */
 void	setConsoleSizePos(UDWORD x, UDWORD y, UDWORD width)
 {

src/console.h

@@ -39,7 +39,6 @@ enum CONSOLE_TEXT_JUSTIFICATION
 
 extern char ConsoleString[MAX_CONSOLE_TMP_STRING_LENGTH];
 
-void consoleInit(void);
 bool addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, SDWORD player);
 void updateConsoleMessages(void);
 void initConsoleMessages(void);
@@ -49,6 +48,7 @@ void flushConsoleMessages(void);
 void setConsoleBackdropStatus(bool state);
 void enableConsoleDisplay(bool state);
 bool getConsoleDisplayStatus(void);
+void setDefaultConsoleJust(CONSOLE_TEXT_JUSTIFICATION defJ);
 void setConsoleSizePos(UDWORD x, UDWORD y, UDWORD width);
 void setConsolePermanence(bool state, bool bClearOld);
 bool mouseOverConsoleBox(void);

src/init.cpp

@@ -466,7 +466,6 @@ bool systemInitialise(void)
 	{
 		return false;
 	}
-	consoleInit();
 
 	buildMapList();
 

src/multiint.cpp

@@ -2589,6 +2589,7 @@ static void addChatBox(void)
 	initConsoleMessages();
 	enableConsoleDisplay(true);
 	setConsoleBackdropStatus(false);
+	setDefaultConsoleJust(LEFT_JUSTIFY);
 	setConsoleSizePos(MULTIOP_CHATBOXX+4+D_W, MULTIOP_CHATBOXY+14+D_H, MULTIOP_CHATBOXW-4);
 	setConsolePermanence(true,true);
 	setConsoleLineInfo(5);											// use x lines on chat window