Skip to content

Let Ctrl+Arrows process spaces correctly in tvedit #195

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 1 commit into
base: master
Choose a base branch
from
Open

Let Ctrl+Arrows process spaces correctly in tvedit #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 26 additions & 11 deletions source/tvision/teditor2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,17 @@ uint TEditor::nextWord( uint p )
{
if (p < bufLen)
{
// First, find the next word boundary
char a = bufChar(p);
char b;
do {
b = a;
p = nextChar(p);
} while( p < bufLen && !isWordBoundary((a = bufChar(p)), b) );
} while( p < bufLen && !isWordBoundary((a = bufChar(p)), b) );

// Then, skip any whitespace after it
while( p < bufLen && getCharType(bufChar(p)) == 0) // type 0 is whitespace
p = nextChar(p);
}
return p;
}
Expand All @@ -324,18 +329,28 @@ uint TEditor::prevLine( uint p )

uint TEditor::prevWord( uint p )
{
if (p > 0 && (p = prevChar(p), p > 0))
{
char a = bufChar(p);
char b;
do {
b = a;
if (p > 0)
{
p = prevChar(p);

// Skip any whitespace before the cursor
while (p > 0 && getCharType(bufChar(p)) == 0)
p = prevChar(p);
a = bufChar(p);
} while( p > 0 && !isWordBoundary(a, b) );
if( isWordBoundary(a, b) )
p = nextChar(p);

// Now we are at the end of a word. Find its beginning.
if (p > 0)
{
char a = bufChar(p);
char b;
do {
b = a;
p = prevChar(p);
a = bufChar(p);
} while (p > 0 && !isWordBoundary(a, b));
if (isWordBoundary(a, b))
p = nextChar(p);
}
}
return p;
}

Expand Down
Loading