diff options
| -rw-r--r-- | apps/wm.c | 26 | ||||
| -rw-r--r-- | libc/inc/vec.h | 14 |
2 files changed, 26 insertions, 14 deletions
@@ -176,8 +176,6 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud if (win == excluded) continue; - vec2 pos = vec2_sub(pos1, win->pos); - s32 start_x = win->pos.x - pos1.x; u32 end_x = width; if (start_x <= 0) { // Either right side or background @@ -190,11 +188,23 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud } } - u32 start_y = 0; + s32 start_y = win->pos.y - pos1.y; u32 end_y = height; + if (start_y <= 0) { // Either bottom side or background + u32 bot = start_y + win->ctx.size.y; + if (bot <= height) { // Bottom side + start_y = 0; + end_y = bot; + } else { // Background + start_y = 0; + } + } + + vec2 pos = vec2_sub(pos1, win->pos); - u8 *srcfb = &win->ctx.fb[(pos.x + start_x) * bypp + pos.y * win->ctx.pitch]; - u8 *destfb = &data[start_x * bypp]; + u8 *srcfb = + &win->ctx.fb[(pos.x + start_x) * bypp + (pos.y + start_y) * win->ctx.pitch]; + u8 *destfb = &data[start_x * bypp + start_y * pitch]; // Copy window data to rectangle buffer for (u32 cy = start_y; cy < end_y; cy++) { @@ -218,8 +228,10 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud static void window_redraw(struct window *win) { - struct rectangle rec = - rectangle_at(win->pos_prev, vec2_add(win->pos_prev, win->ctx.size), win); + // TODO: Only redraw difference of prev/curr (difficult with negative directions) + vec2 pos1 = win->pos_prev; + vec2 pos2 = vec2(pos1.x + win->ctx.size.x, pos1.y + win->ctx.size.y); + struct rectangle rec = rectangle_at(pos1, pos2, win); u8 *srcfb = rec.data; u8 *destfb = &root->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * root->ctx.pitch]; diff --git a/libc/inc/vec.h b/libc/inc/vec.h index 024e792..a036931 100644 --- a/libc/inc/vec.h +++ b/libc/inc/vec.h @@ -13,21 +13,21 @@ typedef struct vec3 { u32 x, y, z; } vec3; -#define vec2(x, y) ((vec2){ x, y }) -#define vec2to3(a, z) ((vec3){ a.x, a.y, z }) +#define vec2(x, y) ((vec2){ (x), (y) }) +#define vec2to3(a, z) ((vec3){ a.x, a.y, (z) }) #define vec2_add(a, b) ((vec2){ a.x + b.x, a.y + b.y }) #define vec2_sub(a, b) ((vec2){ a.x - b.x, a.y - b.y }) -#define vec2_mul(a, b) ((vec2){ a.x * b, a.y * b }) -#define vec2_div(a, b) ((vec2){ a.x / b, a.y / b }) +#define vec2_mul(a, b) ((vec2){ a.x * (b), a.y * (b) }) +#define vec2_div(a, b) ((vec2){ a.x / (b), a.y / (b) }) #define vec2_dot(a, b) ((u32)(a.x * b.x + a.y * b.y)) #define vec2_eq(a, b) (a.x == b.x && a.y == b.y) -#define vec3(x, y, z) ((vec3){ x, y, z }) +#define vec3(x, y, z) ((vec3){ (x), (y), (z) }) #define vec3to2(a) ((vec2){ a.x, a.y }) #define vec3_add(a, b) ((vec3){ a.x + b.x, a.y + b.y, a.z + b.z }) #define vec3_sub(a, b) ((vec3){ a.x - b.x, a.y - b.y, a.z - b.z }) -#define vec3_mul(a, b) ((vec3){ a.x * b, a.y * b, a.z * b }) -#define vec3_div(a, b) ((vec3){ a.x / b, a.y / b, a.z / b }) +#define vec3_mul(a, b) ((vec3){ a.x * (b), a.y * (b), a.z * (b) }) +#define vec3_div(a, b) ((vec3){ a.x / (b), a.y / (b), a.z / (b) }) #define vec3_dot(a, b) ((u32)(a.x * b.x + a.y * b.y + a.z * b.z)) #define vec3_eq(a, b) (a.x == b.x && a.y == b.y && a.z == c.z) #define vec3_cross(a, b) \ |