From 35a0c4feb6569895bf19c05c510a674666dcc4c6 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 17 Jan 2025 12:08:26 -0500 Subject: Update dependencies Signed-off-by: Andrew Opalach --- src/window_wayland.c | 27 ++++++++++++++++----------- src/window_x11.c | 12 ++++++------ 2 files changed, 22 insertions(+), 17 deletions(-) (limited to 'src') 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); } -- cgit v1.2.3-101-g0448