mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-06-13 14:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipc: fix workspace focused/visible reported outside get_workspaces

Browse source 
`ipc_json_describe_workspace` now sets `focused` and adds `visible`
itself. The default `focused` from `ipc_json_create_node` compares the
focused node to the workspace node, which misses the common case where a
window of that workspace is focused.

As a result, `workspace` IPC events reported `focused: false` for every
workspace and were missing `visible` entirely, even though
`get_workspaces` overrode them.
This commit is contained in:
Orestis Floros 2026-05-20 18:02:19 +02:00
parent 9c663b1fa1
commit 10a1653de3
No known key found for this signature in database
GPG key ID: A09DBD7D3222C1C3
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sway/ipc-json.c
View file

@ -501,6 +501,14 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
static void ipc_json_describe_workspace(struct sway_workspace *workspace, static void ipc_json_describe_workspace(struct sway_workspace *workspace,
json_object *object) { json_object *object) {
// Override the default focused indicator because it's set differently
struct sway_seat *seat = input_manager_get_default_seat();
json_object_object_del(object, "focused");
json_object_object_add(object, "focused", json_object_new_boolean(
workspace == seat_get_focused_workspace(seat)));
json_object_object_add(object, "visible",
json_object_new_boolean(workspace_is_visible(workspace)));
int num; int num;
if (isdigit(workspace->name[0])) { if (isdigit(workspace->name[0])) {
errno = 0; errno = 0;

17
sway/ipc-server.c
View file

@ -584,21 +584,8 @@ void ipc_client_disconnect(struct ipc_client *client) {
static void ipc_get_workspaces_callback(struct sway_workspace *workspace, static void ipc_get_workspaces_callback(struct sway_workspace *workspace,
void *data) { void *data) {
json_object *workspace_json = ipc_json_describe_node(&workspace->node); json_object_array_add((json_object *)data,
// override the default focused indicator because ipc_json_describe_node(&workspace->node));
// it's set differently for the get_workspaces reply
struct sway_seat *seat = input_manager_get_default_seat();
struct sway_workspace *focused_ws = seat_get_focused_workspace(seat);
bool focused = workspace == focused_ws;
json_object_object_del(workspace_json, "focused");
json_object_object_add(workspace_json, "focused",
json_object_new_boolean(focused));
json_object_array_add((json_object *)data, workspace_json);
focused_ws = output_get_active_workspace(workspace->output);
bool visible = workspace == focused_ws;
json_object_object_add(workspace_json, "visible",
json_object_new_boolean(visible));
} }
static void ipc_get_marks_callback(struct sway_container *con, void *data) { static void ipc_get_marks_callback(struct sway_container *con, void *data) {