K&R formatting
This commit is contained in:
Petr Vanek
+53
-54
@@ -4,18 +4,18 @@
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU Library General Public License
|
||||
along with this library; see the file COPYING.LIB. If not, write to
|
||||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "qtermwidget.h"
|
||||
|
||||
@@ -26,17 +26,16 @@
|
||||
using namespace Konsole;
|
||||
|
||||
void *createTermWidget(int startnow, void *parent)
|
||||
{
|
||||
return (void*) new QTermWidget(startnow, (QWidget*)parent);
|
||||
{
|
||||
return (void*) new QTermWidget(startnow, (QWidget*)parent);
|
||||
}
|
||||
|
||||
struct TermWidgetImpl
|
||||
{
|
||||
struct TermWidgetImpl {
|
||||
TermWidgetImpl(QWidget* parent = 0);
|
||||
|
||||
TerminalDisplay *m_terminalDisplay;
|
||||
Session *m_session;
|
||||
|
||||
|
||||
Session* createSession();
|
||||
TerminalDisplay* createTerminalDisplay(Session *session, QWidget* parent);
|
||||
};
|
||||
@@ -57,15 +56,15 @@ Session *TermWidgetImpl::createSession()
|
||||
QStringList args("");
|
||||
session->setArguments(args);
|
||||
session->setAutoClose(true);
|
||||
|
||||
|
||||
session->setCodec(QTextCodec::codecForName("UTF-8"));
|
||||
|
||||
|
||||
session->setFlowControlEnabled(true);
|
||||
session->setHistoryType(HistoryTypeBuffer(1000));
|
||||
|
||||
|
||||
session->setDarkBackground(true);
|
||||
|
||||
session->setKeyBindings("");
|
||||
|
||||
session->setKeyBindings("");
|
||||
return session;
|
||||
}
|
||||
|
||||
@@ -73,56 +72,56 @@ TerminalDisplay *TermWidgetImpl::createTerminalDisplay(Session *session, QWidget
|
||||
{
|
||||
// TerminalDisplay* display = new TerminalDisplay(this);
|
||||
TerminalDisplay* display = new TerminalDisplay(parent);
|
||||
|
||||
|
||||
display->setBellMode(TerminalDisplay::NotifyBell);
|
||||
display->setTerminalSizeHint(true);
|
||||
display->setTripleClickMode(TerminalDisplay::SelectWholeLine);
|
||||
display->setTerminalSizeStartup(true);
|
||||
|
||||
display->setRandomSeed(session->sessionId() * 31);
|
||||
|
||||
|
||||
return display;
|
||||
}
|
||||
|
||||
|
||||
QTermWidget::QTermWidget(int startnow, QWidget *parent)
|
||||
:QWidget(parent)
|
||||
:QWidget(parent)
|
||||
{
|
||||
m_impl = new TermWidgetImpl(this);
|
||||
|
||||
|
||||
init();
|
||||
|
||||
if (startnow && m_impl->m_session) {
|
||||
m_impl->m_session->run();
|
||||
m_impl->m_session->run();
|
||||
}
|
||||
|
||||
|
||||
this->setFocus( Qt::OtherFocusReason );
|
||||
m_impl->m_terminalDisplay->resize(this->size());
|
||||
|
||||
|
||||
this->setFocusProxy(m_impl->m_terminalDisplay);
|
||||
}
|
||||
|
||||
void QTermWidget::startShellProgram()
|
||||
{
|
||||
if ( m_impl->m_session->isRunning() )
|
||||
return;
|
||||
|
||||
return;
|
||||
|
||||
m_impl->m_session->run();
|
||||
}
|
||||
|
||||
void QTermWidget::init()
|
||||
{
|
||||
{
|
||||
m_impl->m_terminalDisplay->setSize(80, 40);
|
||||
|
||||
QFont font = QApplication::font();
|
||||
|
||||
QFont font = QApplication::font();
|
||||
font.setFamily("Monospace");
|
||||
font.setPointSize(10);
|
||||
font.setStyleHint(QFont::TypeWriter);
|
||||
setTerminalFont(font);
|
||||
setScrollBarPosition(NoScrollBar);
|
||||
|
||||
setScrollBarPosition(NoScrollBar);
|
||||
|
||||
m_impl->m_session->addView(m_impl->m_terminalDisplay);
|
||||
|
||||
|
||||
connect(m_impl->m_session, SIGNAL(finished()), this, SLOT(sessionFinished()));
|
||||
}
|
||||
|
||||
@@ -136,15 +135,15 @@ QTermWidget::~QTermWidget()
|
||||
void QTermWidget::setTerminalFont(QFont &font)
|
||||
{
|
||||
if (!m_impl->m_terminalDisplay)
|
||||
return;
|
||||
return;
|
||||
m_impl->m_terminalDisplay->setVTFont(font);
|
||||
}
|
||||
|
||||
void QTermWidget::setShellProgram(const QString &progname)
|
||||
{
|
||||
if (!m_impl->m_session)
|
||||
return;
|
||||
m_impl->m_session->setProgram(progname);
|
||||
return;
|
||||
m_impl->m_session->setProgram(progname);
|
||||
}
|
||||
|
||||
void QTermWidget::setWorkingDirectory(const QString& dir)
|
||||
@@ -157,38 +156,38 @@ void QTermWidget::setWorkingDirectory(const QString& dir)
|
||||
void QTermWidget::setArgs(QStringList &args)
|
||||
{
|
||||
if (!m_impl->m_session)
|
||||
return;
|
||||
m_impl->m_session->setArguments(args);
|
||||
return;
|
||||
m_impl->m_session->setArguments(args);
|
||||
}
|
||||
|
||||
void QTermWidget::setTextCodec(QTextCodec *codec)
|
||||
{
|
||||
if (!m_impl->m_session)
|
||||
return;
|
||||
m_impl->m_session->setCodec(codec);
|
||||
return;
|
||||
m_impl->m_session->setCodec(codec);
|
||||
}
|
||||
|
||||
void QTermWidget::setColorScheme(int scheme)
|
||||
{
|
||||
switch(scheme) {
|
||||
case COLOR_SCHEME_WHITE_ON_BLACK:
|
||||
m_impl->m_terminalDisplay->setColorTable(whiteonblack_color_table);
|
||||
break;
|
||||
case COLOR_SCHEME_GREEN_ON_BLACK:
|
||||
m_impl->m_terminalDisplay->setColorTable(greenonblack_color_table);
|
||||
break;
|
||||
case COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW:
|
||||
m_impl->m_terminalDisplay->setColorTable(blackonlightyellow_color_table);
|
||||
break;
|
||||
default: //do nothing
|
||||
break;
|
||||
switch (scheme) {
|
||||
case COLOR_SCHEME_WHITE_ON_BLACK:
|
||||
m_impl->m_terminalDisplay->setColorTable(whiteonblack_color_table);
|
||||
break;
|
||||
case COLOR_SCHEME_GREEN_ON_BLACK:
|
||||
m_impl->m_terminalDisplay->setColorTable(greenonblack_color_table);
|
||||
break;
|
||||
case COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW:
|
||||
m_impl->m_terminalDisplay->setColorTable(blackonlightyellow_color_table);
|
||||
break;
|
||||
default: //do nothing
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
void QTermWidget::setSize(int h, int v)
|
||||
{
|
||||
if (!m_impl->m_terminalDisplay)
|
||||
return;
|
||||
return;
|
||||
m_impl->m_terminalDisplay->setSize(h, v);
|
||||
}
|
||||
|
||||
@@ -197,19 +196,19 @@ void QTermWidget::setHistorySize(int lines)
|
||||
if (lines < 0)
|
||||
m_impl->m_session->setHistoryType(HistoryTypeFile());
|
||||
else
|
||||
m_impl->m_session->setHistoryType(HistoryTypeBuffer(lines));
|
||||
m_impl->m_session->setHistoryType(HistoryTypeBuffer(lines));
|
||||
}
|
||||
|
||||
void QTermWidget::setScrollBarPosition(ScrollBarPosition pos)
|
||||
{
|
||||
if (!m_impl->m_terminalDisplay)
|
||||
return;
|
||||
return;
|
||||
m_impl->m_terminalDisplay->setScrollBarPosition((TerminalDisplay::ScrollBarPosition)pos);
|
||||
}
|
||||
|
||||
void QTermWidget::sendText(QString &text)
|
||||
{
|
||||
m_impl->m_session->sendText(text);
|
||||
m_impl->m_session->sendText(text);
|
||||
}
|
||||
|
||||
void QTermWidget::resizeEvent(QResizeEvent*)
|
||||
@@ -262,9 +261,9 @@ bool QTermWidget::flowControlEnabled(void)
|
||||
|
||||
void QTermWidget::setFlowControlWarningEnabled(bool enabled)
|
||||
{
|
||||
if(flowControlEnabled()) {
|
||||
// Do not show warning label if flow control is disabled
|
||||
m_impl->m_terminalDisplay->setFlowControlWarningEnabled(enabled);
|
||||
if (flowControlEnabled()) {
|
||||
// Do not show warning label if flow control is disabled
|
||||
m_impl->m_terminalDisplay->setFlowControlWarningEnabled(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user