Update dependencies

Signed-off-by: Andrew Opalach <andrew@akon.city>

6 files changed, 27 insertions, 21 deletions

diff --git a/scripts/line_count.sh b/scripts/line_count.sh
index 9b46c9e..a6ac787 100755
--- a/scripts/line_count.sh
+++ b/scripts/line_count.sh
@@ -1,2 +1,3 @@
 #! /usr/bin/env sh
-find ./src ./include -type f -exec wc -l {} +
+export LC_ALL="C"
+find ./src ./include -type f -exec sloccount {} +
diff --git a/src/window_wayland.c b/src/window_wayland.c
index c3de3e1..d37d5d6 100644
--- a/src/window_wayland.c
+++ b/src/window_wayland.c
@@ -78,12 +78,12 @@ static void handle_output_name(void *data, struct wl_output *output, const char
 {
     struct stl_monitor_wayland *monitor = (struct stl_monitor_wayland *)data;
     (void)output;
-    size_t len = al_strlen(name) + 1;
-    if (len >= STELA_MAX_MONITOR_NAME) {
-        len = STELA_MAX_MONITOR_NAME - 1;
-        monitor->m.name[len] = '\0';
+    size_t length = al_strlen(name) + 1;
+    if (length >= STELA_MAX_MONITOR_NAME) {
+        length = STELA_MAX_MONITOR_NAME - 1;
+        monitor->m.name[length] = '\0';
     }
-    al_memcpy(monitor->m.name, name, len);
+    al_memcpy(monitor->m.name, name, length);
 }
 
 static const struct wl_output_listener output_listener = {
@@ -190,7 +190,7 @@ void stl_global_close(void)
 #ifdef STELA_API_OPENGL
     stl_terminate_egl(&global.egl);
 #endif
-    for (u32 i = 0; i < global.monitors.size; i++) {
+    for (u32 i = 0; i < global.monitors.count; i++) {
         struct stl_monitor_wayland *monitor = (struct stl_monitor_wayland *)al_array_at(global.monitors, i);
         if (monitor->output) wl_output_destroy(monitor->output);
         al_free(monitor);
@@ -260,13 +260,15 @@ static void pointer_button(void *data, struct wl_pointer *pointer,
 #define MOUSE1 0x110
 #define MOUSE2 0x111
 #define MOUSE3 0x112
-    if (button == MOUSE1) {
+    switch (button) {
+    case MOUSE1:
         if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
             stl_window_send_mouse_button_event(&wl->w, STELA_BUTTON_PRESSED, STELA_MOUSE1);
         } else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
             stl_window_send_mouse_button_event(&wl->w, STELA_BUTTON_RELEASED, STELA_MOUSE1);
         }
-    } else if (button == MOUSE2) {
+        break;
+    case MOUSE2:
         if (wl->xdg_toplevel) {
             xdg_toplevel_move(wl->xdg_toplevel, wl->seat, serial);
         } else {
@@ -276,12 +278,14 @@ static void pointer_button(void *data, struct wl_pointer *pointer,
                 stl_window_send_mouse_button_event(&wl->w, STELA_BUTTON_RELEASED, STELA_MOUSE2);
             }
         }
-    } else if (button == MOUSE3) {
+        break;
+    case MOUSE3:
         if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
             stl_window_send_mouse_button_event(&wl->w, STELA_BUTTON_PRESSED, STELA_MOUSE3);
         } else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
             stl_window_send_mouse_button_event(&wl->w, STELA_BUTTON_RELEASED, STELA_MOUSE3);
         }
+        break;
     }
 }
 
@@ -594,7 +598,6 @@ static void handle_xdg_surface_configure(void *data, struct xdg_surface *surface
     struct stl_window_wayland *wl = (struct stl_window_wayland *)data;
     if (wl->pending) {
         send_resize(wl);
-        xdg_surface_set_window_geometry(wl->xdg_surface, 0, 0, wl->w.width, wl->w.height);
         wl->pending = false;
     }
     xdg_surface_ack_configure(surface, serial);
@@ -723,7 +726,7 @@ static bool window_wayland_create_context(struct stl_window *window, s32 flags)
 
 static struct stl_monitor_wayland *monitor_from_name(const char *name)
 {
-    for (u32 i = 0; i < global.monitors.size; i++) {
+    for (u32 i = 0; i < global.monitors.count; i++) {
         struct stl_monitor_wayland *monitor = (struct stl_monitor_wayland *)al_array_at(global.monitors, i);
         if (strcmp(monitor->m.name, name) == 0) {
             return monitor;
@@ -767,6 +770,7 @@ static bool create_toplevel(struct stl_window_wayland *wl, s32 scale, const char
 static bool create_layer_shell(struct stl_window_wayland *wl, struct stl_monitor_wayland *monitor, const char *name)
 {
     wl->w.scale = monitor->m.scale;
+    wl_surface_set_buffer_scale(wl->surface, monitor->m.scale);
     u32 surface = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
     u32 anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
         | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
@@ -849,6 +853,7 @@ static void window_wayland_resize_internal(struct stl_window *window, s32 width,
 {
     struct stl_window_wayland *wl = (struct stl_window_wayland *)window;
 #ifdef STELA_API_OPENGL
+    //xdg_surface_set_window_geometry(wl->xdg_surface, 0, 0, wl->w.width, wl->w.height);
     if (stl_egl_is_ready(&wl->egl)) {
         wl_egl_window_resize(wl->egl_window, width, height, 0, 0);
     }
diff --git a/src/window_x11.c b/src/window_x11.c
index 528cfaf..a0e9c69 100644
--- a/src/window_x11.c
+++ b/src/window_x11.c
@@ -51,12 +51,12 @@ bool stl_global_init(bool skip_graphics)
     for (s32 i = 0; i < monitor_count; i++) {
         struct stl_monitor *monitor = al_alloc_object(struct stl_monitor);
         char *name = XGetAtomName(global.x11_d, info[i].name);
-        size_t len = al_strlen(name) + 1;
-        if (len >= STELA_MAX_MONITOR_NAME) {
-            len = STELA_MAX_MONITOR_NAME - 1;
-            monitor->name[len] = '\0';
+        size_t length = al_strlen(name) + 1;
+        if (length >= STELA_MAX_MONITOR_NAME) {
+            length = STELA_MAX_MONITOR_NAME - 1;
+            monitor->name[length] = '\0';
         }
-        al_memcpy(monitor->name, name, len);
+        al_memcpy(monitor->name, name, length);
         free(name);
         monitor->scale = 1;
         monitor->width = info[i].width;
@@ -82,7 +82,7 @@ void stl_global_process_events()
 
 void stl_global_close(void)
 {
-    for (u32 i = 0; i < global.monitors.size; i++) {
+    for (u32 i = 0; i < global.monitors.count; i++) {
         struct stl_monitor *monitor = al_array_at(global.monitors, i);
         al_free(monitor);
     }
diff --git a/subprojects/glfw3.wrap b/subprojects/glfw3.wrap
index 81794a3..9754a3f 100644
--- a/subprojects/glfw3.wrap
+++ b/subprojects/glfw3.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 url = https://github.com/glfw/glfw.git
-revision = 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50
+revision = e7ea71be039836da3a98cea55ae5569cb5eb885c
 depth = 1
 method = cmake
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index fec6aa6..1fec842 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libalabaster
-revision = 97a20386f6e95923a24a30818e00685999298ddc
+revision = 209310c561d89c9ed2040aa7053b320d32cc393c
 depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 833aff8..0466a46 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libnaunet
-revision = be4eb3831a2e5b44fb6e4c2d077e3c07edf6b776
+revision = cef6cabce7ae97e9edfb6821ce4393d714579866
 depth = 1