aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/wm/wm.c117
-rw-r--r--kernel/drivers/rtc.c2
-rw-r--r--kernel/drivers/timer.c18
-rw-r--r--kernel/features/io.c6
-rw-r--r--kernel/features/proc.c11
-rw-r--r--kernel/inc/proc.h1
-rw-r--r--libs/libc/crt/crt0.c6
-rw-r--r--libs/libc/inc/sys.h9
-rw-r--r--libs/libgui/gfx.c13
-rw-r--r--libs/libgui/gfx.h7
-rw-r--r--libs/libgui/gui.c13
11 files changed, 148 insertions, 55 deletions
diff --git a/apps/wm/wm.c b/apps/wm/wm.c
index 8860cdc..3d8fb33 100644
--- a/apps/wm/wm.c
+++ b/apps/wm/wm.c
@@ -1,4 +1,5 @@
// MIT License, Copyright (c) 2020 Marvin Borner
+// Window manager / compositor (does everything basically)
#include <assert.h>
#include <def.h>
@@ -12,6 +13,8 @@
#include <list.h>
#include <rand.h>
+#define WINDOW_MOVE_TIMEOUT 20
+
struct client {
u32 conn; // Bus conn
};
@@ -19,7 +22,6 @@ struct client {
struct window {
u32 id;
u32 shid;
- const char *name;
struct context ctx;
struct client client;
u32 flags;
@@ -33,6 +35,7 @@ struct rectangle {
void *data;
};
+// Global vars ftw!
static u8 bypp = 4;
static struct vbe screen = { 0 };
static struct list *windows = NULL; // THIS LIST SHALL BE SORTED BY Z-INDEX!
@@ -187,12 +190,14 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2)
static void rectangle_redraw(vec2 pos1, vec2 pos2)
{
+ assert(pos1.x <= pos2.x && pos1.y <= pos2.y);
struct rectangle rec = rectangle_at(pos1, pos2);
u32 width = ABS(pos2.x - pos1.x);
u32 height = ABS(pos2.y - pos1.y);
- /* log("REDR at %d %d: %d %d\n", pos1.x, pos1.y, width, height); */
+ if (!width || !height)
+ return;
u8 *srcfb = rec.data;
u8 *destfb = &direct->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * direct->ctx.pitch];
@@ -209,13 +214,11 @@ static void rectangle_redraw(vec2 pos1, vec2 pos2)
* Window operations
*/
-static struct window *window_new(struct client client, const char *name, struct vec2 pos,
- struct vec2 size, u32 flags)
+static struct window *window_new(struct client client, struct vec2 pos, struct vec2 size, u32 flags)
{
struct window *win = malloc(sizeof(*win));
static u32 id = 0;
win->id = id++;
- win->name = name; // strdup?
win->ctx.size = size;
win->ctx.bpp = screen.bpp;
win->ctx.pitch = size.x * bypp;
@@ -262,44 +265,89 @@ static struct window *window_at(vec2 pos)
return ret;
}
-static void window_redraw(struct window *win)
+// Transparent windows can't use efficient rectangle-based redrawing (I think!)
+static void window_redraw_alpha(struct window *win)
+{
+ vec2 pos1 = win->pos_prev;
+ vec2 pos2 = vec2(pos1.x + win->ctx.size.x, pos1.y + win->ctx.size.y);
+
+ rectangle_redraw(pos1, pos2);
+ gfx_ctx_on_ctx(&direct->ctx, &win->ctx, win->pos, GFX_ALPHA);
+}
+
+// TODO: Make more efficient...
+static void window_redraw_non_alpha(struct window *win)
{
- // TODO: Only redraw difference of prev/curr (difficult with negative directions)
- /*s32 diff_x = win->pos_prev.x - win->pos.x;
+ s32 diff_x = win->pos_prev.x - win->pos.x;
s32 diff_y = win->pos_prev.y - win->pos.y;
- if (!diff_x && !diff_y)
+ if (!diff_x && !diff_y) {
+ gfx_ctx_on_ctx(&direct->ctx, &win->ctx, win->pos, GFX_NON_ALPHA);
return;
+ }
vec2 pos1 = { 0 };
vec2 pos2 = { 0 };
- if (diff_x < 0) { // Right
+ /**
+ * Redraw left/right diff rectangle (only one!)
+ */
+
+ if (diff_x <= 0) { // Right
pos1.x = win->pos_prev.x;
- pos2.x = pos1.x + -diff_x;
+ pos2.x = pos1.x - diff_x + 2;
} else if (diff_x > 0) { // Left
- pos1 = win->pos_prev;
- pos2.x = win->pos_prev.x + diff_x;
- pos1.x = pos1.x - diff_x;
+ pos1.x = win->pos.x + win->ctx.size.x;
+ pos2.x = pos1.x + diff_x + 2; // TODO: Why +2?
}
- if (diff_y < 0) { // Down
+ if (diff_y <= 0) { // Down
pos1.y = win->pos_prev.y;
- pos2.x = pos1.x + -diff_x;
+ pos2.y = win->pos.y + win->ctx.size.y;
} else if (diff_y > 0) { // Up
- }*/
+ pos1.y = win->pos.y;
+ pos2.y = win->pos_prev.y + win->ctx.size.y;
+ }
- vec2 pos1 = win->pos_prev;
- vec2 pos2 = vec2(pos1.x + win->ctx.size.x, pos1.y + win->ctx.size.y);
+ rectangle_redraw(pos1, pos2);
+
+ /**
+ * Redraw bottom/top diff rectangle (only one!)
+ */
+
+ if (diff_y <= 0) { // Down
+ pos1.y = win->pos_prev.y;
+ pos2.y = pos1.y - diff_y;
+ } else if (diff_y > 0) { // Up
+ pos1.y = win->pos.y + win->ctx.size.y;
+ pos2.y = pos1.y + diff_y;
+ }
+
+ if (diff_x <= 0) { // Right
+ pos1.x = win->pos_prev.x;
+ pos2.x = win->pos.x + win->ctx.size.x;
+ } else if (diff_x > 0) { // Left
+ pos1.x = win->pos.x;
+ pos2.x = win->pos_prev.x + win->ctx.size.x;
+ }
rectangle_redraw(pos1, pos2);
- gfx_ctx_on_ctx(&direct->ctx, &win->ctx, win->pos);
+
+ // Redraw window on top of everything
+ gfx_ctx_on_ctx(&direct->ctx, &win->ctx, win->pos, GFX_NON_ALPHA);
+}
+
+static void window_redraw(struct window *win)
+{
+ if (win->flags & WF_ALPHA)
+ window_redraw_alpha(win);
+ else
+ window_redraw_non_alpha(win);
}
// 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));
list_remove(windows, list_first_data(windows, win));
@@ -339,6 +387,7 @@ static void handle_event_keyboard(struct event_keyboard *event)
UNUSED(ch);
}
+static struct timer mouse_timer = { 0 };
static void handle_event_mouse(struct event_mouse *event)
{
if (event->magic != MOUSE_MAGIC) {
@@ -377,9 +426,14 @@ static void handle_event_mouse(struct event_mouse *event)
focused = win;
if (focused && !(focused->flags & WF_NO_DRAG) && event->but.left && special_keys.alt) {
- focused->pos_prev = focused->pos;
- focused->pos = mouse.pos;
- window_redraw(focused);
+ struct timer timer = { 0 };
+ io_read(IO_TIMER, &timer, 0, sizeof(timer));
+ if (timer.time - mouse_timer.time > WINDOW_MOVE_TIMEOUT) {
+ focused->pos_prev = focused->pos;
+ focused->pos = mouse.pos;
+ window_redraw(focused);
+ mouse_timer = timer;
+ }
return;
} else if (!vec2_eq(cursor->pos, cursor->pos_prev)) {
window_redraw(cursor);
@@ -406,7 +460,7 @@ static void handle_event_mouse(struct event_mouse *event)
static void handle_message_new_window(struct message_new_window *msg)
{
- struct window *win = window_new((struct client){ .conn = msg->header.bus.conn }, "idk",
+ struct window *win = window_new((struct client){ .conn = msg->header.bus.conn },
vec2(500, 600), vec2(600, 400), 0);
msg->ctx = win->ctx;
msg->shid = win->shid;
@@ -519,18 +573,17 @@ int main(int argc, char **argv)
windows = list_new();
keymap = keymap_parse("/res/keymaps/en.keymap");
- direct = window_new(wm_client, "direct", vec2(0, 0), vec2(screen.width, screen.height),
+ direct = window_new(wm_client, vec2(0, 0), vec2(screen.width, screen.height),
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;
- wallpaper =
- window_new(wm_client, "wallpaper", vec2(0, 0), vec2(screen.width, screen.height),
- WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
- cursor = window_new(wm_client, "cursor", vec2(0, 0), vec2(32, 32),
- WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
+ wallpaper = window_new(wm_client, vec2(0, 0), vec2(screen.width, screen.height),
+ WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
+ cursor = window_new(wm_client, vec2(0, 0), vec2(32, 32),
+ WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE | WF_ALPHA);
/* gfx_write(&direct->ctx, vec2(0, 0), FONT_32, COLOR_FG, "Loading Melvix..."); */
- /* gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png"); */
+ gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png");
memset(cursor->ctx.fb, 0, cursor->ctx.bytes);
gfx_load_wallpaper(&cursor->ctx, "/res/cursor.png");
window_redraw(wallpaper);
diff --git a/kernel/drivers/rtc.c b/kernel/drivers/rtc.c
index 01d65f4..2da61da 100644
--- a/kernel/drivers/rtc.c
+++ b/kernel/drivers/rtc.c
@@ -66,6 +66,6 @@ struct rtc rtc_read(void)
u32 rtc_stamp(void)
{
struct rtc rtc = rtc_read();
- return timer_get() + rtc.second + rtc.minute * 60 + rtc.hour * 360 + rtc.day * 360 * 24 +
+ return rtc.second + rtc.minute * 60 + rtc.hour * 360 + rtc.day * 360 * 24 +
rtc.year * 360 * 24 * 365;
}
diff --git a/kernel/drivers/timer.c b/kernel/drivers/timer.c
index 294df84..176b499 100644
--- a/kernel/drivers/timer.c
+++ b/kernel/drivers/timer.c
@@ -57,14 +57,26 @@ CLEAR void scheduler_disable(void)
irq_install_handler(0, timer_handler);
}
+static struct timer timer_struct(void)
+{
+ struct proc *proc = proc_current();
+ struct timer timer = {
+ .rtc = rtc_stamp(),
+ .ticks.user = proc->ticks.user,
+ .ticks.kernel = proc->ticks.kernel,
+ .time = timer_get(),
+ };
+ return timer;
+}
+
static res timer_read(void *buf, u32 offset, u32 count)
{
UNUSED(offset);
- u32 stamp = rtc_stamp();
- memcpy_user(buf, &stamp, MIN(count, sizeof(stamp)));
+ struct timer timer = timer_struct();
+ memcpy_user(buf, &timer, MIN(count, sizeof(timer)));
- return MIN(count, sizeof(stamp));
+ return MIN(count, sizeof(timer));
}
// Install timer handler into IRQ0
diff --git a/kernel/features/io.c b/kernel/features/io.c
index da179ab..ac599e2 100644
--- a/kernel/features/io.c
+++ b/kernel/features/io.c
@@ -182,6 +182,9 @@ void io_unblock(enum io_type io)
free(listener);
iterator = next;
}
+
+ if (proc_idle())
+ proc_yield();
}
void io_unblock_pid(u32 pid)
@@ -200,6 +203,9 @@ void io_unblock_pid(u32 pid)
iterator = next;
}
}
+
+ if (proc_idle())
+ proc_yield();
}
CLEAR void io_install(struct boot_info *boot)
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index b47df0b..70f2efc 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -91,6 +91,15 @@ u8 proc_super(void)
return 0; // Should never happen
}
+u8 proc_idle(void)
+{
+ struct proc *proc = proc_current();
+ if (proc)
+ return proc == idle_proc->data;
+ else
+ return 0;
+}
+
struct proc *proc_from_pid(u32 pid)
{
struct node *iterator = NULL;
@@ -144,7 +153,6 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status)
if (!running || !list_remove(proc_list_running, running)) {
struct node *blocked = list_first_data(proc_list_blocked, proc);
assert(blocked && list_remove(proc_list_blocked, blocked));
- // Idle procs can't be killed -> assertion failure.
}
if (current->data == proc) {
@@ -182,6 +190,7 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status)
void proc_yield(void)
{
+ // TODO: Fix yielding without debug mode (File size?! Regs?! IDK?!)
proc_reset_quantum(PROC(current));
__asm__ volatile("int $127");
}
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 5b8fbea..877e53e 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -61,6 +61,7 @@ void proc_init(void);
void proc_print(void);
struct proc *proc_current(void);
u8 proc_super(void);
+u8 proc_idle(void);
struct proc *proc_from_pid(u32 pid);
void proc_exit(struct proc *proc, struct regs *r, s32 status) NONNULL;
void proc_yield(void);
diff --git a/libs/libc/crt/crt0.c b/libs/libc/crt/crt0.c
index 3ab7ed4..9e41ae2 100644
--- a/libs/libc/crt/crt0.c
+++ b/libs/libc/crt/crt0.c
@@ -15,9 +15,9 @@ int main(int, char **);
int _start(int argc, char **argv);
int _start(int argc, char **argv)
{
- u32 stamp = 0;
- assert(io_read(IO_TIMER, &stamp, 0, sizeof(stamp)) == sizeof(stamp) && stamp);
- srand(stamp);
+ struct timer timer = { 0 };
+ assert(io_read(IO_TIMER, &timer, 0, sizeof(timer)) == sizeof(timer));
+ srand(timer.rtc + timer.time);
__stack_chk_guard = rand();
exit(main(argc, argv));
diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h
index f65e020..7d81f33 100644
--- a/libs/libc/inc/sys.h
+++ b/libs/libc/inc/sys.h
@@ -75,6 +75,15 @@ struct event_mouse {
} but;
};
+struct timer {
+ u32 rtc;
+ struct {
+ u32 user;
+ u32 kernel;
+ } ticks;
+ u32 time;
+};
+
struct stat {
u32 dev_id;
u32 mode;
diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c
index c26f59a..bddd5ed 100644
--- a/libs/libgui/gfx.c
+++ b/libs/libgui/gfx.c
@@ -93,6 +93,7 @@ static void write_char(struct context *ctx, vec2 pos, struct font *font, u32 c,
static void draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c)
{
+ assert(pos1.x <= pos2.x && pos1.y <= pos2.y);
int bypp = ctx->bpp >> 3;
u8 *draw = &ctx->fb[pos1.x * bypp + pos1.y * ctx->pitch];
for (u32 i = 0; i < pos2.y - pos1.y; i++) {
@@ -230,13 +231,13 @@ void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size)
// TODO: Support alpha values other than 0x0 and 0xff (blending)
// TODO: Optimize!
-void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos, u8 alpha)
{
// 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 (!alpha && 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;
@@ -248,7 +249,7 @@ 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[bypp - 1])
+ if (!alpha || srcfb[bypp - 1])
memcpy(destfb, srcfb, bypp);
srcfb += bypp;
diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h
index c3fe5d3..5cf12f8 100644
--- a/libs/libgui/gfx.h
+++ b/libs/libgui/gfx.h
@@ -43,7 +43,10 @@
#define WF_NO_RESIZE (1 << 2)
#define WF_NO_FB (1 << 3)
#define WF_NO_WINDOW (1 << 4)
-/* #define WF_RELATIVE (1 << 4) */
+#define WF_ALPHA (1 << 5)
+
+#define GFX_NON_ALPHA 0
+#define GFX_ALPHA 1
enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 };
enum gfx_filter {
@@ -78,7 +81,7 @@ void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter
const char *path) NONNULL;
void gfx_load_wallpaper(struct context *ctx, const char *path) NONNULL;
void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size) NONNULL;
-void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos) NONNULL;
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos, u8 alpha) NONNULL;
void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c) NONNULL;
void gfx_fill(struct context *ctx, u32 c) NONNULL;
void gfx_border(struct context *ctx, u32 c, u32 width) NONNULL;
diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index ef99d92..046e8bf 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -110,7 +110,6 @@ static u32 wm_conn = 0;
static void gui_connect_wm(void)
{
if (wm_conn) {
- // TODO: Fix
assert(msg_connect_conn(wm_conn) == EOK);
} else {
assert(msg_connect_bus("wm", &wm_conn) == EOK);
@@ -244,8 +243,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->bg, &w->bg, w->pos);
- gfx_ctx_on_ctx(&widget->fg, &w->fg, w->pos);
+ gfx_ctx_on_ctx(&widget->bg, &w->bg, w->pos, GFX_ALPHA);
+ gfx_ctx_on_ctx(&widget->fg, &w->fg, w->pos, GFX_ALPHA);
iterator = iterator->next;
}
@@ -260,8 +259,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->bg, widget->pos);
- gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos, GFX_ALPHA);
+ gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos, GFX_ALPHA);
return_errno(EOK);
}
@@ -279,8 +278,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->bg, widget->pos);
- gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
+ gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos, GFX_ALPHA);
+ gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos, GFX_ALPHA);
iterator = iterator->next;
}