aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/Makefile2
-rw-r--r--apps/init.c4
-rw-r--r--apps/wm.c401
-rw-r--r--kernel/features/proc.c1
-rw-r--r--libc/inc/sys.h4
-rw-r--r--libc/inc/vec.h4
-rw-r--r--libgui/Makefile1
-rw-r--r--libgui/bmp.c6
-rw-r--r--libgui/gfx.c88
-rw-r--r--libgui/inc/bmp.h4
-rw-r--r--libgui/inc/gfx.h27
-rw-r--r--libgui/png.c4
-rw-r--r--libgui/psf.c4
-rw-r--r--libtxt/html.c18
14 files changed, 205 insertions, 363 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 8f0e150..6164010 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
# MIT License, Copyright (c) 2020 Marvin Borner
-COBJS = init.o wm.o mandelbrot.o window.o exec.o files.o test.o cc.o browser.o server.o
+COBJS = init.o wm.o test.o#mandelbrot.o window.o exec.o files.o test.o cc.o browser.o server.o
CC = ccache ../cross/opt/bin/i686-elf-gcc
LD = ccache ../cross/opt/bin/i686-elf-ld
OC = ccache ../cross/opt/bin/i686-elf-objcopy
diff --git a/apps/init.c b/apps/init.c
index bb9a556..08f2d80 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -12,7 +12,7 @@ int main(int argc, char **argv)
log("%s loaded\n", argv[0]);
int wm = exec("/bin/wm", "wm", argv[1], NULL);
- int exec = exec("/bin/exec", "test", NULL);
+ /* int exec = exec("/bin/exec", "test", NULL); */
- return wm + exec;
+ return wm; //+ exec;
}
diff --git a/apps/wm.c b/apps/wm.c
index 3c952c8..c524926 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -1,307 +1,174 @@
// MIT License, Copyright (c) 2020 Marvin Borner
#include <assert.h>
-#include <cpu.h>
#include <def.h>
#include <gfx.h>
-#include <gui.h>
#include <input.h>
#include <keymap.h>
#include <list.h>
-#include <mem.h>
-#include <msg.h>
-#include <print.h>
#include <random.h>
-#include <sys.h>
#include <vesa.h>
-static int MOUSE_SKIP = 0; // => Every move % n != 0 gets skipped
-static int context_count;
-
-static struct vbe vbe;
-static struct context direct; // Direct video memory context
-static struct context root; // Root context (wallpaper etc.)
-static struct context exchange; // Exchange buffer
-static struct context cursor; // Cursor bitmap context
-static struct context *focused; // The focused context
-static struct list *contexts; // List of all contexts
-
-static struct keymap *keymap;
-
-static int mouse_x = 0;
-static int mouse_y = 0;
-
-static struct context *new_context(struct context *ctx, u32 pid, int x, int y, u16 width,
- u16 height, int flags)
+struct client {
+ u32 pid;
+};
+
+struct window {
+ u32 id;
+ const char *name;
+ struct context ctx;
+ struct client client;
+ u32 flags;
+ vec3 pos;
+};
+
+static struct vbe screen = { 0 };
+static struct list *windows = NULL;
+static struct window *root = NULL;
+static struct window *cursor = NULL;
+static struct keymap *keymap = NULL;
+static struct {
+ u8 shift : 1;
+ u8 alt : 1;
+ u8 ctrl : 1;
+} special_keys = { 0 };
+static struct {
+ vec2 pos;
+ u8 left : 1;
+ u8 mid : 1;
+ u8 right : 1;
+} mouse = { 0 };
+
+static struct window *window_create(struct client client, const char *name, struct vec3 pos,
+ struct vec2 size, u32 flags)
{
- ctx->pid = pid;
- ctx->x = x;
- ctx->y = y;
- ctx->width = width;
- ctx->height = height;
- ctx->bpp = vbe.bpp;
- ctx->pitch = ctx->width * (ctx->bpp >> 3);
- ctx->fb = malloc(height * ctx->pitch);
- memset(ctx->fb, 0, height * ctx->pitch);
- ctx->flags = flags;
- if (!(flags & WF_RELATIVE)) {
- context_count++;
- if (context_count % 2 == 1)
- MOUSE_SKIP++;
- }
- return ctx;
+ struct window *win = malloc(sizeof(*win));
+ win->id = rand();
+ win->name = name;
+ win->ctx.size = size;
+ win->ctx.bpp = screen.bpp;
+ win->ctx.pitch = size.x * (win->ctx.bpp >> 3);
+ if ((flags & WF_NO_FB) == 0)
+ win->ctx.fb = malloc(size.y * win->ctx.pitch);
+ win->client = client;
+ win->flags = flags;
+ win->pos = pos;
+ list_add(windows, win);
+ return win;
}
-static void remove_context(struct context *ctx)
+static struct window *window_find(u32 id)
{
- assert(list_remove(contexts, list_first_data(contexts, ctx)));
-
- if (!(ctx->flags & WF_RELATIVE)) {
- if (context_count % 2 == 1)
- MOUSE_SKIP--;
- context_count--;
- }
-
- free(ctx->fb);
- ctx->fb = NULL;
- free(ctx);
- ctx = NULL;
-}
-
-static struct context *context_at(int x, int y)
-{
- if (!contexts->head || !contexts->head->data)
- return NULL;
-
- struct context *ret = NULL;
- struct node *iterator = contexts->head;
- while (iterator != NULL) {
- struct context *ctx = iterator->data;
- if (ctx != &root && !(ctx->flags & WF_RELATIVE) && x >= ctx->x &&
- x <= ctx->x + (int)ctx->width && y >= ctx->y && y <= ctx->y + (int)ctx->height)
- ret = ctx;
+ struct node *iterator = windows->head;
+ while (iterator) {
+ struct window *win = iterator->data;
+ if (win->id == id)
+ return win;
iterator = iterator->next;
}
- return ret;
+ return NULL;
}
-static void kill_focused()
+static void window_destroy(struct window *win)
{
- if (!focused)
- return;
- msg_send(focused->pid, GUI_KILL, NULL);
- remove_context(focused);
- focused = context_at(mouse_x, mouse_y);
+ free(win->ctx.fb);
+ free(win);
}
-// This only works if window hasn't moved - TODO!
-static void redraw_focused()
+static void handle_event_keyboard(struct event_keyboard *event)
{
- gfx_ctx_on_ctx(&exchange, focused, focused->x, focused->y);
- memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height);
-}
-
-// TODO: Add dirty bitmap redraw (and clipping?): https://github.com/JMarlin/wsbe
-static void redraw_all()
-{
- if (!contexts->head || !contexts->head->data)
+ if (event->magic != KEYBOARD_MAGIC) {
+ log("Keyboard magic doesn't match!\n");
return;
-
- struct node *iterator = contexts->head;
- while (iterator != NULL) {
- struct context *ctx = iterator->data;
- if (ctx != focused && !(ctx->flags & WF_RELATIVE))
- gfx_ctx_on_ctx(&exchange, ctx, ctx->x, ctx->y);
- iterator = iterator->next;
}
- if (focused)
- gfx_ctx_on_ctx(&exchange, focused, focused->x, focused->y);
-
- memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height);
-}
-
-#define SHIFT_PRESSED 1 << 0
-#define ALT_PRESSED 1 << 1
-#define CTRL_PRESSED 1 << 2
-static u32 special_keys_pressed;
-static void handle_keyboard(struct event_keyboard *event)
-{
- if (event->magic != KEYBOARD_MAGIC)
- return;
-
if (event->scancode == KEY_LEFTSHIFT || event->scancode == KEY_RIGHTSHIFT)
- special_keys_pressed ^= SHIFT_PRESSED;
+ special_keys.shift ^= 1;
else if (event->scancode == KEY_LEFTALT || event->scancode == KEY_RIGHTALT)
- special_keys_pressed ^= ALT_PRESSED;
+ special_keys.alt ^= 1;
else if (event->scancode == KEY_LEFTCTRL || event->scancode == KEY_RIGHTCTRL)
- special_keys_pressed ^= CTRL_PRESSED;
-
- // Special key combos
- char ch = keymap->map[event->scancode];
- int mod = event->press && special_keys_pressed & ALT_PRESSED;
- if (mod && focused && ch == 'q') {
- kill_focused();
- redraw_all();
- return;
- } else if (mod && ch == 'p') {
- exec("/bin/exec", NULL);
- return;
- }
+ special_keys.ctrl ^= 1;
- if (!focused)
- return;
-
- // Key maps
- struct gui_event_keyboard *msg = malloc(sizeof(*msg));
- if (special_keys_pressed & SHIFT_PRESSED)
- msg->ch = keymap->shift_map[event->scancode];
- else if (special_keys_pressed & ALT_PRESSED)
- msg->ch = keymap->alt_map[event->scancode];
+ char ch;
+ if (special_keys.shift)
+ ch = keymap->shift_map[event->scancode];
+ else if (special_keys.alt)
+ ch = keymap->alt_map[event->scancode];
else
- msg->ch = ch;
+ ch = keymap->map[event->scancode];
- msg->press = event->press;
- msg->scancode = event->scancode;
- msg_send(focused->pid, GUI_KEYBOARD, msg);
+ (void)ch;
}
-static int mouse_skip = 0;
-static int mouse_pressed[3] = { 0 };
-static void handle_mouse(struct event_mouse *event)
+static void handle_event_mouse(struct event_mouse *event)
{
- if (event->magic != MOUSE_MAGIC)
+ if (event->magic != MOUSE_MAGIC) {
+ log("Mouse magic doesn't match!\n");
return;
-
- // Cursor movement
- mouse_x += event->diff_x;
- mouse_y -= event->diff_y;
-
- if (mouse_x < 0)
- mouse_x = 0;
- else if ((int)(mouse_x + cursor.width) > vbe.width - 1)
- mouse_x = vbe.width - cursor.width - 1;
-
- if (mouse_y < 0)
- mouse_y = 0;
- else if ((int)(mouse_y + cursor.height) > vbe.height - 1)
- mouse_y = vbe.height - cursor.height - 1;
-
- // Restore cursor buffer backup
- gfx_copy(&direct, &exchange, cursor.x, cursor.y, cursor.width, cursor.height);
-
- int mod_pressed = special_keys_pressed & ALT_PRESSED;
-
- // Context focus
- if (!mouse_pressed[0] && !mouse_pressed[1])
- focused = context_at(mouse_x, mouse_y);
-
- // Context position
- if (mod_pressed && event->but1 && !mouse_pressed[1]) {
- mouse_pressed[0] = 1;
- if (focused && !(focused->flags & WF_NO_DRAG)) {
- focused->x = mouse_x;
- focused->y = mouse_y;
- if (mouse_skip % MOUSE_SKIP == 0) {
- mouse_skip = 0;
- redraw_all(); // TODO: Function to redraw one context
- }
- }
- } else if (mod_pressed && mouse_pressed[0]) {
- mouse_pressed[0] = 0;
- redraw_all();
}
- // Context size
- if (mod_pressed && event->but2 && !mouse_pressed[0]) {
- if (focused && !mouse_pressed[1]) {
- mouse_x = focused->x + focused->width;
- mouse_y = focused->y + focused->height;
- } else if (focused && !(focused->flags & WF_NO_RESIZE) &&
- mouse_skip % MOUSE_SKIP == 0) {
- mouse_skip = 0;
- if (mouse_x - focused->x > 0)
- focused->width = mouse_x - focused->x;
- if (mouse_y - focused->y > 0) {
- focused->height = mouse_y - focused->y;
- }
- }
- mouse_pressed[1] = 1;
- } else if (mod_pressed && mouse_pressed[1]) {
- mouse_pressed[1] = 0;
- if (focused) {
- struct context *resized = malloc(sizeof(*resized));
- new_context(resized, focused->pid, focused->x, focused->y, focused->width,
- focused->height, focused->flags);
- remove_context(focused);
- list_add(contexts, resized);
- focused = resized;
- struct gui_event_resize *msg = malloc(sizeof(*msg));
- msg->new_ctx = resized;
- msg_send(resized->pid, GUI_RESIZE, msg);
- redraw_all();
- }
+ mouse.pos.x += event->diff_x;
+ mouse.pos.y -= event->diff_y;
+
+ // Fix x overflow
+ if ((signed)mouse.pos.x < 0)
+ mouse.pos.x = 0;
+ else if (mouse.pos.x + cursor->ctx.size.x > (unsigned)screen.width - 1)
+ mouse.pos.x = screen.width - cursor->ctx.size.x - 1;
+
+ // Fix y overflow
+ if ((signed)mouse.pos.y < 0)
+ mouse.pos.y = 0;
+ 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 = vec2to3(mouse.pos, U32_MAX);
+
+ gfx_fill(&cursor->ctx, COLOR_RED);
+ if (event->but1) {
+ /* TODO: Fix gfx_copy! */
+ /* gfx_copy(&root->ctx, &cursor->ctx, vec3to2(cursor->pos), cursor->ctx.size); */
+ gfx_draw_rectangle(&root->ctx, vec3to2(cursor->pos),
+ vec2_add(cursor->pos, cursor->ctx.size), COLOR_RED);
}
-
- cursor.x = mouse_x;
- cursor.y = mouse_y;
- gfx_ctx_on_ctx(&direct, &cursor, cursor.x, cursor.y);
- mouse_skip++;
-
- if (!focused)
- return;
- struct gui_event_mouse *msg = malloc(sizeof(*msg));
- msg->x = mouse_x - focused->x;
- msg->y = mouse_y - focused->y;
- msg->but1 = event->but1;
- msg->but2 = event->but2;
- msg->but3 = event->but3;
- msg_send(focused->pid, GUI_MOUSE, msg);
}
-// TODO: Clean this god-function
int main(int argc, char **argv)
{
(void)argc;
int pid = getpid();
- vbe = *(struct vbe *)argv[1];
- log("WM loaded: %dx%d\n", vbe.width, vbe.height);
+ screen = *(struct vbe *)argv[1];
+ log("WM loaded: %dx%d\n", screen.width, screen.height);
+ windows = list_new();
keymap = keymap_parse("/res/keymaps/en.keymap");
- contexts = list_new();
- new_context(&root, pid, 0, 0, vbe.width, vbe.height,
- WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE);
- new_context(&exchange, pid, 0, 0, vbe.width, vbe.height,
- WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE);
- new_context(&cursor, pid, 0, 0, 32, 32, WF_NO_FOCUS | WF_NO_RESIZE);
- memcpy(&direct, &root, sizeof(direct));
- direct.fb = vbe.fb;
- list_add(contexts, &root);
+ root = window_create((struct client){ pid }, "root", vec3(0, 0, 0),
+ vec2(screen.width, screen.height), WF_NO_FB);
+ root->ctx.fb = screen.fb;
+ root->flags ^= WF_NO_FB;
+ cursor = window_create((struct client){ pid }, "cursor", vec3(0, 0, 0), vec2(20, 20),
+ WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE);
- gfx_write(&direct, 0, 0, FONT_32, COLOR_FG, "Welcome to Melvix!");
- gfx_write(&direct, 0, 32, FONT_32, COLOR_FG, "Loading resources...");
- gfx_fill(&root, COLOR_FG);
- //gfx_load_wallpaper(&root, "/res/wall.png");
- //gfx_load_image(&cursor, "/res/cursor.png", 0, 0);
- gfx_fill(&cursor, COLOR_BG);
- redraw_all();
+ gfx_fill(&root->ctx, COLOR_WHITE);
struct message msg = { 0 };
- struct event_keyboard kbd_event = { 0 };
- struct event_mouse mouse_event = { 0 };
+ struct event_keyboard event_keyboard = { 0 };
+ struct event_mouse event_mouse = { 0 };
const char *listeners[] = { "/dev/kbd", "/dev/mouse", "/proc/self/msg" };
while (1) {
int poll_ret = 0;
if ((poll_ret = poll(listeners)) >= 0) {
if (poll_ret == 0) {
- if (read(listeners[poll_ret], &kbd_event, 0, sizeof(kbd_event)) > 0)
- handle_keyboard(&kbd_event);
+ if (read(listeners[poll_ret], &event_keyboard, 0,
+ sizeof(event_keyboard)) > 0)
+ handle_event_keyboard(&event_keyboard);
continue;
} else if (poll_ret == 1) {
- if (read(listeners[poll_ret], &mouse_event, 0,
- sizeof(mouse_event)) > 0)
- handle_mouse(&mouse_event);
+ if (read(listeners[poll_ret], &event_mouse, 0,
+ sizeof(event_mouse)) > 0)
+ handle_event_mouse(&event_mouse);
continue;
} else if (poll_ret == 2) {
if (read(listeners[poll_ret], &msg, 0, sizeof(msg)) <= 0)
@@ -311,41 +178,17 @@ int main(int argc, char **argv)
err(1, "POLL ERROR!\n");
}
- assert(msg.magic == MSG_MAGIC);
-
- switch (msg.type) {
- case GFX_NEW_CONTEXT: {
- struct context *ctx = msg.data;
- int width = ctx->width;
- int height = ctx->height;
- int x = ctx->x;
- int y = ctx->y;
- ctx->pid = msg.src;
- new_context(ctx, msg.src, x, y, width, height, ctx->flags);
- list_add(contexts, ctx);
- if (!(ctx->flags & WF_RELATIVE))
- focused = ctx;
- redraw_all();
- msg_send(msg.src, GFX_NEW_CONTEXT, ctx);
-
- // Send mouse position
- struct gui_event_mouse *mouse = malloc(sizeof(msg));
- mouse->x = mouse_x - focused->x;
- mouse->y = mouse_y - focused->y;
- msg_send(focused->pid, GUI_MOUSE, mouse);
- break;
- }
- case GFX_REDRAW:
- redraw_all();
- break;
- case GFX_REDRAW_FOCUSED:
- redraw_focused();
- break;
- default:
- log("Unknown WM request %d\n", msg.type);
- break;
+ if (msg.magic != MSG_MAGIC) {
+ log("Message magic doesn't match!\n");
+ continue;
}
+
+ log("not implemented!\n");
};
+ // TODO: Execute?
+ free(keymap);
+ list_destroy(windows);
+
return 0;
}
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 74fa5d4..2ca213b 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -290,6 +290,7 @@ s32 procfs_write(const char *path, void *buf, u32 offset, u32 count, struct devi
path++;
if (!memcmp(path, "msg", 4)) {
+ // TODO: Messages should be copied by value not by reference
stack_push_bot(p->messages, buf); // TODO: Use offset and count
proc_enable_waiting(pid, PROC_WAIT_MSG);
return count;
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index aead212..be4352f 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -29,13 +29,13 @@ enum sys {
};
struct event_keyboard {
- int magic;
+ u32 magic;
int press;
int scancode;
};
struct event_mouse {
- int magic;
+ u32 magic;
int diff_x;
int diff_y;
int but1;
diff --git a/libc/inc/vec.h b/libc/inc/vec.h
index 9eb706c..024e792 100644
--- a/libc/inc/vec.h
+++ b/libc/inc/vec.h
@@ -13,6 +13,8 @@ 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_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 })
@@ -20,6 +22,8 @@ typedef struct vec3 {
#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 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 })
diff --git a/libgui/Makefile b/libgui/Makefile
index b37bc3b..cb02fed 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -4,7 +4,6 @@ COBJS = psf.o \
bmp.o \
png.o \
gfx.o \
- gui.o \
msg.o
CC = ccache ../cross/opt/bin/i686-elf-gcc
LD = ccache ../cross/opt/bin/i686-elf-ld
diff --git a/libgui/bmp.c b/libgui/bmp.c
index 9fffbf5..c8795e8 100644
--- a/libgui/bmp.c
+++ b/libgui/bmp.c
@@ -19,11 +19,11 @@ struct bmp *bmp_load(const char *path)
// TODO: Support padding with odd widths
struct bmp_info *info = (struct bmp_info *)((u32)buf + sizeof(*h));
struct bmp *bmp = malloc(sizeof(*bmp));
- bmp->width = info->width;
- bmp->height = info->height;
+ bmp->size.x = info->width;
+ bmp->size.y = info->height;
bmp->data = (u8 *)((u32)buf + h->offset);
bmp->bpp = info->bpp;
- bmp->pitch = bmp->width * (bmp->bpp >> 3);
+ bmp->pitch = bmp->size.x * (bmp->bpp >> 3);
return bmp;
}
diff --git a/libgui/gfx.c b/libgui/gfx.c
index a6e23e6..bd7165a 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -59,16 +59,15 @@ static void load_font(enum font_type font_type)
assert(fonts[font_type]);
}
-static void write_char(struct context *ctx, int x, int y, struct font *font, u32 c, char ch)
+static void write_char(struct context *ctx, vec2 pos, struct font *font, u32 c, char ch)
{
int bypp = ctx->bpp >> 3;
- int pos = x * bypp + y * ctx->pitch;
- char *draw = (char *)&ctx->fb[pos];
+ char *draw = (char *)&ctx->fb[pos.x * bypp + pos.y * ctx->pitch];
- u32 stride = font->char_size / font->height;
- for (int cy = 0; cy < font->height; cy++) {
- for (int cx = 0; cx < font->width; cx++) {
+ u32 stride = font->char_size / font->size.y;
+ for (u32 cy = 0; cy < font->size.y; cy++) {
+ for (u32 cx = 0; cx < font->size.x; cx++) {
u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
u8 bit = bits >> (7 - cx % 8) & 1;
if (bit) {
@@ -82,12 +81,12 @@ static void write_char(struct context *ctx, int x, int y, struct font *font, u32
}
}
-static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+static void draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c)
{
int bypp = ctx->bpp >> 3;
- u8 *draw = &ctx->fb[x1 * bypp + y1 * ctx->pitch];
- for (int i = 0; i < y2 - y1; i++) {
- for (int j = 0; j < x2 - x1; j++) {
+ u8 *draw = &ctx->fb[pos1.x * bypp + pos1.y * ctx->pitch];
+ for (u32 i = 0; i < pos2.y - pos1.y; i++) {
+ for (u32 j = 0; j < pos2.x - pos1.x; j++) {
draw[bypp * j] = GET_BLUE(c);
draw[bypp * j + 1] = GET_GREEN(c);
draw[bypp * j + 2] = GET_RED(c);
@@ -114,14 +113,14 @@ struct font *gfx_resolve_font(enum font_type font_type)
return fonts[font_type];
}
-void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch)
+void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch)
{
struct font *font = gfx_resolve_font(font_type);
- write_char(ctx, x, y, font, c, ch);
+ write_char(ctx, pos, font, c, ch);
/* gfx_redraw(); */
}
-void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, const char *text)
+void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text)
{
struct font *font = gfx_resolve_font(font_type);
u32 cnt = 0;
@@ -131,37 +130,37 @@ void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32
cnt = 0;
} else if (text[i] == '\n') {
cnt = 0;
- y += font->height;
+ pos.y += font->size.y;
} else if (text[i] == '\t') {
cnt += 4;
} else {
// TODO: Overflow on single line input
- if ((cnt + 1) * font->width > ctx->width) {
+ if ((cnt + 1) * font->size.x > ctx->size.x) {
cnt = 0;
- y += font->height;
+ pos.y += font->size.y;
}
- write_char(ctx, x + cnt * font->width, y, font, c, text[i]);
+ write_char(ctx, vec2(pos.x + cnt * font->size.x, pos.y), font, c, text[i]);
cnt++;
}
}
/* gfx_redraw(); */
}
-void gfx_load_image(struct context *ctx, const char *path, int x, int y)
+void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
{
// TODO: Support x, y
// TODO: Detect image type
// struct bmp *bmp = bmp_load(path);
struct bmp *bmp = png_load(path);
- assert(bmp && bmp->width + x <= ctx->width);
- assert(bmp && bmp->height + y <= ctx->height);
+ assert(bmp && bmp->size.x + pos.x <= ctx->size.x);
+ assert(bmp && bmp->size.y + pos.y <= ctx->size.y);
// TODO: Fix reversed png in decoder
int bypp = bmp->bpp >> 3;
- // u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
+ // 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->height; cy++) {
+ for (u32 cy = 0; cy < bmp->size.y; cy++) {
memcpy(destfb, srcfb, bmp->pitch);
// srcfb -= bmp->pitch;
srcfb += bmp->pitch;
@@ -172,16 +171,16 @@ void gfx_load_image(struct context *ctx, const char *path, int x, int y)
void gfx_load_wallpaper(struct context *ctx, const char *path)
{
- gfx_load_image(ctx, path, 0, 0);
+ gfx_load_image(ctx, vec2(0, 0), path);
}
-void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height)
+void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size)
{
int bypp = dest->bpp >> 3;
- u8 *srcfb = &src->fb[x * bypp + y * src->pitch];
- u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
- for (u32 cy = 0; cy < height; cy++) {
- memcpy(destfb, srcfb, width * bypp);
+ u8 *srcfb = &src->fb[pos.x * bypp + pos.y * src->pitch];
+ u8 *destfb = &dest->fb[pos.x * bypp + pos.y * dest->pitch];
+ for (u32 cy = 0; cy < size.y; cy++) {
+ memcpy(destfb, srcfb, size.x * bypp);
srcfb += src->pitch;
destfb += dest->pitch;
}
@@ -189,24 +188,23 @@ void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width
// TODO: Support alpha values other than 0x0 and 0xff (blending)
// TODO: Optimize!
-void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y)
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
{
- if (src->width == dest->width && src->height == dest->height && src->x == 0 &&
- dest->y == 0) {
- memcpy(dest->fb, src->fb, dest->pitch * dest->height);
+ 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->width > dest->width || src->height > dest->height)
+ 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 *srcfb = src->fb;
- u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
- for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) {
+ 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++) {
int diff = 0;
- for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
+ 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];
@@ -223,15 +221,15 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y)
}
}
-void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c)
{
- draw_rectangle(ctx, x1, y1, x2, y2, c);
+ draw_rectangle(ctx, pos1, pos2, c);
/* gfx_redraw(); */
}
void gfx_fill(struct context *ctx, u32 c)
{
- draw_rectangle(ctx, 0, 0, ctx->width, ctx->height, c);
+ draw_rectangle(ctx, vec2(0, 0), vec2(ctx->size.x, ctx->size.y), c);
/* gfx_redraw(); */
}
@@ -242,11 +240,11 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
int bypp = ctx->bpp >> 3;
u8 *draw = ctx->fb;
- for (u32 i = 0; i < ctx->height; i++) {
- for (u32 j = 0; j < ctx->width; j++) {
+ for (u32 i = 0; i < ctx->size.y; i++) {
+ for (u32 j = 0; j < ctx->size.x; j++) {
if (j <= width - 1 || i <= width - 1 ||
- j - ctx->width + width + 1 <= width ||
- i - ctx->height + width <= width) {
+ j - ctx->size.x + width + 1 <= width ||
+ i - ctx->size.y + width <= width) {
draw[bypp * j + 0] = GET_BLUE(c);
draw[bypp * j + 1] = GET_GREEN(c);
draw[bypp * j + 2] = GET_RED(c);
@@ -261,11 +259,11 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
int gfx_font_height(enum font_type font_type)
{
struct font *font = gfx_resolve_font(font_type);
- return font->height;
+ return font->size.y;
}
int gfx_font_width(enum font_type font_type)
{
struct font *font = gfx_resolve_font(font_type);
- return font->width;
+ return font->size.x;
}
diff --git a/libgui/inc/bmp.h b/libgui/inc/bmp.h
index ea7a07f..ff8360b 100644
--- a/libgui/inc/bmp.h
+++ b/libgui/inc/bmp.h
@@ -4,6 +4,7 @@
#define BMP_H
#include <def.h>
+#include <vec.h>
struct bmp_header {
u8 signature[2];
@@ -27,8 +28,7 @@ struct bmp_info {
};
struct bmp {
- u32 width;
- u32 height;
+ vec2 size;
u8 *data;
u32 bpp;
u32 pitch;
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
index fd8d4ab..a283459 100644
--- a/libgui/inc/gfx.h
+++ b/libgui/inc/gfx.h
@@ -7,6 +7,7 @@
#include <def.h>
#include <msg.h>
#include <sys.h>
+#include <vec.h>
#include <vesa.h>
#define WM_PATH "/bin/wm"
@@ -41,40 +42,34 @@
#define WF_NO_FOCUS (1 << 0)
#define WF_NO_DRAG (1 << 1)
#define WF_NO_RESIZE (1 << 2)
-#define WF_RELATIVE (1 << 3)
+#define WF_NO_FB (1 << 3)
+/* #define WF_RELATIVE (1 << 4) */
enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 };
// Generalized font struct
struct font {
char *chars;
- int height;
- int width;
+ vec2 size;
int char_size;
};
struct context {
- u32 pid;
- int x;
- int y;
- u32 width;
- u32 height;
+ vec2 size;
u8 *fb;
u32 bpp;
u32 pitch;
- int flags;
};
struct context *gfx_new_ctx(struct context *ctx);
struct font *gfx_resolve_font(enum font_type font_type);
-void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch);
-void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c,
- const char *text);
-void gfx_load_image(struct context *ctx, const char *path, int x, int y);
+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_wallpaper(struct context *ctx, const char *path);
-void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height);
-void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y);
-void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c);
+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);
+void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c);
void gfx_fill(struct context *ctx, u32 c);
void gfx_border(struct context *ctx, u32 c, u32 width);
diff --git a/libgui/png.c b/libgui/png.c
index ad65eba..48089e3 100644
--- a/libgui/png.c
+++ b/libgui/png.c
@@ -1182,8 +1182,8 @@ struct bmp *png_load(const char *path)
assert(png->error == PNG_EOK);
struct bmp *bmp = malloc(sizeof(*bmp));
- bmp->width = png->width;
- bmp->height = png->height;
+ bmp->size.x = png->width;
+ bmp->size.y = png->height;
bmp->data = png->buffer;
bmp->bpp = png_get_bpp(png);
bmp->pitch = png->width * (bmp->bpp >> 3);
diff --git a/libgui/psf.c b/libgui/psf.c
index f7271a8..655fb07 100644
--- a/libgui/psf.c
+++ b/libgui/psf.c
@@ -52,8 +52,8 @@ struct font *psf_parse(char *data)
struct font *font = malloc(sizeof(*font));
font->chars = chars;
- font->height = height;
- font->width = width;
+ font->size.x = width;
+ font->size.y = height;
font->char_size = char_size;
return font;
diff --git a/libtxt/html.c b/libtxt/html.c
index eca2feb..f40f7b3 100644
--- a/libtxt/html.c
+++ b/libtxt/html.c
@@ -169,33 +169,35 @@ static struct html_element *render_object(struct html_element *container, struct
gui_add_label(container->obj, container->x_offset, container->y_offset,
FONT_32, dom->content, COLOR_WHITE, COLOR_BLACK);
container->x_offset = 0;
- container->y_offset += obj->ctx->height;
+ container->y_offset += obj->ctx->size.y;
return new_html_element(obj, dom);
} else if (CMP(tag, "h2")) {
struct element *obj =
gui_add_label(container->obj, container->x_offset, container->y_offset,
FONT_24, dom->content, COLOR_WHITE, COLOR_BLACK);
container->x_offset = 0;
- container->y_offset += obj->ctx->height;
+ container->y_offset += obj->ctx->size.y;
return new_html_element(obj, dom);
} else if (CMP(tag, "h3")) {
struct element *obj =
gui_add_label(container->obj, container->x_offset, container->y_offset,
FONT_16, dom->content, COLOR_WHITE, COLOR_BLACK);
container->x_offset = 0;
- container->y_offset += obj->ctx->height;
+ container->y_offset += obj->ctx->size.y;
return new_html_element(obj, dom);
} else if (CMP(tag, "p")) {
struct element *obj =
gui_add_label(container->obj, container->x_offset, container->y_offset,
FONT_16, dom->content, COLOR_WHITE, COLOR_BLACK);
container->x_offset = 0;
- container->y_offset += obj->ctx->height;
+ container->y_offset += obj->ctx->size.y;
return new_html_element(obj, dom);
} else if (CMP(tag, "hr")) {
- gfx_draw_rectangle(container->obj->ctx, container->x_offset, container->y_offset,
- container->obj->ctx->width - container->x_offset,
- container->y_offset + 2, COLOR_BLACK);
+ gfx_draw_rectangle(container->obj->ctx,
+ vec2(container->x_offset, container->y_offset),
+ vec2(container->obj->ctx->size.x - container->x_offset,
+ container->y_offset + 2),
+ COLOR_BLACK);
container->x_offset = 0;
container->y_offset += 2;
return container;
@@ -208,7 +210,7 @@ static struct html_element *render_object(struct html_element *container, struct
container->y_offset, FONT_16,
dom->content, COLOR_WHITE, COLOR_BLACK);
container->x_offset = 0;
- container->y_offset += obj->ctx->height;
+ container->y_offset += obj->ctx->size.y;
return new_html_element(obj, dom);
}
return container;