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

merge changes from the experimental "bundle" repository

Browse Source
This commit is contained in:
Petr Vanek
2011-06-22 13:12:21 +02:00
parent 451928044f
commit 6ad5d7070a
73 changed files with 11223 additions and 9465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/TerminalCharacterDecoder.cpp
+54 -40
View File
@@ -1,8 +1,8 @@
/*
This file is part of Konsole, an X terminal.
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
@@ -25,14 +25,17 @@
// Qt
#include <QtCore/QTextStream>
// KDE
//#include <kdebug.h>
// Konsole
#include "konsole_wcwidth.h"
using namespace Konsole;
PlainTextDecoder::PlainTextDecoder()
: _output(0)
, _includeTrailingWhitespace(true)
, _recordLinePositions(false)
: _output(0)
, _includeTrailingWhitespace(true)
, _recordLinePositions(false)
{
}
@@ -46,9 +49,9 @@ bool PlainTextDecoder::trailingWhitespace() const
}
void PlainTextDecoder::begin(QTextStream* output)
{
_output = output;
if (!_linePositions.isEmpty())
_linePositions.clear();
_output = output;
if (!_linePositions.isEmpty())
_linePositions.clear();
}
void PlainTextDecoder::end()
{
@@ -64,11 +67,12 @@ 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()) {
if (_recordLinePositions && _output->string())
{
int pos = _output->string()->count();
_linePositions << pos;
}
@@ -80,21 +84,24 @@ 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 ( !_includeTrailingWhitespace )
{
for (int i = count-1 ; i >= 0 ; i--)
{
if ( characters[i].character != ' ' )
break;
else
outputCount--;
}
}
for (int i=0; i<outputCount;) {
for (int i=0;i<outputCount;)
{
plainText.append( QChar(characters[i].character) );
i += qMax(1,konsole_wcwidth(characters[i].character));
}
@@ -103,11 +110,11 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count,
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)
@@ -145,21 +152,23 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
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 ) {
characters[i].foregroundColor != _lastForeColor ||
characters[i].backgroundColor != _lastBackColor )
{
if ( _innerSpanOpen )
closeSpan(text);
closeSpan(text);
_lastRendition = characters[i].rendition;
_lastForeColor = characters[i].foregroundColor;
_lastBackColor = characters[i].backgroundColor;
//build up style string
QString style;
@@ -169,23 +178,25 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
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;");
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;
}
@@ -195,21 +206,24 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
spaceCount++;
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 == '<' )
text.append("&lt;");
else if (ch == '>')
text.append("&gt;");
else
text.append(ch);
} else {
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
@@ -218,7 +232,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
//start new line
text.append("<br>");
*_output << text;
}
void HTMLDecoder::openSpan(QString& text , const QString& style)