pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Rename restack function

Browse Source
This commit is contained in:
Michael Carlberg 2017-01-01 15:45:18 +01:00
parent 2ebaa0fb5f
commit 796cdb52cc
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/bspwm.hpp
View File

@ -25,7 +25,7 @@ namespace bspwm_util {
}; };
vector<xcb_window_t> root_windows(connection& conn); vector<xcb_window_t> root_windows(connection& conn);
bool restack_above_root(connection& conn, const monitor_t& mon, const xcb_window_t win); bool restack_to_root(connection& conn, const monitor_t& mon, const xcb_window_t win);
string get_socket_path(); string get_socket_path();

2
include/utils/i3.hpp
View File

@ -19,7 +19,7 @@ namespace i3_util {
shared_ptr<workspace_t> focused_workspace(const connection_t&); shared_ptr<workspace_t> focused_workspace(const connection_t&);
vector<xcb_window_t> root_windows(connection& conn, const string& output_name = ""); vector<xcb_window_t> root_windows(connection& conn, const string& output_name = "");
bool restack_above_root(connection& conn, const monitor_t& mon, const xcb_window_t win); bool restack_to_root(connection& conn, const monitor_t& mon, const xcb_window_t win);
} }
namespace { namespace {

4
src/components/bar.cpp
View File

@ -366,10 +366,10 @@ void bar::restack_window() {
auto restacked = false; auto restacked = false;
if (wm_restack == "bspwm") { if (wm_restack == "bspwm") {
restacked = bspwm_util::restack_above_root(m_connection, m_opts.monitor, m_opts.window); restacked = bspwm_util::restack_to_root(m_connection, m_opts.monitor, m_opts.window);
#if ENABLE_I3 #if ENABLE_I3
} else if (wm_restack == "i3" && m_opts.override_redirect) { } else if (wm_restack == "i3" && m_opts.override_redirect) {
restacked = i3_util::restack_above_root(m_connection, m_opts.monitor, m_opts.window); restacked = i3_util::restack_to_root(m_connection, m_opts.monitor, m_opts.window);
} else if (wm_restack == "i3" && !m_opts.override_redirect) { } else if (wm_restack == "i3" && !m_opts.override_redirect) {
m_log.warn("Ignoring restack of i3 window (not needed when `override-redirect = false`)"); m_log.warn("Ignoring restack of i3 window (not needed when `override-redirect = false`)");
wm_restack.clear(); wm_restack.clear();

4
src/utils/bspwm.cpp
View File

@ -34,12 +34,12 @@ namespace bspwm_util {
} }
/** /**
* Restack given window above the bspwm root window * Restack given window relative to the bspwm root window
* for the given monitor. * for the given monitor.
* *
* Fixes the issue with always-on-top window's * Fixes the issue with always-on-top window's
*/ */
bool restack_above_root(connection& conn, const monitor_t& mon, const xcb_window_t win) { bool restack_to_root(connection& conn, const monitor_t& mon, const xcb_window_t win) {
for (auto&& root : root_windows(conn)) { for (auto&& root : root_windows(conn)) {
auto geom = conn.get_geometry(root); auto geom = conn.get_geometry(root);

4
src/utils/i3.cpp
View File

@ -55,12 +55,12 @@ namespace i3_util {
} }
/** /**
* Restack given window above the i3 root window * Restack given window relative to the i3 root window
* defined for the given monitor * defined for the given monitor
* *
* Fixes the issue with always-on-top window's * Fixes the issue with always-on-top window's
*/ */
bool restack_above_root(connection& conn, const monitor_t& mon, const xcb_window_t win) { bool restack_to_root(connection& conn, const monitor_t& mon, const xcb_window_t win) {
for (auto&& root : root_windows(conn, mon->name)) { for (auto&& root : root_windows(conn, mon->name)) {
const uint32_t value_mask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE; const uint32_t value_mask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
const uint32_t value_list[2]{root, XCB_STACK_MODE_BELOW}; const uint32_t value_list[2]{root, XCB_STACK_MODE_BELOW};