aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile8
-rw-r--r--apps/mandelbrot.c42
-rw-r--r--apps/window.c27
-rw-r--r--apps/wm.c148
-rw-r--r--kernel/Makefile4
-rw-r--r--kernel/drivers/keyboard.c2
-rw-r--r--libgui/Makefile1
-rw-r--r--libgui/gfx.c184
-rw-r--r--libgui/gui.c196
-rw-r--r--libgui/inc/gfx.h91
-rw-r--r--libgui/inc/gui.h84
-rw-r--r--libgui/psf.c2
-rwxr-xr-xrun2
13 files changed, 434 insertions, 357 deletions
diff --git a/Makefile b/Makefile
index 764c933..6775826 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
# MIT License, Copyright (c) 2020 Marvin Borner
+# Kernel optimization
+OPTIMIZATION = -Ofast
+
+# Remove tree optimizations for kernel - TODO: Why?
+CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter
+
+export
+
all: compile clean
compile:
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c
index 7a7aee1..dad9100 100644
--- a/apps/mandelbrot.c
+++ b/apps/mandelbrot.c
@@ -2,26 +2,26 @@
#include <conv.h>
#include <def.h>
-#include <gui.h>
+#include <gfx.h>
#include <input.h>
#include <print.h>
#include <random.h>
#include <str.h>
#include <sys.h>
-void draw_pixel(struct window *win, int x, int y, u32 c)
+void draw_pixel(struct context *ctx, int x, int y, u32 c)
{
- int pos = x * (win->bpp >> 3) + y * win->pitch;
- win->fb[pos + 0] = GET_BLUE(c);
- win->fb[pos + 1] = GET_GREEN(c);
- win->fb[pos + 2] = GET_RED(c);
- win->fb[pos + 3] = GET_ALPHA(c);
+ int pos = x * (ctx->bpp >> 3) + y * ctx->pitch;
+ ctx->fb[pos + 0] = GET_BLUE(c);
+ ctx->fb[pos + 1] = GET_GREEN(c);
+ ctx->fb[pos + 2] = GET_RED(c);
+ ctx->fb[pos + 3] = GET_ALPHA(c);
}
-void draw_mandelbrot(struct window *win, int resolution)
+void draw_mandelbrot(struct context *ctx, int resolution)
{
- int height = win->height;
- int width = win->width;
+ int height = ctx->height;
+ int width = ctx->width;
int max = resolution;
for (int row = 0; row < height; row++) {
@@ -38,31 +38,31 @@ void draw_mandelbrot(struct window *win, int resolution)
}
srand(iteration);
if (iteration < max)
- draw_pixel(win, col, row,
+ draw_pixel(ctx, col, row,
rand() << 16 | rand() << 8 | rand() | 0xff000000);
else
- draw_pixel(win, col, row, 0xff000000);
+ draw_pixel(ctx, col, row, 0xff000000);
if (row % 50 == 0 && col == 0)
- gui_redraw();
+ gfx_redraw();
}
}
- gui_redraw();
+ gfx_redraw();
print("Rendered mandelbrot successfully\n");
yield();
}
int main()
{
- print("[mandelbrot window loaded]\n");
+ print("[mandelbrot context loaded]\n");
- struct window win = { 0 };
- win.width = 500;
- win.height = 300;
- gui_new_window(&win);
- gui_fill(&win, COLOR_BG);
+ struct context ctx = { 0 };
+ ctx.width = 500;
+ ctx.height = 300;
+ gfx_new_ctx(&ctx);
+ gfx_fill(&ctx, COLOR_BG);
- draw_mandelbrot(&win, 50);
+ draw_mandelbrot(&ctx, 50);
while (1) {
yield();
diff --git a/apps/window.c b/apps/window.c
index a796b52..70131a6 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -2,6 +2,7 @@
#include <conv.h>
#include <def.h>
+#include <gfx.h>
#include <gui.h>
#include <input.h>
#include <print.h>
@@ -9,24 +10,16 @@
int main()
{
- print("[test window loaded]\n");
+ print("[test context loaded]\n");
- struct window win = { 0 };
- win.height = 400;
- win.width = 600;
- win.x = 50;
- win.y = 50;
- gui_new_window(&win);
+ struct window *win = gui_init("test", 0, 0);
+ struct context *ctx = win->ctx;
- gui_fill(&win, COLOR_BG);
- /* gui_border(&win, COLOR_FG, 2); */
-
- gui_init("/font/spleen-12x24.psfu");
- int font_height = gui_font_height();
- int font_width = gui_font_width();
+ int font_height = gfx_font_height();
+ int font_width = gfx_font_width();
char *hello = "Hello, world!";
- gui_write(&win, win.width / 2 - (strlen(hello) * font_width) / 2, 0, COLOR_GREEN, hello);
+ gfx_write(ctx, ctx->width / 2 - (strlen(hello) * font_width) / 2, 0, COLOR_GREEN, hello);
struct message *msg;
int char_x = 0;
@@ -45,7 +38,7 @@ int main()
if (!event->press)
break;
- if (char_x * font_width >= (int)win.width) {
+ if (char_x * font_width >= (int)ctx->width) {
char_y++;
char_x = 0;
}
@@ -58,7 +51,7 @@ int main()
} else if (ch == '\b') {
if (char_x > 0) {
char_x--;
- gui_draw_rectangle(&win, font_width * char_x,
+ gfx_draw_rectangle(ctx, font_width * char_x,
font_height * char_y,
font_width * (char_x + 1),
font_height * (char_y + 1), COLOR_BG);
@@ -66,7 +59,7 @@ int main()
} else if (ch == ' ' && event->scancode == KEY_SPACE) {
char_x++;
} else if (ch != ' ' && ch != '\0') {
- gui_write_char(&win, font_width * char_x++, font_height * char_y,
+ gfx_write_char(ctx, font_width * char_x++, font_height * char_y,
COLOR_CYAN, ch);
}
break;
diff --git a/apps/wm.c b/apps/wm.c
index e016eda..2443d87 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -3,7 +3,7 @@
#include <assert.h>
#include <cpu.h>
#include <def.h>
-#include <gui.h>
+#include <gfx.h>
#include <input.h>
#include <keymap.h>
#include <list.h>
@@ -14,52 +14,52 @@
#include <vesa.h>
static int MOUSE_SKIP = 0; // => Every move % n != 0 gets skipped
-static int window_count;
+static int context_count;
static struct vbe vbe;
-static struct window direct; // Direct video memory window
-static struct window root; // Root window (wallpaper etc.)
-static struct window exchange; // Exchange buffer
-static struct window cursor; // Cursor bitmap window
-static struct window *focused; // The focused window
-static struct list *windows; // List of all windows
+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 window *new_window(struct window *win, u32 pid, int x, int y, u16 width, u16 height,
- int flags)
+static struct context *new_context(struct context *ctx, u32 pid, int x, int y, u16 width,
+ u16 height, int flags)
{
- win->pid = pid;
- win->x = x;
- win->y = y;
- win->width = width;
- win->height = height;
- win->bpp = vbe.bpp;
- win->pitch = win->width * (win->bpp >> 3);
- win->fb = malloc(height * win->pitch);
- memset(win->fb, 0, height * win->pitch);
- win->flags = flags;
- window_count++;
- if (window_count % 2 == 1)
+ 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;
+ context_count++;
+ if (context_count % 2 == 1)
MOUSE_SKIP++;
- return win;
+ return ctx;
}
-static struct window *window_at(int x, int y)
+static struct context *context_at(int x, int y)
{
- if (!windows->head || !windows->head->data)
+ if (!contexts->head || !contexts->head->data)
return NULL;
- struct window *ret = NULL;
- struct node *iterator = windows->head;
+ struct context *ret = NULL;
+ struct node *iterator = contexts->head;
while (iterator != NULL) {
- struct window *win = iterator->data;
- if (win != &root && x >= win->x && x <= win->x + (int)win->width && y >= win->y &&
- y <= win->y + (int)win->height)
- ret = win;
+ struct context *ctx = iterator->data;
+ if (ctx != &root && x >= ctx->x && x <= ctx->x + (int)ctx->width && y >= ctx->y &&
+ y <= ctx->y + (int)ctx->height)
+ ret = ctx;
iterator = iterator->next;
}
return ret;
@@ -67,24 +67,24 @@ static struct window *window_at(int x, int y)
static void redraw_all()
{
- if (!windows->head || !windows->head->data)
+ if (!contexts->head || !contexts->head->data)
return;
- struct node *iterator = windows->head;
+ struct node *iterator = contexts->head;
while (iterator != NULL) {
- struct window *win = iterator->data;
- if (win != focused)
- gui_win_on_win(&exchange, win, win->x, win->y);
+ struct context *ctx = iterator->data;
+ if (ctx != focused)
+ gfx_ctx_on_ctx(&exchange, ctx, ctx->x, ctx->y);
iterator = iterator->next;
}
if (focused)
- gui_win_on_win(&exchange, focused, focused->x, focused->y);
+ gfx_ctx_on_ctx(&exchange, focused, focused->x, focused->y);
memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height);
}
-// TODO: Send relative mouse position event to focused window
+// TODO: Send relative mouse position event to focused context
static int mouse_skip = 0;
static int mouse_pressed[3] = { 0 };
static void handle_mouse(struct event_mouse *event)
@@ -107,13 +107,13 @@ static void handle_mouse(struct event_mouse *event)
mouse_y = vbe.height - cursor.height - 1;
// Restore cursor buffer backup
- gui_copy(&direct, &exchange, cursor.x, cursor.y, cursor.width, cursor.height);
+ gfx_copy(&direct, &exchange, cursor.x, cursor.y, cursor.width, cursor.height);
- // Window focus
+ // Context focus
if (!mouse_pressed[0] && !mouse_pressed[1])
- focused = window_at(mouse_x, mouse_y);
+ focused = context_at(mouse_x, mouse_y);
- // Window position
+ // Context position
if (event->but1 && !mouse_pressed[1]) {
mouse_pressed[0] = 1;
if (focused && !(focused->flags & WF_NO_DRAG)) {
@@ -121,7 +121,7 @@ static void handle_mouse(struct event_mouse *event)
focused->y = mouse_y;
if (mouse_skip % MOUSE_SKIP == 0) {
mouse_skip = 0;
- redraw_all(); // TODO: Function to redraw one window
+ redraw_all(); // TODO: Function to redraw one context
}
}
} else if (mouse_pressed[0]) {
@@ -129,7 +129,7 @@ static void handle_mouse(struct event_mouse *event)
redraw_all();
}
- // Window size
+ // Context size
if (event->but2 && !mouse_pressed[0]) {
if (focused && !mouse_pressed[1]) {
mouse_x = focused->x + focused->width;
@@ -141,7 +141,7 @@ static void handle_mouse(struct event_mouse *event)
focused->width = mouse_x - focused->x;
if (mouse_y - focused->y > 0)
focused->height = mouse_y - focused->y;
- redraw_all(); // TODO: Function to redraw one window
+ redraw_all(); // TODO: Function to redraw one context
}
mouse_pressed[1] = 1;
} else if (mouse_pressed[1]) {
@@ -151,7 +151,7 @@ static void handle_mouse(struct event_mouse *event)
cursor.x = mouse_x;
cursor.y = mouse_y;
- gui_win_on_win(&direct, &cursor, cursor.x, cursor.y);
+ gfx_ctx_on_ctx(&direct, &cursor, cursor.x, cursor.y);
mouse_skip++;
}
@@ -191,26 +191,26 @@ int main(int argc, char **argv)
printf("VBE: %dx%d\n", vbe.width, vbe.height);
keymap = keymap_parse("/res/keymaps/en.keymap");
- gui_init("/font/spleen-16x32.psfu");
-
- windows = list_new();
- new_window(&root, pid, 0, 0, vbe.width, vbe.height,
- WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE);
- new_window(&exchange, pid, 0, 0, vbe.width, vbe.height,
- WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE);
- new_window(&cursor, pid, 0, 0, 32, 32, WF_NO_FOCUS | WF_NO_RESIZE);
+ gfx_init("/font/spleen-16x32.psfu");
+
+ 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(windows, &root);
+ list_add(contexts, &root);
- gui_fill(&direct, COLOR_BG);
- gui_write(&direct, 0, 0, COLOR_FG, "Welcome to Melvix!");
- gui_write(&direct, 0, 32, COLOR_FG, "Loading resources...");
+ gfx_fill(&direct, COLOR_BG);
+ gfx_write(&direct, 0, 0, COLOR_FG, "Welcome to Melvix!");
+ gfx_write(&direct, 0, 32, COLOR_FG, "Loading resources...");
- gui_fill(&root, COLOR_BG);
- gui_border(&root, COLOR_FG, 2);
- gui_load_image(&cursor, "/res/cursor.bmp", 0, 0);
- gui_load_wallpaper(&root, "/res/wall.bmp");
+ gfx_fill(&root, COLOR_BG);
+ gfx_border(&root, COLOR_FG, 2);
+ gfx_load_image(&cursor, "/res/cursor.bmp", 0, 0);
+ gfx_load_wallpaper(&root, "/res/wall.bmp");
redraw_all();
event_register(EVENT_MOUSE);
@@ -224,19 +224,19 @@ int main(int argc, char **argv)
}
switch (msg->type) {
- case WM_NEW_WINDOW:
- printf("New window for pid %d\n", msg->src);
- struct window *win = msg->data;
- int width = win->width ? win->width : 1000;
- int height = win->height ? win->height : 800;
- int x = win->x ? win->x : vbe.width / 2 - (width / 2);
- int y = win->y ? win->y : vbe.height / 2 - (height / 2);
- win->pid = msg->src;
- new_window(win, msg->src, x, y, width, height, win->flags);
- msg_send(msg->src, WM_NEW_WINDOW, win);
- list_add(windows, win);
- focused = win;
+ case WM_NEW_CONTEXT:
+ printf("New context for pid %d\n", msg->src);
+ struct context *ctx = msg->data;
+ int width = ctx->width ? ctx->width : 1000;
+ int height = ctx->height ? ctx->height : 800;
+ int x = ctx->x ? ctx->x : vbe.width / 2 - (width / 2);
+ int y = ctx->y ? ctx->y : vbe.height / 2 - (height / 2);
+ ctx->pid = msg->src;
+ new_context(ctx, msg->src, x, y, width, height, ctx->flags);
+ list_add(contexts, ctx);
+ focused = ctx;
redraw_all();
+ msg_send(msg->src, WM_NEW_CONTEXT, ctx);
break;
case WM_REDRAW:
redraw_all();
diff --git a/kernel/Makefile b/kernel/Makefile
index fcee759..c449cd9 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -23,9 +23,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld
OC = ccache ../cross/opt/bin/i686-elf-objcopy
AS = ccache nasm
-# TODO: Remove fixflags?
-FIXFLAGS = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter
-CFLAGS = -Wall -Wextra -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(FIXFLAGS) -Ofast
+CFLAGS = -Wall -Wextra -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(CFLAGS_EXTRA) $(OPTIMIZATION)
ASFLAGS = -f elf32
all: compile
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index 854ab3b..2bd67ba 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -67,7 +67,7 @@ char keymap[128] = {
0, // Alt key
' ', // Space bar
15, // Caps lock
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
0, // Num lock
0, // Scroll lock
0, // Home key
diff --git a/libgui/Makefile b/libgui/Makefile
index 29c8db4..a29a393 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -2,6 +2,7 @@
COBJS = psf.o \
bmp.o \
+ gfx.o \
gui.o
CC = ccache ../cross/opt/bin/i686-elf-gcc
LD = ccache ../cross/opt/bin/i686-elf-ld
diff --git a/libgui/gfx.c b/libgui/gfx.c
new file mode 100644
index 0000000..30c10e3
--- /dev/null
+++ b/libgui/gfx.c
@@ -0,0 +1,184 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GFX functions
+// TODO: Better support for bpp < 32
+
+#include <assert.h>
+#include <bmp.h>
+#include <gfx.h>
+#include <mem.h>
+#include <psf.h>
+#include <str.h>
+#include <sys.h>
+#include <vesa.h>
+
+struct font *font;
+
+static void write_char(struct context *ctx, int x, int y, u32 c, char ch)
+{
+ int bypp = ctx->bpp >> 3;
+
+ int pos = x * bypp + y * ctx->pitch;
+ char *draw = (char *)&ctx->fb[pos];
+
+ u32 stride = font->char_size / font->height;
+ for (int cy = 0; cy < font->height; cy++) {
+ for (int cx = 0; cx < font->width; cx++) {
+ u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
+ u8 bit = bits >> (7 - cx % 8) & 1;
+ if (bit) {
+ draw[bypp * cx] = GET_BLUE(c);
+ draw[bypp * cx + 1] = GET_GREEN(c);
+ draw[bypp * cx + 2] = GET_RED(c);
+ draw[bypp * cx + 3] = GET_ALPHA(c);
+ }
+ }
+ draw += ctx->pitch;
+ }
+}
+
+static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, 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++) {
+ draw[bypp * j] = GET_BLUE(c);
+ draw[bypp * j + 1] = GET_GREEN(c);
+ draw[bypp * j + 2] = GET_RED(c);
+ draw[bypp * j + 3] = GET_ALPHA(c);
+ }
+ draw += ctx->pitch;
+ }
+}
+
+void gfx_write_char(struct context *ctx, int x, int y, u32 c, char ch)
+{
+ write_char(ctx, x, y, c, ch);
+ gfx_redraw();
+}
+
+void gfx_write(struct context *ctx, int x, int y, u32 c, char *text)
+{
+ for (u32 i = 0; i < strlen(text); i++) {
+ write_char(ctx, x + i * font->width, y, c, text[i]);
+ }
+ gfx_redraw();
+}
+
+void gfx_load_image(struct context *ctx, char *path, int x, int y)
+{
+ // TODO: Support x, y
+ struct bmp *bmp = bmp_load(path);
+ assert(bmp && bmp->width + x <= ctx->width);
+ assert(bmp && bmp->height + y <= ctx->height);
+
+ // TODO: Support padding with odd widths
+ int bypp = bmp->bpp >> 3;
+ u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
+ u8 *destfb = &ctx->fb[bypp];
+ for (u32 cy = 0; cy < bmp->height; cy++) {
+ memcpy(destfb, srcfb, bmp->pitch);
+ srcfb -= bmp->pitch;
+ destfb += ctx->pitch;
+ }
+ gfx_redraw();
+}
+
+void gfx_load_wallpaper(struct context *ctx, char *path)
+{
+ gfx_load_image(ctx, path, 0, 0);
+}
+
+void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height)
+{
+ 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 * (dest->bpp >> 3));
+ srcfb += src->pitch;
+ destfb += dest->pitch;
+ }
+}
+
+// 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)
+{
+ if (src->width == dest->width && src->height == dest->height && src->x == 0 &&
+ dest->y == 0) {
+ memcpy(dest->fb, src->fb, dest->pitch * dest->height);
+ return;
+ }
+
+ if (src->width > dest->width || src->height > dest->height)
+ 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++) {
+ for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
+ if (srcfb[bypp * cx + 3]) {
+ destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
+ destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
+ destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
+ destfb[bypp * cx + 3] = srcfb[bypp * cx + 3];
+ }
+ }
+ srcfb += src->pitch;
+ destfb += dest->pitch;
+ }
+}
+
+void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+{
+ draw_rectangle(ctx, x1, y1, x2, y2, c);
+ gfx_redraw();
+}
+
+void gfx_fill(struct context *ctx, u32 c)
+{
+ draw_rectangle(ctx, 0, 0, ctx->width, ctx->height, c);
+ gfx_redraw();
+}
+
+void gfx_border(struct context *ctx, u32 c, u32 width)
+{
+ if (width <= 0)
+ return;
+
+ 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++) {
+ if (j <= width - 1 || i <= width - 1 ||
+ j - ctx->width + width + 1 <= width ||
+ i - ctx->height + width <= width) {
+ draw[bypp * j + 0] = GET_BLUE(c);
+ draw[bypp * j + 1] = GET_GREEN(c);
+ draw[bypp * j + 2] = GET_RED(c);
+ draw[bypp * j + 3] = GET_ALPHA(c);
+ }
+ }
+ draw += ctx->pitch;
+ }
+ gfx_redraw();
+}
+
+int gfx_font_height()
+{
+ return font->height;
+}
+
+int gfx_font_width()
+{
+ return font->width;
+}
+
+void gfx_init(char *font_path)
+{
+ font = psf_parse(read(font_path));
+ assert(font);
+}
diff --git a/libgui/gui.c b/libgui/gui.c
index 3bbf3d2..8ed79af 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -1,184 +1,50 @@
// MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
-// TODO: Better support for bpp < 32
+// Mostly GFX function wrappers
-#include <assert.h>
-#include <bmp.h>
+#include <def.h>
+#include <gfx.h>
#include <gui.h>
#include <mem.h>
-#include <psf.h>
-#include <str.h>
-#include <sys.h>
-#include <vesa.h>
-struct font *font;
+#define MAX_WINDOWS 10
-static void write_char(struct window *win, int x, int y, u32 c, char ch)
-{
- int bypp = win->bpp >> 3;
-
- int pos = x * bypp + y * win->pitch;
- char *draw = (char *)&win->fb[pos];
-
- u32 stride = font->char_size / font->height;
- for (int cy = 0; cy < font->height; cy++) {
- for (int cx = 0; cx < font->width; cx++) {
- u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
- u8 bit = bits >> (7 - cx % 8) & 1;
- if (bit) {
- draw[bypp * cx] = GET_BLUE(c);
- draw[bypp * cx + 1] = GET_GREEN(c);
- draw[bypp * cx + 2] = GET_RED(c);
- draw[bypp * cx + 3] = GET_ALPHA(c);
- }
- }
- draw += win->pitch;
- }
-}
-
-static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c)
-{
- int bypp = win->bpp >> 3;
- u8 *draw = &win->fb[x1 * bypp + y1 * win->pitch];
- for (int i = 0; i < y2 - y1; i++) {
- for (int j = 0; j < x2 - x1; j++) {
- draw[bypp * j] = GET_BLUE(c);
- draw[bypp * j + 1] = GET_GREEN(c);
- draw[bypp * j + 2] = GET_RED(c);
- draw[bypp * j + 3] = GET_ALPHA(c);
- }
- draw += win->pitch;
- }
-}
-
-void gui_write_char(struct window *win, int x, int y, u32 c, char ch)
-{
- write_char(win, x, y, c, ch);
- gui_redraw();
-}
-
-void gui_write(struct window *win, int x, int y, u32 c, char *text)
-{
- for (u32 i = 0; i < strlen(text); i++) {
- write_char(win, x + i * font->width, y, c, text[i]);
- }
- gui_redraw();
-}
-
-void gui_load_image(struct window *win, char *path, int x, int y)
-{
- // TODO: Support x, y
- struct bmp *bmp = bmp_load(path);
- assert(bmp && bmp->width + x <= win->width);
- assert(bmp && bmp->height + y <= win->height);
-
- // TODO: Support padding with odd widths
- int bypp = bmp->bpp >> 3;
- u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
- u8 *destfb = &win->fb[bypp];
- for (u32 cy = 0; cy < bmp->height; cy++) {
- memcpy(destfb, srcfb, bmp->pitch);
- srcfb -= bmp->pitch;
- destfb += win->pitch;
- }
- gui_redraw();
-}
+u32 window_count = 0;
+static struct window windows[MAX_WINDOWS] = { 0 };
-void gui_load_wallpaper(struct window *win, char *path)
+struct window *new_window(const char *title, int x, int y, u32 width, u32 height, int flags)
{
- gui_load_image(win, path, 0, 0);
-}
+ if (window_count + 1 >= MAX_WINDOWS)
+ return NULL;
-void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height)
-{
- 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 * (dest->bpp >> 3));
- srcfb += src->pitch;
- destfb += dest->pitch;
- }
-}
+ struct window *win = &windows[window_count + 1];
+ win->ctx = malloc(sizeof(*win->ctx));
+ win->ctx->x = x > 0 ? x : 50;
+ win->ctx->y = y > 0 ? y : 50;
+ win->ctx->width = width > 0 ? width : 600;
+ win->ctx->height = height > 0 ? height : 400;
+ win->ctx->flags = flags;
+ win->title = title;
+ gfx_new_ctx(windows[window_count + 1].ctx);
-// TODO: Support alpha values other than 0x0 and 0xff (blending)
-// TODO: Optimize!
-void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
-{
- if (src->width == dest->width && src->height == dest->height && src->x == 0 &&
- dest->y == 0) {
- memcpy(dest->fb, src->fb, dest->pitch * dest->height);
- return;
- }
+ if (!win->ctx->fb)
+ return NULL;
- if (src->width > dest->width || src->height > dest->height)
- return;
+ window_count++;
- // 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++) {
- for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
- if (srcfb[bypp * cx + 3]) {
- destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
- destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
- destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
- destfb[bypp * cx + 3] = srcfb[bypp * cx + 3];
- }
- }
- srcfb += src->pitch;
- destfb += dest->pitch;
- }
+ return win;
}
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c)
+struct window *gui_init(const char *title, u32 width, u32 height)
{
- draw_rectangle(win, x1, y1, x2, y2, c);
- gui_redraw();
-}
+ if (window_count != 0)
+ return NULL;
-void gui_fill(struct window *win, u32 c)
-{
- draw_rectangle(win, 0, 0, win->width, win->height, c);
- gui_redraw();
-}
+ struct window *win = new_window(title, 0, 0, width, height, WF_DEFAULT);
+ if (!win)
+ return NULL;
-void gui_border(struct window *win, u32 c, u32 width)
-{
- if (width <= 0)
- return;
+ gfx_fill(win->ctx, COLOR_BG);
+ gfx_init("/font/spleen-12x24.psfu");
- int bypp = win->bpp >> 3;
- u8 *draw = win->fb;
- for (u32 i = 0; i < win->height; i++) {
- for (u32 j = 0; j < win->width; j++) {
- if (j <= width - 1 || i <= width - 1 ||
- j - win->width + width + 1 <= width ||
- i - win->height + width <= width) {
- draw[bypp * j + 0] = GET_BLUE(c);
- draw[bypp * j + 1] = GET_GREEN(c);
- draw[bypp * j + 2] = GET_RED(c);
- draw[bypp * j + 3] = GET_ALPHA(c);
- }
- }
- draw += win->pitch;
- }
- gui_redraw();
-}
-
-int gui_font_height()
-{
- return font->height;
-}
-
-int gui_font_width()
-{
- return font->width;
-}
-
-void gui_init(char *font_path)
-{
- font = psf_parse(read(font_path));
- assert(font);
+ return win;
}
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
new file mode 100644
index 0000000..342fe84
--- /dev/null
+++ b/libgui/inc/gfx.h
@@ -0,0 +1,91 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GFX functions
+
+#ifndef GFX_H
+#define GFX_H
+
+#include <def.h>
+#include <gui.h>
+#include <sys.h>
+#include <vesa.h>
+
+#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
+#define GET_RED(color) ((color >> 16) & 0x000000FF)
+#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
+#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+
+#define COLOR_BLACK 0xff0f0f0f
+#define COLOR_RED 0xfff07f7f
+#define COLOR_GREEN 0xff7ff088
+#define COLOR_YELLOW 0xffeef07f
+#define COLOR_BLUE 0xff7facf0
+#define COLOR_MAGENTA 0xffd67ff0
+#define COLOR_CYAN 0xff7fe7f0
+#define COLOR_WHITE 0xffe9e9e9
+#define COLOR_BRIGHT_BLACK 0xff928374
+#define COLOR_BRIGHT_RED 0xffed9a9a
+#define COLOR_BRIGHT_GREEN 0xff9ef0a5
+#define COLOR_BRIGHT_YELLOW 0xffe7e897
+#define COLOR_BRIGHT_BLUE 0xff98b9eb
+#define COLOR_BRIGHT_MAGENTA 0xffd196e3
+#define COLOR_BRIGHT_CYAN 0xff94dae0
+#define COLOR_BRIGHT_WHITE 0xffe3e3e3
+#define COLOR_FG COLOR_WHITE
+#define COLOR_BG COLOR_BLACK
+
+#define WF_DEFAULT (0 << 0)
+#define WF_NO_FOCUS (1 << 0)
+#define WF_NO_DRAG (1 << 1)
+#define WF_NO_RESIZE (1 << 2)
+
+enum message_type { WM_NEW_CONTEXT = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD };
+
+// Generalized font struct
+struct font {
+ char *chars;
+ int height;
+ int width;
+ int char_size;
+};
+
+struct context {
+ u32 pid;
+ int x;
+ int y;
+ u32 width;
+ u32 height;
+ u8 *fb;
+ u32 bpp;
+ u32 pitch;
+ int flags;
+};
+
+struct msg_keyboard {
+ char ch;
+ int press;
+ int scancode;
+};
+
+void gfx_write_char(struct context *ctx, int x, int y, u32 c, char ch);
+void gfx_write(struct context *ctx, int x, int y, u32 c, char *text);
+void gfx_load_image(struct context *ctx, char *path, int x, int y);
+void gfx_load_wallpaper(struct context *ctx, 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_fill(struct context *ctx, u32 c);
+void gfx_border(struct context *ctx, u32 c, u32 width);
+void gfx_init(char *font_path);
+
+int gfx_font_height();
+int gfx_font_width();
+
+/**
+ * Wrappers
+ */
+
+#define gfx_new_ctx(ctx) \
+ (msg_send(2, WM_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data)
+#define gfx_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization)
+
+#endif
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 4186d43..565bcf6 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -1,89 +1,25 @@
// MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
+// Mostly GFX function wrappers
#ifndef GUI_H
#define GUI_H
#include <def.h>
-#include <sys.h>
-#include <vesa.h>
+#include <gfx.h>
-#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
-#define GET_RED(color) ((color >> 16) & 0x000000FF)
-#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
-#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+#define MAX_CHILDS 100
-#define COLOR_BLACK 0xff0f0f0f
-#define COLOR_RED 0xfff07f7f
-#define COLOR_GREEN 0xff7ff088
-#define COLOR_YELLOW 0xffeef07f
-#define COLOR_BLUE 0xff7facf0
-#define COLOR_MAGENTA 0xffd67ff0
-#define COLOR_CYAN 0xff7fe7f0
-#define COLOR_WHITE 0xffe9e9e9
-#define COLOR_BRIGHT_BLACK 0xff928374
-#define COLOR_BRIGHT_RED 0xffed9a9a
-#define COLOR_BRIGHT_GREEN 0xff9ef0a5
-#define COLOR_BRIGHT_YELLOW 0xffe7e897
-#define COLOR_BRIGHT_BLUE 0xff98b9eb
-#define COLOR_BRIGHT_MAGENTA 0xffd196e3
-#define COLOR_BRIGHT_CYAN 0xff94dae0
-#define COLOR_BRIGHT_WHITE 0xffe3e3e3
-#define COLOR_FG COLOR_WHITE
-#define COLOR_BG COLOR_BLACK
-
-#define WF_DEFAULT (0 << 0)
-#define WF_NO_FOCUS (1 << 0)
-#define WF_NO_DRAG (1 << 1)
-#define WF_NO_RESIZE (1 << 2)
-
-enum message_type { WM_NEW_WINDOW = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD };
-
-// Generalized font struct
-struct font {
- char *chars;
- int height;
- int width;
- int char_size;
+struct element {
+ struct context *ctx;
};
struct window {
- u32 pid;
- int x;
- int y;
- u32 width;
- u32 height;
- u8 *fb;
- u32 bpp;
- u32 pitch;
- int flags;
+ const char *title;
+ struct element *childs[MAX_CHILDS];
+ struct context *ctx;
};
-struct msg_keyboard {
- char ch;
- int press;
- int scancode;
-};
-
-void gui_write_char(struct window *win, int x, int y, u32 c, char ch);
-void gui_write(struct window *win, int x, int y, u32 c, char *text);
-void gui_load_image(struct window *win, char *path, int x, int y);
-void gui_load_wallpaper(struct window *win, char *path);
-void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height);
-void gui_win_on_win(struct window *dest, struct window *src, int x, int y);
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c);
-void gui_fill(struct window *win, u32 c);
-void gui_border(struct window *win, u32 c, u32 width);
-void gui_init(char *font_path);
-
-int gui_font_height();
-int gui_font_width();
-
-/**
- * Wrappers
- */
+// TODO: Remove window return (internal)
+struct window *gui_init(const char *title, u32 width, u32 height);
-#define gui_new_window(flags) \
- (msg_send(2, WM_NEW_WINDOW, flags), (struct window *)msg_receive_loop()->data)
-#define gui_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization)
#endif
diff --git a/libgui/psf.c b/libgui/psf.c
index dbbf032..d6dc9c3 100644
--- a/libgui/psf.c
+++ b/libgui/psf.c
@@ -2,7 +2,7 @@
// PSF parser
#include <def.h>
-#include <gui.h>
+#include <gfx.h>
#include <mem.h>
#include <print.h>
#include <psf.h>
diff --git a/run b/run
index 8048408..3a14d12 100755
--- a/run
+++ b/run
@@ -193,7 +193,7 @@ make_debug() {
}
make_disasm() {
- objdump -drwC -Mintel build/debug.o --visualize-jumps=color | less -R
+ objdump -drwC -Mintel build/debug.o | less -R
#hexdump -C build/kernel.bin | less -R
}