rasmusq/mangowc-rasmusq
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: ext-workspace confuse status in multi monitor

Browse Source
This commit is contained in:
DreamMaoMao
2025-09-02 11:50:17 +08:00
parent 1d31a3ffb2
commit 15ca571bce
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ext-protocol/ext-workspace.h
View File

@@ -86,11 +86,11 @@ static void add_workspace_by_tag(int tag, Monitor *m) {
&workspace->activate); &workspace->activate);
} }
unsigned int get_tag_status(unsigned int tag) { unsigned int get_tag_status(unsigned int tag, Monitor *m) {
Client *c; Client *c;
unsigned int status = 0; unsigned int status = 0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->tags & 1 << (tag - 1) & TAGMASK) { if (c->mon == m && c->tags & 1 << (tag - 1) & TAGMASK) {
if (c->isurgent) { if (c->isurgent) {
status = 2; status = 2;
break; break;
@@ -123,21 +123,14 @@ unsigned int get_tags_first_tag_num(unsigned int source_tags) {
} }
void dwl_ext_workspace_printstatus(Monitor *m) { void dwl_ext_workspace_printstatus(Monitor *m) {
unsigned int current_tag;
struct workspace *w; struct workspace *w;
unsigned int tag_status = 0; unsigned int tag_status = 0;
bool is_active = false;
current_tag = get_tags_first_tag_num(m->tagset[m->seltags]);
wl_list_for_each(w, &workspaces, link) { wl_list_for_each(w, &workspaces, link) {
if (w && w->m == m) { if (w && w->m == m) {
is_active = (w->tag == current_tag) || m->isoverview;
tag_status = get_tag_status(w->tag); tag_status = get_tag_status(w->tag, m);
if (is_active) { if (tag_status == 2) {
wlr_ext_workspace_handle_v1_set_urgent(w->ext_workspace, false);
wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false);
} else if (tag_status == 2) {
wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false); wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false);
wlr_ext_workspace_handle_v1_set_urgent(w->ext_workspace, true); wlr_ext_workspace_handle_v1_set_urgent(w->ext_workspace, true);
} else if (tag_status == 1) { } else if (tag_status == 1) {
@@ -148,7 +141,8 @@ void dwl_ext_workspace_printstatus(Monitor *m) {
wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, true); wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, true);
} }
if (m->tagset[m->seltags] & (1 << (w->tag - 1)) & TAGMASK) { if ((m->tagset[m->seltags] & (1 << (w->tag - 1)) & TAGMASK) ||
m->isoverview) {
wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false); wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false);
wlr_ext_workspace_handle_v1_set_active(w->ext_workspace, true); wlr_ext_workspace_handle_v1_set_active(w->ext_workspace, true);
} else { } else {