Skip to content

[lib][gfxconsole] Implement ASCII backspace #498

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

[lib][gfxconsole] Implement ASCII backspace #498

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: 25 additions & 12 deletions lib/gfxconsole/gfxconsole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* @ingroup graphics
*/

#include <lk/debug.h>
#include <assert.h>
#include <lib/io.h>
#include <lk/init.h>
#include <dev/display.h>
#include <lib/font.h>
#include <lib/gfx.h>
#include <lib/gfxconsole.h>
#include <lib/font.h>
#include <dev/display.h>
#include <lib/io.h>
#include <lk/debug.h>
#include <lk/init.h>

/** @addtogroup graphics
* @{
Expand All @@ -43,14 +43,25 @@ static struct {
} gfxconsole;

static void gfxconsole_putc(char c) {
static enum { NORMAL, ESCAPE } state = NORMAL;
static enum { NORMAL,
ESCAPE } state = NORMAL;
static uint32_t p_num = 0;

switch (state) {
case NORMAL: {
if (c == '\n' || c == '\r') {
gfxconsole.x = 0;
gfxconsole.y++;
} else if (c == '\b') {
if (gfxconsole.x > 0) {
gfxconsole.x--;
}

gfx_fillrect(gfxconsole.surface, gfxconsole.x * FONT_X, gfxconsole.y * FONT_Y,
FONT_X, FONT_Y, gfxconsole.back_color);

gfx_flush_rows(gfxconsole.surface, gfxconsole.y * FONT_Y,
(gfxconsole.y * FONT_Y) + FONT_Y);
} else if (c == 0x1b) {
p_num = 0;
state = ESCAPE;
Expand All @@ -65,8 +76,9 @@ static void gfxconsole_putc(char c) {
if (c >= '0' && c <= '9') {
p_num = (p_num * 10) + (c - '0');
} else if (c == 'D') {
if (p_num <= gfxconsole.x)
if (p_num <= gfxconsole.x) {
gfxconsole.x -= p_num;
}
state = NORMAL;
} else if (c == '[') {
// eat this character
Expand Down Expand Up @@ -99,10 +111,9 @@ void gfxconsole_print_callback(print_callback_t *cb, const char *str, size_t len
}

static print_callback_t cb = {
.entry = { 0 },
.entry = {0},
.print = gfxconsole_print_callback,
.context = NULL
};
.context = NULL};

/**
* @brief Initialize graphics console on given drawing surface.
Expand Down Expand Up @@ -141,13 +152,15 @@ void gfxconsole_start(gfx_surface *surface) {
void gfxconsole_start_on_display(void) {
static bool started = false;

if (started)
if (started) {
return;
}

/* pop up the console */
struct display_framebuffer fb;
if (display_get_framebuffer(&fb) < 0)
if (display_get_framebuffer(&fb) < 0) {
return;
}

gfx_surface *s = gfx_create_surface_from_display(&fb);
gfxconsole_start(s);
Expand Down