hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 21:06:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

wlr_ext_workspaces: honor activate from client + format

Browse source
This commit is contained in:
vaxerski 2023-05-22 19:36:47 +02:00
parent ad244190e0
commit 086f724951
4 changed files with 473 additions and 539 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Compositor.cpp
View file

@ -1486,6 +1486,15 @@ CWorkspace* CCompositor::getWorkspaceByString(const std::string& str) {
return nullptr; return nullptr;
} }
CWorkspace* CCompositor::getWorkspaceByWorkspaceHandle(const wlr_ext_workspace_handle_v1* handle) {
for (auto& ws : m_vWorkspaces) {
if (ws->m_pWlrHandle == handle)
return ws.get();
}
return nullptr;
}
bool CCompositor::isPointOnAnyMonitor(const Vector2D& point) { bool CCompositor::isPointOnAnyMonitor(const Vector2D& point) {
for (auto& m : m_vMonitors) { for (auto& m : m_vMonitors) {
if (VECINRECT(point, m->vecPosition.x, m->vecPosition.y, m->vecSize.x + m->vecPosition.x, m->vecSize.y + m->vecPosition.y)) if (VECINRECT(point, m->vecPosition.x, m->vecPosition.y, m->vecSize.x + m->vecPosition.x, m->vecSize.y + m->vecPosition.y))

1
src/Compositor.hpp
View file

@ -144,6 +144,7 @@ class CCompositor {
CWorkspace* getWorkspaceByID(const int&); CWorkspace* getWorkspaceByID(const int&);
CWorkspace* getWorkspaceByName(const std::string&); CWorkspace* getWorkspaceByName(const std::string&);
CWorkspace* getWorkspaceByString(const std::string&); CWorkspace* getWorkspaceByString(const std::string&);
CWorkspace* getWorkspaceByWorkspaceHandle(const wlr_ext_workspace_handle_v1*);
void sanityCheckWorkspaces(); void sanityCheckWorkspaces();
void updateWorkspaceWindowDecos(const int&); void updateWorkspaceWindowDecos(const int&);
int getWindowsOnWorkspace(const int&); int getWindowsOnWorkspace(const int&);

873
src/wlrunstable/wlr_ext_workspace_v1.cpp
View file

File diff suppressed because it is too large Load diff

129
src/wlrunstable/wlr_ext_workspace_v1.hpp
View file

@ -10,127 +10,116 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
struct wlr_ext_workspace_manager_v1 { struct wlr_ext_workspace_manager_v1 {
struct wl_event_loop *event_loop; struct wl_event_loop* event_loop;
struct wl_event_source *idle_source; struct wl_event_source* idle_source;
struct wl_global *global; struct wl_global* global;
struct wl_list resources; // wl_resource_get_link struct wl_list resources; // wl_resource_get_link
struct wl_list groups; // wlr_ext_workspace_group_handle_v1::link struct wl_list groups; // wlr_ext_workspace_group_handle_v1::link
struct wl_listener display_destroy; struct wl_listener display_destroy;
struct { struct {
struct wl_signal commit; // wlr_ext_workspace_manager_v1 struct wl_signal commit; // wlr_ext_workspace_manager_v1
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
void *data; void* data;
}; };
struct wlr_ext_workspace_group_handle_v1 { struct wlr_ext_workspace_group_handle_v1 {
struct wl_list link; // wlr_ext_workspace_manager_v1::groups struct wl_list link; // wlr_ext_workspace_manager_v1::groups
struct wl_list resources; // wl_ext_resource_get_link struct wl_list resources; // wl_ext_resource_get_link
struct wl_list workspaces; // wlr_ext_workspace_handle_v1::link struct wl_list workspaces; // wlr_ext_workspace_handle_v1::link
struct wl_list outputs; // wlr_ext_workspace_group_handle_v1_output::link struct wl_list outputs; // wlr_ext_workspace_group_handle_v1_output::link
struct wlr_ext_workspace_manager_v1 *manager; struct wlr_ext_workspace_manager_v1* manager;
struct { struct {
// wlr_ext_workspace_group_handle_v1_create_workspace_event // wlr_ext_workspace_group_handle_v1_create_workspace_event
struct wl_signal create_workspace_request; struct wl_signal create_workspace_request;
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
void *data; void* data;
}; };
struct wlr_ext_workspace_group_handle_v1_create_workspace_event { struct wlr_ext_workspace_group_handle_v1_create_workspace_event {
struct wlr_ext_workspace_group_handle_v1 *workspace_group; struct wlr_ext_workspace_group_handle_v1* workspace_group;
const char *name; const char* name;
}; };
struct wlr_ext_workspace_group_handle_v1_output { struct wlr_ext_workspace_group_handle_v1_output {
struct wl_list link; // wlr_ext_workspace_group_handle_v1::outputs struct wl_list link; // wlr_ext_workspace_group_handle_v1::outputs
struct wl_listener output_bind; struct wl_listener output_bind;
struct wl_listener output_destroy; struct wl_listener output_destroy;
struct wlr_output *output; struct wlr_output* output;
struct wlr_ext_workspace_group_handle_v1 *group_handle; struct wlr_ext_workspace_group_handle_v1* group_handle;
}; };
enum wlr_ext_workspace_handle_v1_state enum wlr_ext_workspace_handle_v1_state
{ {
WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE = 1 << 0, WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE = 1 << 0,
WLR_EXT_WORKSPACE_HANDLE_V1_STATE_URGENT = 1 << 1, WLR_EXT_WORKSPACE_HANDLE_V1_STATE_URGENT = 1 << 1,
WLR_EXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN = 1 << 2, WLR_EXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN = 1 << 2,
}; };
struct wlr_ext_workspace_handle_v1 { struct wlr_ext_workspace_handle_v1 {
struct wl_list link; // wlr_ext_workspace_group_handle_v1::workspaces struct wl_list link; // wlr_ext_workspace_group_handle_v1::workspaces
struct wl_list resources; struct wl_list resources;
struct wlr_ext_workspace_group_handle_v1 *group; struct wlr_ext_workspace_group_handle_v1* group;
// request from the client // request from the client
uint32_t pending, current; uint32_t pending, current;
bool requestsActivate;
// set by the compositor // set by the compositor
uint32_t server_state; uint32_t server_state;
char *name; char* name;
struct wl_array coordinates; struct wl_array coordinates;
struct { struct {
struct wl_signal remove_request; struct wl_signal remove_request;
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
void *data; void* data;
}; };
struct wlr_ext_workspace_manager_v1 *wlr_ext_workspace_manager_v1_create( struct wlr_ext_workspace_manager_v1* wlr_ext_workspace_manager_v1_create(struct wl_display* display);
struct wl_display *display);
struct wlr_ext_workspace_group_handle_v1 *wlr_ext_workspace_group_handle_v1_create( struct wlr_ext_workspace_group_handle_v1* wlr_ext_workspace_group_handle_v1_create(struct wlr_ext_workspace_manager_v1* manager);
struct wlr_ext_workspace_manager_v1 *manager);
/** /**
* Destroy the workspace group and all workspaces inside it. * Destroy the workspace group and all workspaces inside it.
*/ */
void wlr_ext_workspace_group_handle_v1_destroy( void wlr_ext_workspace_group_handle_v1_destroy(struct wlr_ext_workspace_group_handle_v1* group);
struct wlr_ext_workspace_group_handle_v1 *group);
/** /**
* Create a new workspace in the workspace group. * Create a new workspace in the workspace group.
* Note that the compositor must set the workspace name immediately after * Note that the compositor must set the workspace name immediately after
* creating it. * creating it.
*/ */
struct wlr_ext_workspace_handle_v1 *wlr_ext_workspace_handle_v1_create( struct wlr_ext_workspace_handle_v1* wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_group_handle_v1* group);
struct wlr_ext_workspace_group_handle_v1 *group);
void wlr_ext_workspace_handle_v1_destroy( void wlr_ext_workspace_handle_v1_destroy(struct wlr_ext_workspace_handle_v1* workspace);
struct wlr_ext_workspace_handle_v1 *workspace);
void wlr_ext_workspace_group_handle_v1_output_enter( void wlr_ext_workspace_group_handle_v1_output_enter(struct wlr_ext_workspace_group_handle_v1* group, struct wlr_output* output);
struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output);
void wlr_ext_workspace_group_handle_v1_output_leave( void wlr_ext_workspace_group_handle_v1_output_leave(struct wlr_ext_workspace_group_handle_v1* group, struct wlr_output* output);
struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output);
void wlr_ext_workspace_handle_v1_set_name( void wlr_ext_workspace_handle_v1_set_name(struct wlr_ext_workspace_handle_v1* workspace, const char* name);
struct wlr_ext_workspace_handle_v1 *workspace, const char* name);
void wlr_ext_workspace_handle_v1_set_coordinates( void wlr_ext_workspace_handle_v1_set_coordinates(struct wlr_ext_workspace_handle_v1* workspace, struct wl_array* coordinates);
struct wlr_ext_workspace_handle_v1 *workspace, struct wl_array *coordinates);
void wlr_ext_workspace_handle_v1_set_active( void wlr_ext_workspace_handle_v1_set_active(struct wlr_ext_workspace_handle_v1* workspace, bool active);
struct wlr_ext_workspace_handle_v1 *workspace, bool active);
void wlr_ext_workspace_handle_v1_set_urgent( void wlr_ext_workspace_handle_v1_set_urgent(struct wlr_ext_workspace_handle_v1* workspace, bool urgent);
struct wlr_ext_workspace_handle_v1 *workspace, bool urgent);
void wlr_ext_workspace_handle_v1_set_hidden( void wlr_ext_workspace_handle_v1_set_hidden(struct wlr_ext_workspace_handle_v1* workspace, bool hidden);
struct wlr_ext_workspace_handle_v1 *workspace, bool hidden);
#endif #endif