panel: Watch the panel`s WM_DESKTOP property and reset it if it changes
o9000 mrovi9000@gmail.com
3 files changed,
14 insertions(+),
9 deletions(-)
M
src/panel.c
→
src/panel.c
@@ -241,7 +241,7 @@ server.visual,
mask, &att); - long event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask; + long event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | PropertyChangeMask; if (p->mouse_effects || p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled)) event_mask |= PointerMotionMask | LeaveWindowMask;
M
src/tint.c
→
src/tint.c
@@ -919,6 +919,14 @@ Atom at = e->xproperty.atom;
if (xsettings_client) xsettings_client_process_event(xsettings_client, e); + for (int i = 0; i < num_panels; i++) { + Panel *p = &panels[i]; + if (win == p->main_win) { + if (at == server.atom._NET_WM_DESKTOP && get_window_desktop(p->main_win) != ALL_DESKTOPS) + place_panel_all_desktops(p); + return; + } + } if (win == server.root_win) { if (!server.got_root_win) { XSelectInput(server.display, server.root_win, PropertyChangeMask | StructureNotifyMask);@@ -953,7 +961,6 @@ cleanup_taskbar();
init_taskbar(); for (int i = 0; i < num_panels; i++) { init_taskbar_panel(&panels[i]); - place_panel_all_desktops(&panels[i]); set_panel_items_order(&panels[i]); update_taskbar_visibility(&panels[i]); panels[i].area.resize_needed = 1;@@ -964,7 +971,6 @@ panel_refresh = TRUE;
} else if (old_desktop != server.desktop) { for (int i = 0; i < num_panels; i++) { Panel *panel = &panels[i]; - place_panel_all_desktops(panel); set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL); set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE); // check ALL_DESKTOPS task => resize taskbar
M
src/util/window.c
→
src/util/window.c
@@ -108,17 +108,16 @@ }
int get_window_desktop(Window win) { - if (!server.viewports) { - int desktop = get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL); - if (desktop != ALL_DESKTOPS) - desktop = MAX(0, MIN(server.num_desktops - 1, desktop)); + int desktop = get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL); + if (desktop == ALL_DESKTOPS) return desktop; - } + if (!server.viewports) + return CLAMP(desktop, 0, server.num_desktops - 1); int x, y, w, h; get_window_coordinates(win, &x, &y, &w, &h); - int desktop = get_current_desktop(); + desktop = get_current_desktop(); // Window coordinates are relative to the current viewport, make them absolute x += server.viewports[desktop].x; y += server.viewports[desktop].y;