From 8176351e1a3d1598bedbc007897d530475942275 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 13 Mar 2021 13:33:26 +0100
Subject: Nicü

---
 apps/init.c | 6 ++----
 apps/wm.c   | 8 +++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/init.c b/apps/init.c
index 705f178..f854a81 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -10,11 +10,9 @@ int main(int argc, char **argv)
 {
 	UNUSED(argc);
 	UNUSED(argv);
-	while (1) {
-	};
 
 	int wm = exec("/bin/wm", "wm", NULL);
-	int test = exec("/bin/window", "test", NULL);
+	/* int test = exec("/bin/window", "test", NULL); */
 
-	return wm + test;
+	return wm; //+ test;
 }
diff --git a/apps/wm.c b/apps/wm.c
index becbf0a..8eb6f70 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -5,6 +5,7 @@
 #include <gfx.h>
 #include <gui.h>
 #include <input.h>
+#include <ioctl.h>
 #include <keymap.h>
 #include <list.h>
 #include <random.h>
@@ -361,11 +362,12 @@ static void handle_message(struct message *msg)
 
 int main(int argc, char **argv)
 {
-	(void)argc;
-	screen = *(struct vbe *)argv[1];
+	UNUSED(argc);
+	UNUSED(argv);
+	assert(ioctl("/dev/fb", IO_FB_GET, &screen) == 0);
+	log("WM loaded: %dx%d\n", screen.width, screen.height);
 	wm_client = (struct client){ .pid = getpid() };
 	bypp = (screen.bpp >> 3);
-	log("WM loaded: %dx%d\n", screen.width, screen.height);
 
 	windows = list_new();
 	keymap = keymap_parse("/res/keymaps/en.keymap");
-- 
cgit v1.2.3