Skip to content

More refresh optimizations #14

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

Merged
jledet merged 2 commits into from
Jul 11, 2025
Merged

More refresh optimizations #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a935b8
slash: use explicit flush and reenable stream buffering
jledet Jul 10, 2025
9414e18
slash: use CUB to move cursor back
jledet Jul 10, 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
57 changes: 35 additions & 22 deletions src/slash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ static int slash_write(struct slash *slash, const char *buf, size_t count)
return fwrite(buf, 1, count, slash->file_write) == count ? (int)count : -1;
}

static int slash_write_flush(struct slash *slash)
{
return fflush(slash->file_write) == 0 ? 0 : -1;
}

static int slash_read(struct slash *slash, void *buf, size_t count)
{
return fread(buf, 1, count, slash->file_read) == count ? (int)count : -1;
Expand Down Expand Up @@ -906,37 +911,48 @@ static bool slash_history_previous(struct slash *slash)
}

/* Line editing */
static int slash_cursor_back(struct slash *slash, size_t n)
{
/* If we need to move more than 3 colums, CUB uses fewer bytes */
if (n > 3) {
slash_printf(slash, ESCAPE("%zuD"), n);
} else {
while (n--)
slash_putchar(slash, '\b');
}

return 0;
}
int slash_refresh(struct slash *slash)
{
const char *esc = ESCAPE("K");

if (slash->refresh_full) {
slash_putchar(slash, '\r');
if (slash_write(slash, slash->prompt, slash->prompt_length) < 0)
return -1;
if (slash_write(slash, esc, strlen(esc)) < 0)
return -1;
if (slash_write(slash, slash->prompt, slash->prompt_length) < 0)
return -1;
slash->cursor_screen = 0;
slash->length_screen = 0;
slash->refresh_full = false;
}

if (slash->refresh_buffer) {
while (slash->cursor_screen > 0) {
slash_putchar(slash, '\b');
slash->cursor_screen--;
}
slash_cursor_back(slash, slash->cursor_screen);
slash->cursor_screen = 0;
slash->refresh_buffer = false;
}

while (slash->cursor_screen != slash->cursor) {
if (slash->cursor_screen < slash->cursor) {
slash_putchar(slash, slash->buffer[slash->cursor_screen]);
slash->cursor_screen++;
} else if (slash->cursor_screen > slash->cursor) {
slash_putchar(slash, '\b');
slash->cursor_screen--;
}
while (slash->cursor_screen < slash->cursor) {
slash_putchar(slash, slash->buffer[slash->cursor_screen]);
slash->cursor_screen++;
}

if (slash->cursor_screen > slash->cursor) {
slash_cursor_back(slash,
slash->cursor_screen - slash->cursor);
slash->cursor_screen = slash->cursor;
}

if (slash->length_screen != slash->length) {
Expand All @@ -951,15 +967,16 @@ int slash_refresh(struct slash *slash)
return -1;
}

while (slash->cursor_screen > slash->cursor) {
slash_putchar(slash, '\b');
slash->cursor_screen--;
if (slash->cursor_screen > slash->cursor) {
slash_cursor_back(slash,
slash->cursor_screen - slash->cursor);
slash->cursor_screen = slash->cursor;
}

slash->length_screen = slash->length;
}

return 0;
return slash_write_flush(slash);
}

static void slash_insert(struct slash *slash, int c)
Expand Down Expand Up @@ -1335,10 +1352,6 @@ int slash_init(struct slash *slash,
/* Set default prompt */
slash_set_prompt(slash, "slash> ");

/* Disable stream buffering */
setvbuf(slash->file_read, NULL, _IONBF, 0);
setvbuf(slash->file_write, NULL, _IONBF, 0);

/* Initialize line buffer */
slash->buffer = line;
slash->line_size = line_size;
Expand Down