Compare commits

..

5 Commits

View File

@@ -86,6 +86,12 @@ void buffer_right(Buffer* buffer) {
}
}
void right_key_handler(Buffer* buffer) {
if ((*(buffer->end) != '\n') || (getcury(mainwin) + 1 < getmaxy(mainwin))) {
buffer_right(buffer);
}
}
void buffer_left(Buffer* buffer) {
if (buffer->start != buffer->text) {
char c = *(buffer->start - 1);
@@ -96,7 +102,11 @@ void buffer_left(Buffer* buffer) {
}
}
void left_key_handler(Buffer* buffer) {
if ((getcurx(mainwin) > 0) || (getcury(mainwin) > 0)) {
buffer_left(buffer);
}
}
void scroll_page_down_handler(Buffer* buffer) {
while (*(buffer->text + index_to_start) != '\n') {
@@ -114,7 +124,7 @@ void page_down_handler(Buffer* buffer) {
once, so this hardcoded statement is fine. */
while (*(buffer->start - 1) != '\n') {
while ((*(buffer->start - 1) != '\n') && (buffer->end != (buffer->text + buffer->size))) {
buffer_right(buffer);
}
@@ -158,6 +168,13 @@ void page_up_handler(Buffer* buffer) {
}
void keypress_handler(char key, Buffer* buffer) {
buffer_insert(key,buffer);
if ((getcury(mainwin) + 1) == getmaxy(mainwin)) {
scroll_page_down_handler(buffer);
}
}
int is_file(char* path) {
struct stat st;
if (stat(path, &st) < 0) {
@@ -197,7 +214,6 @@ void init_curses() {
keypad(stdscr,TRUE);
keypad(mainwin,TRUE);
raw();
// scrollok(stdscr,TRUE);
}
void end_ncurses() {
@@ -247,14 +263,16 @@ int main(int argc, char** argv) {
if (i >= buffer->size) {
break;
}
waddch(mainwin,*(buffer->text + i));
i++;
fprintf(logfile,"At line %d of %d\n",getcury(mainwin),getmaxy(mainwin));
if (*(buffer->text + i) == '\n' && ((getcury(mainwin) + 1) == getmaxy(mainwin))) {
fprintf(logfile,"Read newline\n");
break;
}
waddch(mainwin,*(buffer->text + i));
i++;
}
wmove(mainwin,y,x);
@@ -276,15 +294,15 @@ int main(int argc, char** argv) {
break;
case KEY_LEFT:
buffer_left(buffer);
left_key_handler(buffer);
break;
case KEY_RIGHT:
buffer_right(buffer);
right_key_handler(buffer);
break;
case 10: /* Enter key */
buffer_insert('\n',buffer); /* Why handle this separately?
keypress_handler('\n',buffer); /* Why handle this separately?
Because, by default, curses seems to send '\r\n',
which is technically two characters. I should
probably add some code to deal with this scenario
@@ -316,7 +334,7 @@ int main(int argc, char** argv) {
break;
default:
buffer_insert(ch,buffer);
keypress_handler(ch,buffer);
}