sources/coloredline.cpp

Fri, 24 Jul 2015 04:24:38 +0300

author
Teemu Piippo <tsapii@utu.fi>
date
Fri, 24 Jul 2015 04:24:38 +0300
changeset 100
d301ead29d7c
parent 88
08ccaf26cffd
child 106
7b156b764d11
child 109
e4966d7e615d
permissions
-rw-r--r--

Apply Leonard's patch for fixing the colors:

The colors were broken again.
* isprint for some reason returned true when the given byte is higher than 255.
The char cast of the byte was then printed which resulted in odd characters
popping up. Black appeared as ^@ which is NULL in caret notation.
* After that, the colors were all messed up because the RLINE enum didn't take
in account the color swapping.
So instead of messing up the enum order/number I went for a new "range-like"
method.
* After fixing all of that, I noticed the Interface::render_colorline had a
broken loop since the VS2010 commits.
This made the lines not print entierely and messed up the colors etc.

/*
	Copyright 2014, 2015 Teemu Piippo
	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:

	1. Redistributions of source code must retain the above copyright
	   notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	   notice, this list of conditions and the following disclaimer in the
	   documentation and/or other materials provided with the distribution.
	3. Neither the name of the copyright holder nor the names of its
	   contributors may be used to endorse or promote products derived from
	   this software without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
	TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
	PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
	OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "coloredline.h"
BEGIN_ZFC_NAMESPACE

struct ColorCodeInfo
{
	const char* name;
	Color color;
	bool bold;
};

ColoredLine::ColoredLine() :
	m_length (0),
	m_final (false),
	m_activeColor (DEFAULT),
	m_boldActive (false),
	m_colorCodeStage (0) {}

// -------------------------------------------------------------------------------------------------
//
void ColoredLine::finalize()
{
	if (m_activeColor != DEFAULT)
		set_color (m_activeColor, false);

	if (m_boldActive)
		m_data << RLINE_OFF_BOLD;

	m_final = true;
}

// -------------------------------------------------------------------------------------------------
//
void ColoredLine::add_char (char ch)
{
	static const ColorCodeInfo colorCodes[] =
	{
		{ "Brick",        RED,     true  }, // a
		{ "Tan",          YELLOW,  true  }, // b
		{ "Gray",         WHITE,   false }, // c
		{ "Green",        GREEN,   true  }, // d
		{ "Brown",        YELLOW,  false }, // e
		{ "Gold",         YELLOW,  true  }, // f
		{ "Red",          RED,     true  }, // g
		{ "Blue",         BLUE,    false }, // h
		{ "Orange",       YELLOW,  false }, // i
		{ "White",        WHITE,   true  }, // j
		{ "Yellow",       YELLOW,  true  }, // k
		{ "Untranslated", DEFAULT, false }, // l
		{ "Black",        BLACK,   false }, // m
		{ "Blue",         BLUE,    true  }, // n
		{ "Cream",        YELLOW,  true  }, // o
		{ "Olive",        GREEN,   true  }, // p
		{ "Dark Green",   GREEN,   false }, // q
		{ "Dark Red",     RED,     false }, // r
		{ "Dark Brown",   YELLOW,  false }, // s
		{ "Purple",       MAGENTA, false }, // t
		{ "Dark Gray",    BLACK,   true  }, // u
		{ "Cyan",         CYAN,    true  }, // v
	};

	if (m_final)
		return; // Don't touch finalized lines.

	if (ch == '\x1C' and m_colorCodeStage == 0)
	{
		m_colorCodeStage = 1;
		return;
	}

	if (m_colorCodeStage == 1)
	{
		if (m_activeColor != DEFAULT)
			set_color (m_activeColor, false);

		if (m_boldActive)
			m_data << RLINE_OFF_BOLD;

		// Chars may be in uppercase
		if (ch >= 'A' and ch <= 'V')
			ch += 'a' - 'A';

		if (ch >= 'a' and ch <= 'v' and ch != 'l')
		{
			auto colorInfo = colorCodes[ch - 'a'];
			m_activeColor = colorInfo.color;
			m_boldActive = colorInfo.bold;
			assert (m_activeColor < 8);
			set_color (m_activeColor, true);

			if (m_boldActive)
				m_data << RLINE_ON_BOLD;
		}

		m_colorCodeStage = 0;
		return;
	}

	if (isprint (ch))
	{
		m_string += ch;
		m_data << int (ch);
		++m_length;
	}
}

// -------------------------------------------------------------------------------------------------
//
void ColoredLine::set_color (Color a, bool on)
{
	assert (a < 8);
	m_data << (a + (on ? RLINE_ON_COLOR : RLINE_OFF_COLOR));
}

// -------------------------------------------------------------------------------------------------
// How many rows does this line take up?
//
int ColoredLine::rows (int cols) const
{
	int rows = length() / cols;

	if (length() % cols != 0)
		rows++;

	return max (rows, 1);
}

END_ZFC_NAMESPACE

mercurial