diff dep/animia/src/win/wayland.cc @ 231:69f4768a820c

chore: merge divergent branches
author Paper <paper@paper.us.eu.org>
date Sat, 13 Jan 2024 09:43:41 -0500
parents 84e0a3c4737a
children
line wrap: on
line diff
--- a/dep/animia/src/win/wayland.cc	Sat Jan 13 09:42:02 2024 -0500
+++ b/dep/animia/src/win/wayland.cc	Sat Jan 13 09:43:41 2024 -0500
@@ -1,6 +1,7 @@
 #include "animia/win/wayland.h"
 #include "animia.h"
 #include "animia/win.h"
+#include "animia/util.h"
 
 #include <cstring>
 #include <iostream>
@@ -90,9 +91,10 @@
 		reinterpret_cast<Window*>(data)->text = title;
 }
 
-static void ext_foreign_handle_handle_identifier(void*, ext_foreign_toplevel_handle_v1*, const char* identifier) {
-	if (identifier)
-		reinterpret_cast<Window*>(data)->id = identifier;
+static void ext_foreign_handle_handle_identifier(void* data, ext_foreign_toplevel_handle_v1* handle, const char* identifier) {
+	if (identifier) {
+		reinterpret_cast<Window*>(data)->id = util::StringToInt(identifier, 0);
+	}
 }
 
 static void ext_foreign_handle_handle_done(void* data, struct ext_foreign_toplevel_handle_v1* handle) {