Differential D13174 Diff 35034 src/SessionController.cpp

Changeset View

Standalone View

View Options

src/SessionController.cpp

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s)
87// activity are available 87​// activity are available
88Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _activityIcon, (QIcon::fromTheme(QLatin1String("dialog-information")))) 88​Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _activityIcon, (QIcon::fromTheme(QLatin1String("dialog-information"))))
89Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _silenceIcon, (QIcon::fromTheme(QLatin1String("dialog-information")))) 89​Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _silenceIcon, (QIcon::fromTheme(QLatin1String("dialog-information"))))
90Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _broadcastIcon, (QIcon::fromTheme(QLatin1String("emblem-important")))) 90​Q_GLOBAL_STATIC_WITH_ARGS(QIcon, _broadcastIcon, (QIcon::fromTheme(QLatin1String("emblem-important"))))
91 91​
92QSet<SessionController*> SessionController::_allControllers; 92​QSet<SessionController*> SessionController::_allControllers;
93int SessionController::_lastControllerId; 93​int SessionController::_lastControllerId;
94 94​
95SessionController::SessionController(Session* session , TerminalDisplay* view, QObject* parent) 95​SessionController::SessionController(Session* session , TerminalWidget* view, QObject* parent)
96 : ViewProperties(parent) 96​ : ViewProperties(parent)
97 , KXMLGUIClient() 97​ , KXMLGUIClient()
98 , _session(session) 98​ , _session(session)
99 , _view(view) 99​ , _view(view)
100 , _copyToGroup(nullptr) 100​ , _copyToGroup(nullptr)
101 , _profileList(nullptr) 101​ , _profileList(nullptr)
102 , _sessionIcon(QIcon()) 102​ , _sessionIcon(QIcon())
103 , _sessionIconName(QString()) 103​ , _sessionIconName(QString())
104 , _previousState(-1) 104​ , _previousState(-1)
105 , _searchFilter(nullptr) 105​ , _searchFilter(nullptr)
106 , _urlFilter(nullptr) 106​ , _urlFilter(nullptr)
107 , _fileFilter(nullptr) 107​ , _fileFilter(nullptr)
108 , _copyInputToAllTabsAction(nullptr) 108​ , _copyInputToAllTabsAction(nullptr)
109 , _findAction(nullptr) 109​ , _findAction(nullptr)
110 , _findNextAction(nullptr) 110​ , _findNextAction(nullptr)
111 , _findPreviousAction(nullptr) 111​ , _findPreviousAction(nullptr)
112 , _interactionTimer(nullptr) 112​ , _interactionTimer(nullptr)
113 , _searchStartLine(0) 113​ , _searchStartLine(0)
114 , _prevSearchResultLine(0) 114​ , _prevSearchResultLine(0)
115 , _searchBar(nullptr) ​
116 , _codecAction(nullptr) 115​ , _codecAction(nullptr)
117 , _switchProfileMenu(nullptr) 116​ , _switchProfileMenu(nullptr)
118 , _webSearchMenu(nullptr) 117​ , _webSearchMenu(nullptr)
119 , _listenForScreenWindowUpdates(false) 118​ , _listenForScreenWindowUpdates(false)
120 , _preventClose(false) 119​ , _preventClose(false)
121 , _keepIconUntilInteraction(false) 120​ , _keepIconUntilInteraction(false)
122 , _selectedText(QString()) 121​ , _selectedText(QString())
123 , _showMenuAction(nullptr) 122​ , _showMenuAction(nullptr)
Show All 19 Lines126{
143 foreach(QAction * action, actionCollection()->actions()) { 142​ foreach(QAction * action, actionCollection()->actions()) {
144 action->setShortcutContext(Qt::WidgetWithChildrenShortcut); 143​ action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
145 } 144​ }
146 145​
147 setIdentifier(++_lastControllerId); 146​ setIdentifier(++_lastControllerId);
148 sessionTitleChanged(); 147​ sessionTitleChanged();
149 148​
150 view->installEventFilter(this); 149​ view->installEventFilter(this);
151 view->setSessionController(this); 150​ view->terminalDisplay()->setSessionController(this);
152 151​
153 // install filter on the view to highlight URLs and files 152​ // install filter on the view to highlight URLs and files
154 updateFilterList(SessionManager::instance()->sessionProfile(_session)); 153​ updateFilterList(SessionManager::instance()->sessionProfile(_session));
155 154​
156 // listen for changes in session, we might need to change the enabled filters 155​ // listen for changes in session, we might need to change the enabled filters
157 connect(ProfileManager::instance(), &Konsole::ProfileManager::profileChanged, this, &Konsole::SessionController::updateFilterList); 156​ connect(ProfileManager::instance(), &Konsole::ProfileManager::profileChanged, this, &Konsole::SessionController::updateFilterList);
158 157​
159 // listen for session resize requests 158​ // listen for session resize requests
160 connect(_session.data(), &Konsole::Session::resizeRequest, this, &Konsole::SessionController::sessionResizeRequest); 159​ connect(_session.data(), &Konsole::Session::resizeRequest, this, &Konsole::SessionController::sessionResizeRequest);
161 160​
162 // listen for popup menu requests 161​ // listen for popup menu requests
163 connect(_view.data(), &Konsole::TerminalDisplay::configureRequest, this, &Konsole::SessionController::showDisplayContextMenu); 162​ connect(_view->terminalDisplay(), &Konsole::TerminalDisplay::configureRequest, this, &Konsole::SessionController::showDisplayContextMenu);
164 163​
165 // move view to newest output when keystrokes occur 164​ // move view to newest output when keystrokes occur
166 connect(_view.data(), &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::SessionController::trackOutput); 165​ connect(_view->terminalDisplay(), &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::SessionController::trackOutput);
167 166​
168 // listen to activity / silence notifications from session 167​ // listen to activity / silence notifications from session
169 connect(_session.data(), &Konsole::Session::stateChanged, this, &Konsole::SessionController::sessionStateChanged); 168​ connect(_session.data(), &Konsole::Session::stateChanged, this, &Konsole::SessionController::sessionStateChanged);
170 // listen to title and icon changes 169​ // listen to title and icon changes
171 connect(_session.data(), &Konsole::Session::titleChanged, this, &Konsole::SessionController::sessionTitleChanged); 170​ connect(_session.data(), &Konsole::Session::titleChanged, this, &Konsole::SessionController::sessionTitleChanged);
172 connect(_session.data(), &Konsole::Session::readOnlyChanged, this, &Konsole::SessionController::sessionReadOnlyChanged); 171​ connect(_session.data(), &Konsole::Session::readOnlyChanged, this, &Konsole::SessionController::sessionReadOnlyChanged);
173 172​
174 connect(this, &Konsole::SessionController::tabRenamedByUser, _session, &Konsole::Session::tabRenamedByUser); 173​ connect(this, &Konsole::SessionController::tabRenamedByUser, _session, &Konsole::Session::tabRenamedByUser);
175 174​
176 connect(_session.data() , &Konsole::Session::currentDirectoryChanged , this , &Konsole::SessionController::currentDirectoryChanged); 175​ connect(_session.data() , &Konsole::Session::currentDirectoryChanged , this , &Konsole::SessionController::currentDirectoryChanged);
177 176​
178 // listen for color changes 177​ // listen for color changes
179 connect(_session.data(), &Konsole::Session::changeBackgroundColorRequest, _view.data(), &Konsole::TerminalDisplay::setBackgroundColor); 178​ connect(_session.data(), &Konsole::Session::changeBackgroundColorRequest, _view->terminalDisplay(), &Konsole::TerminalDisplay::setBackgroundColor);
180 connect(_session.data(), &Konsole::Session::changeForegroundColorRequest, _view.data(), &Konsole::TerminalDisplay::setForegroundColor); 179​ connect(_session.data(), &Konsole::Session::changeForegroundColorRequest, _view->terminalDisplay(), &Konsole::TerminalDisplay::setForegroundColor);
181 180​
182 // update the title when the session starts 181​ // update the title when the session starts
183 connect(_session.data(), &Konsole::Session::started, this, &Konsole::SessionController::snapshot); 182​ connect(_session.data(), &Konsole::Session::started, this, &Konsole::SessionController::snapshot);
184 183​
185 // listen for output changes to set activity flag 184​ // listen for output changes to set activity flag
186 connect(_session->emulation(), &Konsole::Emulation::outputChanged, this, &Konsole::SessionController::fireActivity); 185​ connect(_session->emulation(), &Konsole::Emulation::outputChanged, this, &Konsole::SessionController::fireActivity);
187 186​
188 // listen for detection of ZModem transfer 187​ // listen for detection of ZModem transfer
189 connect(_session.data(), &Konsole::Session::zmodemDownloadDetected, this, &Konsole::SessionController::zmodemDownload); 188​ connect(_session.data(), &Konsole::Session::zmodemDownloadDetected, this, &Konsole::SessionController::zmodemDownload);
190 connect(_session.data(), &Konsole::Session::zmodemUploadDetected, this, &Konsole::SessionController::zmodemUpload); 189​ connect(_session.data(), &Konsole::Session::zmodemUploadDetected, this, &Konsole::SessionController::zmodemUpload);
191 190​
192 // listen for flow control status changes 191​ // listen for flow control status changes
193 connect(_session.data(), &Konsole::Session::flowControlEnabledChanged, _view.data(), &Konsole::TerminalDisplay::setFlowControlWarningEnabled); 192​ connect(_session.data(), &Konsole::Session::flowControlEnabledChanged, _view->terminalDisplay(), &Konsole::TerminalDisplay::setFlowControlWarningEnabled);
194 _view->setFlowControlWarningEnabled(_session->flowControlEnabled()); 193​ _view->terminalDisplay()->setFlowControlWarningEnabled(_session->flowControlEnabled());
195 194​
196 // take a snapshot of the session state every so often when 195​ // take a snapshot of the session state every so often when
197 // user activity occurs 196​ // user activity occurs
198 // 197​ //
199 // the timer is owned by the session so that it will be destroyed along 198​ // the timer is owned by the session so that it will be destroyed along
200 // with the session 199​ // with the session
201 _interactionTimer = new QTimer(_session); 200​ _interactionTimer = new QTimer(_session);
202 _interactionTimer->setSingleShot(true); 201​ _interactionTimer->setSingleShot(true);
203 _interactionTimer->setInterval(500); 202​ _interactionTimer->setInterval(500);
204 connect(_interactionTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot); 203​ connect(_interactionTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot);
205 connect(_view.data(), &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::SessionController::interactionHandler); 204​ connect(_view->terminalDisplay(), &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::SessionController::interactionHandler);
206 205​
207 // take a snapshot of the session state periodically in the background 206​ // take a snapshot of the session state periodically in the background
208 auto backgroundTimer = new QTimer(_session); 207​ auto backgroundTimer = new QTimer(_session);
209 backgroundTimer->setSingleShot(false); 208​ backgroundTimer->setSingleShot(false);
210 backgroundTimer->setInterval(2000); 209​ backgroundTimer->setInterval(2000);
211 connect(backgroundTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot); 210​ connect(backgroundTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot);
212 backgroundTimer->start(); 211​ backgroundTimer->start();
213 212​
214 // xterm '11;?' request 213​ // xterm '11;?' request
215 connect(_session.data(), &Konsole::Session::getBackgroundColor, 214​ connect(_session.data(), &Konsole::Session::getBackgroundColor,
216 this, &Konsole::SessionController::sendBackgroundColor); 215​ this, &Konsole::SessionController::sendBackgroundColor);
217 216​
218 connect(_session, &Konsole::Session::primaryScreenInUse, view, &Konsole::TerminalDisplay::usingPrimaryScreen); 217​ connect(_session, &Konsole::Session::primaryScreenInUse, view->terminalDisplay(), &Konsole::TerminalDisplay::usingPrimaryScreen);
219 218​
220 _allControllers.insert(this); 219​ _allControllers.insert(this);
221 220​
222 // A list of programs that accept Ctrl+C to clear command line used 221​ // A list of programs that accept Ctrl+C to clear command line used
223 // before outputting bookmark. 222​ // before outputting bookmark.
224 _bookmarkValidProgramsToClear << QStringLiteral("bash") << QStringLiteral("fish") << QStringLiteral("sh"); 223​ _bookmarkValidProgramsToClear << QStringLiteral("bash") << QStringLiteral("fish") << QStringLiteral("sh");
225 _bookmarkValidProgramsToClear << QStringLiteral("tcsh") << QStringLiteral("zsh"); 224​ _bookmarkValidProgramsToClear << QStringLiteral("tcsh") << QStringLiteral("zsh");
225​
rizzitelloUnsubmitted
Not Done

New Empty line

rizzitello: New Empty line
226​ setupSearchBar();
226} 227​}
227 228​
228SessionController::~SessionController() 229​SessionController::~SessionController()
229{ 230​{
230 if (!_view.isNull()) { 231​ if (!_view.isNull()) {
231 _view->setScreenWindow(nullptr); 232​ _view->terminalDisplay()->setScreenWindow(nullptr);
232 } 233​ }
233 234​
234 _allControllers.remove(this); 235​ _allControllers.remove(this);
235 236​
236 if (!_editProfileDialog.isNull()) { 237​ if (!_editProfileDialog.isNull()) {
237 delete _editProfileDialog.data(); 238​ delete _editProfileDialog.data();
238 } 239​ }
239} 240​}
240void SessionController::trackOutput(QKeyEvent* event) 241​void SessionController::trackOutput(QKeyEvent* event)
241{ 242​{
242 Q_ASSERT(_view->screenWindow()); 243​ Q_ASSERT(_view->terminalDisplay()->screenWindow());
243 244​
244 // Only jump to the bottom if the user actually typed something in, 245​ // Only jump to the bottom if the user actually typed something in,
245 // not if the user e. g. just pressed a modifier. 246​ // not if the user e. g. just pressed a modifier.
246 if (event->text().isEmpty() && (event->modifiers() != 0u)) { 247​ if (event->text().isEmpty() && (event->modifiers() != 0u)) {
247 return; 248​ return;
248 } 249​ }
249 250​
250 _view->screenWindow()->setTrackOutput(true); 251​ _view->terminalDisplay()->screenWindow()->setTrackOutput(true);
251} 252​}
252void SessionController::interactionHandler() 253​void SessionController::interactionHandler()
253{ 254​{
254 // This flag is used to make sure those special icons indicating interest 255​ // This flag is used to make sure those special icons indicating interest
255 // events (activity/silence/bell?) remain in the tab until user interaction 256​ // events (activity/silence/bell?) remain in the tab until user interaction
256 // happens. Otherwise, those special icons will quickly be replaced by 257​ // happens. Otherwise, those special icons will quickly be replaced by
257 // normal icon when ::snapshot() is triggered 258​ // normal icon when ::snapshot() is triggered
258 _keepIconUntilInteraction = false; 259​ _keepIconUntilInteraction = false;
▲ Show 20 Lines • Show All 198 Lines • ▼ Show 20 Line(s)
457void SessionController::sendSignal(QAction* action) 458​void SessionController::sendSignal(QAction* action)
458{ 459​{
459 const int signal = action->data().value<int>(); 460​ const int signal = action->data().value<int>();
460 _session->sendSignal(signal); 461​ _session->sendSignal(signal);
461} 462​}
462 463​
463void SessionController::sendBackgroundColor() 464​void SessionController::sendBackgroundColor()
464{ 465​{
465 const QColor c = _view->getBackgroundColor(); 466​ const QColor c = _view->terminalDisplay()->getBackgroundColor();
466 _session->reportBackgroundColor(c); 467​ _session->reportBackgroundColor(c);
467} 468​}
468 469​
469void SessionController::toggleReadOnly() 470​void SessionController::toggleReadOnly()
470{ 471​{
471 QAction *action = qobject_cast<QAction*>(sender()); 472​ QAction *action = qobject_cast<QAction*>(sender());
472 if (action != nullptr) { 473​ if (action != nullptr) {
473 bool readonly = !isReadOnly(); 474​ bool readonly = !isReadOnly();
Show All 9 Lines481 if (event->type() == QEvent::FocusIn && watched == _view) {
483 emit focused(this); 484​ emit focused(this);
484 485​
485 // when the view is focused, set bell events from the associated session to be delivered 486​ // when the view is focused, set bell events from the associated session to be delivered
486 // by the focused view 487​ // by the focused view
487 488​
488 // first, disconnect any other views which are listening for bell signals from the session 489​ // first, disconnect any other views which are listening for bell signals from the session
489 disconnect(_session.data(), &Konsole::Session::bellRequest, nullptr, nullptr); 490​ disconnect(_session.data(), &Konsole::Session::bellRequest, nullptr, nullptr);
490 // second, connect the newly focused view to listen for the session's bell signal 491​ // second, connect the newly focused view to listen for the session's bell signal
491 connect(_session.data(), &Konsole::Session::bellRequest, _view.data(), &Konsole::TerminalDisplay::bell); 492​ connect(_session.data(), &Konsole::Session::bellRequest, _view->terminalDisplay(), &Konsole::TerminalDisplay::bell);
492 493​
493 if ((_copyInputToAllTabsAction != nullptr) && _copyInputToAllTabsAction->isChecked()) { 494​ if ((_copyInputToAllTabsAction != nullptr) && _copyInputToAllTabsAction->isChecked()) {
494 // A session with "Copy To All Tabs" has come into focus: 495​ // A session with "Copy To All Tabs" has come into focus:
495 // Ensure that newly created sessions are included in _copyToGroup! 496​ // Ensure that newly created sessions are included in _copyToGroup!
496 copyInputToAllTabs(); 497​ copyInputToAllTabs();
497 } 498​ }
498 } 499​ }
499 return Konsole::ViewProperties::eventFilter(watched, event); 500​ return Konsole::ViewProperties::eventFilter(watched, event);
500} 501​}
501 502​
502void SessionController::removeSearchFilter() 503​void SessionController::removeSearchFilter()
503{ 504​{
504 if (_searchFilter == nullptr) { 505​ if (_searchFilter == nullptr) {
505 return; 506​ return;
506 } 507​ }
507 508​
508 _view->filterChain()->removeFilter(_searchFilter); 509​ _view->terminalDisplay()->filterChain()->removeFilter(_searchFilter);
509 delete _searchFilter; 510​ delete _searchFilter;
510 _searchFilter = nullptr; 511​ _searchFilter = nullptr;
511} 512​}
512 513​
513void SessionController::setSearchBar(IncrementalSearchBar* searchBar) 514​void SessionController::setupSearchBar()
514{ 515​{
515 // disconnect the existing search bar 516​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::unhandledMovementKeyPressed, this, &Konsole::SessionController::movementKeyFromSearchBarReceived);
516 if (!_searchBar.isNull()) { 517​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::closeClicked, this, &Konsole::SessionController::searchClosed);
517 disconnect(this, nullptr, _searchBar, nullptr); 518​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchFromClicked, this, &Konsole::SessionController::searchFrom);
518 disconnect(_searchBar, nullptr, this, nullptr); 519​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::findNextClicked, this, &Konsole::SessionController::findNextInHistory);
519 } 520​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::findPreviousClicked, this, &Konsole::SessionController::findPreviousInHistory);
520 521​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::highlightMatchesToggled , this , &Konsole::SessionController::highlightMatches);
521 // connect new search bar 522​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::matchCaseToggled, this, &Konsole::SessionController::changeSearchMatch);
522 _searchBar = searchBar; 523​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::matchRegExpToggled, this, &Konsole::SessionController::changeSearchMatch);
523 if (!_searchBar.isNull()) { 524​
524 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::unhandledMovementKeyPressed, this, &Konsole::SessionController::movementKeyFromSearchBarReceived); ​
525 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::closeClicked, this, &Konsole::SessionController::searchClosed); ​
526 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchFromClicked, this, &Konsole::SessionController::searchFrom); ​
527 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::findNextClicked, this, &Konsole::SessionController::findNextInHistory); ​
528 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::findPreviousClicked, this, &Konsole::SessionController::findPreviousInHistory); ​
529 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::highlightMatchesToggled , this , &Konsole::SessionController::highlightMatches); ​
530 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::matchCaseToggled, this, &Konsole::SessionController::changeSearchMatch); ​
531 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::matchRegExpToggled, this, &Konsole::SessionController::changeSearchMatch); ​
532 ​
533 // if the search bar was previously active ​
534 // then re-enter search mode ​
535 enableSearchBar(_isSearchBarEnabled); ​
536 } ​
537} ​
538IncrementalSearchBar* SessionController::searchBar() const ​
539{ ​
540 return _searchBar; ​
541} 525​}
rizzitelloUnsubmitted
Not Done

New Empty line

rizzitello: New Empty line
542 526​
543void SessionController::setShowMenuAction(QAction* action) 527​void SessionController::setShowMenuAction(QAction* action)
544{ 528​{
545 _showMenuAction = action; 529​ _showMenuAction = action;
546} 530​}
547 531​
548void SessionController::setupCommonActions() 532​void SessionController::setupCommonActions()
549{ 533​{
▲ Show 20 Lines • Show All 422 Lines • ▼ Show 20 Line(s)955 if (currentUrl.isLocalFile()) {
972 new KRun(currentUrl, QApplication::activeWindow(), true); 956​ new KRun(currentUrl, QApplication::activeWindow(), true);
973 } else { 957​ } else {
974 new KRun(QUrl::fromLocalFile(QDir::homePath()), QApplication::activeWindow(), true); 958​ new KRun(QUrl::fromLocalFile(QDir::homePath()), QApplication::activeWindow(), true);
975 } 959​ }
976} 960​}
977 961​
978void SessionController::copy() 962​void SessionController::copy()
979{ 963​{
980 _view->copyToClipboard(); 964​ _view->terminalDisplay()->copyToClipboard();
981} 965​}
982 966​
983void SessionController::paste() 967​void SessionController::paste()
984{ 968​{
985 _view->pasteFromClipboard(); 969​ _view->terminalDisplay()->pasteFromClipboard();
986} 970​}
987void SessionController::pasteFromX11Selection() 971​void SessionController::pasteFromX11Selection()
988{ 972​{
989 _view->pasteFromX11Selection(); 973​ _view->terminalDisplay()->pasteFromX11Selection();
990} 974​}
991void SessionController::selectAll() 975​void SessionController::selectAll()
992{ 976​{
993 _view->selectAll(); 977​ _view->terminalDisplay()->selectAll();
994} 978​}
995void SessionController::selectLine() 979​void SessionController::selectLine()
996{ 980​{
997 _view->selectCurrentLine(); 981​ _view->terminalDisplay()->selectCurrentLine();
998} 982​}
999static const KXmlGuiWindow* findWindow(const QObject* object) 983​static const KXmlGuiWindow* findWindow(const QObject* object)
1000{ 984​{
1001 // Walk up the QObject hierarchy to find a KXmlGuiWindow. 985​ // Walk up the QObject hierarchy to find a KXmlGuiWindow.
1002 while (object != nullptr) { 986​ while (object != nullptr) {
1003 const KXmlGuiWindow* window = qobject_cast<const KXmlGuiWindow*>(object); 987​ const KXmlGuiWindow* window = qobject_cast<const KXmlGuiWindow*>(object);
1004 if (window != nullptr) { 988​ if (window != nullptr) {
1005 return(window); 989​ return(window);
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s)
1140{ 1124​{
1141 if (profile != SessionManager::instance()->sessionProfile(_session)) { 1125​ if (profile != SessionManager::instance()->sessionProfile(_session)) {
1142 return; 1126​ return;
1143 } 1127​ }
1144 1128​
1145 bool underlineFiles = profile->underlineFilesEnabled(); 1129​ bool underlineFiles = profile->underlineFilesEnabled();
1146 1130​
1147 if (!underlineFiles && (_fileFilter != nullptr)) { 1131​ if (!underlineFiles && (_fileFilter != nullptr)) {
1148 _view->filterChain()->removeFilter(_fileFilter); 1132​ _view->terminalDisplay()->filterChain()->removeFilter(_fileFilter);
1149 delete _fileFilter; 1133​ delete _fileFilter;
1150 _fileFilter = nullptr; 1134​ _fileFilter = nullptr;
1151 } else if (underlineFiles && (_fileFilter == nullptr)) { 1135​ } else if (underlineFiles && (_fileFilter == nullptr)) {
1152 _fileFilter = new FileFilter(_session); 1136​ _fileFilter = new FileFilter(_session);
1153 _view->filterChain()->addFilter(_fileFilter); 1137​ _view->terminalDisplay()->filterChain()->addFilter(_fileFilter);
1154 } 1138​ }
1155 1139​
1156 bool underlineLinks = profile->underlineLinksEnabled(); 1140​ bool underlineLinks = profile->underlineLinksEnabled();
1157 if (!underlineLinks && (_urlFilter != nullptr)) { 1141​ if (!underlineLinks && (_urlFilter != nullptr)) {
1158 _view->filterChain()->removeFilter(_urlFilter); 1142​ _view->terminalDisplay()->filterChain()->removeFilter(_urlFilter);
1159 delete _urlFilter; 1143​ delete _urlFilter;
1160 _urlFilter = nullptr; 1144​ _urlFilter = nullptr;
1161 } else if (underlineLinks && (_urlFilter == nullptr)) { 1145​ } else if (underlineLinks && (_urlFilter == nullptr)) {
1162 _urlFilter = new UrlFilter(); 1146​ _urlFilter = new UrlFilter();
1163 _view->filterChain()->addFilter(_urlFilter); 1147​ _view->terminalDisplay()->filterChain()->addFilter(_urlFilter);
1164 } 1148​ }
1165} 1149​}
1166 1150​
1167void SessionController::setSearchStartToWindowCurrentLine() 1151​void SessionController::setSearchStartToWindowCurrentLine()
1168{ 1152​{
1169 setSearchStartTo(-1); 1153​ setSearchStartTo(-1);
1170} 1154​}
1171 1155​
1172void SessionController::setSearchStartTo(int line) 1156​void SessionController::setSearchStartTo(int line)
1173{ 1157​{
1174 _searchStartLine = line; 1158​ _searchStartLine = line;
1175 _prevSearchResultLine = line; 1159​ _prevSearchResultLine = line;
1176} 1160​}
1177 1161​
1178void SessionController::listenForScreenWindowUpdates() 1162​void SessionController::listenForScreenWindowUpdates()
1179{ 1163​{
1180 if (_listenForScreenWindowUpdates) { 1164​ if (_listenForScreenWindowUpdates) {
1181 return; 1165​ return;
1182 } 1166​ }
1183 1167​
1184 connect(_view->screenWindow(), &Konsole::ScreenWindow::outputChanged, this, &Konsole::SessionController::updateSearchFilter); 1168​ connect(_view->terminalDisplay()->screenWindow(), &Konsole::ScreenWindow::outputChanged,
1185 connect(_view->screenWindow(), &Konsole::ScreenWindow::scrolled, this, &Konsole::SessionController::updateSearchFilter); 1169​ this, &Konsole::SessionController::updateSearchFilter);
1186 connect(_view->screenWindow(), &Konsole::ScreenWindow::currentResultLineChanged, _view.data(), static_cast<void(TerminalDisplay::*)()>(&Konsole::TerminalDisplay::update)); 1170​ connect(_view->terminalDisplay()->screenWindow(), &Konsole::ScreenWindow::scrolled,
1171​ this, &Konsole::SessionController::updateSearchFilter);
1172​ connect(_view->terminalDisplay()->screenWindow(), &Konsole::ScreenWindow::currentResultLineChanged,
1173​ _view->terminalDisplay(), static_cast<void(TerminalDisplay::*)()>(&Konsole::TerminalDisplay::update));
1187 1174​
1188 _listenForScreenWindowUpdates = true; 1175​ _listenForScreenWindowUpdates = true;
1189} 1176​}
1190 1177​
1191void SessionController::updateSearchFilter() 1178​void SessionController::updateSearchFilter()
1192{ 1179​{
1193 if ((_searchFilter != nullptr) && (!_searchBar.isNull())) { 1180​ if (_searchFilter != nullptr) {
1194 _view->processFilters(); 1181​ _view->terminalDisplay()->processFilters();
1195 } 1182​ }
1196} 1183​}
1197 1184​
1198void SessionController::searchBarEvent() 1185​void SessionController::searchBarEvent()
1199{ 1186​{
1200 QString selectedText = _view->screenWindow()->selectedText(Screen::PreserveLineBreaks | Screen::TrimLeadingWhitespace | Screen::TrimTrailingWhitespace); 1187​ QString selectedText = _view->terminalDisplay()->screenWindow()->selectedText(
1188​ Screen::PreserveLineBreaks | Screen::TrimLeadingWhitespace | Screen::TrimTrailingWhitespace);
1189​
1201 if (!selectedText.isEmpty()) { 1190​ if (!selectedText.isEmpty()) {
1202 _searchBar->setSearchText(selectedText); 1191​ _view->searchBar()->setSearchText(selectedText);
1203 } 1192​ }
1204 1193​
1205 if (_searchBar->isVisible()) { 1194​ if (_view->searchBar()->isVisible()) {
1206 _searchBar->focusLineEdit(); 1195​ _view->searchBar()->focusLineEdit();
1207 } else { 1196​ } else {
1208 searchHistory(true); 1197​ searchHistory(true);
1209 _isSearchBarEnabled = true; 1198​ _isSearchBarEnabled = true;
1210 } 1199​ }
1211} 1200​}
1212 1201​
1213void SessionController::enableSearchBar(bool showSearchBar) 1202​void SessionController::enableSearchBar(bool showSearchBar)
1214{ 1203​{
1215 if (_searchBar.isNull()) { 1204​ if (showSearchBar && !_view->searchBar()->isVisible()) {
1216 return; ​
1217 } ​
1218 ​
1219 if (showSearchBar && !_searchBar->isVisible()) { ​
1220 setSearchStartToWindowCurrentLine(); 1205​ setSearchStartToWindowCurrentLine();
1221 } 1206​ }
1222 1207​
1223 _searchBar->setVisible(showSearchBar); 1208​ _view->searchBar()->setVisible(showSearchBar);
1224 if (showSearchBar) { 1209​ if (showSearchBar) {
1225 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchChanged, this, &Konsole::SessionController::searchTextChanged); 1210​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchChanged, this, &Konsole::SessionController::searchTextChanged);
1226 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchReturnPressed, this, &Konsole::SessionController::findPreviousInHistory); 1211​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchReturnPressed, this, &Konsole::SessionController::findPreviousInHistory);
1227 connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this, &Konsole::SessionController::findNextInHistory); 1212​ connect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this, &Konsole::SessionController::findNextInHistory);
1228 } else { 1213​ } else {
1229 disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchChanged, this, 1214​ disconnect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchChanged, this,
1230 &Konsole::SessionController::searchTextChanged); 1215​ &Konsole::SessionController::searchTextChanged);
1231 disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchReturnPressed, this, 1216​ disconnect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchReturnPressed, this,
1232 &Konsole::SessionController::findPreviousInHistory); 1217​ &Konsole::SessionController::findPreviousInHistory);
1233 disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this, 1218​ disconnect(_view->searchBar(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this,
1234 &Konsole::SessionController::findNextInHistory); 1219​ &Konsole::SessionController::findNextInHistory);
1235 if ((!_view.isNull()) && (_view->screenWindow() != nullptr)) { 1220​ if ((!_view.isNull()) && (_view->terminalDisplay()->screenWindow() != nullptr)) {
1236 _view->screenWindow()->setCurrentResultLine(-1); 1221​ _view->terminalDisplay()->screenWindow()->setCurrentResultLine(-1);
1237 } 1222​ }
1238 } 1223​ }
1239} 1224​}
1240 1225​
1241 1226​
1242bool SessionController::reverseSearchChecked() const 1227​bool SessionController::reverseSearchChecked() const
1243{ 1228​{
1244 Q_ASSERT(_searchBar); 1229​ QBitArray options = _view->searchBar()->optionsChecked();
1245 ​
1246 QBitArray options = _searchBar->optionsChecked(); ​
1247 return options.at(IncrementalSearchBar::ReverseSearch); 1230​ return options.at(IncrementalSearchBar::ReverseSearch);
1248} 1231​}
1249 1232​
1250QRegularExpression SessionController::regexpFromSearchBarOptions() const 1233​QRegularExpression SessionController::regexpFromSearchBarOptions() const
1251{ 1234​{
1252 QBitArray options = _searchBar->optionsChecked(); 1235​ QBitArray options = _view->searchBar()->optionsChecked();
1253 1236​
1254 QString text(_searchBar->searchText()); 1237​ QString text(_view->searchBar()->searchText());
1255 1238​
1256 QRegularExpression regExp; 1239​ QRegularExpression regExp;
1257 if (options.at(IncrementalSearchBar::RegExp)) { 1240​ if (options.at(IncrementalSearchBar::RegExp)) {
1258 regExp.setPattern(text); 1241​ regExp.setPattern(text);
1259 } else { 1242​ } else {
1260 regExp.setPattern(QRegularExpression::escape(text)); 1243​ regExp.setPattern(QRegularExpression::escape(text));
1261 } 1244​ }
1262 1245​
1263 if (!options.at(IncrementalSearchBar::MatchCase)) { 1246​ if (!options.at(IncrementalSearchBar::MatchCase)) {
1264 regExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption); 1247​ regExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
1265 } 1248​ }
1266 1249​
1267 return regExp; 1250​ return regExp;
1268} 1251​}
1269 1252​
1270// searchHistory() may be called either as a result of clicking a menu item or 1253​// searchHistory() may be called either as a result of clicking a menu item or
1271// as a result of changing the search bar widget 1254​// as a result of changing the search bar widget
1272void SessionController::searchHistory(bool showSearchBar) 1255​void SessionController::searchHistory(bool showSearchBar)
1273{ 1256​{
1274 enableSearchBar(showSearchBar); 1257​ enableSearchBar(showSearchBar);
1275 ​
1276 if (!_searchBar.isNull()) { ​
1277 if (showSearchBar) { 1258​ if (showSearchBar) {
1278 removeSearchFilter(); 1259​ removeSearchFilter();
1279 1260​
1280 listenForScreenWindowUpdates(); 1261​ listenForScreenWindowUpdates();
1281 1262​
1282 _searchFilter = new RegExpFilter(); 1263​ _searchFilter = new RegExpFilter();
1283 _searchFilter->setRegExp(regexpFromSearchBarOptions()); 1264​ _searchFilter->setRegExp(regexpFromSearchBarOptions());
1284 _view->filterChain()->addFilter(_searchFilter); 1265​ _view->terminalDisplay()->filterChain()->addFilter(_searchFilter);
1285 _view->processFilters(); 1266​ _view->terminalDisplay()->processFilters();
1286 1267​
1287 setFindNextPrevEnabled(true); 1268​ setFindNextPrevEnabled(true);
1288 } else { 1269​ } else {
1289 setFindNextPrevEnabled(false); 1270​ setFindNextPrevEnabled(false);
1290 ​
1291 removeSearchFilter(); 1271​ removeSearchFilter();
1292 1272​ _view->terminalDisplay()->setFocus(Qt::ActiveWindowFocusReason);
1293 _view->setFocus(Qt::ActiveWindowFocusReason); ​
1294 } ​
1295 } 1273​ }
1274​
rizzitelloUnsubmitted
Not Done

New Empty line

rizzitello: New Empty line
1296} 1275​}
1297 1276​
1298void SessionController::setFindNextPrevEnabled(bool enabled) 1277​void SessionController::setFindNextPrevEnabled(bool enabled)
1299{ 1278​{
1300 _findNextAction->setEnabled(enabled); 1279​ _findNextAction->setEnabled(enabled);
1301 _findPreviousAction->setEnabled(enabled); 1280​ _findPreviousAction->setEnabled(enabled);
1302} 1281​}
1303void SessionController::searchTextChanged(const QString& text) 1282​void SessionController::searchTextChanged(const QString& text)
1304{ 1283​{
1305 Q_ASSERT(_view->screenWindow()); 1284​ Q_ASSERT(_view->terminalDisplay()->screenWindow());
1306 1285​
1307 if (_searchText == text) { 1286​ if (_searchText == text) {
1308 return; 1287​ return;
1309 } 1288​ }
1310 1289​
1311 _searchText = text; 1290​ _searchText = text;
1312 1291​
1313 if (text.isEmpty()) { 1292​ if (text.isEmpty()) {
1314 _view->screenWindow()->clearSelection(); 1293​ _view->terminalDisplay()->screenWindow()->clearSelection();
1315 _view->screenWindow()->scrollTo(_searchStartLine); 1294​ _view->terminalDisplay()->screenWindow()->scrollTo(_searchStartLine);
1316 } 1295​ }
1317 1296​
1318 // update search. this is called even when the text is 1297​ // update search. this is called even when the text is
1319 // empty to clear the view's filters 1298​ // empty to clear the view's filters
1320 beginSearch(text , reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch); 1299​ beginSearch(text , reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
1321} 1300​}
1322void SessionController::searchCompleted(bool success) 1301​void SessionController::searchCompleted(bool success)
1323{ 1302​{
1324 _prevSearchResultLine = _view->screenWindow()->currentResultLine(); 1303​ _prevSearchResultLine = _view->terminalDisplay()->screenWindow()->currentResultLine();
1325 1304​ _view->searchBar()->setFoundMatch(success);
1326 if (!_searchBar.isNull()) { ​
1327 _searchBar->setFoundMatch(success); ​
1328 } ​
1329} 1305​}
1330 1306​
1331void SessionController::beginSearch(const QString& text, Enum::SearchDirection direction) 1307​void SessionController::beginSearch(const QString& text, Enum::SearchDirection direction)
1332{ 1308​{
1333 Q_ASSERT(_searchBar); ​
1334 Q_ASSERT(_searchFilter); 1309​ Q_ASSERT(_searchFilter);
1335 1310​
1336 QRegularExpression regExp = regexpFromSearchBarOptions(); 1311​ QRegularExpression regExp = regexpFromSearchBarOptions();
1337 _searchFilter->setRegExp(regExp); 1312​ _searchFilter->setRegExp(regExp);
1338 1313​
1339 if (_searchStartLine == -1) { 1314​ if (_searchStartLine == -1) {
1340 if (direction == Enum::ForwardsSearch) { 1315​ if (direction == Enum::ForwardsSearch) {
1341 setSearchStartTo(_view->screenWindow()->currentLine()); 1316​ setSearchStartTo(_view->terminalDisplay()->screenWindow()->currentLine());
1342 } else { 1317​ } else {
1343 setSearchStartTo(_view->screenWindow()->currentLine() + _view->screenWindow()->windowLines()); 1318​ setSearchStartTo(_view->terminalDisplay()->screenWindow()->currentLine() + _view->terminalDisplay()->screenWindow()->windowLines());
1344 } 1319​ }
1345 } 1320​ }
1346 1321​
1347 if (!regExp.pattern().isEmpty()) { 1322​ if (!regExp.pattern().isEmpty()) {
1348 _view->screenWindow()->setCurrentResultLine(-1); 1323​ _view->terminalDisplay()->screenWindow()->setCurrentResultLine(-1);
1349 auto task = new SearchHistoryTask(this); 1324​ auto task = new SearchHistoryTask(this);
1350 1325​
1351 connect(task, &Konsole::SearchHistoryTask::completed, this, &Konsole::SessionController::searchCompleted); 1326​ connect(task, &Konsole::SearchHistoryTask::completed, this, &Konsole::SessionController::searchCompleted);
1352 1327​
1353 task->setRegExp(regExp); 1328​ task->setRegExp(regExp);
1354 task->setSearchDirection(direction); 1329​ task->setSearchDirection(direction);
1355 task->setAutoDelete(true); 1330​ task->setAutoDelete(true);
1356 task->setStartLine(_searchStartLine); 1331​ task->setStartLine(_searchStartLine);
1357 task->addScreenWindow(_session , _view->screenWindow()); 1332​ task->addScreenWindow(_session , _view->terminalDisplay()->screenWindow());
1358 task->execute(); 1333​ task->execute();
1359 } else if (text.isEmpty()) { 1334​ } else if (text.isEmpty()) {
1360 searchCompleted(false); 1335​ searchCompleted(false);
1361 } 1336​ }
1362 1337​
1363 _view->processFilters(); 1338​ _view->terminalDisplay()->processFilters();
1364} 1339​}
1365void SessionController::highlightMatches(bool highlight) 1340​void SessionController::highlightMatches(bool highlight)
1366{ 1341​{
1367 if (highlight) { 1342​ if (highlight) {
1368 _view->filterChain()->addFilter(_searchFilter); 1343​ _view->terminalDisplay()->filterChain()->addFilter(_searchFilter);
1369 _view->processFilters(); 1344​ _view->terminalDisplay()->processFilters();
1370 } else { 1345​ } else {
1371 _view->filterChain()->removeFilter(_searchFilter); 1346​ _view->terminalDisplay()->filterChain()->removeFilter(_searchFilter);
1372 } 1347​ }
1373 1348​
1374 _view->update(); 1349​ _view->terminalDisplay()->update();
1375} 1350​}
1376 1351​
1377void SessionController::searchFrom() 1352​void SessionController::searchFrom()
1378{ 1353​{
1379 Q_ASSERT(_searchBar); ​
1380 Q_ASSERT(_searchFilter); 1354​ Q_ASSERT(_searchFilter);
1381 1355​
1382 if (reverseSearchChecked()) { 1356​ if (reverseSearchChecked()) {
1383 setSearchStartTo(_view->screenWindow()->lineCount()); 1357​ setSearchStartTo(_view->terminalDisplay()->screenWindow()->lineCount());
1384 } else { 1358​ } else {
1385 setSearchStartTo(0); 1359​ setSearchStartTo(0);
1386 } 1360​ }
1387 1361​
1388 1362​
1389 beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch); 1363​ beginSearch(_view->searchBar()->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
1390} 1364​}
1391void SessionController::findNextInHistory() 1365​void SessionController::findNextInHistory()
1392{ 1366​{
1393 Q_ASSERT(_searchBar); ​
1394 Q_ASSERT(_searchFilter); 1367​ Q_ASSERT(_searchFilter);
1395 1368​
1396 setSearchStartTo(_prevSearchResultLine); 1369​ setSearchStartTo(_prevSearchResultLine);
1397 1370​
1398 beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch); 1371​ beginSearch(_view->searchBar()->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
1399} 1372​}
1400void SessionController::findPreviousInHistory() 1373​void SessionController::findPreviousInHistory()
1401{ 1374​{
1402 Q_ASSERT(_searchBar); ​
1403 Q_ASSERT(_searchFilter); 1375​ Q_ASSERT(_searchFilter);
1404 1376​
1405 setSearchStartTo(_prevSearchResultLine); 1377​ setSearchStartTo(_prevSearchResultLine);
1406 1378​
1407 beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::ForwardsSearch : Enum::BackwardsSearch); 1379​ beginSearch(_view->searchBar()->searchText(), reverseSearchChecked() ? Enum::ForwardsSearch : Enum::BackwardsSearch);
1408} 1380​}
1409void SessionController::changeSearchMatch() 1381​void SessionController::changeSearchMatch()
1410{ 1382​{
1411 Q_ASSERT(_searchBar); ​
1412 Q_ASSERT(_searchFilter); 1383​ Q_ASSERT(_searchFilter);
1413 1384​
1414 // reset Selection for new case match 1385​ // reset Selection for new case match
1415 _view->screenWindow()->clearSelection(); 1386​ _view->terminalDisplay()->screenWindow()->clearSelection();
1416 beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch); 1387​ beginSearch(_view->searchBar()->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
1417} 1388​}
1418void SessionController::showHistoryOptions() 1389​void SessionController::showHistoryOptions()
1419{ 1390​{
1420 QScopedPointer<HistorySizeDialog> dialog(new HistorySizeDialog(QApplication::activeWindow())); 1391​ QScopedPointer<HistorySizeDialog> dialog(new HistorySizeDialog(QApplication::activeWindow()));
1421 const HistoryType& currentHistory = _session->historyType(); 1392​ const HistoryType& currentHistory = _session->historyType();
1422 1393​
1423 if (currentHistory.isEnabled()) { 1394​ if (currentHistory.isEnabled()) {
1424 if (currentHistory.isUnlimited()) { 1395​ if (currentHistory.isUnlimited()) {
Show All 14 Lines
1439 1410​
1440 if (result != 0) { 1411​ if (result != 0) {
1441 scrollBackOptionsChanged(dialog->mode(), dialog->lineCount()); 1412​ scrollBackOptionsChanged(dialog->mode(), dialog->lineCount());
1442 } 1413​ }
1443} 1414​}
1444void SessionController::sessionResizeRequest(const QSize& size) 1415​void SessionController::sessionResizeRequest(const QSize& size)
1445{ 1416​{
1446 ////qDebug() << "View resize requested to " << size; 1417​ ////qDebug() << "View resize requested to " << size;
1447 _view->setSize(size.width(), size.height()); 1418​ _view->terminalDisplay()->setSize(size.width(), size.height());
1448} 1419​}
1449void SessionController::scrollBackOptionsChanged(int mode, int lines) 1420​void SessionController::scrollBackOptionsChanged(int mode, int lines)
1450{ 1421​{
1451 switch (mode) { 1422​ switch (mode) {
1452 case Enum::NoHistory: 1423​ case Enum::NoHistory:
1453 _session->setHistoryType(HistoryTypeNone()); 1424​ _session->setHistoryType(HistoryTypeNone());
1454 break; 1425​ break;
1455 case Enum::FixedSizeHistory: 1426​ case Enum::FixedSizeHistory:
Show All 25 Lines1436{
1481 KConfigGroup configGroup(KSharedConfig::openConfig(), "PrintOptions"); 1452​ KConfigGroup configGroup(KSharedConfig::openConfig(), "PrintOptions");
1482 1453​
1483 if (configGroup.readEntry("ScaleOutput", true)) { 1454​ if (configGroup.readEntry("ScaleOutput", true)) {
1484 double scale = qMin(printer.pageRect().width() / static_cast<double>(_view->width()), 1455​ double scale = qMin(printer.pageRect().width() / static_cast<double>(_view->width()),
1485 printer.pageRect().height() / static_cast<double>(_view->height())); 1456​ printer.pageRect().height() / static_cast<double>(_view->height()));
1486 painter.scale(scale, scale); 1457​ painter.scale(scale, scale);
1487 } 1458​ }
1488 1459​
1489 _view->printContent(painter, configGroup.readEntry("PrinterFriendly", true)); 1460​ _view->terminalDisplay()->printContent(painter, configGroup.readEntry("PrinterFriendly", true));
1490} 1461​}
1491 1462​
1492void SessionController::saveHistory() 1463​void SessionController::saveHistory()
1493{ 1464​{
1494 SessionTask* task = new SaveHistoryTask(this); 1465​ SessionTask* task = new SaveHistoryTask(this);
1495 task->setAutoDelete(true); 1466​ task->setAutoDelete(true);
1496 task->addSession(_session); 1467​ task->addSession(_session);
1497 task->execute(); 1468​ task->execute();
1498} 1469​}
1499 1470​
1500void SessionController::clearHistory() 1471​void SessionController::clearHistory()
1501{ 1472​{
1502 _session->clearHistory(); 1473​ _session->clearHistory();
1503 _view->updateImage(); // To reset view scrollbar 1474​ _view->terminalDisplay()->updateImage(); // To reset view scrollbar
1504} 1475​}
1505 1476​
1506void SessionController::clearHistoryAndReset() 1477​void SessionController::clearHistoryAndReset()
1507{ 1478​{
1508 Profile::Ptr profile = SessionManager::instance()->sessionProfile(_session); 1479​ Profile::Ptr profile = SessionManager::instance()->sessionProfile(_session);
1509 QByteArray name = profile->defaultEncoding().toUtf8(); 1480​ QByteArray name = profile->defaultEncoding().toUtf8();
1510 1481​
1511 Emulation* emulation = _session->emulation(); 1482​ Emulation* emulation = _session->emulation();
1512 emulation->reset(); 1483​ emulation->reset();
1513 _session->refresh(); 1484​ _session->refresh();
1514 _session->setCodec(QTextCodec::codecForName(name)); 1485​ _session->setCodec(QTextCodec::codecForName(name));
1515 clearHistory(); 1486​ clearHistory();
1516} 1487​}
1517 1488​
1518void SessionController::increaseFontSize() 1489​void SessionController::increaseFontSize()
1519{ 1490​{
1520 _view->increaseFontSize(); 1491​ _view->terminalDisplay()->increaseFontSize();
1521} 1492​}
1522 1493​
1523void SessionController::decreaseFontSize() 1494​void SessionController::decreaseFontSize()
1524{ 1495​{
1525 _view->decreaseFontSize(); 1496​ _view->terminalDisplay()->decreaseFontSize();
1526} 1497​}
1527 1498​
1528void SessionController::monitorActivity(bool monitor) 1499​void SessionController::monitorActivity(bool monitor)
1529{ 1500​{
1530 _session->setMonitorActivity(monitor); 1501​ _session->setMonitorActivity(monitor);
1531} 1502​}
1532void SessionController::monitorSilence(bool monitor) 1503​void SessionController::monitorSilence(bool monitor)
1533{ 1504​{
Show All 37 Lines1522{
1571 updateActionState(QStringLiteral("send-signal")); 1542​ updateActionState(QStringLiteral("send-signal"));
1572 updateActionState(QStringLiteral("zmodem-upload")); 1543​ updateActionState(QStringLiteral("zmodem-upload"));
1573 1544​
1574 _codecAction->setEnabled(!readonly); 1545​ _codecAction->setEnabled(!readonly);
1575 1546​
1576 // Without the timer, when detaching a tab while the message widget is visible, 1547​ // Without the timer, when detaching a tab while the message widget is visible,
1577 // the size of the terminal becomes really small... 1548​ // the size of the terminal becomes really small...
1578 QTimer::singleShot(0, this, [this, readonly]() { 1549​ QTimer::singleShot(0, this, [this, readonly]() {
1579 _view->updateReadOnlyState(readonly); 1550​ _view->terminalDisplay()->updateReadOnlyState(readonly);
1580 }); 1551​ });
1581} 1552​}
1582 1553​
1583bool SessionController::isReadOnly() const 1554​bool SessionController::isReadOnly() const
1584{ 1555​{
1585 if (!_session.isNull()) { 1556​ if (!_session.isNull()) {
1586 return _session->isReadOnly(); 1557​ return _session->isReadOnly();
1587 } else { 1558​ } else {
Show All 29 Lines
1617void SessionController::sessionReadOnlyChanged() { 1588​void SessionController::sessionReadOnlyChanged() {
1618 // Trigger icon update 1589​ // Trigger icon update
1619 sessionTitleChanged(); 1590​ sessionTitleChanged();
1620 1591​
1621 updateReadOnlyActionStates(); 1592​ updateReadOnlyActionStates();
1622 1593​
1623 // Update all views 1594​ // Update all views
1624 for (TerminalDisplay* view : session()->views()) { 1595​ for (TerminalDisplay* view : session()->views()) {
1625 if (view != _view.data()) { 1596​ if (view != _view->terminalDisplay()) {
1626 view->updateReadOnlyState(isReadOnly()); 1597​ view->updateReadOnlyState(isReadOnly());
1627 } 1598​ }
1628 } 1599​ }
1629} 1600​}
1630 1601​
1631void SessionController::showDisplayContextMenu(const QPoint& position) 1602​void SessionController::showDisplayContextMenu(const QPoint& position)
1632{ 1603​{
1633 // needed to make sure the popup menu is available, even if a hosting 1604​ // needed to make sure the popup menu is available, even if a hosting
1634 // application did not merge our GUI. 1605​ // application did not merge our GUI.
1635 if (factory() == nullptr) { 1606​ if (factory() == nullptr) {
1636 if (clientBuilder() == nullptr) { 1607​ if (clientBuilder() == nullptr) {
1637 setClientBuilder(new KXMLGUIBuilder(_view)); 1608​ setClientBuilder(new KXMLGUIBuilder(_view->terminalDisplay()));
1638 } 1609​ }
1639 1610​
1640 auto factory = new KXMLGUIFactory(clientBuilder(), this); 1611​ auto factory = new KXMLGUIFactory(clientBuilder(), this);
1641 factory->addClient(this); 1612​ factory->addClient(this);
1642 ////qDebug() << "Created xmlgui factory" << factory; 1613​ ////qDebug() << "Created xmlgui factory" << factory;
1643 } 1614​ }
1644 1615​
1645 QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this)); 1616​ QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this));
1646 if (!popup.isNull()) { 1617​ if (!popup.isNull()) {
1647 updateReadOnlyActionStates(); 1618​ updateReadOnlyActionStates();
1648 1619​
1649 // prepend content-specific actions such as "Open Link", "Copy Email Address" etc. 1620​ // prepend content-specific actions such as "Open Link", "Copy Email Address" etc.
1650 QList<QAction*> contentActions = _view->filterActions(position); 1621​ QList<QAction*> contentActions = _view->terminalDisplay()->filterActions(position);
1651 auto contentSeparator = new QAction(popup); 1622​ auto contentSeparator = new QAction(popup);
1652 contentSeparator->setSeparator(true); 1623​ contentSeparator->setSeparator(true);
1653 contentActions << contentSeparator; 1624​ contentActions << contentSeparator;
1654 popup->insertActions(popup->actions().value(0, nullptr), contentActions); 1625​ popup->insertActions(popup->actions().value(0, nullptr), contentActions);
1655 1626​
1656 // always update this submenu before showing the context menu, 1627​ // always update this submenu before showing the context menu,
1657 // because the available search services might have changed 1628​ // because the available search services might have changed
1658 // since the context menu is shown last time 1629​ // since the context menu is shown last time
▲ Show 20 Lines • Show All 477 Lines • Show Last 20 Lines