Skip to content

Commit 232def0

Browse files
committed
Revert "Infrastructure: Revert 6207 and 6277 (#6423)"
This reverts commit 4a9e1a4.
1 parent 4a9e1a4 commit 232def0

12 files changed

Lines changed: 336 additions & 398 deletions

src/Host.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4055,3 +4055,12 @@ void Host::setCaretEnabled(bool enabled) {
40554055
mCaretEnabled = enabled;
40564056
mpConsole->setCaretMode(enabled);
40574057
}
4058+
4059+
bool Host::autoWrap() const {
4060+
return mAutoWrap;
4061+
}
4062+
4063+
void Host::setAutoWrap(bool enabled) {
4064+
mAutoWrap = enabled;
4065+
mpConsole->setAutoWrap(enabled);
4066+
}

src/Host.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ class Host : public QObject
399399
void setEditorShowBidi(const bool);
400400
bool caretEnabled() const;
401401
void setCaretEnabled(bool enabled);
402+
bool autoWrap() const;
403+
void setAutoWrap(bool enabled);
402404

403405
cTelnet mTelnet;
404406
QPointer<TMainConsole> mpConsole;
@@ -521,7 +523,9 @@ class Host : public QObject
521523
bool mUSE_FORCE_LF_AFTER_PROMPT;
522524
bool mUSE_IRE_DRIVER_BUGFIX;
523525
bool mUSE_UNIX_EOL;
526+
// wrap at a specific amount of characters if not autowrapping:
524527
int mWrapAt;
528+
// after wrapping a line, intent it by how many spaces:
525529
int mWrapIndentCount;
526530

527531
bool mEditorAutoComplete;
@@ -722,6 +726,9 @@ private slots:
722726
ActionUnit mActionUnit;
723727
KeyUnit mKeyUnit;
724728

729+
// automatically calculate wrapping?
730+
bool mAutoWrap = true;
731+
725732
QFile mErrorLogFile;
726733

727734
QMap<QString, TEvent*> mEventMap;

0 commit comments

Comments
 (0)