diff options
| author | Marvin Borner | 2020-11-19 20:03:54 +0100 |
|---|---|---|
| committer | Marvin Borner | 2020-11-19 20:03:54 +0100 |
| commit | b014342841485737424bee31840fd848fa706536 (patch) | |
| tree | cdf3580b787bab95d1b1e331fb778a7fd39dfad3 | |
| parent | d8036aa78139c7890d8adde6ee937929623dbffb (diff) | |
Added some color
| -rw-r--r-- | apps/browser.c | 29 | ||||
| -rw-r--r-- | apps/wm.c | 6 | ||||
| -rw-r--r-- | libgui/gfx.c | 2 | ||||
| -rw-r--r-- | libgui/inc/gfx.h | 3 |
4 files changed, 34 insertions, 6 deletions
diff --git a/apps/browser.c b/apps/browser.c index 5a10857..2bc85d6 100644 --- a/apps/browser.c +++ b/apps/browser.c @@ -32,6 +32,32 @@ char **dns_split(char *url, char **buf) return buf; } +u32 status_color(char *http_code) +{ + u32 c = 0; + switch (http_code[0]) { + case '1': // Information response + c = COLOR_BLUE; + break; + case '2': // Successful response + c = COLOR_GREEN; + break; + case '3': // Redirects + c = COLOR_YELLOW; + break; + case '4': // Client error + c = COLOR_RED; + break; + case '5': // Server error + c = COLOR_MAGENTA; + break; + default: + c = COLOR_WHITE; + break; + } + return c; +} + void on_submit(void *event, struct element *box) { (void)event; @@ -56,6 +82,7 @@ void on_submit(void *event, struct element *box) net_receive(socket, buf, 4096); l->text = http_data(buf); c->text = http_code(buf); + c->color_fg = status_color(c->text); } else { l->text = strdup("Can't connect to server."); c->text = strdup("000"); @@ -69,7 +96,7 @@ int main() { // TODO: Dynamic element positioning root = gui_init("browser", WIDTH + 2 * BORDER, HEIGHT + 2 * BORDER, COLOR_BG); - code_label = gui_add_label(root, BORDER, BORDER, FONT_24, "000", COLOR_WHITE, COLOR_BLACK); + code_label = gui_add_label(root, BORDER, BORDER, FONT_24, "000", COLOR_BLACK, COLOR_WHITE); struct element *text_input = gui_add_text_input(root, LABEL_WIDTH + 2 * BORDER, BORDER, WIDTH - LABEL_WIDTH - BORDER, FONT_24, COLOR_WHITE, COLOR_BLACK); @@ -232,10 +232,10 @@ int main(int argc, char **argv) direct.fb = vbe.fb; list_add(contexts, &root); - /* gfx_write(&direct, 0, 0, FONT_32, COLOR_FG, "Welcome to Melvix!"); */ - /* gfx_write(&direct, 0, 32, FONT_32, COLOR_FG, "Loading resources..."); */ + gfx_write(&direct, 0, 0, FONT_32, COLOR_FG, "Welcome to Melvix!"); + gfx_write(&direct, 0, 32, FONT_32, COLOR_FG, "Loading resources..."); gfx_fill(&root, COLOR_FG); - /* gfx_load_wallpaper(&root, "/res/wall.bmp"); */ + gfx_load_wallpaper(&root, "/res/wall.bmp"); gfx_load_image(&cursor, "/res/cursor.bmp", 0, 0); redraw_all(); diff --git a/libgui/gfx.c b/libgui/gfx.c index 066ab81..16b5683 100644 --- a/libgui/gfx.c +++ b/libgui/gfx.c @@ -102,7 +102,7 @@ void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, /* gfx_redraw(); */ } -void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char *text) +void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, const char *text) { struct font *font = gfx_resolve_font(font_type); u32 cnt = 0; diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h index 58a03cb..0f4c631 100644 --- a/libgui/inc/gfx.h +++ b/libgui/inc/gfx.h @@ -66,7 +66,8 @@ struct context { struct font *gfx_resolve_font(enum font_type font_type); void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch); -void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char *text); +void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, + const char *text); void gfx_load_image(struct context *ctx, const char *path, int x, int y); void gfx_load_wallpaper(struct context *ctx, const char *path); void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height); |