Maaany wm features

7 files changed, 73 insertions, 23 deletions

diff --git a/apps/init.c b/apps/init.c
index ba6f93e..192224b 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -10,8 +10,8 @@ int main(int argc, char **argv)
 	printf("[%s loaded]\n", argv[0]);
 
 	int wm = exec("/wm", "wm", argv[1], NULL);
-	/* int test = exec("/window", "test", NULL); */
+	int test = exec("/window", "test", NULL);
 	int mandelbrot = exec("/mandelbrot", "mandelbrot", NULL);
 
-	return wm + mandelbrot;
+	return wm + mandelbrot + test;
 }
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c
index 677d674..dc4f6ce 100644
--- a/apps/mandelbrot.c
+++ b/apps/mandelbrot.c
@@ -58,7 +58,7 @@ int main()
 
 	struct window win = { 0 };
 	gui_new_window(&win);
-	gui_fill(&win, BG_COLOR);
+	gui_fill(&win, COLOR_BG);
 
 	draw_mandelbrot(&win, 50);
 
diff --git a/apps/window.c b/apps/window.c
index 0d503de..f20bab3 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -12,14 +12,18 @@ int main()
 	print("[test window loaded]\n");
 
 	struct window win = { 0 };
+	win.height = 200;
+	win.width = 300;
+	win.x = 50;
+	win.y = 50;
 	gui_new_window(&win);
 
-	gui_fill(&win, BG_COLOR);
-	gui_border(&win, FG_COLOR, 2);
+	gui_fill(&win, COLOR_BG);
+	gui_border(&win, COLOR_FG, 2);
 
 	gui_init("/font/spleen-12x24.psfu");
 	char *hello = "Hello, world!";
-	gui_write(&win, win.width / 2 - (strlen(hello) * 12) / 2, 5, FG_COLOR, hello);
+	gui_write(&win, win.width / 2 - (strlen(hello) * 12) / 2, 5, COLOR_GREEN, hello);
 	event_register(EVENT_KEYBOARD);
 
 	struct message *msg;
@@ -45,7 +49,8 @@ int main()
 				char_x = 0;
 				char_y++;
 			} else if (KEY_ALPHABETIC(key)) {
-				gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, FG_COLOR, 'a');
+				gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN,
+					       'a');
 			}
 
 			break;
diff --git a/apps/wm.c b/apps/wm.c
index 147bcc0..3efe597 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -38,6 +38,21 @@ static struct window *new_window(struct window *win, int x, int y, u16 width, u1
 	return win;
 }
 
+static struct window *window_at(int x, int y)
+{
+	if (windows->head && windows->head->data) {
+		struct node *iterator = windows->head;
+		do {
+			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) {
+				return win;
+			}
+		} while ((iterator = iterator->next) != NULL);
+	}
+	return NULL;
+}
+
 static void redraw_all()
 {
 	if (windows->head && windows->head->data) {
@@ -50,6 +65,7 @@ static void redraw_all()
 	}
 }
 
+// TODO: Clean this god-function
 int main(int argc, char **argv)
 {
 	(void)argc;
@@ -66,11 +82,12 @@ int main(int argc, char **argv)
 	direct.fb = vbe.fb;
 	list_add(windows, &root);
 
-	gui_write(&direct, 0, 0, FG_COLOR, "Welcome to Melvix!");
-	gui_write(&direct, 0, 32, FG_COLOR, "Loading resources...");
+	gui_fill(&direct, COLOR_BG);
+	gui_write(&direct, 0, 0, COLOR_FG, "Welcome to Melvix!");
+	gui_write(&direct, 0, 32, COLOR_FG, "Loading resources...");
 
-	gui_fill(&root, BG_COLOR);
-	gui_border(&root, FG_COLOR, 2);
+	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");
 	redraw_all();
@@ -79,6 +96,7 @@ int main(int argc, char **argv)
 
 	struct message *msg;
 	int mouse_skip = 0;
+	int but1_pressed = 0;
 	while (1) {
 		if (!(msg = msg_receive())) {
 			yield();
@@ -89,8 +107,11 @@ int main(int argc, char **argv)
 		case MSG_NEW_WINDOW:
 			printf("New window for pid %d\n", msg->src);
 			struct window *win = msg->data;
-			new_window(win, vbe.width / 2 - 500, vbe.height / 2 - 400, 1000, 800,
-				   win->flags);
+			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);
+			new_window(win, x, y, width, height, win->flags);
 			msg_send(msg->src, MSG_NEW_WINDOW, win);
 			list_add(windows, win);
 			focused = win;
@@ -120,13 +141,20 @@ int main(int argc, char **argv)
 				 cursor.height);
 			cursor.x = mouse_x;
 			cursor.y = mouse_y;
-
-			if (event->but1 && !(focused->flags & WF_NO_DRAG) &&
-			    mouse_skip % MOUSE_SKIP == 0) {
-				mouse_skip = 0;
-				focused->x = mouse_x;
-				focused->y = mouse_y;
-				redraw_all(); // TODO: Function to redraw one window
+			if (!but1_pressed)
+				focused = window_at(cursor.x, cursor.y);
+
+			if (event->but1) {
+				but1_pressed = 1;
+				if (focused && !(focused->flags & WF_NO_DRAG) &&
+				    mouse_skip % MOUSE_SKIP == 0) {
+					mouse_skip = 0;
+					focused->x = cursor.x;
+					focused->y = cursor.y;
+					redraw_all(); // TODO: Function to redraw one window
+				}
+			} else {
+				but1_pressed = 0;
 			}
 			gui_win_on_win(&direct, &cursor, cursor.x, cursor.y);
 			mouse_skip++;
diff --git a/libgui/gui.c b/libgui/gui.c
index d973835..486fe8e 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -74,7 +74,7 @@ void gui_load_image(struct window *win, char *path, int x, int y)
 
 	// TODO: Support padding with odd widths
 	int bypp = bmp->bpp >> 3;
-	u8 *srcfb = &bmp->data[bypp + bmp->height * bmp->pitch];
+	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);
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 335dc05..5087fbf 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -12,8 +12,25 @@
 #define GET_RED(color) ((color >> 16) & 0x000000FF)
 #define GET_GREEN(color) ((color >> 8) & 0x000000FF)
 #define GET_BLUE(color) ((color >> 0) & 0X000000FF)
-#define FG_COLOR 0xffabb2bf
-#define BG_COLOR 0xff282c34
+
+#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)
diff --git a/res/wall.bmp b/res/wall.bmp
index 0188866..1f4b6a6 100644
--- a/res/wall.bmp
+++ b/res/wall.bmp