From 731eaeb0be09fd85c739790a03d1128b1aed05f8 Mon Sep 17 00:00:00 2001 From: David Delarosa Date: Thu, 13 Apr 2023 03:58:57 +0300 Subject: [PATCH] Addapt to DWL new tag system - tagscount is being used instead of tag array --- protocol/dwl-bar-ipc-unstable-v1.xml | 2 +- src/modules/dwl/tags.cpp | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/protocol/dwl-bar-ipc-unstable-v1.xml b/protocol/dwl-bar-ipc-unstable-v1.xml index 0dcec4f4..1b614b27 100644 --- a/protocol/dwl-bar-ipc-unstable-v1.xml +++ b/protocol/dwl-bar-ipc-unstable-v1.xml @@ -48,7 +48,7 @@ I would probably just submit raphi's patchset but I don't think that would be po This event is sent after binding. A roundtrip after binding guarantees the client recieved all tags. - + diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp index a38e7094..7d40882d 100644 --- a/src/modules/dwl/tags.cpp +++ b/src/modules/dwl/tags.cpp @@ -66,37 +66,11 @@ static const zdwl_output_v1_listener output_status_listener_impl { .frame = dwl_frame, }; -void add_layout(void* data, zdwl_manager_v1* zdwl_manager_v1, const char* name) { - void* temp = wl_array_add(&layouts, sizeof(char**)); - if (!temp) - return; - - char* dup = strdup(name); - - memcpy(temp, &dup, sizeof(char**)); -} - -void add_tag(void* data, zdwl_manager_v1* zdwl_manager_v1, const char* name) { - void* temp = wl_array_add(&tags, sizeof(char**)); - if (!temp) - return; - - char* dup = strdup(name); /* Gain ownership of name */ - - memcpy(temp, &dup, sizeof(char**)); /* Copy a pointer of it into the array */; -} - -static const struct zdwl_manager_v1_listener dwl_listener = { - .tag = add_tag, - .layout = add_layout, -}; - static void handle_global(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { if (std::strcmp(interface, zdwl_manager_v1_interface.name) == 0) { static_cast(data)->status_manager_ = static_cast( (zdwl_manager_v1*)wl_registry_bind(registry, name, &zdwl_manager_v1_interface, 3)); - zdwl_manager_v1_add_listener(static_cast(data)->status_manager_, &dwl_listener, NULL); } if (std::strcmp(interface, wl_seat_interface.name) == 0) { version = std::min(version, 1);