tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-10-31 07:52: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

16
include/modules/wlr/workspace_manager.hpp
View File

@@ -11,7 +11,7 @@
#include "AModule.hpp"
#include "bar.hpp"
#include "wlr-workspace-unstable-v1-client-protocol.h"
#include "ext-workspace-unstable-v1-client-protocol.h"
namespace waybar::modules::wlr {
@@ -21,7 +21,7 @@ class WorkspaceGroup;
class Workspace {
public:
Workspace(const waybar::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);
~Workspace();
auto update() -> void;
@@ -51,7 +51,7 @@ class Workspace {
WorkspaceGroup & workspace_group_;
// wlr stuff
zwlr_workspace_handle_v1 *workspace_handle_;
zext_workspace_handle_v1 *workspace_handle_;
uint32_t state_ = 0;
uint32_t id_;
@@ -69,7 +69,7 @@ class Workspace {
class WorkspaceGroup {
public:
WorkspaceGroup(const waybar::Bar &bar, Gtk::Box &box, const Json::Value &config,
WorkspaceManager &manager, zwlr_workspace_group_handle_v1 *workspace_group_handle,
WorkspaceManager &manager, zext_workspace_group_handle_v1 *workspace_group_handle,
uint32_t id);
~WorkspaceGroup();
auto update() -> void;
@@ -79,7 +79,7 @@ class WorkspaceGroup {
auto remove_workspace(uint32_t id_) -> void;
// wlr stuff
auto handle_workspace_create(zwlr_workspace_handle_v1 *workspace_handle) -> void;
auto handle_workspace_create(zext_workspace_handle_v1 *workspace_handle) -> void;
auto handle_remove() -> void;
auto handle_output_enter(wl_output *output) -> void;
auto handle_output_leave() -> void;
@@ -98,7 +98,7 @@ class WorkspaceGroup {
WorkspaceManager & workspace_manager_;
// wlr stuff
zwlr_workspace_group_handle_v1 *workspace_group_handle_;
zext_workspace_group_handle_v1 *workspace_group_handle_;
wl_output * output_ = nullptr;
uint32_t id_;
@@ -117,7 +117,7 @@ class WorkspaceManager : public AModule {
// wlr stuff
auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void;
auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle)
auto handle_workspace_group_create(zext_workspace_group_handle_v1 *workspace_group_handle)
-> void;
auto handle_done() -> void;
auto handle_finished() -> void;
@@ -130,7 +130,7 @@ class WorkspaceManager : public AModule {
std::vector<std::unique_ptr<WorkspaceGroup>> groups_;
// wlr stuff
zwlr_workspace_manager_v1 *workspace_manager_ = nullptr;
zext_workspace_manager_v1 *workspace_manager_ = nullptr;
static uint32_t group_global_id;
};

10
include/modules/wlr/workspace_manager_binding.hpp
View File

@@ -1,8 +1,8 @@
#include "wlr-workspace-unstable-v1-client-protocol.h"
#include "ext-workspace-unstable-v1-client-protocol.h"
namespace waybar::modules::wlr {
void add_registry_listener(void *data);
void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data);
void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle, void *data);
zwlr_workspace_manager_v1* workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data);
}
void add_workspace_listener(zext_workspace_handle_v1 *workspace_handle, void *data);
void add_workspace_group_listener(zext_workspace_group_handle_v1 *workspace_group_handle, void *data);
zext_workspace_manager_v1* workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data);
}