fix: error version of dwl ipc file
This commit is contained in:
86
maomao.c
86
maomao.c
@@ -2846,56 +2846,56 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
|
|||||||
focused = focustop(monitor);
|
focused = focustop(monitor);
|
||||||
zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
|
zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
|
||||||
|
|
||||||
if ((monitor->tagset[monitor->seltags] & TAGMASK) == TAGMASK) {
|
// if ((monitor->tagset[monitor->seltags] & TAGMASK) == TAGMASK) {
|
||||||
state = 0;
|
// state = 0;
|
||||||
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
||||||
zdwl_ipc_output_v2_send_tag(ipc_output->resource, 888, state, 1, 1);
|
// zdwl_ipc_output_v2_send_tag(ipc_output->resource, 888, state, 1, 1);
|
||||||
} else {
|
// } else {
|
||||||
for (tag = 0; tag < LENGTH(tags); tag++) {
|
// for (tag = 0; tag < LENGTH(tags); tag++) {
|
||||||
numclients = state = focused_client = 0;
|
|
||||||
tagmask = 1 << tag;
|
|
||||||
if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
|
|
||||||
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
|
||||||
|
|
||||||
wl_list_for_each(c, &clients, link) {
|
|
||||||
if (c->iskilling)
|
|
||||||
continue;
|
|
||||||
if (c->mon != monitor)
|
|
||||||
continue;
|
|
||||||
if (!(c->tags & tagmask))
|
|
||||||
continue;
|
|
||||||
if (c == focused)
|
|
||||||
focused_client = 1;
|
|
||||||
if (c->isurgent)
|
|
||||||
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
|
|
||||||
|
|
||||||
numclients++;
|
|
||||||
}
|
|
||||||
zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients,
|
|
||||||
focused_client);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// for ( tag = 0 ; tag < LENGTH(tags); tag++) {
|
|
||||||
// numclients = state = focused_client = 0;
|
// numclients = state = focused_client = 0;
|
||||||
// tagmask = 1 << tag;
|
// tagmask = 1 << tag;
|
||||||
// if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
|
// if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
|
||||||
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
||||||
|
|
||||||
// wl_list_for_each(c, &clients, link) {
|
// wl_list_for_each(c, &clients, link) {
|
||||||
// if (c->mon != monitor)
|
// if (c->iskilling)
|
||||||
// continue;
|
// continue;
|
||||||
// if (!(c->tags & tagmask))
|
// if (c->mon != monitor)
|
||||||
// continue;
|
// continue;
|
||||||
// if (c == focused)
|
// if (!(c->tags & tagmask))
|
||||||
// focused_client = 1;
|
// continue;
|
||||||
// if (c->isurgent)
|
// if (c == focused)
|
||||||
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
|
// focused_client = 1;
|
||||||
// numclients++;
|
// if (c->isurgent)
|
||||||
|
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
|
||||||
|
|
||||||
|
// numclients++;
|
||||||
// }
|
// }
|
||||||
// zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state,
|
// zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients,
|
||||||
// numclients, focused_client);
|
// focused_client);
|
||||||
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
for ( tag = 0 ; tag < LENGTH(tags); tag++) {
|
||||||
|
numclients = state = focused_client = 0;
|
||||||
|
tagmask = 1 << tag;
|
||||||
|
if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
|
||||||
|
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
|
||||||
|
wl_list_for_each(c, &clients, link) {
|
||||||
|
if (c->mon != monitor)
|
||||||
|
continue;
|
||||||
|
if (!(c->tags & tagmask))
|
||||||
|
continue;
|
||||||
|
if (c == focused)
|
||||||
|
focused_client = 1;
|
||||||
|
if (c->isurgent)
|
||||||
|
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
|
||||||
|
numclients++;
|
||||||
|
}
|
||||||
|
zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state,
|
||||||
|
numclients, focused_client);
|
||||||
|
}
|
||||||
|
|
||||||
title = focused ? client_get_title(focused) : "";
|
title = focused ? client_get_title(focused) : "";
|
||||||
appid = focused ? client_get_appid(focused) : "";
|
appid = focused ? client_get_appid(focused) : "";
|
||||||
symbol = monitor->pertag->ltidxs[monitor->pertag->curtag]->symbol;
|
symbol = monitor->pertag->ltidxs[monitor->pertag->curtag]->symbol;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ I would probably just submit raphi's patchset but I don't think that would be po
|
|||||||
reset.
|
reset.
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<interface name="zdwl_ipc_manager_v2" version="1">
|
<interface name="zdwl_ipc_manager_v2" version="2">
|
||||||
<description summary="manage dwl state">
|
<description summary="manage dwl state">
|
||||||
This interface is exposed as a global in wl_registry.
|
This interface is exposed as a global in wl_registry.
|
||||||
|
|
||||||
@@ -60,7 +60,7 @@ I would probably just submit raphi's patchset but I don't think that would be po
|
|||||||
</event>
|
</event>
|
||||||
</interface>
|
</interface>
|
||||||
|
|
||||||
<interface name="zdwl_ipc_output_v2" version="1">
|
<interface name="zdwl_ipc_output_v2" version="2">
|
||||||
<description summary="control dwl output">
|
<description summary="control dwl output">
|
||||||
Observe and control a dwl output.
|
Observe and control a dwl output.
|
||||||
|
|
||||||
@@ -162,5 +162,20 @@ I would probably just submit raphi's patchset but I don't think that would be po
|
|||||||
<description summary="Set the layout of this output"/>
|
<description summary="Set the layout of this output"/>
|
||||||
<arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
|
<arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
|
||||||
</request>
|
</request>
|
||||||
|
|
||||||
|
<!-- Version 2 -->
|
||||||
|
<event name="fullscreen" since="2">
|
||||||
|
<description summary="Update fullscreen status">
|
||||||
|
Indicates if the selected client on this output is fullscreen.
|
||||||
|
</description>
|
||||||
|
<arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="floating" since="2">
|
||||||
|
<description summary="Update the floating status">
|
||||||
|
Indicates if the selected client on this output is floating.
|
||||||
|
</description>
|
||||||
|
<arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
|
||||||
|
</event>
|
||||||
</interface>
|
</interface>
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|||||||
Reference in New Issue
Block a user