qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-14 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qwaq] Update line and char indices with cursor motion

Browse source
This commit is contained in:
Bill Currie 2021-06-08 16:48:24 +09:00
parent 1f6a4ed941
commit c06acd3b53
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ruamoko/qwaq/editor/editor.r
View file

@ -182,10 +182,13 @@ handleEvent (Editor *self, qwaq_event_t *event)
-cursorUp:(unsigned)count -cursorUp:(unsigned)count
{ {
[self recenter:0];
if (count > cursor.y) { if (count > cursor.y) {
count = cursor.y; count = cursor.y;
} }
cursor.y -= count; cursor.y -= count;
line_index = [buffer prevLine:line_index :count];
char_index = [buffer charPtr:line_index at:cursor.x];
if (base.y > cursor.y) { if (base.y > cursor.y) {
[vScrollBar setIndex:cursor.y]; [vScrollBar setIndex:cursor.y];
} }
@ -195,10 +198,13 @@ handleEvent (Editor *self, qwaq_event_t *event)
-cursorDown:(unsigned)count -cursorDown:(unsigned)count
{ {
[self recenter:0];
if (count > line_count - cursor.y) { if (count > line_count - cursor.y) {
count = line_count - cursor.y; count = line_count - cursor.y;
} }
cursor.y += count; cursor.y += count;
line_index = [buffer nextLine:line_index :count];
char_index = [buffer charPtr:line_index at:cursor.x];
if (base.y + ylen - 1 < cursor.y) { if (base.y + ylen - 1 < cursor.y) {
[vScrollBar setIndex:cursor.y + 1 - ylen]; [vScrollBar setIndex:cursor.y + 1 - ylen];
} }
@ -208,10 +214,12 @@ handleEvent (Editor *self, qwaq_event_t *event)
-cursorLeft:(unsigned)count -cursorLeft:(unsigned)count
{ {
[self recenter:0];
if (count > cursor.x) { if (count > cursor.x) {
count = cursor.x; count = cursor.x;
} }
cursor.x -= count; cursor.x -= count;
char_index = [buffer charPtr:line_index at:cursor.x];
if (base.x > cursor.x) { if (base.x > cursor.x) {
[hScrollBar setIndex:cursor.x]; [hScrollBar setIndex:cursor.x];
} }
@ -221,8 +229,10 @@ handleEvent (Editor *self, qwaq_event_t *event)
-cursorRight:(unsigned)count -cursorRight:(unsigned)count
{ {
[self recenter:0];
// FIXME handle horizontal scrolling and how to deal with max scroll // FIXME handle horizontal scrolling and how to deal with max scroll
cursor.x += count; cursor.x += count;
char_index = [buffer charPtr:line_index at:cursor.x];
if (base.x + xlen - 1 < cursor.x) { if (base.x + xlen - 1 < cursor.x) {
[hScrollBar setIndex:cursor.x + 1 - xlen]; [hScrollBar setIndex:cursor.x + 1 - xlen];
} }
@ -283,7 +293,7 @@ trackCursor (Editor *self)
} }
cursor.y = line; cursor.y = line;
char_index = [buffer charPtr:line_index at:cursor.x]; char_index = [buffer charPtr:line_index at:cursor.x];
[self recenter: 0]; [self recenter:0];
[self moveCursor: {cursor.x - base.x, cursor.y - base.y}]; [self moveCursor: {cursor.x - base.x, cursor.y - base.y}];
return self; return self;
} }