aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/test.c14
-rw-r--r--apps/wm.c24
-rw-r--r--libc/inc/mem.h4
-rw-r--r--libc/inc/sys.h2
-rw-r--r--libc/mem.c44
-rw-r--r--libgui/gui.c86
-rw-r--r--libgui/inc/gui.h10
-rw-r--r--libgui/psf.c2
8 files changed, 122 insertions, 64 deletions
diff --git a/apps/test.c b/apps/test.c
index efc7432..93ee07a 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -1,16 +1,26 @@
// MIT License, Copyright (c) 2020 Marvin Borner
+#include <conv.h>
#include <def.h>
#include <gui.h>
#include <print.h>
+#include <str.h>
int main()
{
print("[test loaded]\n");
struct window *win = gui_new_window();
- u32 color[3] = { 0xff, 0xff, 0xff };
- gui_fill(win, color);
+
+ const u32 background[3] = { 0x28, 0x2c, 0x34 };
+ gui_fill(win, background);
+ const u32 border[3] = { 0xab, 0xb2, 0xbf };
+ gui_border(win, border, 2);
+ const u32 text[3] = { 0xab, 0xb2, 0xbf };
+
+ gui_init("/font/spleen-12x24.psfu");
+ char *hello = "Hello, world!";
+ gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, text, hello);
while (1) {
yield();
diff --git a/apps/wm.c b/apps/wm.c
index 1e1a8bc..7a3e2d7 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -65,12 +65,13 @@ int main(int argc, char **argv)
direct->fb = vbe->fb;
list_add(windows, root);
- const u32 background[3] = { 0x0, 0x0, 0x0 };
+ const u32 background[3] = { 0x28, 0x2c, 0x34 };
gui_fill(root, background);
- const u32 border[3] = { 0xff, 0xff, 0xff };
+ const u32 border[3] = { 0xab, 0xb2, 0xbf };
gui_border(root, border, 2);
// TODO: Fix wallpaper
/* gui_load_wallpaper(root, "/wall.bmp"); */
+ redraw_all();
event_register(EVENT_KEYBOARD);
event_register(EVENT_MOUSE);
@@ -86,23 +87,31 @@ int main(int argc, char **argv)
case MSG_NEW_WINDOW:
printf("New window for pid %d\n", msg->src);
struct window *win =
- new_window(vbe->width / 2 - 100, vbe->height / 2 - 100, 200, 200);
+ new_window(vbe->width / 2 - 100, vbe->height / 2 - 100, 500, 300);
msg_send(msg->src, MSG_NEW_WINDOW, win);
list_add(windows, win);
focused = win;
+ redraw_all();
+ break;
+ case MSG_REDRAW:
+ redraw_all();
break;
case EVENT_KEYBOARD: {
struct event_keyboard *event = msg->data;
- assert(event->magic == KEYBOARD_MAGIC);
+ if (event->magic != KEYBOARD_MAGIC)
+ break;
printf("Keypress %d %s!\n", event->scancode,
event->press ? "pressed" : "released");
- /* focused->x += 50; */
- /* redraw_all(); */
+ if (event->press) {
+ focused->x += 50;
+ redraw_all();
+ }
break;
}
case EVENT_MOUSE: {
struct event_mouse *event = msg->data;
- assert(event->magic == MOUSE_MAGIC);
+ if (event->magic != MOUSE_MAGIC)
+ break;
mouse_x += event->diff_x;
mouse_y -= event->diff_y;
@@ -119,7 +128,6 @@ int main(int argc, char **argv)
focused->x = mouse_x;
focused->y = mouse_y;
redraw_all();
- printf("%d %d\n", mouse_x, mouse_y);
break;
}
default:
diff --git a/libc/inc/mem.h b/libc/inc/mem.h
index 0030b3d..cb64ce8 100644
--- a/libc/inc/mem.h
+++ b/libc/inc/mem.h
@@ -20,8 +20,8 @@
u32 HEAP;
u32 HEAP_START;
-void *memcpy(void *dst, const void *src, u32 n);
-void *memset(void *dst, int c, u32 n);
+void *memcpy(void *dest, const void *src, u32 n);
+void *memset(void *dest, int c, u32 n);
int memcmp(const void *s1, const void *s2, u32 n);
#endif
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index ebb3836..7c3e6fb 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -22,7 +22,7 @@ enum sys {
SYS_SEND, // Send message to process
SYS_RECEIVE // Receive message (non-blocking/sync)
};
-enum message_type { MSG_NEW_WINDOW, EVENT_KEYBOARD, EVENT_MOUSE };
+enum message_type { MSG_NEW_WINDOW, MSG_REDRAW, EVENT_KEYBOARD, EVENT_MOUSE };
struct message {
int src;
diff --git a/libc/mem.c b/libc/mem.c
index 58c337b..4b7981f 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -4,21 +4,43 @@
#include <print.h>
#include <sys.h>
-void *memcpy(void *dst, const void *src, u32 n)
+// Taken from jgraef at osdev
+void *memcpy(void *dest, const void *src, u32 n)
{
- const char *sp = (const char *)src;
- char *dp = (char *)dst;
- for (; n != 0; n--)
- *dp++ = *sp++;
- return dst;
+ u32 num_dwords = n / 4;
+ u32 num_bytes = n % 4;
+ u32 *dest32 = (u32 *)dest;
+ u32 *src32 = (u32 *)src;
+ u8 *dest8 = ((u8 *)dest) + num_dwords * 4;
+ u8 *src8 = ((u8 *)src) + num_dwords * 4;
+ u32 i;
+
+ for (i = 0; i < num_dwords; i++) {
+ dest32[i] = src32[i];
+ }
+ for (i = 0; i < num_bytes; i++) {
+ dest8[i] = src8[i];
+ }
+ return dest;
}
-void *memset(void *dst, char val, u32 n)
+void *memset(void *dest, char val, u32 n)
{
- char *temp = (char *)dst;
- for (; n != 0; n--)
- *temp++ = val;
- return dst;
+ u32 num_dwords = n / 4;
+ u32 num_bytes = n % 4;
+ u32 *dest32 = (u32 *)dest;
+ u8 *dest8 = ((u8 *)dest) + num_dwords * 4;
+ u8 val8 = (u8)val;
+ u32 val32 = val | (val << 8) | (val << 16) | (val << 24);
+ u32 i;
+
+ for (i = 0; i < num_dwords; i++) {
+ dest32[i] = val32;
+ }
+ for (i = 0; i < num_bytes; i++) {
+ dest8[i] = val8;
+ }
+ return dest;
}
int memcmp(const void *s1, const void *s2, u32 n)
diff --git a/libgui/gui.c b/libgui/gui.c
index 0759df6..331c940 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -12,12 +12,12 @@
struct font *font;
-void gui_write_char(struct vbe *vbe, int x, int y, const u32 c[3], char ch)
+static void write_char(struct window *win, int x, int y, const u32 c[3], char ch)
{
- int bypp = vbe->bpp >> 3;
+ int bypp = win->bpp >> 3;
- int pos = x * bypp + y * vbe->pitch;
- char *draw = (char *)&vbe->fb[pos];
+ 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++) {
@@ -30,15 +30,38 @@ void gui_write_char(struct vbe *vbe, int x, int y, const u32 c[3], char ch)
draw[bypp * cx + 2] = c[0];
}
}
- draw += vbe->pitch;
+ draw += win->pitch;
+ }
+}
+
+static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3])
+{
+ int bypp = win->bpp >> 3;
+
+ int pos1 = x1 * bypp + y1 * win->pitch;
+ u8 *draw = &win->fb[pos1];
+ for (int i = 0; i < y2 - y1; i++) {
+ for (int j = 0; j < x2 - x1; j++) {
+ draw[bypp * j] = c[2];
+ draw[bypp * j + 1] = c[1];
+ draw[bypp * j + 2] = c[0];
+ }
+ draw += win->pitch;
}
}
-void gui_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text)
+void gui_write_char(struct window *win, int x, int y, const u32 c[3], char ch)
+{
+ write_char(win, x, y, c, ch);
+ gui_redraw();
+}
+
+void gui_write(struct window *win, int x, int y, const u32 c[3], char *text)
{
for (u32 i = 0; i < strlen(text); i++) {
- gui_write_char(vbe, x + i * font->width, y, c, 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)
@@ -60,6 +83,7 @@ void gui_load_image(struct window *win, char *path, int x, int y)
srcfb += bmp->pitch;
destfb += win->pitch;
}
+ gui_redraw();
}
void gui_load_wallpaper(struct window *win, char *path)
@@ -70,18 +94,17 @@ void gui_load_wallpaper(struct window *win, char *path)
// TODO: Optimize!
void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
{
- // Optimization?
- /* 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 && src->x == 0 &&
+ dest->y == 0) {
+ memcpy(dest->fb, src->fb, dest->pitch * dest->height);
+ return;
+ }
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 - 1; cy++) {
- for (u32 cx = 0; cx < src->width - 1; cx++) {
+ for (u32 cy = 0; cy < src->height; cy++) {
+ for (u32 cx = 0; cx < src->width; cx++) {
destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
@@ -91,28 +114,19 @@ 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, const u32 color[3])
+void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3])
{
- int bypp = win->bpp >> 3;
-
- int pos1 = x1 * bypp + y1 * win->pitch;
- u8 *draw = &win->fb[pos1];
- for (int i = 0; i < y2 - y1; i++) {
- for (int j = 0; j < x2 - x1; j++) {
- draw[bypp * j] = color[2];
- draw[bypp * j + 1] = color[1];
- draw[bypp * j + 2] = color[0];
- }
- draw += win->pitch;
- }
+ draw_rectangle(win, x1, y1, x2, y2, c);
+ gui_redraw();
}
-void gui_fill(struct window *win, const u32 color[3])
+void gui_fill(struct window *win, const u32 c[3])
{
- gui_draw_rectangle(win, 0, 0, win->width - 1, win->height - 1, color);
+ draw_rectangle(win, 0, 0, win->width, win->height, c);
+ gui_redraw();
}
-void gui_border(struct window *win, const u32 color[3], u32 width)
+void gui_border(struct window *win, const u32 c[3], u32 width)
{
if (width <= 0)
return;
@@ -123,17 +137,19 @@ void gui_border(struct window *win, const u32 color[3], u32 width)
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 + 1 <= width) {
- draw[bypp * j + 0] = color[2];
- draw[bypp * j + 1] = color[1];
- draw[bypp * j + 2] = color[0];
+ i - win->height + width <= width) {
+ draw[bypp * j + 0] = c[2];
+ draw[bypp * j + 1] = c[1];
+ draw[bypp * j + 2] = c[0];
}
}
draw += win->pitch;
}
+ gui_redraw();
}
void gui_init(char *font_path)
{
font = psf_parse(read(font_path));
+ assert(font);
}
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index e0cffdf..e228772 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -26,11 +26,13 @@ struct window {
u32 pitch;
};
+void gui_write_char(struct window *win, int x, int y, const u32 c[3], char ch);
+void gui_write(struct window *win, int x, int y, const u32 c[3], char *text);
void gui_load_wallpaper(struct window *win, char *path);
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, const u32 color[3]);
-void gui_fill(struct window *win, const u32 color[3]);
-void gui_border(struct window *win, const u32 color[3], u32 width);
+void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3]);
+void gui_fill(struct window *win, const u32 c[3]);
+void gui_border(struct window *win, const u32 c[3], u32 width);
void gui_init(char *font_path);
/**
@@ -39,5 +41,5 @@ void gui_init(char *font_path);
#define gui_new_window() \
(msg_send(2, MSG_NEW_WINDOW, NULL), (struct window *)msg_receive_loop()->data)
-
+#define gui_redraw() (msg_send(2, MSG_REDRAW, NULL)) // TODO: Partial redraw (optimisation)
#endif
diff --git a/libgui/psf.c b/libgui/psf.c
index 56c673b..dbbf032 100644
--- a/libgui/psf.c
+++ b/libgui/psf.c
@@ -44,7 +44,7 @@ struct font *psf_parse(char *data)
char_size = ((struct psf2_header *)data)->char_size;
} else {
print("Unknown font!\n");
- return 0;
+ return NULL;
}
struct font *font = malloc(sizeof(*font));