~ubuntu-branches/ubuntu/precise/konsole/precise-proposed

« back to all changes in this revision

Viewing changes to src/ScreenWindow.cpp

Committer: Package Import Robot
Author(s): Jonathan Riddell
Date: 2011-12-16 13:14:43 UTC
mto: This revision was merged to the branch mainline in revision 8.
Revision ID: package-import@ubuntu.com-20111216131443-rhdplbmmuxntat3k

Tags: upstream-4.7.90

Import upstream version 4.7.90

files added:
data/color-schemes/Solarized.colorscheme

doc/developer/MAINTAINER.README

doc/manual/README

tests/GLASS.utf8

tests/UTF-8-demo.txt

tests/nfd_unicode.py

tests/unicode.txt

files removed:
src/ProfileListWidget.cpp

src/ProfileListWidget.h

files modified:
CMakeLists.txt

README

data/color-schemes/CMakeLists.txt

data/color-schemes/GreenOnBlack.colorscheme

data/keyboard-layouts/default.keytab

data/profiles/Shell.profile

desktop/konsole.notifyrc

desktop/konsolehere.desktop

desktop/konsolepart.desktop

desktop/konsoleui.rc

desktop/partui.rc

desktop/quick-access-konsole.desktop

desktop/sessionui.rc

desktop/terminalemulator.desktop

doc/manual/index.cache.bz2

doc/manual/index.docbook

doc/user/README.fonts

doc/user/README.keyboard

doc/user/README.linux.console

src/Application.cpp

src/Application.h

src/BlockArray.cpp

src/BlockArray.h

src/BookmarkHandler.cpp

src/BookmarkHandler.h

src/CMakeLists.txt

src/Character.h

src/CharacterColor.h

src/ColorScheme.cpp

src/ColorScheme.h

src/ColorSchemeEditor.cpp

src/ColorSchemeEditor.h

src/ColorSchemeEditor.ui

src/CopyInputDialog.cpp

src/CopyInputDialog.h

src/EditProfileDialog.cpp

src/EditProfileDialog.h

src/EditProfileDialog.ui

src/Emulation.cpp

src/Emulation.h

src/Filter.cpp

src/Filter.h

src/History.cpp

src/History.h

src/HistorySizeDialog.cpp

src/HistorySizeDialog.h

src/IncrementalSearchBar.cpp

src/IncrementalSearchBar.h

src/KeyBindingEditor.cpp

src/KeyBindingEditor.h

src/KeyboardTranslator.cpp

src/KeyboardTranslator.h

src/MainWindow.cpp

src/MainWindow.h

src/ManageProfilesDialog.cpp

src/ManageProfilesDialog.h

src/ManageProfilesDialog.ui

src/Part.cpp

src/Part.h

src/ProcessInfo.cpp

src/ProcessInfo.h

src/Profile.cpp

src/Profile.h

src/ProfileList.cpp

src/ProfileList.h

src/Pty.cpp

src/Pty.h

src/RenameTabsDialog.cpp

src/RenameTabsDialog.h

src/Screen.cpp

src/Screen.h

src/ScreenWindow.cpp

src/ScreenWindow.h

src/Session.cpp

src/Session.h

src/SessionController.cpp

src/SessionController.h

src/SessionManager.cpp

src/SessionManager.h

src/ShellCommand.cpp

src/ShellCommand.h

src/TabTitleFormatAction.cpp

src/TabTitleFormatAction.h

src/TerminalCharacterDecoder.cpp

src/TerminalCharacterDecoder.h

src/TerminalDisplay.cpp

src/TerminalDisplay.h

src/ViewContainer.cpp

src/ViewContainer.h

src/ViewManager.cpp

src/ViewManager.h

src/ViewProperties.cpp

src/ViewProperties.h

src/ViewSplitter.cpp

src/ViewSplitter.h

src/Vt102Emulation.cpp

src/Vt102Emulation.h

src/WarningBox.cpp

src/WarningBox.h

src/XKB.cpp

src/ZModemDialog.cpp

src/ZModemDialog.h

src/fontembedder.cpp

src/konsole_wcwidth.cpp

src/konsole_wcwidth.h

src/main.cpp

src/tests/DBusTest.cpp

src/tests/DBusTest.h

src/tests/PartTest.cpp

src/tests/ProfileTest.cpp

src/tests/ProfileTest.h

Show diffs side-by-side

added added

removed removed

src/ScreenWindow.cpp

// Own

#include "ScreenWindow.h"

// Qt

// KDE

#include <KDebug>

// Konsole

if (!_bufferNeedsUpdate)

return _windowBuffer;

_screen->getImage(_windowBuffer,size,

currentLine(),endWindowLine());

108

QVector<LineProperty> ScreenWindow::getLineProperties()

109

{

110

QVector<LineProperty> result = _screen->getLineProperties(currentLine(),endWindowLine());

111

112

if (result.count() != windowLines())

113

result.resize(windowLines());

114

133

void ScreenWindow::setSelectionStart( int column , int line , bool columnMode )

134

{

135

_screen->setSelectionStart( column , qMin(line + currentLine(),endWindowLine()) , columnMode);

136

137

_bufferNeedsUpdate = true;

138

emit selectionChanged();

139

}

146

emit selectionChanged();

147

}

148

149

void ScreenWindow::setSelectionByLineRange(int start, int end)

150

{

151

clearSelection();

152

153

_screen->setSelectionStart( 0 , start , false);

154

_screen->setSelectionEnd( windowColumns() , end );

155

156

_bufferNeedsUpdate = true;

157

emit selectionChanged();

158

}

159

149

160

bool ScreenWindow::isSelected( int column , int line )

150

161

{

151

162

return _screen->isSelected( column , qMin(line + currentLine(),endWindowLine()) );

186

197

QPoint ScreenWindow::cursorPosition() const

187

198

{

188

199

QPoint position;

189

200

190

201

position.setX( _screen->getCursorX() );

191

202

position.setY( _screen->getCursorY() );

192

203

Older »