Skip to content

Several editor fixes and improvements #3151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unxed wants to merge 7 commits into
base: master
Choose a base branch
from
+46 −2
Open

Several editor fixes and improvements #3151

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ed1107
Removed unneeded line
unxed Dec 13, 2025
a67a53b
Fix #3149
unxed Dec 27, 2025
fb6c24f
cosmetic
unxed Dec 27, 2025
c498e17
Fix #3167
unxed Dec 27, 2025
16f31fb
- implement horizontal auto scrolling on mouse selection
unxed Dec 28, 2025
54a8a72
let #3149 fix be more explicit
unxed Dec 28, 2025
fe583ee
Take in mind Shift+...
unxed Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 deletions far2l/src/editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,11 @@ void Editor::ShowEditor(int CurLineOnly)
CurLine->SetLeftPos(0);
MaxRightPos = CurLine->GetCellCurPos();

int v_start, v_end;
CurLine->GetVisualLine(m_CurVisualLineInLogicalLine, v_start, v_end);
int visual_line_start_cell = CurLine->RealPosToCell(v_start);
m_WordWrapMaxRightPos = CurLine->GetCellCurPos() - visual_line_start_cell;

// Ensure TopScreen pointers are initialized
if (!m_TopScreenLogicalLine) {
m_TopScreenLogicalLine = TopScreen;
Expand Down Expand Up @@ -2132,8 +2137,6 @@ int Editor::ProcessKey(FarKey Key)
}
else
{
CurPos = CurLine->RealPosToCell(CurPos);

if (!SelStart) {
CurLine->Select(-1, 0);
} else {
Expand Down Expand Up @@ -3395,6 +3398,14 @@ case KEY_CTRLNUMPAD3: {
}
default: {
{
// workaround for #3149
unsigned int BaseKey = Key & ~KEY_SHIFT;
if (m_bWordWrap && (
((BaseKey >= KEY_CTRLG) && (BaseKey <= KEY_CTRLJ)) ||
BaseKey == KEY_CTRLR
))
return TRUE;

if ((Key == KEY_CTRLDEL || Key == KEY_CTRLNUMDEL || Key == KEY_CTRLDECIMAL
|| Key == KEY_CTRLT)
&& CurPos >= CurLine->GetLength()) {
Expand Down Expand Up @@ -3724,6 +3735,39 @@ int Editor::ProcessMouse(MOUSE_EVENT_RECORD *MouseEvent)
return TRUE;
}

if (!m_bWordWrap && (MouseEvent->dwButtonState & 3) && (MouseEvent->dwEventFlags & MOUSE_MOVED)) {
if (MouseEvent->dwMousePosition.X <= X1 || MouseEvent->dwMousePosition.X >= XX2) {
const bool Left = MouseEvent->dwMousePosition.X <= X1;
while (IsMouseButtonPressed() && (Left ? MouseX <= X1 : MouseX >= XX2)) {
if (Left) {
if (CurLine->GetCurPos() == 0) break;
} else {
if (!EdOpt.CursorBeyondEOL && CurLine->GetCurPos() >= CurLine->GetLength()) break;
}

Pasting++;
ProcessKey(Left ? KEY_LEFT : KEY_RIGHT);
Pasting--;

if (MouseSelStartingLine != -1) {
const int TargetPos = CurLine->GetCurPos();
const bool SelVBlock = (MouseEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) != 0;

if (MouseSelStartingLine < NumLine || (MouseSelStartingLine == NumLine && TargetPos >= MouseSelStartingPos)) {
MarkBlock(SelVBlock, MouseSelStartingLine, MouseSelStartingPos,
TargetPos - MouseSelStartingPos, NumLine + 1 - MouseSelStartingLine);
} else {
MarkBlock(SelVBlock, NumLine, TargetPos,
MouseSelStartingPos - TargetPos, MouseSelStartingLine + 1 - NumLine);
}
}
Show();
if (m_bWordWrap) break;
WINPORT(Sleep)(10);
}
return TRUE;
}
}
// scroll up/down by dragging outside editor window
if (MouseEvent->dwMousePosition.Y < Y1 && (MouseEvent->dwButtonState & 3)) {
while (IsMouseButtonPressed() && MouseY < Y1) ProcessKey(KEY_UP);
Expand Down