mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3177667609 into cd1a823fee

Browse source
This commit is contained in:
Maik Broemme 2025-10-25 20:41:41 +02:00 • committed by GitHub
commit 6bcb047dff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 77 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/protocols/ext-workspace.h
View file

@ -106,4 +106,13 @@ void lab_ext_workspace_set_coordinates(struct lab_ext_workspace *workspace,
void lab_ext_workspace_destroy(struct lab_ext_workspace *workspace);
/* Notify clients that a workspace has entered/left the currently bound output group.
* This emits workspace_enter/leave for all clients that have both the group and the
* workspace bound, mirroring the initial-state emission.
*/
void lab_ext_workspace_group_workspace_enter(struct lab_ext_workspace_group *group,
struct lab_ext_workspace *workspace);
void lab_ext_workspace_group_workspace_leave(struct lab_ext_workspace_group *group,
struct lab_ext_workspace *workspace);
#endif /* LABWC_PROTOCOLS_EXT_WORKSPACES_H */

53
src/protocols/ext-workspace/ext-workspace.c
View file

@ -760,3 +760,56 @@ lab_ext_workspace_destroy(struct lab_ext_workspace *workspace)
zfree(workspace->name);
free(workspace);
}
void
lab_ext_workspace_group_workspace_enter(struct lab_ext_workspace_group *group,
struct lab_ext_workspace *workspace)
{
if (!group || !workspace) {
return;
}
/* Verbose logging for debugging: print workspace name on enter */
wlr_log(WLR_DEBUG, "ext-workspace: enter name='%s'", workspace->name);
/* For each manager/group resource pair belonging to the same client,
* emit workspace_enter with the matching workspace resource.
*/
struct wl_resource *group_resource;
wl_resource_for_each(group_resource, &group->resources) {
struct wl_client *client = wl_resource_get_client(group_resource);
struct wl_resource *ws_resource;
wl_resource_for_each(ws_resource, &workspace->resources) {
if (wl_resource_get_client(ws_resource) == client) {
ext_workspace_group_handle_v1_send_workspace_enter(
group_resource, ws_resource);
}
}
}
ext_manager_schedule_done_event(group->manager);
}
void
lab_ext_workspace_group_workspace_leave(struct lab_ext_workspace_group *group,
struct lab_ext_workspace *workspace)
{
if (!group || !workspace) {
return;
}
/* Verbose logging for debugging: print workspace name on leave */
wlr_log(WLR_DEBUG, "ext-workspace: leave name='%s'", workspace->name);
struct wl_resource *group_resource;
wl_resource_for_each(group_resource, &group->resources) {
struct wl_client *client = wl_resource_get_client(group_resource);
struct wl_resource *ws_resource;
wl_resource_for_each(ws_resource, &workspace->resources) {
if (wl_resource_get_client(ws_resource) == client) {
ext_workspace_group_handle_v1_send_workspace_leave(
group_resource, ws_resource);
}
}
}
ext_manager_schedule_done_event(group->manager);
}

15
src/workspaces.c
View file

@ -237,6 +237,12 @@ add_workspace(struct server *server, const char *name)
lab_ext_workspace_set_name(workspace->ext_workspace, name);
lab_ext_workspace_set_active(workspace->ext_workspace, active);
/* Notify ext-workspace listeners for active workspace only */
if (active) {
lab_ext_workspace_group_workspace_enter(
server->workspaces.ext_group, workspace->ext_workspace);
}
workspace->on_ext.activate.notify = handle_ext_workspace_activate;
wl_signal_add(&workspace->ext_workspace->events.activate,
&workspace->on_ext.activate);
@ -427,6 +433,10 @@ workspaces_switch_to(struct workspace *target, bool update_focus)
lab_ext_workspace_set_active(
server->workspaces.current->ext_workspace, false);
/* Notify ext-workspace listeners */
lab_ext_workspace_group_workspace_leave(
server->workspaces.ext_group, server->workspaces.current->ext_workspace);
/* Move Omnipresent views to new workspace */
struct view *view;
enum lab_view_criteria criteria =
@ -482,6 +492,11 @@ workspaces_switch_to(struct workspace *target, bool update_focus)
desktop_update_top_layer_visibility(server);
lab_cosmic_workspace_set_active(target->cosmic_workspace, true);
/* Notify ext-workspace listeners */
lab_ext_workspace_group_workspace_enter(
server->workspaces.ext_group, target->ext_workspace);
lab_ext_workspace_set_active(target->ext_workspace, true);
}