Z ordering, prep for command window

src/text_editor/math.cpp

@@ -20,6 +20,7 @@ Vec2 GetSizeF(Rect2I r) {
 
 Vec2   ToVec2(Vec2I v) { return {(float)v.x, (float)v.y}; }
 Vec2I  ToVec2I(Vec2 v) { return {(Int)v.x, (Int)v.y}; }
+Rect2I ToRect2I(Rect2 r) { return {ToVec2I(r.min), ToVec2I(r.max)}; }
 
 // clang-format off
 Rect2 operator-(Rect2 r, Rect2 value) { return { r.min.x - value.min.x, r.min.y - value.min.y, r.max.x - value.max.x, r.max.y - value.max.y }; }

src/text_editor/raylib_utils.cpp

@@ -13,6 +13,11 @@ Rect2I GetScreenRect() {
     return result;
 }
 
+Rect2 GetScreenRectF() {
+    Rect2 result = {0, 0, (float)GetRenderWidth(), (float)GetRenderHeight()};
+    return result;
+}
+
 Int GetCharSpacing(Font font, Int font_size, Int spacing) {
     int index       = GetGlyphIndex(font, '_');
     Int textOffsetX = 0;

src/text_editor/text_editor.cpp

@@ -96,9 +96,22 @@ int main(void) {
         LoadLine(b);
         AddView(w->id, v->id);
     }
+    {
+        Window *w            = CreateWindow();
+        w->draw_scrollbar    = false;
+        w->draw_line_numbers = false;
+        w->draw_infobar      = false;
+        Buffer *b            = CreateBuffer(sys_allocator);
+        View   *v            = CreateView(b->id);
+        LoadLine(b);
+        AddView(w->id, v->id);
+    }
+
+    Int LastFrameIDWhenSwitchedActiveWindow = 0;
 
     while (!WindowShouldClose()) {
         ProfileScope(game_loop);
+        FrameID += 1;
 
         Rect2I screen_rect       = GetScreenRect();
         float  line_numbers_size = MeasureTextEx(MainFont, "12345", (float)FontSize, (float)FontSpacing).x;
@@ -126,13 +139,56 @@ int main(void) {
             if (Windows[i].draw_infobar) Windows[i].infobar_rect = CutBottom(&Windows[i].document_rect, (Int)MenuFontSize);
             if (Windows[i].draw_line_numbers) Windows[i].line_numbers_rect = CutLeft(&Windows[i].document_rect, (Int)line_numbers_size);
         }
+        {
+            int   i           = 4;
+            Rect2 screen_rect = GetScreenRectF();
+            Vec2  size        = GetSize(screen_rect);
+            CutTop(&screen_rect, size.y * 0.05f);
+            CutBottom(&screen_rect, size.y * 0.8f);
+            CutLeft(&screen_rect, size.x * 0.2f);
+            CutRight(&screen_rect, size.x * 0.2f);
+
+            Windows[i].z             = 1;
+            Windows[i].total_rect    = ToRect2I(screen_rect);
+            Windows[i].document_rect = Windows[i].total_rect;
+        }
 
         BeginDrawing();
         ClearBackground(ColorBackground);
-        For(Windows) {
+
-            if (!it.visible) continue;
+        Scratch    scratch;
-            HandleKeybindings(&it);
+        Array<Int> order = GetWindowZOrder(scratch);
-            DrawWindow(it);
+
+        For(order) {
+            Window *window = &Windows[it];
+            if (window->visible == false) continue;
+            View *view = GetActiveView(window);
+
+            Vec2 _mouse             = GetMousePosition();
+            bool mouse_in_view      = CheckCollisionPointRec(_mouse, ToRectangle(window->document_rect));
+            bool mouse_in_scrollbar = CheckCollisionPointRec(_mouse, ToRectangle(window->scrollbar_rect));
+
+            if (mouse_in_view || mouse_in_scrollbar) {
+                if (IsKeyDown(KEY_F1)) {
+                    view->scroll.x -= (Int)(GetMouseWheelMove() * 48);
+                } else {
+                    view->scroll.y -= (Int)(GetMouseWheelMove() * 48);
+                }
+
+                if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) {
+                    if (LastFrameIDWhenSwitchedActiveWindow != FrameID) {
+                        ActiveWindow                        = window->id;
+                        LastFrameIDWhenSwitchedActiveWindow = FrameID;
+                    }
+                }
+            }
+        }
+
+        For(IterateInReverse(&order)) {
+            Window &window = Windows[it];
+            if (window.visible == false) continue;
+            HandleKeybindings(&window);
+            DrawWindow(window);
         }
         SetMouseCursor();
         EndDrawing();

src/text_editor/text_editor.h

@@ -55,6 +55,7 @@ struct Window {
     Rect2I document_rect;
 
     double mouse_scroller_offset;
+    int    z;
 
     struct {
         bool mouse_selecting_scrollbar : 1;
@@ -99,6 +100,8 @@ Int  FontSpacing;
 Int  FontLineSpacing;
 Int  FontCharSpacing;
 
+Int FrameID;
+
 inline Window *GetWindow(WindowID id) {
     For(Windows) if (it.id.id == id.id) return ⁢
     return &Windows[0];

src/text_editor/view_commands.cpp

@@ -118,29 +118,7 @@ void HandleKeybindings(Window *window) {
     Buffer *buffer                    = GetBuffer(view.buffer_id);
     Caret   main_caret_on_begin_frame = view.carets[0];
 
-    {
+    if (IsActive(window)) {
-        Vec2 _mouse             = GetMousePosition();
-        bool mouse_in_view      = CheckCollisionPointRec(_mouse, ToRectangle(window->document_rect));
-        bool mouse_in_scrollbar = CheckCollisionPointRec(_mouse, ToRectangle(window->scrollbar_rect));
-
-        if (mouse_in_view || mouse_in_scrollbar) {
-            if (IsKeyDown(KEY_F1)) {
-                view.scroll.x -= (Int)(GetMouseWheelMove() * 48);
-            } else {
-                view.scroll.y -= (Int)(GetMouseWheelMove() * 48);
-            }
-
-            if (!IsActive(window)) {
-                if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) {
-                    ActiveWindow = window->id;
-                }
-            }
-        }
-    }
-
-    if (!IsActive(window)) {
-        return;
-    }
 
         if (CtrlPress(KEY_F2)) {
             LoadBigLine(buffer);
@@ -433,6 +411,7 @@ void HandleKeybindings(Window *window) {
                 view.scroll.x = xy.col * FontCharSpacing;
             }
         }
+    }
 
     // Clip scroll
     {

src/text_editor/view_draw.cpp

@@ -150,6 +150,7 @@ void DrawSelection(Window &window, Caret &it) {
 void DrawWindow(Window &window) {
     View   &view   = *GetActiveView(&window);
     Buffer *buffer = GetBuffer(view.buffer_id);
+    DrawRectangleRec(ToRectangle(window.total_rect), ColorBackground);
 
     BeginScissorMode((int)window.document_rect.min.x, (int)window.document_rect.min.y, (int)window.document_rect.max.x - (int)window.document_rect.min.x, (int)window.document_rect.max.y - (int)window.document_rect.min.y);
     For(view.carets) {

src/text_editor/windows.cpp

@@ -39,3 +39,11 @@ void SetMouseCursor() {
         SetMouseCursor(MOUSE_CURSOR_POINTING_HAND);
     }
 }
+
+Array<Int> GetWindowZOrder(Allocator allocator) {
+    Array<Int> order = {allocator};
+    For(Windows) if (it.z == 2) Add(&order, GetIndex(Windows, it));
+    For(Windows) if (it.z == 1) Add(&order, GetIndex(Windows, it));
+    For(Windows) if (it.z == 0) Add(&order, GetIndex(Windows, it));
+    return order;
+}