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

fix(tray): Handle error when trying to restack window

Browse source
This commit is contained in:
Michael Carlberg 2016-10-15 14:49:53 +02:00
parent 8750894bb3
commit 20991a3465
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/components/x11/connection.hpp
View file

@ -57,7 +57,7 @@ class connection : public xpp_connection {
*/ */
auto id(xcb_window_t w) const { auto id(xcb_window_t w) const {
return string_util::from_stream( return string_util::from_stream(
std::stringstream() << "0x" << std::hex << std::setw(8) << std::setfill('0') << w); std::stringstream() << "0x" << std::hex << std::setw(7) << std::setfill('0') << w);
} }
/** /**

17
include/components/x11/tray.hpp
View file

@ -325,12 +325,17 @@ class traymanager
m_settings.width + m_settings.spacing * 2, m_settings.height + m_settings.spacing * 2, 0, m_settings.width + m_settings.spacing * 2, m_settings.height + m_settings.spacing * 2, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT, scr->root_visual, mask, values); XCB_WINDOW_CLASS_INPUT_OUTPUT, scr->root_visual, mask, values);
// Put the tray window above the defined sibling in the window stack try {
if (m_settings.sibling != XCB_NONE) { // Put the tray window above the defined sibling in the window stack
const uint32_t value_mask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE; if (m_settings.sibling != XCB_NONE) {
const uint32_t value_list[2]{m_settings.sibling, XCB_STACK_MODE_ABOVE}; const uint32_t value_mask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
m_connection.configure_window_checked(m_tray, value_mask, value_list); const uint32_t value_list[2]{m_settings.sibling, XCB_STACK_MODE_ABOVE};
m_connection.flush(); m_connection.configure_window_checked(m_tray, value_mask, value_list);
m_connection.flush();
}
} catch (const std::exception& err) {
auto id = m_connection.id(m_settings.sibling);
m_logger.trace("tray: Failed to put tray above %s in the stack (%s)", id, err.what());
} }
} }