aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/window.c15
-rw-r--r--apps/wm.c198
-rw-r--r--kernel/features/fs.c1
-rw-r--r--kernel/features/load.c2
-rw-r--r--libc/print.c3
-rw-r--r--libgui/gfx.c5
-rw-r--r--libgui/gui.c131
-rw-r--r--libgui/inc/gui.h12
-rw-r--r--libgui/inc/msg.h46
-rw-r--r--libgui/msg.c4
10 files changed, 310 insertions, 107 deletions
diff --git a/apps/window.c b/apps/window.c
index 03a384d..08c4263 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -6,17 +6,8 @@
int main(void)
{
- 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,
- 0xff000000 + (i * 0xaf << i), "Hallo, wie geht es Ihnen denn heute?!");
- }
- assert(gui_redraw_window(win.id) > 0);
- log("%d\n", win.ctx.size.x);
- /* while (1) */
- /* ; */
+ u32 win;
+ assert((win = gui_new_window()) > 0);
+ gui_loop();
return 0;
}
diff --git a/apps/wm.c b/apps/wm.c
index 6088a30..54d8f5c 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -71,49 +71,11 @@ static void buffer_flush(void)
#endif
}
-static struct window *window_new(struct client client, const char *name, struct vec2 pos,
- struct vec2 size, u32 flags)
-{
- struct window *win = malloc(sizeof(*win));
- win->id = rand();
- win->name = name; // strdup?
- win->ctx.size = size;
- win->ctx.bpp = screen.bpp;
- win->ctx.pitch = size.x * bypp;
- win->ctx.bytes = win->ctx.pitch * win->ctx.size.y;
- if ((flags & WF_NO_FB) != 0) {
- win->ctx.fb = NULL;
- } else {
- assert(shalloc(win->ctx.bytes, (u32 *)&win->ctx.fb, &win->shid) == EOK);
- }
- win->client = client;
- win->flags = flags;
- win->pos = pos;
- win->pos_prev = pos;
- list_add(windows, win);
- return win;
-}
+/**
+ * 5head algorithms
+ * Thanks to @LarsVomMars for the help
+ */
-static struct window *window_find(u32 id)
-{
- struct node *iterator = windows->head;
- while (iterator) {
- struct window *win = iterator->data;
- if (win->id == id)
- return win;
- iterator = iterator->next;
- }
- return NULL;
-}
-
-/*static void window_destroy(struct window *win)
-{
- //free(win->name);
- free(win->ctx.fb);
- free(win);
-}*/
-
-// Beautiful
static void windows_at_rec(vec2 pos1, vec2 pos2, struct list *list)
{
u32 width = pos2.x - pos1.x;
@@ -212,7 +174,7 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud
// Copy window data to rectangle buffer
for (u32 cy = start_y; cy < end_y; cy++) {
- int diff = 0;
+ u32 diff = 0;
for (u32 cx = start_x; cx < end_x; cx++) {
if (srcfb[bypp - 1])
memcpy(destfb, srcfb, bypp);
@@ -230,29 +192,106 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud
return (struct rectangle){ .pos1 = pos1, .pos2 = pos2, .data = data };
}
-static void window_redraw(struct window *win)
+static void rectangle_redraw(vec2 pos1, vec2 pos2, struct window *excluded)
{
- // 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);
+ 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];
- for (u32 cy = 0; cy < win->ctx.size.y; cy++) {
- memcpy(destfb, srcfb, win->ctx.size.x * bypp);
- srcfb += win->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;
}
free(rec.data);
- gfx_ctx_on_ctx(&root->ctx, &win->ctx, win->pos);
+ gfx_ctx_on_ctx(&root->ctx, &excluded->ctx, excluded->pos);
+}
+
+/**
+ * Window operations
+ */
+
+static struct window *window_new(struct client client, const char *name, struct vec2 pos,
+ struct vec2 size, u32 flags)
+{
+ struct window *win = malloc(sizeof(*win));
+ win->id = rand();
+ win->name = name; // strdup?
+ win->ctx.size = size;
+ win->ctx.bpp = screen.bpp;
+ win->ctx.pitch = size.x * bypp;
+ win->ctx.bytes = win->ctx.pitch * win->ctx.size.y;
+ if ((flags & WF_NO_FB) != 0) {
+ win->ctx.fb = NULL;
+ } else {
+ assert(shalloc(win->ctx.bytes, (u32 *)&win->ctx.fb, &win->shid) == EOK);
+ }
+ win->client = client;
+ win->flags = flags;
+ win->pos = pos;
+ win->pos_prev = pos;
+ list_add(windows, win);
+ return win;
+}
+
+static struct window *window_find(u32 id)
+{
+ struct node *iterator = windows->head;
+ while (iterator) {
+ struct window *win = iterator->data;
+ if (win->id == id)
+ return win;
+ iterator = iterator->next;
+ }
+ return NULL;
+}
+
+static struct window *window_at(vec2 pos)
+{
+ struct window *ret = NULL;
+
+ struct node *iterator = windows->head;
+ while (iterator) {
+ struct window *win = iterator->data;
+ if (!(win->flags & (WF_NO_WINDOW | WF_NO_FOCUS)) && pos.x >= win->pos.x &&
+ pos.x <= win->pos.x + win->ctx.size.x && pos.y >= win->pos.y &&
+ pos.y <= win->pos.y + win->ctx.size.y)
+ ret = win;
+ iterator = iterator->next;
+ }
+ return ret;
+}
+
+static void window_redraw(struct window *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);
+
+ rectangle_redraw(pos1, pos2, win);
if (win != cursor)
window_redraw(cursor);
buffer_flush();
}
+// TODO: Fix strange artifacts after destroying
+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));
+ free(win->ctx.fb);
+ free(win);
+}
+
+/**
+ * Event handlers
+ */
+
static void handle_event_keyboard(struct event_keyboard *event)
{
if (event->magic != KEYBOARD_MAGIC) {
@@ -309,8 +348,20 @@ static void handle_event_mouse(struct event_mouse *event)
if (!vec2_eq(cursor->pos, cursor->pos_prev))
window_redraw(cursor);
+
+ struct window *win = window_at(mouse.pos);
+ if (win) {
+ struct message_mouse msg = { 0 };
+ msg.header.state = MSG_GO_ON;
+ msg.pos = vec2_sub(mouse.pos, win->pos);
+ msg_send(win->client.pid, GUI_MOUSE, &msg, sizeof(msg));
+ }
}
+/**
+ * Message handlers
+ */
+
static void handle_message_new_window(struct message_new_window *msg)
{
struct window *win = window_new((struct client){ .pid = msg->header.src }, "idk",
@@ -318,8 +369,9 @@ static void handle_message_new_window(struct message_new_window *msg)
msg->ctx = win->ctx;
msg->shid = win->shid;
msg->id = win->id;
- msg_send(msg->header.src, GUI_NEW_WINDOW | MSG_SUCCESS, msg, sizeof(*msg));
- /* window_redraw(win); */
+
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, GUI_NEW_WINDOW | MSG_SUCCESS, msg, sizeof(*msg));
}
static void handle_message_redraw_window(struct message_redraw_window *msg)
@@ -327,12 +379,35 @@ static void handle_message_redraw_window(struct message_redraw_window *msg)
u32 id = msg->id;
struct window *win = window_find(id);
if (!win) {
- msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL,
- sizeof(msg->header));
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL,
+ sizeof(msg->header));
return;
}
- msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_SUCCESS, msg, sizeof(msg->header));
+
window_redraw(win);
+
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_SUCCESS, msg,
+ sizeof(msg->header));
+}
+
+static void handle_message_destroy_window(struct message_destroy_window *msg)
+{
+ u32 id = msg->id;
+ struct window *win = window_find(id);
+ if (!win) {
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, GUI_DESTROY_WINDOW | MSG_FAILURE, NULL,
+ sizeof(msg->header));
+ return;
+ }
+
+ window_destroy(win);
+
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, GUI_DESTROY_WINDOW | MSG_SUCCESS, msg,
+ sizeof(msg->header));
}
static void handle_message(void *msg)
@@ -346,9 +421,12 @@ static void handle_message(void *msg)
case GUI_REDRAW_WINDOW:
handle_message_redraw_window(msg);
break;
+ case GUI_DESTROY_WINDOW:
+ handle_message_destroy_window(msg);
+ break;
default:
log("Message type %d not implemented!\n", header->type);
- msg_send(header->src, MSG_FAILURE, msg, sizeof(*header));
+ msg_send(header->src, header->type | MSG_FAILURE, msg, sizeof(*header));
}
}
@@ -362,6 +440,10 @@ static void handle_exit(void)
memset(screen.fb, COLOR_RED, screen.height * screen.pitch);
}
+/**
+ * Main loop
+ */
+
int main(int argc, char **argv)
{
UNUSED(argc);
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index ce56b4c..d16b7b4 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -1,6 +1,7 @@
// MIT License, Copyright (c) 2020 Marvin Borner
#include <assert.h>
+#include <crypto.h>
#include <def.h>
#include <errno.h>
#include <fs.h>
diff --git a/kernel/features/load.c b/kernel/features/load.c
index b8640c1..b46f772 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -89,5 +89,5 @@ res elf_load(const char *path, struct proc *proc)
proc->entry = header.entry;
memory_switch_dir(prev);
- return 0;
+ return EOK;
}
diff --git a/libc/print.c b/libc/print.c
index 7ebf7ca..2422fed 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -142,7 +142,8 @@ int log(const char *format, ...)
int err(int code, const char *format, ...)
{
- log("ERRNO: %d (%s)\n", errno, strerror(errno));
+ if (errno != EOK)
+ log("ERRNO: %d (%s)\n", errno, strerror(errno));
va_list ap;
va_start(ap, format);
vfprintf(PATH_ERR, format, ap);
diff --git a/libgui/gfx.c b/libgui/gfx.c
index dad8b88..ff5bf69 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -118,7 +118,6 @@ void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32
{
struct font *font = gfx_resolve_font(font_type);
write_char(ctx, pos, font, c, ch);
- /* gfx_redraw(); */
}
void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text)
@@ -144,7 +143,6 @@ void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, c
cnt++;
}
}
- /* gfx_redraw(); */
}
void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
@@ -227,13 +225,11 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c)
{
draw_rectangle(ctx, pos1, pos2, c);
- /* gfx_redraw(); */
}
void gfx_fill(struct context *ctx, u32 c)
{
draw_rectangle(ctx, vec2(0, 0), vec2(ctx->size.x, ctx->size.y), c);
- /* gfx_redraw(); */
}
void gfx_border(struct context *ctx, u32 c, u32 width)
@@ -256,7 +252,6 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
}
draw += ctx->pitch;
}
- /* gfx_redraw(); */
}
int gfx_font_height(enum font_type font_type)
diff --git a/libgui/gui.c b/libgui/gui.c
index 9f0d39f..87ea4c9 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -1,16 +1,60 @@
// MIT License, Copyright (c) 2021 Marvin Borner
+#include <assert.h>
#include <def.h>
#include <errno.h>
#include <gui.h>
+#include <list.h>
#include <msg.h>
#include <print.h>
#define WM_PATH "/bin/wm"
-s32 gui_new_window(struct gui_window *win)
+struct gui_window {
+ u32 id;
+ struct context ctx;
+};
+
+struct list *windows = NULL;
+
+static struct gui_window *win_by_id(u32 id)
+{
+ assert(windows);
+ struct node *iterator = windows->head;
+ while (iterator) {
+ struct gui_window *win = iterator->data;
+ if (win->id == id)
+ return iterator->data;
+ iterator = iterator->next;
+ }
+ return NULL;
+}
+
+/**
+ * GFX wrappers
+ */
+
+static res fill(u32 id, u32 c)
{
- struct message_new_window msg = { 0 };
+ struct gui_window *win = win_by_id(id);
+ if (!win)
+ return -ENOENT;
+ gfx_fill(&win->ctx, c);
+ return EOK;
+}
+
+/**
+ * Program interface
+ */
+
+res gui_new_window(void)
+{
+ if (!windows)
+ windows = list_new();
+
+ struct gui_window *win = zalloc(sizeof(*win));
+
+ struct message_new_window msg = { .header.state = MSG_NEED_ANSWER };
if (msg_send(pidof(WM_PATH), GUI_NEW_WINDOW, &msg, sizeof(msg)) > 0 &&
msg_receive(&msg, sizeof(msg)) > 0 &&
msg.header.type == (GUI_NEW_WINDOW | MSG_SUCCESS)) {
@@ -19,18 +63,91 @@ s32 gui_new_window(struct gui_window *win)
u32 size;
res ret = shaccess(msg.shid, (u32 *)&win->ctx.fb, &size);
if (ret < 0 || !win->ctx.fb)
- return MIN(ret, -1);
+ return MIN(ret, -EFAULT);
+ list_add(windows, win);
+ assert(fill(win->id, COLOR_BLACK) == EOK);
+ gui_redraw_window(win->id);
return win->id;
}
- return -1;
+ return -EINVAL;
}
-s32 gui_redraw_window(u32 id)
+res gui_redraw_window(u32 id)
{
- struct message_redraw_window msg = { .id = id };
+ struct message_redraw_window msg = { .id = id, .header.state = MSG_NEED_ANSWER };
if (msg_send(pidof(WM_PATH), GUI_REDRAW_WINDOW, &msg, sizeof(msg)) > 0 &&
msg_receive(&msg, sizeof(msg)) > 0 &&
msg.header.type == (GUI_REDRAW_WINDOW | MSG_SUCCESS))
return id;
- return -1;
+ return -EINVAL;
+}
+
+/**
+ * Message handling
+ */
+
+static res handle_error(const char *op, res code)
+{
+ log("GUI error at '%s': %s (%d)\n", op, strerror(code), code);
+ return code;
+}
+
+static res handle_ping(struct message_ping *msg)
+{
+ if (msg->ping != MSG_PING_SEND)
+ return handle_error("ping", EINVAL);
+
+ msg->header.type |= MSG_SUCCESS;
+ msg->ping = MSG_PING_RECV;
+ msg_send(msg->header.src, GUI_PING, &msg, sizeof(msg));
+
+ return errno;
+}
+
+static res handle_mouse(struct message_mouse *msg)
+{
+ if (msg->header.state == MSG_NEED_ANSWER)
+ msg_send(msg->header.src, msg->header.type | MSG_SUCCESS, msg, sizeof(*msg));
+
+ return errno;
+}
+
+static void handle_exit(void)
+{
+ if (!windows)
+ return;
+
+ struct node *iterator = windows->head;
+ while (iterator) {
+ struct gui_window *win = iterator->data;
+ struct message_destroy_window msg = { .id = win->id };
+ msg_send(pidof(WM_PATH), GUI_DESTROY_WINDOW, &msg, sizeof(msg));
+ iterator = iterator->next;
+ }
+
+ list_destroy(windows);
+}
+
+/**
+ * Main loop
+ */
+
+void gui_loop(void)
+{
+ atexit(handle_exit);
+
+ void *msg = zalloc(4096);
+ while (msg_receive(msg, 4096)) {
+ struct message_header *head = msg;
+ switch (head->type) {
+ case GUI_PING:
+ handle_ping(msg);
+ break;
+ case GUI_MOUSE:
+ handle_mouse(msg);
+ break;
+ default:
+ handle_error("loop", EINVAL);
+ }
+ }
}
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index d160333..a3f74f8 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -4,14 +4,10 @@
#define GUI_H
#include <def.h>
-#include <gfx.h>
+#include <errno.h>
-struct gui_window {
- u32 id;
- struct context ctx;
-};
-
-s32 gui_new_window(struct gui_window *win);
-s32 gui_redraw_window(u32 id);
+res gui_new_window(void);
+res gui_redraw_window(u32 id);
+void gui_loop(void);
#endif
diff --git a/libgui/inc/msg.h b/libgui/inc/msg.h
index 150c42d..0e85d5a 100644
--- a/libgui/inc/msg.h
+++ b/libgui/inc/msg.h
@@ -6,15 +6,28 @@
#include <def.h>
#include <gfx.h>
+#define MSG_PING_SEND 0x07734
+#define MSG_PING_RECV 0x7474
+
#define MSG_MAGIC 0x42042069
#define MSG_SUCCESS (1 << 29)
#define MSG_FAILURE (1 << 30)
+enum message_state {
+ MSG_GO_ON,
+ MSG_NEED_ANSWER,
+};
+
struct message_header {
u32 magic;
u32 src;
u32 type;
- u32 size;
+ enum message_state state;
+};
+
+struct message_ping {
+ struct message_header header;
+ u32 ping;
};
struct message_new_window {
@@ -29,23 +42,30 @@ struct message_redraw_window {
u32 id;
};
-enum message_type {
- // GFX // TODO: Remove
- GFX_NEW_CONTEXT,
- GFX_REDRAW,
- GFX_REDRAW_FOCUSED,
+struct message_destroy_window {
+ struct message_header header;
+ u32 id;
+};
+
+struct message_mouse {
+ struct message_header header;
+ vec2 pos;
+ struct {
+ u8 click : 1;
+ } bits;
+};
- // GUI
+enum message_type {
+ GUI_PING,
GUI_NEW_WINDOW,
GUI_REDRAW_WINDOW,
- GUI_KILL,
- GUI_KEYBOARD,
+ GUI_DESTROY_WINDOW,
+
GUI_MOUSE,
- GUI_RESIZE,
- GUI_MAX
+ GUI_KEYBOARD,
};
-int msg_send(u32 pid, enum message_type type, void *data, u32 size);
-int msg_receive(void *buf, u32 size);
+res msg_send(u32 pid, enum message_type type, void *data, u32 size);
+res msg_receive(void *buf, u32 size);
#endif
diff --git a/libgui/msg.c b/libgui/msg.c
index 677ad52..5f4ae39 100644
--- a/libgui/msg.c
+++ b/libgui/msg.c
@@ -6,7 +6,7 @@
#include <print.h>
#include <sys.h>
-int msg_send(u32 pid, enum message_type type, void *data, u32 size)
+res msg_send(u32 pid, enum message_type type, void *data, u32 size)
{
if (!data)
return -EFAULT;
@@ -20,7 +20,7 @@ int msg_send(u32 pid, enum message_type type, void *data, u32 size)
return write(path, data, 0, size);
}
-int msg_receive(void *buf, u32 size)
+res msg_receive(void *buf, u32 size)
{
int ret = read("/proc/self/msg", buf, 0, size);
struct message_header *header = buf;