Added moving square

2 files changed, 26 insertions, 18 deletions

diff --git a/apps/test.c b/apps/test.c
index ee5792d..0fecbf4 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -1,3 +1,5 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
 #include <def.h>
 #include <gui.h>
 #include <print.h>
@@ -6,15 +8,18 @@ int main()
 {
 	print("[test loaded]\n");
 
-	/* struct window *win = gui_new_window(); */
-	/* msg_send(1, MSG_NEW_WINDOW, NULL); */
-	/* struct message *msg = msg_receive_loop(); */
-	/* struct window *win = (struct window *)msg->data; */
-
-	/* const u32 color[3] = { 0xff, 0, 0 }; */
-	/* gui_fill(win, color); */
+	struct window *win = gui_new_window();
+	u32 color[3] = { 0xff, 0, 0 };
+	gui_fill(win, color);
 
+	u32 last_time = 0;
 	while (1) {
-	};
+		u32 current_time = time();
+		if (current_time - last_time > 1000 / 60) { // 60Hz
+			win->x += 10;
+		};
+		last_time = current_time;
+		yield();
+	}
 	return 0;
 }
diff --git a/apps/wm.c b/apps/wm.c
index a010928..5e5fd01 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -13,6 +13,7 @@
 struct vbe *vbe;
 struct window *direct; // Direct video memory window
 struct window *root; // Root window (wallpaper etc.)
+struct window *exchange; // Exchange buffer
 struct list *windows;
 
 void onkey(u32 scancode)
@@ -49,28 +50,30 @@ int main(int argc, char **argv)
 
 	windows = list_new();
 	root = new_window(0, 0, vbe->width, vbe->height);
+	exchange = new_window(0, 0, vbe->width, vbe->height);
 	direct = malloc(sizeof(*direct));
 	memcpy(direct, root, sizeof(*direct));
 	direct->fb = vbe->fb;
+	list_add(windows, root);
 
-	const u32 background[3] = { 0x10, 0x10, 0x10 };
+	const u32 background[3] = { 0x0, 0x0, 0x0 };
 	gui_fill(root, background);
-	gui_load_wallpaper(root, "/wall.bmp");
-	list_add(windows, root);
+	// TODO: Fix wallpaper
+	/* gui_load_wallpaper(root, "/wall.bmp"); */
 
 	// TODO: Remove async events completely
 	/* event_map(EVENT_KEYBOARD, onkey); */
 
-	u32 last_time = 0;
 	struct message *msg;
 	while (1) {
-		u32 current_time = time();
-		if (current_time - last_time > 1000 / 60) { // 60Hz
-			struct window *win;
-			if (windows->head && (win = windows->head->data))
-				gui_win_on_win(win, direct, 0, 0);
+		if (windows->head && windows->head->data) {
+			struct node *iterator = windows->head;
+			do {
+				struct window *win = iterator->data;
+				gui_win_on_win(win, exchange, win->x, win->y);
+			} while ((iterator = iterator->next) != NULL);
+			gui_win_on_win(exchange, direct, 0, 0);
 		}
-		last_time = current_time;
 
 		if (!(msg = msg_receive())) {
 			yield();