lovecraft/qmltermwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display stuff synced from konsole again to improve color scheme handling

Browse Source
This commit is contained in:
Petr Vanek
2010-10-25 16:27:34 +02:00
parent cf016137bb
commit b2449cc578
9 changed files with 2666 additions and 2359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/TerminalCharacterDecoder.cpp
+91 -67
View File
@@ -1,10 +1,8 @@
/*
This file is part of Konsole, an X terminal.
Copyright (C) 2006 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -27,12 +25,14 @@
// Qt
#include <QtCore/QTextStream>
// Konsole
#include "konsole_wcwidth.h"
using namespace Konsole;
PlainTextDecoder::PlainTextDecoder()
: _output(0)
, _includeTrailingWhitespace(true)
: _output(0)
, _includeTrailingWhitespace(true)
, _recordLinePositions(false)
{
}
@@ -44,19 +44,36 @@ bool PlainTextDecoder::trailingWhitespace() const
{
return _includeTrailingWhitespace;
}
void PlainTextDecoder::begin(QTextStream * output)
void PlainTextDecoder::begin(QTextStream* output)
{
_output = output;
_output = output;
if (!_linePositions.isEmpty())
_linePositions.clear();
}
void PlainTextDecoder::end()
{
_output = 0;
}
void PlainTextDecoder::decodeLine(const Character * const characters, int count, LineProperty /*properties*/
)
void PlainTextDecoder::setRecordLinePositions(bool record)
{
_recordLinePositions = record;
}
QList<int> PlainTextDecoder::linePositions() const
{
return _linePositions;
}
void PlainTextDecoder::decodeLine(const Character* const characters, int count, LineProperty /*properties*/
)
{
Q_ASSERT( _output );
if (_recordLinePositions && _output->string())
{
int pos = _output->string()->count();
_linePositions << pos;
}
//TODO should we ignore or respect the LINE_WRAPPED line property?
//note: we build up a QString and send it to the text stream rather writing into the text
@@ -64,38 +81,40 @@ void PlainTextDecoder::decodeLine(const Character * const characters, int count,
//(since QTextStream always deals with QStrings internally anyway)
QString plainText;
plainText.reserve(count);
int outputCount = count;
// if inclusion of trailing whitespace is disabled then find the end of the
// line
if ( !_includeTrailingWhitespace ) {
for (int i = count-1 ; i >= 0 ; i--) {
if ( characters[i].character != ' ' ) {
if ( !_includeTrailingWhitespace )
{
for (int i = count-1 ; i >= 0 ; i--)
{
if ( characters[i].character != ' ' )
break;
} else {
else
outputCount--;
}
}
}
for (int i=0; i<outputCount; i++) {
for (int i=0;i<outputCount;)
{
plainText.append( QChar(characters[i].character) );
i += qMax(1,konsole_wcwidth(characters[i].character));
}
*_output << plainText;
}
HTMLDecoder::HTMLDecoder() :
_output(0)
,_colorTable(base_color_table)
,_innerSpanOpen(false)
,_lastRendition(DEFAULT_RENDITION)
,_colorTable(base_color_table)
,_innerSpanOpen(false)
,_lastRendition(DEFAULT_RENDITION)
{
}
void HTMLDecoder::begin(QTextStream * output)
void HTMLDecoder::begin(QTextStream* output)
{
_output = output;
@@ -122,7 +141,7 @@ void HTMLDecoder::end()
}
//TODO: Support for LineProperty (mainly double width , double height)
void HTMLDecoder::decodeLine(const Character * const characters, int count, LineProperty /*properties*/
void HTMLDecoder::decodeLine(const Character* const characters, int count, LineProperty /*properties*/
)
{
Q_ASSERT( _output );
@@ -130,95 +149,100 @@ void HTMLDecoder::decodeLine(const Character * const characters, int count, Line
QString text;
int spaceCount = 0;
for (int i=0; i<count; i++) {
for (int i=0;i<count;i++)
{
QChar ch(characters[i].character);
//check if appearance of character is different from previous char
if ( characters[i].rendition != _lastRendition ||
characters[i].foregroundColor != _lastForeColor ||
characters[i].backgroundColor != _lastBackColor ) {
if ( _innerSpanOpen ) {
closeSpan(text);
}
characters[i].foregroundColor != _lastForeColor ||
characters[i].backgroundColor != _lastBackColor )
{
if ( _innerSpanOpen )
closeSpan(text);
_lastRendition = characters[i].rendition;
_lastForeColor = characters[i].foregroundColor;
_lastBackColor = characters[i].backgroundColor;
//build up style string
QString style;
if ( _lastRendition & RE_BOLD ||
(_colorTable && characters[i].isBold(_colorTable)) ) {
bool useBold;
ColorEntry::FontWeight weight = characters[i].fontWeight(_colorTable);
if (weight == ColorEntry::UseCurrentFormat)
useBold = _lastRendition & RE_BOLD;
else
useBold = weight == ColorEntry::Bold;
if (useBold)
style.append("font-weight:bold;");
}
if ( _lastRendition & RE_UNDERLINE ) {
style.append("font-decoration:underline;");
}
if ( _lastRendition & RE_UNDERLINE )
style.append("font-decoration:underline;");
//colours - a colour table must have been defined first
if ( _colorTable ) {
if ( _colorTable )
{
style.append( QString("color:%1;").arg(_lastForeColor.color(_colorTable).name() ) );
if (!characters[i].isTransparent(_colorTable)) {
if (!characters[i].isTransparent(_colorTable))
{
style.append( QString("background-color:%1;").arg(_lastBackColor.color(_colorTable).name() ) );
}
}
//open the span with the current style
//open the span with the current style
openSpan(text,style);
_innerSpanOpen = true;
}
//handle whitespace
if (ch.isSpace()) {
if (ch.isSpace())
spaceCount++;
} else {
else
spaceCount = 0;
}
//output current character
if (spaceCount < 2) {
if (spaceCount < 2)
{
//escape HTML tag characters and just display others as they are
if ( ch == '<' ) {
if ( ch == '<' )
text.append("&lt;");
} else if (ch == '>') {
text.append("&gt;");
} else {
text.append(ch);
}
} else {
else if (ch == '>')
text.append("&gt;");
else
text.append(ch);
}
else
{
text.append("&nbsp;"); //HTML truncates multiple spaces, so use a space marker instead
}
}
//close any remaining open inner spans
if ( _innerSpanOpen ) {
if ( _innerSpanOpen )
closeSpan(text);
}
//start new line
text.append("<br>");
*_output << text;
}
void HTMLDecoder::openSpan(QString & text , const QString & style)
void HTMLDecoder::openSpan(QString& text , const QString& style)
{
text.append( QString("<span style=\"%1\">").arg(style) );
}
void HTMLDecoder::closeSpan(QString & text)
void HTMLDecoder::closeSpan(QString& text)
{
text.append("</span>");
}
void HTMLDecoder::setColorTable(const ColorEntry * table)
void HTMLDecoder::setColorTable(const ColorEntry* table)
{
_colorTable = table;
}