[osx] implement oc_surface_bring_to_front() and oc_surface_send_to_back()

sketches/multi_surface/main.c

@@ -65,6 +65,22 @@ int main()
                 }
                 break;
 
+                case OC_EVENT_KEYBOARD_KEY:
+                {
+                    if(event->key.action == OC_KEY_PRESS)
+                    {
+                        if(event->key.code == OC_KEY_UP)
+                        {
+                            oc_surface_bring_to_front(surface2);
+                        }
+                        else if(event->key.code == OC_KEY_DOWN)
+                        {
+                            oc_surface_send_to_back(surface2);
+                        }
+                    }
+                }
+                break;
+
                 default:
                     break;
             }
@@ -89,7 +105,7 @@ int main()
         oc_clear();
 
         oc_set_color_rgba(0, 0, 1, 1);
-        oc_rectangle_fill(300, 300, 300, 200);
+        oc_rectangle_fill(200, 200, 300, 200);
 
         oc_render(surface2, canvas2);
         //*/

src/app/osx_app.h

@@ -32,6 +32,8 @@ typedef struct oc_osx_window_data
     NSView* nsView;
     NSObject* nsWindowDelegate;
 
+    oc_list layers;
+
 } oc_osx_window_data;
 
 #define OC_PLATFORM_WINDOW_DATA oc_osx_window_data osx;
@@ -78,6 +80,9 @@ typedef uint32_t CAContextID;
 
 typedef struct oc_layer
 {
+    oc_window window;
+    oc_list_elt listElt;
+
     CALayer* caLayer;
     CAContext* caContext;
 } oc_layer;

src/app/osx_app.m

@@ -1311,10 +1311,10 @@ oc_window oc_window_create(oc_rect contentRect, oc_str8 title, oc_window_style s
             oc_log_error("Could not allocate window data\n");
             return ((oc_window){ 0 });
         }
-
         window->style = style;
         window->shouldClose = false;
         window->hidden = true;
+        window->osx.layers = (oc_list){ 0 };
 
         u32 styleMask = oc_osx_get_window_style_mask(style);
 
@@ -1735,10 +1735,51 @@ void oc_osx_surface_set_hidden(oc_surface_data* surface, bool hidden)
     }
 }
 
+void oc_osx_update_layers(oc_window_data* window)
+{
+    @autoreleasepool
+    {
+        int z = 0;
+        oc_list_for(&window->osx.layers, layer, oc_layer, listElt)
+        {
+            layer->caLayer.zPosition = (CGFloat)z;
+            z++;
+        }
+    }
+}
+
+void oc_osx_surface_bring_to_front(oc_surface_data* surface)
+{
+    oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
+    if(window)
+    {
+        oc_list_remove(&window->osx.layers, &surface->layer.listElt);
+        oc_list_push_back(&window->osx.layers, &surface->layer.listElt);
+        oc_osx_update_layers(window);
+    }
+}
+
+void oc_osx_surface_send_to_back(oc_surface_data* surface)
+{
+    oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
+    if(window)
+    {
+        oc_list_remove(&window->osx.layers, &surface->layer.listElt);
+        oc_list_push(&window->osx.layers, &surface->layer.listElt);
+        oc_osx_update_layers(window);
+    }
+}
+
 void oc_surface_cleanup(oc_surface_data* surface)
 {
     @autoreleasepool
     {
+        oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
+        if(window)
+        {
+            oc_list_remove(&window->osx.layers, &surface->layer.listElt);
+            oc_osx_update_layers(window);
+        }
         [surface->layer.caLayer release];
     }
 }
@@ -1747,12 +1788,17 @@ void oc_surface_init_for_window(oc_surface_data* surface, oc_window_data* window
 {
     @autoreleasepool
     {
+        surface->layer.window = oc_window_handle_from_ptr(window);
+
         surface->nativeLayer = oc_osx_surface_native_layer;
         surface->contentsScaling = oc_osx_surface_contents_scaling;
         surface->getSize = oc_osx_surface_get_size;
         surface->getHidden = oc_osx_surface_get_hidden;
         surface->setHidden = oc_osx_surface_set_hidden;
 
+        surface->bringToFront = oc_osx_surface_bring_to_front;
+        surface->sendToBack = oc_osx_surface_send_to_back;
+
         surface->layer.caLayer = [[CALayer alloc] init];
         [surface->layer.caLayer retain];
 
@@ -1760,10 +1806,12 @@ void oc_surface_init_for_window(oc_surface_data* surface, oc_window_data* window
         CGSize size = frame.size;
         surface->layer.caLayer.frame = (CGRect){ { 0, 0 }, size };
         surface->layer.caLayer.contentsScale = window->osx.nsView.layer.contentsScale;
-
         surface->layer.caLayer.autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
 
         [window->osx.nsView.layer addSublayer:surface->layer.caLayer];
+
+        oc_list_push_back(&window->osx.layers, &surface->layer.listElt);
+        oc_osx_update_layers(window);
     }
 }
 

src/graphics/graphics.h

@@ -115,6 +115,9 @@ ORCA_API oc_vec2 oc_surface_contents_scaling(oc_surface surface);
 ORCA_API bool oc_surface_get_hidden(oc_surface surface);
 ORCA_API void oc_surface_set_hidden(oc_surface surface, bool hidden);
 
+ORCA_API void oc_surface_bring_to_front(oc_surface surface);
+ORCA_API void oc_surface_send_to_back(oc_surface surface);
+
 //NOTE(martin): surface sharing
 typedef u64 oc_surface_id;
 

src/graphics/graphics_surface.c

@@ -372,6 +372,24 @@ void oc_surface_render_commands(oc_surface surface,
     }
 }
 
+void oc_surface_bring_to_front(oc_surface handle)
+{
+    oc_surface_data* surface = oc_surface_data_from_handle(handle);
+    if(surface && surface->bringToFront)
+    {
+        surface->bringToFront(surface);
+    }
+}
+
+void oc_surface_send_to_back(oc_surface handle)
+{
+    oc_surface_data* surface = oc_surface_data_from_handle(handle);
+    if(surface && surface->sendToBack)
+    {
+        surface->sendToBack(surface);
+    }
+}
+
 //------------------------------------------------------------------------------------------
 //NOTE(martin): images
 //------------------------------------------------------------------------------------------

src/graphics/graphics_surface.h

@@ -12,31 +12,33 @@
 #include "graphics_common.h"
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
-{
 #endif
 
-    //---------------------------------------------------------------
+//---------------------------------------------------------------
-    // surface interface
+// surface interface
-    //---------------------------------------------------------------
+//---------------------------------------------------------------
-    typedef struct oc_surface_data oc_surface_data;
+typedef struct oc_surface_data oc_surface_data;
-    typedef struct oc_canvas_backend oc_canvas_backend;
+typedef struct oc_canvas_backend oc_canvas_backend;
 
-    typedef void (*oc_surface_destroy_proc)(oc_surface_data* surface);
+typedef void (*oc_surface_destroy_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_select_proc)(oc_surface_data* surface);
+typedef void (*oc_surface_select_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_deselect_proc)(oc_surface_data* surface);
+typedef void (*oc_surface_deselect_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_present_proc)(oc_surface_data* surface);
+typedef void (*oc_surface_present_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_swap_interval_proc)(oc_surface_data* surface, int swap);
+typedef void (*oc_surface_swap_interval_proc)(oc_surface_data* surface, int swap);
-    typedef oc_vec2 (*oc_surface_get_size_proc)(oc_surface_data* surface);
+typedef oc_vec2 (*oc_surface_get_size_proc)(oc_surface_data* surface);
-    typedef oc_vec2 (*oc_surface_contents_scaling_proc)(oc_surface_data* surface);
+typedef oc_vec2 (*oc_surface_contents_scaling_proc)(oc_surface_data* surface);
-    typedef bool (*oc_surface_get_hidden_proc)(oc_surface_data* surface);
+typedef bool (*oc_surface_get_hidden_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_set_hidden_proc)(oc_surface_data* surface, bool hidden);
+typedef void (*oc_surface_set_hidden_proc)(oc_surface_data* surface, bool hidden);
-    typedef void* (*oc_surface_native_layer_proc)(oc_surface_data* surface);
+typedef void* (*oc_surface_native_layer_proc)(oc_surface_data* surface);
-    typedef oc_surface_id (*oc_surface_remote_id_proc)(oc_surface_data* surface);
+typedef oc_surface_id (*oc_surface_remote_id_proc)(oc_surface_data* surface);
-    typedef void (*oc_surface_host_connect_proc)(oc_surface_data* surface, oc_surface_id remoteId);
+typedef void (*oc_surface_host_connect_proc)(oc_surface_data* surface, oc_surface_id remoteId);
 
-    typedef struct oc_surface_data
+typedef void (*oc_surface_bring_to_front_proc)(oc_surface_data* surface);
-    {
+typedef void (*oc_surface_send_to_back_proc)(oc_surface_data* surface);
+
+typedef struct oc_surface_data
+{
     oc_surface_api api;
     oc_layer layer;
 
@@ -53,49 +55,52 @@ extern "C"
     oc_surface_remote_id_proc remoteID;
     oc_surface_host_connect_proc hostConnect;
 
+    oc_surface_bring_to_front_proc bringToFront;
+    oc_surface_send_to_back_proc sendToBack;
+
     oc_canvas_backend* backend;
 
-    } oc_surface_data;
+} oc_surface_data;
 
-    oc_surface oc_surface_handle_alloc(oc_surface_data* surface);
+oc_surface oc_surface_handle_alloc(oc_surface_data* surface);
-    oc_surface_data* oc_surface_data_from_handle(oc_surface handle);
+oc_surface_data* oc_surface_data_from_handle(oc_surface handle);
 
-    void oc_surface_init_for_window(oc_surface_data* surface, oc_window_data* window);
+void oc_surface_init_for_window(oc_surface_data* surface, oc_window_data* window);
-    void oc_surface_init_remote(oc_surface_data* surface, u32 width, u32 height);
+void oc_surface_init_remote(oc_surface_data* surface, u32 width, u32 height);
-    void oc_surface_init_host(oc_surface_data* surface, oc_window_data* window);
+void oc_surface_init_host(oc_surface_data* surface, oc_window_data* window);
-    void oc_surface_cleanup(oc_surface_data* surface);
+void oc_surface_cleanup(oc_surface_data* surface);
-    void* oc_surface_native_layer(oc_surface surface);
+void* oc_surface_native_layer(oc_surface surface);
 
-    //---------------------------------------------------------------
+//---------------------------------------------------------------
-    // canvas backend interface
+// canvas backend interface
-    //---------------------------------------------------------------
+//---------------------------------------------------------------
-    typedef struct oc_image_data
+typedef struct oc_image_data
-    {
+{
     oc_list_elt listElt;
     u32 generation;
     oc_surface surface;
     oc_vec2 size;
 
-    } oc_image_data;
+} oc_image_data;
 
-    typedef void (*oc_canvas_backend_destroy_proc)(oc_canvas_backend* backend);
+typedef void (*oc_canvas_backend_destroy_proc)(oc_canvas_backend* backend);
 
-    typedef oc_image_data* (*oc_canvas_backend_image_create_proc)(oc_canvas_backend* backend, oc_vec2 size);
+typedef oc_image_data* (*oc_canvas_backend_image_create_proc)(oc_canvas_backend* backend, oc_vec2 size);
-    typedef void (*oc_canvas_backend_image_destroy_proc)(oc_canvas_backend* backend, oc_image_data* image);
+typedef void (*oc_canvas_backend_image_destroy_proc)(oc_canvas_backend* backend, oc_image_data* image);
-    typedef void (*oc_canvas_backend_image_upload_region_proc)(oc_canvas_backend* backend,
+typedef void (*oc_canvas_backend_image_upload_region_proc)(oc_canvas_backend* backend,
                                                            oc_image_data* image,
                                                            oc_rect region,
                                                            u8* pixels);
 
-    typedef void (*oc_canvas_backend_render_proc)(oc_canvas_backend* backend,
+typedef void (*oc_canvas_backend_render_proc)(oc_canvas_backend* backend,
                                               oc_color clearColor,
                                               u32 primitiveCount,
                                               oc_primitive* primitives,
                                               u32 eltCount,
                                               oc_path_elt* pathElements);
 
-    typedef struct oc_canvas_backend
+typedef struct oc_canvas_backend
-    {
+{
     oc_canvas_backend_destroy_proc destroy;
 
     oc_canvas_backend_image_create_proc imageCreate;
@@ -104,7 +109,7 @@ extern "C"
 
     oc_canvas_backend_render_proc render;
 
-    } oc_canvas_backend;
+} oc_canvas_backend;
 
 #ifdef __cplusplus
 } // extern "C"