diff options
| -rw-r--r-- | apps/wm.c | 13 | ||||
| -rw-r--r-- | libgui/gfx.c | 13 | ||||
| -rw-r--r-- | libgui/gui.c | 2 | ||||
| -rw-r--r-- | libgui/inc/gfx.h | 3 |
4 files changed, 22 insertions, 9 deletions
@@ -43,7 +43,8 @@ static struct context *new_context(struct context *ctx, u32 pid, int x, int y, u ctx->fb = malloc(height * ctx->pitch); memset(ctx->fb, 0, height * ctx->pitch); ctx->flags = flags; - context_count++; + if (!(flags & WF_RELATIVE)) + context_count++; if (context_count % 2 == 1) MOUSE_SKIP++; return ctx; @@ -66,6 +67,13 @@ static struct context *context_at(int x, int y) return ret; } +// This only works if window hasn't moved - TODO! +static void redraw_focused() +{ + gfx_ctx_on_ctx(&exchange, focused, focused->x, focused->y); + memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height); +} + // TODO: Add dirty bitmap redraw (and clipping?): https://github.com/JMarlin/wsbe static void redraw_all() { @@ -257,6 +265,9 @@ int main(int argc, char **argv) case GFX_REDRAW: redraw_all(); break; + case GFX_REDRAW_FOCUSED: + redraw_focused(); + break; case EVENT_MOUSE: handle_mouse(msg->data); break; diff --git a/libgui/gfx.c b/libgui/gfx.c index 63306e6..6e8b56a 100644 --- a/libgui/gfx.c +++ b/libgui/gfx.c @@ -1,6 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner // Some GFX functions // TODO: Better support for bpp < 32 +// TODO: Use efficient redrawing #include <assert.h> #include <bmp.h> @@ -98,7 +99,7 @@ void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, { struct font *font = gfx_resolve_font(font_type); write_char(ctx, x, y, font, c, ch); - gfx_redraw(); + /* gfx_redraw(); */ } void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char *text) @@ -107,7 +108,7 @@ void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 for (u32 i = 0; i < strlen(text); i++) { write_char(ctx, x + i * font->width, y, font, c, text[i]); } - gfx_redraw(); + /* gfx_redraw(); */ } void gfx_load_image(struct context *ctx, char *path, int x, int y) @@ -126,7 +127,7 @@ void gfx_load_image(struct context *ctx, char *path, int x, int y) srcfb -= bmp->pitch; destfb += ctx->pitch; } - gfx_redraw(); + /* gfx_redraw(); */ } void gfx_load_wallpaper(struct context *ctx, char *path) @@ -185,13 +186,13 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y) void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c) { draw_rectangle(ctx, x1, y1, x2, y2, c); - gfx_redraw(); + /* gfx_redraw(); */ } void gfx_fill(struct context *ctx, u32 c) { draw_rectangle(ctx, 0, 0, ctx->width, ctx->height, c); - gfx_redraw(); + /* gfx_redraw(); */ } void gfx_border(struct context *ctx, u32 c, u32 width) @@ -209,7 +210,7 @@ void gfx_border(struct context *ctx, u32 c, u32 width) } draw += ctx->pitch; } - gfx_redraw(); + /* gfx_redraw(); */ } int gfx_font_height(enum font_type font_type) diff --git a/libgui/gui.c b/libgui/gui.c index 72de970..399192f 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -277,7 +277,7 @@ void gui_event_loop(struct element *container) s[l + 1] = '\0'; gui_sync_text_input(focused); merge_elements(get_root(focused->window_id)); - gfx_redraw(); + gfx_redraw_focused(); // Only redraw window } if (focused && focused->event.on_key && event->ch) { diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h index c8e5a29..0b37d84 100644 --- a/libgui/inc/gfx.h +++ b/libgui/inc/gfx.h @@ -42,7 +42,7 @@ enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 }; -enum message_type { GFX_NEW_CONTEXT = EVENT_MAX + 1, GFX_REDRAW, GFX_MAX }; +enum message_type { GFX_NEW_CONTEXT = EVENT_MAX + 1, GFX_REDRAW, GFX_REDRAW_FOCUSED, GFX_MAX }; // Generalized font struct struct font { @@ -85,5 +85,6 @@ int gfx_font_width(enum font_type); #define gfx_new_ctx(ctx) \ (msg_send(2, GFX_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data) #define gfx_redraw() (msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization) +#define gfx_redraw_focused() (msg_send(2, GFX_REDRAW_FOCUSED, NULL)) #endif |