tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-11-04 09:42:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update names

Browse Source
This commit is contained in:
dmitry
2021-11-21 15:01:25 +03:00
parent 15761ef802
commit ffeecf626c
6 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/wlr/workspace_manager.cpp
View File

@@ -44,7 +44,7 @@ auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, ui
}
auto WorkspaceManager::handle_workspace_group_create(
zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void {
zext_workspace_group_handle_v1 *workspace_group_handle) -> void {
auto new_id = ++group_global_id;
groups_.push_back(
std::make_unique<WorkspaceGroup>(bar_, box_, config_, *this, workspace_group_handle, new_id));
@@ -52,7 +52,7 @@ auto WorkspaceManager::handle_workspace_group_create(
}
auto WorkspaceManager::handle_finished() -> void {
zwlr_workspace_manager_v1_destroy(workspace_manager_);
zext_workspace_manager_v1_destroy(workspace_manager_);
workspace_manager_ = nullptr;
}
@@ -75,7 +75,7 @@ WorkspaceManager::~WorkspaceManager() {
return;
}
zwlr_workspace_manager_v1_destroy(workspace_manager_);
zext_workspace_manager_v1_destroy(workspace_manager_);
workspace_manager_ = nullptr;
}
@@ -91,11 +91,11 @@ auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void {
groups_.erase(it);
}
auto WorkspaceManager::commit() -> void { zwlr_workspace_manager_v1_commit(workspace_manager_); }
auto WorkspaceManager::commit() -> void { zext_workspace_manager_v1_commit(workspace_manager_); }
WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value &config,
WorkspaceManager & manager,
zwlr_workspace_group_handle_v1 *workspace_group_handle, uint32_t id)
zext_workspace_group_handle_v1 *workspace_group_handle, uint32_t id)
: bar_(bar),
box_(box),
config_(config),
@@ -123,18 +123,18 @@ WorkspaceGroup::~WorkspaceGroup() {
return;
}
zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_);
zext_workspace_group_handle_v1_destroy(workspace_group_handle_);
workspace_group_handle_ = nullptr;
}
auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 *workspace) -> void {
auto WorkspaceGroup::handle_workspace_create(zext_workspace_handle_v1 *workspace) -> void {
auto new_id = ++workspace_global_id;
workspaces_.push_back(std::make_unique<Workspace>(bar_, config_, *this, workspace, new_id));
spdlog::debug("Workspace {} created", new_id);
}
auto WorkspaceGroup::handle_remove() -> void {
zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_);
zext_workspace_group_handle_v1_destroy(workspace_group_handle_);
workspace_group_handle_ = nullptr;
workspace_manager_.remove_workspace_group(id_);
}
@@ -226,7 +226,7 @@ auto WorkspaceGroup::remove_button(Gtk::Button &button) -> void {
}
Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group,
zwlr_workspace_handle_v1 *workspace, uint32_t id)
zext_workspace_handle_v1 *workspace, uint32_t id)
: bar_(bar),
config_(config),
workspace_group_(workspace_group),
@@ -267,7 +267,7 @@ Workspace::~Workspace() {
return;
}
zwlr_workspace_handle_v1_destroy(workspace_handle_);
zext_workspace_handle_v1_destroy(workspace_handle_);
workspace_handle_ = nullptr;
}
@@ -280,7 +280,7 @@ auto Workspace::handle_state(const std::vector<uint32_t> &state) -> void {
state_ = 0;
for (auto state_entry : state) {
switch (state_entry) {
case ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE:
case ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE:
state_ |= (uint32_t)State::ACTIVE;
break;
}
@@ -288,7 +288,7 @@ auto Workspace::handle_state(const std::vector<uint32_t> &state) -> void {
}
auto Workspace::handle_remove() -> void {
zwlr_workspace_handle_v1_destroy(workspace_handle_);
zext_workspace_handle_v1_destroy(workspace_handle_);
workspace_handle_ = nullptr;
workspace_group_.remove_workspace(id_);
}
@@ -326,7 +326,7 @@ auto Workspace::get_icon() -> std::string {
auto Workspace::handle_clicked() -> void {
spdlog::debug("Workspace {} clicked", (void *)workspace_handle_);
zwlr_workspace_handle_v1_activate(workspace_handle_);
zext_workspace_handle_v1_activate(workspace_handle_);
workspace_group_.commit();
}
@@ -339,4 +339,4 @@ auto Workspace::handle_coordinates(const std::vector<uint32_t> &coordinates) ->
coordinates_ = coordinates;
workspace_group_.sort_workspaces();
}
} // namespace waybar::modules::wlr
} // namespace waybar::modules::wlr

54
src/modules/wlr/workspace_manager_binding.cpp
View File

@@ -9,7 +9,7 @@ namespace waybar::modules::wlr {
static void handle_global(void *data, wl_registry *registry, uint32_t name, const char *interface,
uint32_t version) {
if (std::strcmp(interface, zwlr_workspace_manager_v1_interface.name) == 0) {
if (std::strcmp(interface, zext_workspace_manager_v1_interface.name) == 0) {
static_cast<WorkspaceManager *>(data)->register_manager(registry, name, version);
}
}
@@ -31,72 +31,72 @@ void add_registry_listener(void *data) {
}
static void workspace_manager_handle_workspace_group(
void *data, zwlr_workspace_manager_v1 *_, zwlr_workspace_group_handle_v1 *workspace_group) {
void *data, zext_workspace_manager_v1 *_, zext_workspace_group_handle_v1 *workspace_group) {
static_cast<WorkspaceManager *>(data)->handle_workspace_group_create(workspace_group);
}
static void workspace_manager_handle_done(void *data, zwlr_workspace_manager_v1 *_) {
static void workspace_manager_handle_done(void *data, zext_workspace_manager_v1 *_) {
static_cast<WorkspaceManager *>(data)->handle_done();
}
static void workspace_manager_handle_finished(void *data, zwlr_workspace_manager_v1 *_) {
static void workspace_manager_handle_finished(void *data, zext_workspace_manager_v1 *_) {
static_cast<WorkspaceManager *>(data)->handle_finished();
}
static const zwlr_workspace_manager_v1_listener workspace_manager_impl = {
static const zext_workspace_manager_v1_listener workspace_manager_impl = {
.workspace_group = workspace_manager_handle_workspace_group,
.done = workspace_manager_handle_done,
.finished = workspace_manager_handle_finished,
};
zwlr_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name,
zext_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name,
uint32_t version, void *data) {
auto *workspace_manager = static_cast<zwlr_workspace_manager_v1 *>(
wl_registry_bind(registry, name, &zwlr_workspace_manager_v1_interface, version));
auto *workspace_manager = static_cast<zext_workspace_manager_v1 *>(
wl_registry_bind(registry, name, &zext_workspace_manager_v1_interface, version));
if (workspace_manager)
zwlr_workspace_manager_v1_add_listener(workspace_manager, &workspace_manager_impl, data);
zext_workspace_manager_v1_add_listener(workspace_manager, &workspace_manager_impl, data);
else
spdlog::error("Failed to register manager");
return workspace_manager;
}
static void workspace_group_handle_output_enter(void *data, zwlr_workspace_group_handle_v1 *_,
static void workspace_group_handle_output_enter(void *data, zext_workspace_group_handle_v1 *_,
wl_output *output) {
static_cast<WorkspaceGroup *>(data)->handle_output_enter(output);
}
static void workspace_group_handle_output_leave(void *data, zwlr_workspace_group_handle_v1 *_,
static void workspace_group_handle_output_leave(void *data, zext_workspace_group_handle_v1 *_,
wl_output *output) {
static_cast<WorkspaceGroup *>(data)->handle_output_leave();
}
static void workspace_group_handle_workspace(void *data, zwlr_workspace_group_handle_v1 *_,
zwlr_workspace_handle_v1 *workspace) {
static void workspace_group_handle_workspace(void *data, zext_workspace_group_handle_v1 *_,
zext_workspace_handle_v1 *workspace) {
static_cast<WorkspaceGroup *>(data)->handle_workspace_create(workspace);
}
static void workspace_group_handle_remove(void *data, zwlr_workspace_group_handle_v1 *_) {
static void workspace_group_handle_remove(void *data, zext_workspace_group_handle_v1 *_) {
static_cast<WorkspaceGroup *>(data)->handle_remove();
}
static const zwlr_workspace_group_handle_v1_listener workspace_group_impl = {
static const zext_workspace_group_handle_v1_listener workspace_group_impl = {
.output_enter = workspace_group_handle_output_enter,
.output_leave = workspace_group_handle_output_leave,
.workspace = workspace_group_handle_workspace,
.remove = workspace_group_handle_remove};
void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle,
void add_workspace_group_listener(zext_workspace_group_handle_v1 *workspace_group_handle,
void * data) {
zwlr_workspace_group_handle_v1_add_listener(workspace_group_handle, &workspace_group_impl, data);
zext_workspace_group_handle_v1_add_listener(workspace_group_handle, &workspace_group_impl, data);
}
void workspace_handle_name(void *data, struct zwlr_workspace_handle_v1 *_, const char *name) {
void workspace_handle_name(void *data, struct zext_workspace_handle_v1 *_, const char *name) {
static_cast<Workspace *>(data)->handle_name(name);
}
void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_,
void workspace_handle_coordinates(void *data, struct zext_workspace_handle_v1 *_,
struct wl_array *coordinates) {
std::vector<uint32_t> coords_vec;
auto coords = static_cast<uint32_t *>(coordinates->data);
@@ -107,16 +107,16 @@ void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_
static_cast<Workspace *>(data)->handle_coordinates(coords_vec);
}
void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *workspace_handle,
void workspace_handle_state(void *data, struct zext_workspace_handle_v1 *workspace_handle,
struct wl_array *state) {
std::vector<uint32_t> state_vec;
auto states = static_cast<uint32_t *>(state->data);
for (size_t i = 0; i < state->size; ++i) {
// To sync server and pending states
if (states[i] == ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE) {
zwlr_workspace_handle_v1_activate(workspace_handle);
if (states[i] == ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE) {
zext_workspace_handle_v1_activate(workspace_handle);
} else {
zwlr_workspace_handle_v1_deactivate(workspace_handle);
zext_workspace_handle_v1_deactivate(workspace_handle);
}
state_vec.push_back(states[i]);
}
@@ -124,17 +124,17 @@ void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *workspa
static_cast<Workspace *>(data)->handle_state(state_vec);
}
void workspace_handle_remove(void *data, struct zwlr_workspace_handle_v1 *_) {
void workspace_handle_remove(void *data, struct zext_workspace_handle_v1 *_) {
static_cast<Workspace *>(data)->handle_remove();
}
static const zwlr_workspace_handle_v1_listener workspace_impl = {
static const zext_workspace_handle_v1_listener workspace_impl = {
.name = workspace_handle_name,
.coordinates = workspace_handle_coordinates,
.state = workspace_handle_state,
.remove = workspace_handle_remove};
void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data) {
zwlr_workspace_handle_v1_add_listener(workspace_handle, &workspace_impl, data);
void add_workspace_listener(zext_workspace_handle_v1 *workspace_handle, void *data) {
zext_workspace_handle_v1_add_listener(workspace_handle, &workspace_impl, data);
}
} // namespace waybar::modules::wlr