update wm_layout function to handle tree structure

util.c

@@ -418,6 +418,52 @@ ret:
     return ret;
 }
 
+PtrArray wm_treenode_find_client_nodes_ptr(TreeNode *root)
+{
+    assert(root);
+
+    PtrArray ret = wm_ptrarray_new();
+
+    NodeArray visited = wm_nodearray_new();
+    wm_nodearray_push(&visited, *root);
+
+    PtrArray queue = wm_ptrarray_new();
+
+    wm_ptrarray_push(&queue, root);
+
+    while (queue.size > 0) {
+        TreeNode *node;
+
+        if (!wm_ptrarray_pop_front(&queue, (void**)&node))
+            goto ret;
+
+        if (node->type == NODE_CLIENT)
+            wm_ptrarray_push(&ret, node);
+
+        for (int i = 0; i < node->children.size; i++) {
+            TreeNode child_node = node->children.nodes[i];
+            bool _visited = false;
+
+            for (int j = 0; j < visited.size; j++) {
+                if (visited.nodes[j].children.nodes == child_node.children.nodes) {
+                    _visited = true;
+                    break;
+                }
+            }
+
+            if (!_visited) {
+                wm_nodearray_push(&visited, child_node);
+                wm_ptrarray_push(&queue, &child_node);
+            }
+        }
+    }
+
+ret:
+    wm_nodearray_free(&visited);
+    wm_ptrarray_free(&queue);
+    return ret;
+}
+
 ClientArray wm_clientarray_new()
 {
     ClientArray arr;

util.h

@@ -82,6 +82,7 @@ bool wm_ptrarray_remove(PtrArray *arr, size_t index);
 void wm_ptrarray_free(PtrArray *arr);
 TreeNode* wm_treenode_ptr_find_focused_client_node(TreeNode *root);
 TreeNode* wm_treenode_ptr_find_client_node(TreeNode *root, Client *client);
+PtrArray wm_treenode_find_client_nodes_ptr(TreeNode *root);
 
 ClientArray wm_clientarray_new();
 void wm_clientarray_push(ClientArray *arr, Client node);

wm.c

@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <assert.h>
 #include "handler.h"
 #include "client.h"
 #include "util.h"
@@ -339,12 +340,35 @@ void wm_set_layout(Wm *wm, void(*f)(Wm *wm, Monitor*))
     wm->active_layout = f;
 }
 
-// TODO: layout floating window, selected layout func p
 void wm_layout(Wm *wm, Monitor *m)
 {
     RETURN_IF_NULL(m);
 
-    wm_mstack(wm, m);
+    Workspace *ws = &m->workspaces[m->selws];
+    PtrArray clients = wm_treenode_find_client_nodes_ptr(&ws->tree);
+
+    for (size_t i = 0; i < clients.size; i++) {
+        TreeNode *node = (TreeNode*) clients.ptrs[i];
+        assert(node->client);
+
+        node->client->x = node->pos.x;
+        node->client->y = node->pos.y;
+        node->client->w = node->pos.w;
+        node->client->h = node->pos.h;
+
+        unsigned int value_mask = CWX | CWY | CWWidth | CWHeight;
+        XWindowChanges xwc = wm_client_to_xwchanges(*node->client);
+        XConfigureWindow(wm->display, node->client->window, value_mask, &xwc);
+
+        if (node->client->focused)
+            wm_client_focus(wm, node->client);
+    }
+
+    XEvent e;
+    XSync(wm->display, False);
+    while(XCheckMaskEvent(wm->display, EnterWindowMask, &e));
+
+    wm_monitor_clients_border(wm, m);
 }
 
 Client *wm_get_last_client(Wm *wm, Monitor m)

wm.h

@@ -55,7 +55,8 @@ if (c == NULL)              \
 #define DEBUG 1
 
 #define DEBUG_PRINT(fmt, ...) \
-            do { if (DEBUG) fprintf(stderr, fmt, ##__VA_ARGS__); } while (0);
+    do { if (DEBUG) { fprintf(stderr, "[%s:%d] ", __FILE__, __LINE__); \
+                      fprintf(stderr, fmt, ##__VA_ARGS__);} } while (0);
 
 #define WM_WS_NAME_LEN 64