aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/chess.c65
-rw-r--r--apps/wm.c36
-rw-r--r--libs/libgui/gfx.c47
-rw-r--r--libs/libgui/gfx.h5
-rw-r--r--libs/libgui/gui.c63
-rw-r--r--libs/libgui/gui.h11
6 files changed, 166 insertions, 61 deletions
diff --git a/apps/chess.c b/apps/chess.c
index d339534..3c4c0c3 100644
--- a/apps/chess.c
+++ b/apps/chess.c
@@ -1,14 +1,54 @@
// MIT License, Copyright (c) 2021 Marvin Borner
+// Ugly chess implementation to find the limits of libgui
+// Asserts are generally not needed but don't hurt either
#include <assert.h>
#include <libgui/gui.h>
#include <print.h>
#define SIZE 8
-#define TILE 24
+#define TILE 36
#define WHITE_STARTS 1
-typedef u32 board[SIZE][SIZE];
+#define DARK_COLOR 0xff946f51
+#define LIGHT_COLOR 0xfff0d9b5
+
+// Pieces
+#define NONE 0
+#define KING 1
+#define PAWN 2
+#define KNIGHT 3
+#define BISHOP 5
+#define ROOK 6
+#define QUEEN 7
+#define WHITE 8
+#define BLACK 16
+
+// Masks
+#define TYPE_MASK 7
+#define BLACK_MASK BLACK
+#define WHITE_MASK WHITE
+#define COLOR_MASK (WHITE_MASK | BLACK_MASK)
+
+// Macros
+#define COLOR(piece) (piece & COLOR_MASK)
+#define IS_COLOR(piece, color) (COLOR(piece) == color)
+#define TYPE(piece) (piece & TYPE_MASK)
+#define IS_ROOK_OR_QUEEN(piece) ((piece & 6) == 6)
+#define IS_BISHOP_OR_QUEEN(piece) ((piece & 5) == 5)
+#define IS_SLIDING_PIECE(piece) ((piece & 4) != 0)
+
+struct piece {
+ u32 piece;
+ u32 widget;
+ const char *icon;
+ struct {
+ u8 moved : 1;
+ // idk
+ } bits;
+};
+
+typedef struct piece board[SIZE][SIZE];
static u32 win = 0; // Window
static board tiles = { 0 }; // Matrix
@@ -20,8 +60,8 @@ static void mouseclick(u32 widget_id, vec2 pos)
u32 x = widget_id / SIZE;
u32 y = (widget_id % SIZE) - 1;
- u32 widget = tiles[x][y];
- assert(gui_fill(win, widget, COLOR_MAGENTA) == EOK);
+ u32 widget = tiles[x][y].widget;
+ assert(gui_fill(win, widget, GUI_LAYER_BG, COLOR_MAGENTA) == EOK);
gui_redraw_widget(win, widget);
}
@@ -32,14 +72,27 @@ static void create_board(void)
for (u8 y = 0; y < 8; y++) {
widget = gui_new_widget(win, vec2(TILE, TILE), vec2(TILE * x, TILE * y));
assert(widget > 0);
- tiles[x][y] = widget;
u8 colored = (x + y + 1) % 2 == 0;
+ u8 colored_piece = y < SIZE / 2;
#if !WHITE_STARTS
colored = !colored;
+ colored_piece = !colored_piece;
#endif
- assert(gui_fill(win, widget, colored ? COLOR_BLACK : COLOR_WHITE) == EOK);
+ struct piece *tile = &tiles[x][y];
+ tile->piece |= colored_piece ? BLACK : WHITE;
+ tile->widget = widget;
+ tile->icon = "/icons/chess-king-36.png";
+
+ assert(gui_fill(win, widget, GUI_LAYER_BG,
+ colored ? DARK_COLOR : LIGHT_COLOR) == EOK);
+
+ enum gfx_filter filter =
+ colored_piece ? GFX_FILTER_NONE : GFX_FILTER_INVERT;
+ assert(gui_load_image_filter(win, widget, GUI_LAYER_FG, vec2(0, 0),
+ vec2(TILE, TILE), filter, tile->icon) == EOK);
+
assert(gui_listen_widget(win, widget, GUI_LISTEN_MOUSECLICK,
(u32)mouseclick) == EOK);
}
diff --git a/apps/wm.c b/apps/wm.c
index 1fca72e..ab85ff3 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -40,7 +40,6 @@ static u8 bypp = 4;
static struct vbe screen = { 0 };
static struct list *windows = NULL; // THIS LIST SHALL BE SORTED BY Z-INDEX!
static struct window *direct = NULL;
-static struct window *root = NULL;
static struct window *wallpaper = NULL;
static struct window *cursor = NULL;
static struct window *focused = NULL;
@@ -58,20 +57,6 @@ static struct {
u8 right : 1;
} mouse = { 0 };
-static void buffer_flush(void)
-{
-#ifdef FLUSH_TIMEOUT
- static u32 time_flush = 0;
- u32 time_now = time();
- if (time_now - time_flush > FLUSH_TIMEOUT) {
- memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes);
- time_flush = time_now;
- }
-#else
- memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes);
-#endif
-}
-
/**
* 5head algorithms
* Thanks to @LarsVomMars for the help
@@ -198,16 +183,16 @@ static void rectangle_redraw(vec2 pos1, vec2 pos2, struct window *excluded)
struct rectangle rec = rectangle_at(pos1, pos2, excluded);
u8 *srcfb = rec.data;
- u8 *destfb = &root->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * root->ctx.pitch];
+ u8 *destfb = &direct->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * direct->ctx.pitch];
for (u32 cy = 0; cy < excluded->ctx.size.y; cy++) {
memcpy(destfb, srcfb, excluded->ctx.size.x * bypp);
srcfb += excluded->ctx.pitch;
- destfb += root->ctx.pitch;
+ destfb += direct->ctx.pitch;
}
free(rec.data);
- gfx_ctx_on_ctx(&root->ctx, &excluded->ctx, excluded->pos);
+ gfx_ctx_on_ctx(&direct->ctx, &excluded->ctx, excluded->pos);
}
/**
@@ -218,7 +203,8 @@ static struct window *window_new(struct client client, const char *name, struct
struct vec2 size, u32 flags)
{
struct window *win = malloc(sizeof(*win));
- win->id = rand();
+ static u32 id = 0;
+ win->id = id++;
win->name = name; // strdup?
win->ctx.size = size;
win->ctx.bpp = screen.bpp;
@@ -272,10 +258,8 @@ static void window_redraw(struct window *win)
vec2 pos2 = vec2(pos1.x + win->ctx.size.x, pos1.y + win->ctx.size.y);
rectangle_redraw(pos1, pos2, win);
- if (win != cursor) {
+ if (win != cursor)
window_redraw(cursor);
- buffer_flush();
- }
}
// TODO: Fix strange artifacts after destroying
@@ -284,7 +268,6 @@ static void window_destroy(struct window *win)
//free(win->name);
memset(win->ctx.fb, 0, win->ctx.bytes);
rectangle_redraw(win->pos, vec2_add(win->pos, win->ctx.size), win);
- buffer_flush();
list_remove(windows, list_first_data(windows, win));
sys_free(win->ctx.fb);
free(win);
@@ -359,7 +342,6 @@ static void handle_event_mouse(struct event_mouse *event)
return;
} else if (!vec2_eq(cursor->pos, cursor->pos_prev)) {
window_redraw(cursor);
- buffer_flush();
}
if (!win)
@@ -393,7 +375,7 @@ static void handle_message_redraw_window(struct message_redraw_window *msg)
{
u32 id = msg->id;
struct window *win = window_find(id);
- if (!win) {
+ if (!win || win->client.pid != msg->header.src) {
if (msg->header.state == MSG_NEED_ANSWER)
msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL,
sizeof(msg->header));
@@ -411,7 +393,7 @@ static void handle_message_destroy_window(struct message_destroy_window *msg)
{
u32 id = msg->id;
struct window *win = window_find(id);
- if (!win) {
+ if (!win || win->client.pid != msg->header.src) {
if (msg->header.state == MSG_NEED_ANSWER)
msg_send(msg->header.src, GUI_DESTROY_WINDOW | MSG_FAILURE, NULL,
sizeof(msg->header));
@@ -478,8 +460,6 @@ int main(int argc, char **argv)
WF_NO_WINDOW | WF_NO_FB | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
direct->ctx.fb = screen.fb;
direct->flags ^= WF_NO_FB;
- root = window_new(wm_client, "root", vec2(0, 0), vec2(screen.width, screen.height),
- WF_NO_WINDOW | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
wallpaper =
window_new(wm_client, "wallpaper", vec2(0, 0), vec2(screen.width, screen.height),
WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c
index a0f5b22..db09d21 100644
--- a/libs/libgui/gfx.c
+++ b/libs/libgui/gfx.c
@@ -145,7 +145,7 @@ void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, c
}
}
-void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
+void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, const char *path)
{
// TODO: Support x, y
// TODO: Detect image type
@@ -162,18 +162,38 @@ void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
bmp.pitch = bmp.size.x * (bmp.bpp >> 3);
// TODO: Fix reversed png in decoder
- int bypp = bmp.bpp >> 3;
- // u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch];
+ u8 bypp = bmp.bpp >> 3;
+ /* u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch]; */
u8 *srcfb = bmp.data;
u8 *destfb = &ctx->fb[bypp];
- for (u32 cy = 0; cy < bmp.size.y; cy++) {
- memcpy(destfb, srcfb, bmp.pitch);
- // srcfb -= bmp->pitch;
- srcfb += bmp.pitch;
- destfb += ctx->pitch;
+ for (u32 cy = 0; cy < bmp.size.y && cy + pos.y < ctx->size.y; cy++) {
+ int diff = 0;
+ for (u32 cx = 0; cx < bmp.size.x && cx + pos.x < ctx->size.x; cx++) {
+ if (srcfb[bypp - 1]) {
+ if (filter == GFX_FILTER_NONE) {
+ memcpy(destfb, srcfb, bypp);
+ } else if (filter == GFX_FILTER_INVERT) {
+ destfb[0] = 0xff - srcfb[0];
+ destfb[1] = 0xff - srcfb[1];
+ destfb[2] = 0xff - srcfb[2];
+ destfb[3] = srcfb[3];
+ }
+ }
+
+ srcfb += bypp;
+ destfb += bypp;
+ diff += bypp;
+ }
+ srcfb += bmp.pitch - diff;
+ destfb += ctx->pitch - diff;
}
}
+void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
+{
+ gfx_load_image_filter(ctx, pos, GFX_FILTER_NONE, path);
+}
+
void gfx_load_wallpaper(struct context *ctx, const char *path)
{
gfx_load_image(ctx, vec2(0, 0), path);
@@ -195,16 +215,17 @@ void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size)
// TODO: Optimize!
void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
{
- if (src->size.x == dest->size.x && src->size.y == dest->size.y) {
- memcpy(dest->fb, src->fb, dest->pitch * dest->size.y);
- return;
- }
+ // TODO: Some kind of alpha-acknowledging memcpy?
+ /* if (src->size.x == dest->size.x && src->size.y == dest->size.y) { */
+ /* memcpy(dest->fb, src->fb, dest->pitch * dest->size.y); */
+ /* return; */
+ /* } */
if (src->size.x > dest->size.x || src->size.y > dest->size.y)
return;
// TODO: Negative x and y
- int bypp = dest->bpp >> 3;
+ u8 bypp = dest->bpp >> 3;
u8 *srcfb = src->fb;
u8 *destfb = &dest->fb[pos.x * bypp + pos.y * dest->pitch];
for (u32 cy = 0; cy < src->size.y && cy + pos.y < dest->size.y; cy++) {
diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h
index 1999b0c..83736fd 100644
--- a/libs/libgui/gfx.h
+++ b/libs/libgui/gfx.h
@@ -46,6 +46,10 @@
/* #define WF_RELATIVE (1 << 4) */
enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 };
+enum gfx_filter {
+ GFX_FILTER_NONE,
+ GFX_FILTER_INVERT,
+};
// Generalized font struct
struct font {
@@ -67,6 +71,7 @@ struct font *gfx_resolve_font(enum font_type font_type);
void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch);
void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text);
void gfx_load_image(struct context *ctx, vec2 pos, const char *path);
+void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, const char *path);
void gfx_load_wallpaper(struct context *ctx, const char *path);
void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size);
void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos);
diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index 99b3b5c..e8291f5 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -13,7 +13,9 @@
struct gui_widget {
u32 id;
vec2 pos;
- struct context ctx;
+ /* struct context ctx; */
+ struct context fg;
+ struct context bg;
struct list *children;
struct {
@@ -106,17 +108,47 @@ static struct gui_widget *gui_widget_by_id(u32 win_id, u32 widget_id)
* GFX wrappers
*/
-res gui_fill(u32 win_id, u32 widget_id, u32 c)
+res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c)
+{
+ struct gui_widget *widget = gui_widget_by_id(win_id, widget_id);
+ if (!widget)
+ return_errno(ENOENT);
+
+ if (layer == GUI_LAYER_BG)
+ gfx_fill(&widget->bg, c);
+ else if (layer == GUI_LAYER_FG)
+ gfx_fill(&widget->fg, c);
+ else
+ return_errno(EINVAL);
+
+ return_errno(EOK);
+}
+
+res gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+ enum gfx_filter filter, const char *path)
{
+ UNUSED(size); // TODO: Add image scaling
+
struct gui_widget *widget = gui_widget_by_id(win_id, widget_id);
if (!widget)
return_errno(ENOENT);
- gfx_fill(&widget->ctx, c);
+ if (layer == GUI_LAYER_BG)
+ gfx_load_image_filter(&widget->bg, pos, filter, path);
+ else if (layer == GUI_LAYER_FG)
+ gfx_load_image_filter(&widget->fg, pos, filter, path);
+ else
+ return_errno(EINVAL);
return_errno(EOK);
}
+res gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+ const char *path)
+{
+ return gui_load_image_filter(win_id, widget_id, layer, pos, size, GFX_FILTER_NONE, path);
+}
+
/**
* Widgets
*/
@@ -132,8 +164,8 @@ static res gui_sub_widget_at(struct gui_widget *widget, vec2 pos, struct gui_wid
struct node *iterator = widget->children->head;
while (iterator) {
struct gui_widget *w = iterator->data;
- if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->ctx.size.x && pos.y >= w->pos.y &&
- pos.y <= w->pos.y + w->ctx.size.y)
+ if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->bg.size.x && pos.y >= w->pos.y &&
+ pos.y <= w->pos.y + w->bg.size.y)
ret = w;
if (w->children->head) {
@@ -169,8 +201,8 @@ static res gui_widget_at(u32 win_id, vec2 pos, struct gui_widget *widget)
struct node *iterator = win->widgets->head;
while (iterator) {
struct gui_widget *w = iterator->data;
- if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->ctx.size.x && pos.y >= w->pos.y &&
- pos.y <= w->pos.y + w->ctx.size.y)
+ if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->bg.size.x && pos.y >= w->pos.y &&
+ pos.y <= w->pos.y + w->bg.size.y)
ret = w;
if (w->children->head) {
@@ -199,7 +231,8 @@ static res gui_sync_sub_widgets(struct gui_widget *widget)
struct node *iterator = widget->children->head;
while (iterator) {
struct gui_widget *w = iterator->data;
- gfx_ctx_on_ctx(&widget->ctx, &w->ctx, w->pos);
+ gfx_ctx_on_ctx(&widget->bg, &w->bg, w->pos);
+ gfx_ctx_on_ctx(&widget->fg, &w->fg, w->pos);
iterator = iterator->next;
}
@@ -214,7 +247,8 @@ static res gui_sync_widget(u32 win_id, u32 widget_id)
return_errno(ENOENT);
gui_sync_sub_widgets(widget);
- gfx_ctx_on_ctx(&win->ctx, &widget->ctx, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
return_errno(EOK);
}
@@ -232,7 +266,8 @@ static res gui_sync_widgets(u32 win_id)
while (iterator) {
struct gui_widget *widget = iterator->data;
gui_sync_sub_widgets(widget);
- gfx_ctx_on_ctx(&win->ctx, &widget->ctx, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
iterator = iterator->next;
}
@@ -275,12 +310,14 @@ static vec2 gui_offset_widget(struct gui_widget *parent, struct gui_widget *chil
static struct gui_widget *gui_new_plain_widget(vec2 size, vec2 pos, u8 bpp)
{
struct gui_widget *widget = zalloc(sizeof(*widget));
- struct context *ctx = zalloc(sizeof(*ctx));
+ struct context *bg = zalloc(sizeof(*bg));
+ struct context *fg = zalloc(sizeof(*fg));
static u32 id = 0;
widget->id = id++;
widget->pos = pos;
- widget->ctx = *gfx_new_ctx(ctx, size, bpp);
+ widget->bg = *gfx_new_ctx(bg, size, bpp);
+ widget->fg = *gfx_new_ctx(fg, size, bpp);
widget->children = list_new();
return widget;
@@ -292,7 +329,7 @@ res gui_add_widget(u32 win_id, u32 widget_id, vec2 size, vec2 pos)
if (!parent)
return_errno(ENOENT);
- struct gui_widget *child = gui_new_plain_widget(size, pos, parent->ctx.bpp);
+ struct gui_widget *child = gui_new_plain_widget(size, pos, parent->bg.bpp);
list_add(parent->children, child);
return child->id;
diff --git a/libs/libgui/gui.h b/libs/libgui/gui.h
index ff475ae..5190155 100644
--- a/libs/libgui/gui.h
+++ b/libs/libgui/gui.h
@@ -13,10 +13,19 @@ enum gui_listener {
GUI_LISTEN_MOUSECLICK,
};
+enum gui_layer {
+ GUI_LAYER_BG,
+ GUI_LAYER_FG,
+};
+
res gui_new_window(void);
res gui_redraw_window(u32 id);
-res gui_fill(u32 win_id, u32 widget_id, u32 c);
+res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c);
+res gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+ const char *path);
+res gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+ enum gfx_filter filter, const char *path);
res gui_add_widget(u32 win_id, u32 widget_id, vec2 size, vec2 pos);
res gui_new_widget(u32 win_id, vec2 size, vec2 pos);