diff options
| -rw-r--r-- | apps/window.c | 5 | ||||
| -rw-r--r-- | apps/wm.c | 28 | ||||
| -rw-r--r-- | libc/inc/mem.h | 4 | ||||
| -rw-r--r-- | libc/str.c | 3 | ||||
| -rw-r--r-- | libgui/gfx.c | 8 |
5 files changed, 27 insertions, 21 deletions
diff --git a/apps/window.c b/apps/window.c index f993ea4..da84eff 100644 --- a/apps/window.c +++ b/apps/window.c @@ -9,6 +9,11 @@ int main() struct gui_window win = { 0 }; assert(gui_new_window(&win) > 0); gfx_fill(win.ctx, COLOR_GREEN); + // Professional testing + for (int i = 0; i < 12; i++) { + gfx_write(win.ctx, vec2(0, i * gfx_font_height(FONT_32)), FONT_32, COLOR_BLACK, + "Hallo, wie geht es Ihnen denn heute?"); + } assert(gui_redraw_window(win.id) > 0); log("%d\n", win.ctx->size.x); return 0; @@ -19,7 +19,7 @@ struct client { struct window { u32 id; - char *name; + const char *name; struct context ctx; struct client client; u32 flags; @@ -72,11 +72,10 @@ static struct window *window_new(struct client client, const char *name, struct { struct window *win = malloc(sizeof(*win)); win->id = rand(); - win->name = strdup(name); + win->name = name; // strdup? win->ctx.size = size; win->ctx.bpp = screen.bpp; win->ctx.pitch = size.x * bypp; - log("%s: %d %d\n", name, size.x, win->ctx.pitch); win->ctx.bytes = win->ctx.pitch * win->ctx.size.y; if ((flags & WF_NO_FB) != 0) { win->ctx.fb = NULL; @@ -105,7 +104,7 @@ static struct window *window_find(u32 id) static void window_destroy(struct window *win) { - free(win->name); + /* free(win->name); */ free(win->ctx.fb); free(win); } @@ -164,6 +163,7 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud { u32 width = pos2.x - pos1.x; u32 height = pos2.y - pos1.y; + u32 pitch = width * bypp; void *data = zalloc(width * height * bypp); struct list *windows_at = list_new(); @@ -176,14 +176,21 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud if (win == excluded) continue; - // This will only work for background windows - TODO - u32 pitch = width * bypp; - u8 *srcfb = &win->ctx.fb[pos1.x * bypp + pos1.y * win->ctx.pitch]; + vec2 pos = vec2_sub(pos1, win->pos); + u8 *srcfb = &win->ctx.fb[pos.x * bypp + pos.y * win->ctx.pitch]; u8 *destfb = data; for (u32 cy = 0; cy < height; cy++) { - memcpy(destfb, srcfb, pitch); - srcfb += win->ctx.pitch; - destfb += pitch; + int diff = 0; + for (u32 cx = 0; cx < width; cx++) { + if (srcfb[bypp - 1]) + memcpy(destfb, srcfb, bypp); + + srcfb += bypp; + destfb += bypp; + diff += bypp; + } + srcfb += win->ctx.pitch - diff; + destfb += pitch - diff; } } list_destroy(windows_at); @@ -261,7 +268,6 @@ static void handle_event_mouse(struct event_mouse *event) else if (mouse.pos.y + cursor->ctx.size.y > (unsigned)screen.height - 1) mouse.pos.y = screen.height - cursor->ctx.size.y - 1; - /* log("%d %d\n", mouse.pos.x, mouse.pos.y); */ cursor->pos = mouse.pos; if (!vec2_eq(cursor->pos, cursor->pos_prev)) diff --git a/libc/inc/mem.h b/libc/inc/mem.h index 0498d8c..e4416dd 100644 --- a/libc/inc/mem.h +++ b/libc/inc/mem.h @@ -9,8 +9,8 @@ int malloc_allocated; void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp); void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp); -#define malloc(size) malloc_debug(size, __FILE__, __LINE__, __func__, #size) -#define free(ptr) free_debug(ptr, __FILE__, __LINE__, __func__, #ptr) +#define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size) +#define free(ptr) free_debug((void *)(ptr), __FILE__, __LINE__, __func__, #ptr) void *realloc(void *ptr, u32 size); void *zalloc(u32 size); @@ -119,8 +119,7 @@ char *strdup(const char *s) int l = strlen(s) + 1; char *d = malloc(l); - if (d) - memcpy(d, s, l); + memcpy(d, s, l); return d; } diff --git a/libgui/gfx.c b/libgui/gfx.c index 687a883..d9457c7 100644 --- a/libgui/gfx.c +++ b/libgui/gfx.c @@ -211,12 +211,8 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos) for (u32 cy = 0; cy < src->size.y && cy + pos.y < dest->size.y; cy++) { int diff = 0; for (u32 cx = 0; cx < src->size.x && cx + pos.x < dest->size.x; cx++) { - if (srcfb[3]) { - destfb[0] = srcfb[0]; - destfb[1] = srcfb[1]; - destfb[2] = srcfb[2]; - destfb[3] = srcfb[3]; - } + if (srcfb[bypp - 1]) + memcpy(destfb, srcfb, bypp); srcfb += bypp; destfb += bypp; |