diff options
| -rw-r--r-- | apps/window.c | 19 | ||||
| -rw-r--r-- | libgui/gui.c | 10 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 3 | ||||
| -rwxr-xr-x | run | 6 |
4 files changed, 28 insertions, 10 deletions
diff --git a/apps/window.c b/apps/window.c index 6c71fc6..b3746c6 100644 --- a/apps/window.c +++ b/apps/window.c @@ -21,9 +21,12 @@ int main() gui_fill(&win, COLOR_BG); /* gui_border(&win, COLOR_FG, 2); */ - gui_init("/font/spleen-12x24.psfu"); + gui_init("/font/ter-p18n.psf"); + int font_height = gui_font_height(); + int font_width = gui_font_width(); + char *hello = "Hello, world!"; - gui_write(&win, win.width / 2 - (strlen(hello) * 12) / 2, 5, COLOR_GREEN, hello); + gui_write(&win, win.width / 2 - (strlen(hello) * font_width) / 2, 5, COLOR_GREEN, hello); struct message *msg; int char_x = 0; @@ -50,15 +53,17 @@ int main() } else if (ch == '\b') { if (char_x > 0) { char_x--; - gui_draw_rectangle(&win, 12 * char_x, 24 * char_y + 5, - 12 * (char_x + 1) - 1, - 24 * (char_y + 1) + 4, COLOR_BG); + gui_draw_rectangle(&win, font_width * char_x, + font_height * char_y + 5, + font_width * (char_x + 1) - 1, + font_height * (char_y + 1) + 4, + COLOR_BG); } } else if (ch == ' ' && event->scancode == KEY_SPACE) { char_x++; } else if (ch != ' ' && ch != '\0') { - gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN, - ch); + gui_write_char(&win, font_width * char_x++, + font_height * char_y + 5, COLOR_CYAN, ch); } break; } diff --git a/libgui/gui.c b/libgui/gui.c index 1ff202d..3bbf3d2 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -167,6 +167,16 @@ void gui_border(struct window *win, u32 c, u32 width) gui_redraw(); } +int gui_font_height() +{ + return font->height; +} + +int gui_font_width() +{ + return font->width; +} + void gui_init(char *font_path) { font = psf_parse(read(font_path)); diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index da548fc..4186d43 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -76,6 +76,9 @@ void gui_fill(struct window *win, u32 c); void gui_border(struct window *win, u32 c, u32 width); void gui_init(char *font_path); +int gui_font_height(); +int gui_font_width(); + /** * Wrappers */ @@ -73,9 +73,9 @@ make_disk() { mv spleen-"$VERSION"/*.psfu . rm -rf "spleen-$VERSION"* - cp /usr/share/kbd/consolefonts/ter-p32b.psf.gz . && - cp /usr/share/kbd/consolefonts/ter-p32n.psf.gz . && - gunzip ter-p32* || echo "Terminus font not found!" + ls /usr/share/kbd/consolefonts/ter-p* >/dev/null && + cp /usr/share/kbd/consolefonts/ter-p* . && + gunzip ter-p* || echo "Terminus font not found!" cd ../../ } |