aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/wm.c28
-rw-r--r--libgui/Makefile3
-rw-r--r--libgui/gui.c36
-rw-r--r--libgui/inc/gui.h3
-rw-r--r--libgui/inc/vesa.h4
-rw-r--r--libgui/vesa.c34
6 files changed, 38 insertions, 70 deletions
diff --git a/apps/wm.c b/apps/wm.c
index d0a6bc1..1c6fa2b 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -44,7 +44,6 @@ static void redraw_all()
struct window *win = iterator->data;
gui_win_on_win(exchange, win, win->x, win->y);
} while ((iterator = iterator->next) != NULL);
- gui_win_on_win(exchange, cursor, cursor->x, cursor->y);
memcpy(direct->fb, exchange->fb, exchange->pitch * exchange->height);
}
}
@@ -55,10 +54,6 @@ int main(int argc, char **argv)
vbe = (struct vbe *)argv[1];
printf("VBE: %dx%d\n", vbe->width, vbe->height);
- const u32 color[3] = { 0, 0, 0 };
- vesa_fill(vbe, color);
- gui_init("/font/spleen-16x32.psfu");
-
windows = list_new();
root = new_window(0, 0, vbe->width, vbe->height);
exchange = new_window(0, 0, vbe->width, vbe->height);
@@ -104,12 +99,12 @@ int main(int argc, char **argv)
struct event_keyboard *event = msg->data;
if (event->magic != KEYBOARD_MAGIC)
break;
- printf("Keypress %d %s!\n", event->scancode,
- event->press ? "pressed" : "released");
- if (event->press) {
- focused->x += 50;
- redraw_all();
- }
+ /* printf("Keypress %d %s!\n", event->scancode, */
+ /* event->press ? "pressed" : "released"); */
+ /* if (event->press) { */
+ /* focused->x += 50; */
+ /* redraw_all(); */
+ /* } */
break;
}
case EVENT_MOUSE: {
@@ -129,9 +124,18 @@ int main(int argc, char **argv)
else if ((int)(mouse_y + cursor->height) > vbe->height - 1)
mouse_y = vbe->height - cursor->height - 1;
+ gui_copy(direct, exchange, cursor->x, cursor->y, cursor->width,
+ cursor->height);
cursor->x = mouse_x;
cursor->y = mouse_y;
- redraw_all();
+ gui_win_on_win(direct, cursor, cursor->x, cursor->y);
+
+ if (event->but1 && mouse_x + (int)focused->width < vbe->width - 1 &&
+ mouse_y + (int)focused->height < vbe->height - 1) {
+ focused->x = mouse_x;
+ focused->y = mouse_y;
+ redraw_all(); // TODO: Function to redraw one window
+ }
break;
}
default:
diff --git a/libgui/Makefile b/libgui/Makefile
index 2638cb0..d1f820f 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -1,7 +1,6 @@
# MIT License, Copyright (c) 2020 Marvin Borner
-COBJS = vesa.o \
- psf.o \
+COBJS = psf.o \
bmp.o \
gui.o
CC = ../cross/opt/bin/i686-elf-gcc
diff --git a/libgui/gui.c b/libgui/gui.c
index 331c940..a22ee51 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -37,9 +37,7 @@ static void write_char(struct window *win, int x, int y, const u32 c[3], char ch
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];
+ 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] = c[2];
@@ -71,15 +69,11 @@ void gui_load_image(struct window *win, char *path, int x, int y)
assert(bmp && bmp->height + y <= win->height);
// TODO: Support padding with odd widths
- u8 *srcfb = bmp->data;
- u8 *destfb = win->fb;
int bypp = bmp->bpp >> 3;
+ u8 *srcfb = &bmp->data[bypp];
+ u8 *destfb = &win->fb[bypp];
for (u32 cy = 0; cy < bmp->height; cy++) {
- for (u32 cx = 0; cx < bmp->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];
- }
+ memcpy(destfb, srcfb, bmp->pitch);
srcfb += bmp->pitch;
destfb += win->pitch;
}
@@ -91,6 +85,18 @@ void gui_load_wallpaper(struct window *win, char *path)
gui_load_image(win, path, 0, 0);
}
+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 + 1) * bypp + y * src->pitch];
+ u8 *destfb = &dest->fb[(x + 1) * 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: Optimize!
void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
{
@@ -101,14 +107,10 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
}
int bypp = dest->bpp >> 3;
- u8 *srcfb = src->fb;
- u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
+ u8 *srcfb = &src->fb[bypp];
+ u8 *destfb = &dest->fb[(x + 1) * bypp + y * dest->pitch];
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];
- }
+ memcpy(destfb, srcfb, src->pitch);
srcfb += src->pitch;
destfb += dest->pitch;
}
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index e228772..6244e22 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -29,6 +29,7 @@ struct window {
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_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, const u32 c[3]);
void gui_fill(struct window *win, const u32 c[3]);
@@ -41,5 +42,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)
+#define gui_redraw() (msg_send(2, MSG_REDRAW, NULL)) // TODO: Partial redraw (optimization)
#endif
diff --git a/libgui/inc/vesa.h b/libgui/inc/vesa.h
index bd758a5..892bd89 100644
--- a/libgui/inc/vesa.h
+++ b/libgui/inc/vesa.h
@@ -43,8 +43,4 @@ struct vbe {
u8 reserved1[206];
};
-void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3]);
-void vesa_fill(struct vbe *vbe, const u32 color[3]);
-void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3]);
-
#endif
diff --git a/libgui/vesa.c b/libgui/vesa.c
deleted file mode 100644
index c005711..0000000
--- a/libgui/vesa.c
+++ /dev/null
@@ -1,34 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <def.h>
-#include <vesa.h>
-
-void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3])
-{
- int bypp = vbe->bpp >> 3;
-
- int pos1 = x1 * bypp + y1 * vbe->pitch;
- u8 *draw = &vbe->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 += vbe->pitch;
- }
-}
-
-void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3])
-{
- u8 pos = x * (vbe->bpp >> 3) + y * vbe->pitch;
- u8 *draw = &vbe->fb[pos];
- draw[pos] = (char)color[2];
- draw[pos + 1] = (char)color[1];
- draw[pos + 2] = (char)color[0];
-}
-
-void vesa_fill(struct vbe *vbe, const u32 color[3])
-{
- vesa_draw_rectangle(vbe, 0, 0, vbe->width - 1, vbe->height - 1, color);
-}