Major GUI refactoring

2 files changed, 69 insertions, 30 deletions

diff --git a/apps/chess/main.c b/apps/chess/main.c
index 94739ef..e5a8799 100644
--- a/apps/chess/main.c
+++ b/apps/chess/main.c
@@ -57,15 +57,15 @@ static vec2 selected = { -1, -1 }; // Selected tile
 
 static void load_image(struct piece *tile)
 {
-	assert(gui_clear(win, tile->widget, GUI_LAYER_FG) == EOK);
+	gui_clear(win, tile->widget, GUI_LAYER_FG);
 
 	char icon[48] = { 0 };
 	snprintf(icon, sizeof(icon), "/icons/chess-%s-%d.png", tile->name, TILE);
 	enum gfx_filter filter = IS_COLOR(tile->piece, BLACK) ? GFX_FILTER_NONE : GFX_FILTER_INVERT;
 
 	/* assert(gui_fill(win, tile->widget, GUI_LAYER_FG, 0) == EOK); */
-	assert(gui_load_image_filter(win, tile->widget, GUI_LAYER_FG, vec2(0, 0), vec2(TILE, TILE),
-				     filter, icon) == EOK);
+	gui_load_image_filter(win, tile->widget, GUI_LAYER_FG, vec2(0, 0), vec2(TILE, TILE), filter,
+			      icon);
 }
 
 static void mouseclick(u32 widget_id, vec2 pos)
@@ -92,14 +92,14 @@ static void mouseclick(u32 widget_id, vec2 pos)
 		strlcpy(clicked_piece->name, selected_piece->name, sizeof(clicked_piece->name));
 		selected_piece->name[0] = '\0';
 
-		assert(gui_clear(win, selected_piece->widget, GUI_LAYER_FG) == EOK);
+		gui_clear(win, selected_piece->widget, GUI_LAYER_FG);
 		load_image(clicked_piece);
 
-		assert(gui_redraw_window(win) == EOK);
+		gui_redraw_window(win);
 
 		selected = vec2(-1, -1);
 	} else if (clicked_piece->piece) {
-		assert(gui_redraw_widget(win, clicked_piece->widget) == EOK);
+		gui_redraw_widget(win, clicked_piece->widget);
 		selected = clicked;
 	}
 }
@@ -216,20 +216,18 @@ static void draw_board(void)
 {
 	for (u8 x = 0; x < 8; x++) {
 		for (u8 y = 0; y < 8; y++) {
-			u32 widget =
-				gui_new_widget(win, vec2(TILE, TILE), vec2(TILE * x, TILE * y));
+			u32 widget;
+			gui_new_widget(&widget, win, vec2(TILE * x, TILE * y), vec2(TILE, TILE));
 			assert((signed)widget > 0);
 
 			u8 colored = (x + y + 1) % 2 == 0;
 #if !WHITE_STARTS
 			colored = !colored;
 #endif
-			assert(gui_fill(win, widget, GUI_LAYER_BG,
-					colored ? DARK_COLOR : LIGHT_COLOR) == EOK);
+			gui_fill(win, widget, GUI_LAYER_BG, colored ? DARK_COLOR : LIGHT_COLOR);
 
 			struct piece *tile = &tiles[x][y];
-			assert(gui_listen_widget(win, widget, GUI_LISTEN_MOUSECLICK,
-						 (u32)mouseclick) == EOK);
+			gui_listen_widget(win, widget, GUI_LISTEN_MOUSECLICK, (u32)mouseclick);
 
 			tile->widget = widget;
 
@@ -238,12 +236,12 @@ static void draw_board(void)
 		}
 	}
 
-	assert(gui_redraw_window(win) == EOK);
+	gui_redraw_window(win);
 }
 
 int main(void)
 {
-	assert(gui_new_window(&win) == EOK);
+	gui_new_custom_window(&win, vec2(0, 0), vec2(TILE * 8, TILE * 8));
 	fen_parse(START_FEN);
 	draw_board();
 
diff --git a/apps/wm/main.c b/apps/wm/main.c
index 0d00427..0e47af4 100644
--- a/apps/wm/main.c
+++ b/apps/wm/main.c
@@ -13,8 +13,6 @@
 #include <rand.h>
 #include <sys.h>
 
-#define WINDOW_MOVE_TIMEOUT 20
-
 struct client {
 	u32 conn; // Bus conn
 };
@@ -223,9 +221,9 @@ static struct window *window_new(struct client client, struct vec2 pos, struct v
 	win->id = id++;
 	win->ctx.size = size;
 	win->ctx.bpp = screen.bpp;
-	win->ctx.pitch = size.x * bypp;
+	win->ctx.pitch = win->ctx.size.x * bypp;
 	win->ctx.bytes = win->ctx.pitch * win->ctx.size.y;
-	if ((flags & WF_NO_FB) != 0) {
+	if (flags & WF_NO_FB) {
 		win->ctx.fb = NULL;
 	} else {
 		assert(shalloc(win->ctx.bytes, (u32 *)&win->ctx.fb, &win->shid) == EOK);
@@ -347,6 +345,13 @@ static void window_redraw(struct window *win)
 		window_redraw_non_alpha(win);
 }
 
+static void window_move(struct window *win, vec2 pos)
+{
+	win->pos_prev = win->pos;
+	win->pos = pos;
+	window_redraw(win);
+}
+
 // TODO: Fix strange artifacts after destroying
 static void window_destroy(struct window *win)
 {
@@ -358,6 +363,37 @@ static void window_destroy(struct window *win)
 }
 
 /**
+ * Window bar
+ */
+
+#define BAR_HEIGHT 32
+#define BAR_CLOSE_SIZE 24
+#define BAR_MARGIN GFX_CENTER_IN(BAR_HEIGHT, BAR_CLOSE_SIZE)
+#define BAR_BUTTONS_WIDTH (BAR_MARGIN * 2 + BAR_CLOSE_SIZE)
+
+static void window_bar_mousemove(struct window *win, struct event_mouse *event, vec2 pos,
+				 vec2 mouse_pos)
+{
+	if (pos.y > BAR_HEIGHT)
+		return;
+
+	if (pos.x >= win->ctx.size.x - BAR_BUTTONS_WIDTH && event->but.left)
+		window_destroy(win);
+	else if (event->but.left)
+		window_move(win, vec2_sub(mouse_pos, vec2(win->ctx.size.x / 2, BAR_HEIGHT / 2)));
+}
+
+static void window_bar_draw(struct window *win)
+{
+	if (!(win->flags & WF_BAR))
+		return;
+
+	gfx_load_image_filter(&win->ctx,
+			      vec2(win->ctx.size.x - BAR_CLOSE_SIZE - BAR_MARGIN, BAR_MARGIN),
+			      GFX_FILTER_INVERT, "/icons/close-" STRINGIFY(BAR_CLOSE_SIZE) ".png");
+}
+
+/**
  * Event handlers
  */
 
@@ -389,7 +425,6 @@ static void handle_event_keyboard(struct event_keyboard *event)
 	UNUSED(ch);
 }
 
-static struct timer mouse_timer = { 0 };
 static void handle_event_mouse(struct event_mouse *event)
 {
 	if (event->magic != MOUSE_MAGIC) {
@@ -428,14 +463,7 @@ static void handle_event_mouse(struct event_mouse *event)
 		focused = win;
 
 	if (focused && !(focused->flags & WF_NO_DRAG) && event->but.left && special_keys.alt) {
-		struct timer timer = { 0 };
-		io_read(IO_TIMER, &timer, 0, sizeof(timer));
-		if (timer.time - mouse_timer.time > WINDOW_MOVE_TIMEOUT) {
-			focused->pos_prev = focused->pos;
-			focused->pos = mouse.pos;
-			window_redraw(focused);
-			mouse_timer = timer;
-		}
+		window_move(win, mouse.pos);
 		return;
 	} else if (!vec2_eq(cursor->pos, cursor->pos_prev)) {
 		window_redraw(cursor);
@@ -444,10 +472,20 @@ static void handle_event_mouse(struct event_mouse *event)
 	if (!win)
 		return;
 
+	vec2 relative_pos = vec2_sub(mouse.pos, win->pos);
+	if (win->flags & WF_BAR) {
+		if (relative_pos.y <= BAR_HEIGHT) {
+			window_bar_mousemove(win, event, relative_pos, mouse.pos);
+			return;
+		} else {
+			relative_pos.y -= BAR_HEIGHT;
+		}
+	}
+
 	struct message_mouse msg = { 0 };
 	msg.header.state = MSG_GO_ON;
 	msg.id = win->id;
-	msg.pos = vec2_sub(mouse.pos, win->pos);
+	msg.pos = relative_pos;
 	msg.bits.click = event->but.left;
 
 	if (msg_connect_conn(win->client.conn) == EOK)
@@ -462,9 +500,12 @@ static void handle_event_mouse(struct event_mouse *event)
 
 static void handle_message_new_window(struct message_new_window *msg)
 {
-	struct window *win = window_new((struct client){ .conn = msg->header.bus.conn },
-					vec2(500, 600), vec2(600, 400), 0);
+	struct window *win = window_new((struct client){ .conn = msg->header.bus.conn }, msg->pos,
+					vec2_add(msg->size, vec2(0, BAR_HEIGHT)), WF_BAR);
+	window_bar_draw(win);
+
 	msg->ctx = win->ctx;
+	msg->off = vec2(0, BAR_HEIGHT);
 	msg->shid = win->shid;
 	msg->id = win->id;