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

refactor(tray): Cleanup

Browse Source
This commit is contained in:
Michael Carlberg 2017-01-25 23:33:26 +01:00
parent d8d007aa9c
commit 09808e99f9
2 changed files with 55 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/x11/tray_manager.hpp
View File

@ -28,8 +28,6 @@ POLYBAR_NS
namespace chrono = std::chrono; namespace chrono = std::chrono;
using namespace std::chrono_literals; using namespace std::chrono_literals;
using namespace signals::eventqueue;
using namespace signals::ui;
// fwd declarations // fwd declarations
class connection; class connection;
@ -45,24 +43,25 @@ struct tray_settings {
int orig_y{0}; int orig_y{0};
int configured_x{0}; int configured_x{0};
int configured_y{0}; int configured_y{0};
unsigned int configured_w{0}; unsigned int configured_w{0U};
unsigned int configured_h{0}; unsigned int configured_h{0U};
unsigned int configured_slots{0}; unsigned int configured_slots{0U};
unsigned int width{0}; unsigned int width{0U};
unsigned int width_max{0}; unsigned int width_max{0U};
unsigned int height{0}; unsigned int height{0U};
unsigned int height_fill{0}; unsigned int height_fill{0U};
unsigned int spacing{0}; unsigned int spacing{0U};
unsigned int sibling{0}; unsigned int sibling{0U};
unsigned int background{0}; unsigned int background{0U};
bool transparent{false}; bool transparent{false};
bool detached{false}; bool detached{false};
}; };
class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify, evt::client_message, class tray_manager
evt::configure_request, evt::resize_request, evt::selection_clear, evt::property_notify, : public xpp::event::sink<evt::expose, evt::visibility_notify, evt::client_message, evt::configure_request,
evt::reparent_notify, evt::destroy_notify, evt::map_notify, evt::unmap_notify>, evt::resize_request, evt::selection_clear, evt::property_notify, evt::reparent_notify, evt::destroy_notify,
public signal_receiver<SIGN_PRIORITY_TRAY, visibility_change, dim_window> { evt::map_notify, evt::unmap_notify>,
public signal_receiver<SIGN_PRIORITY_TRAY, signals::ui::visibility_change, signals::ui::dim_window> {
public: public:
using make_type = unique_ptr<tray_manager>; using make_type = unique_ptr<tray_manager>;
static make_type make(); static make_type make();
@ -112,7 +111,7 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
shared_ptr<tray_client> find_client(const xcb_window_t& win) const; shared_ptr<tray_client> find_client(const xcb_window_t& win) const;
void remove_client(shared_ptr<tray_client>& client, bool reconfigure = true); void remove_client(shared_ptr<tray_client>& client, bool reconfigure = true);
void remove_client(xcb_window_t win, bool reconfigure = true); void remove_client(xcb_window_t win, bool reconfigure = true);
size_t mapped_clients() const; unsigned int mapped_clients() const;
void handle(const evt::expose& evt); void handle(const evt::expose& evt);
void handle(const evt::visibility_notify& evt); void handle(const evt::visibility_notify& evt);
@ -126,8 +125,8 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
void handle(const evt::map_notify& evt); void handle(const evt::map_notify& evt);
void handle(const evt::unmap_notify& evt); void handle(const evt::unmap_notify& evt);
bool on(const visibility_change& evt); bool on(const signals::ui::visibility_change& evt);
bool on(const dim_window& evt); bool on(const signals::ui::dim_window& evt);
private: private:
connection& m_connection; connection& m_connection;
@ -144,8 +143,8 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
int m_rootpixmap_depth{0}; int m_rootpixmap_depth{0};
xcb_rectangle_t m_rootpixmap_geom{0, 0, 0U, 0U}; xcb_rectangle_t m_rootpixmap_geom{0, 0, 0U, 0U};
unsigned int m_prevwidth{0}; unsigned int m_prevwidth{0U};
unsigned int m_prevheight{0}; unsigned int m_prevheight{0U};
xcb_atom_t m_atom{0}; xcb_atom_t m_atom{0};
xcb_window_t m_tray{0}; xcb_window_t m_tray{0};
@ -160,8 +159,6 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
mutex m_mtx{}; mutex m_mtx{};
chrono::time_point<chrono::system_clock, chrono::milliseconds> m_drawtime;
bool m_firstactivation{true}; bool m_firstactivation{true};
}; };

89
src/x11/tray_manager.cpp
View File

@ -281,46 +281,41 @@ void tray_manager::deactivate(bool clear_selection) {
m_connection.flush(); m_connection.flush();
m_sig.emit(notify_forcechange{}); m_sig.emit(signals::eventqueue::notify_forcechange{});
} }
/** /**
* Reconfigure tray * Reconfigure tray
*/ */
void tray_manager::reconfigure() { void tray_manager::reconfigure() {
if (!m_tray || !m_mtx.try_lock()) { if (!m_tray) {
return; return;
} else if (m_mtx.try_lock()) {
std::unique_lock<mutex> guard(m_mtx, std::adopt_lock);
try {
reconfigure_clients();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray clients (%s)", err.what());
}
try {
reconfigure_window();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray window (%s)", err.what());
}
try {
reconfigure_bg();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray background (%s)", err.what());
}
m_opts.configured_slots = mapped_clients();
guard.unlock();
refresh_window();
m_connection.flush();
} }
std::unique_lock<mutex> guard(m_mtx, std::adopt_lock); m_sig.emit(signals::eventqueue::notify_forcechange{});
try {
reconfigure_clients();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray clients (%s)", err.what());
}
try {
reconfigure_window();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray window (%s)", err.what());
}
try {
reconfigure_bg();
} catch (const exception& err) {
m_log.err("Failed to reconfigure tray background (%s)", err.what());
}
m_opts.configured_slots = mapped_clients();
guard.unlock();
refresh_window();
m_connection.flush();
m_sig.emit(notify_forcechange{});
} }
/** /**
@ -334,7 +329,6 @@ void tray_manager::reconfigure_window() {
} }
auto clients = mapped_clients(); auto clients = mapped_clients();
if (!clients && m_mapped) { if (!clients && m_mapped) {
m_log.trace("tray: Reconfigure window / unmap"); m_log.trace("tray: Reconfigure window / unmap");
m_connection.unmap_window_checked(m_tray); m_connection.unmap_window_checked(m_tray);
@ -346,11 +340,6 @@ void tray_manager::reconfigure_window() {
auto width = calculate_w(); auto width = calculate_w();
auto x = calculate_x(width); auto x = calculate_x(width);
if (m_opts.configured_w == width && m_opts.configured_x == x) {
m_log.trace("tray: Reconfigure window / ignoring unchanged values w=%d x=%d", width, x);
return;
}
if (width > 0) { if (width > 0) {
m_log.trace("tray: New window values, width=%d, x=%d", width, x); m_log.trace("tray: New window values, width=%d, x=%d", width, x);
@ -506,15 +495,7 @@ void tray_manager::refresh_window() {
* Redraw window * Redraw window
*/ */
void tray_manager::redraw_window(bool realloc_bg) { void tray_manager::redraw_window(bool realloc_bg) {
chrono::system_clock::time_point now{chrono::system_clock::now()}; m_log.info("Redraw tray container (id=%s)", m_connection.id(m_tray));
if (!realloc_bg && now - 24ms < m_drawtime) {
return m_log.trace("tray: Ignoring redraw (throttled)");
}
m_drawtime = chrono::time_point_cast<chrono::milliseconds>(now);
m_log.info("Redraw tray container (id=%s) %lu", m_connection.id(m_tray),
chrono::duration_cast<chrono::microseconds>(chrono::system_clock::now().time_since_epoch()));
reconfigure_bg(realloc_bg); reconfigure_bg(realloc_bg);
refresh_window(); refresh_window();
} }
@ -834,7 +815,7 @@ int tray_manager::calculate_y() const {
*/ */
unsigned int tray_manager::calculate_w() const { unsigned int tray_manager::calculate_w() const {
unsigned int width = m_opts.spacing; unsigned int width = m_opts.spacing;
size_t count{0}; unsigned int count{0};
for (auto&& client : m_clients) { for (auto&& client : m_clients) {
if (client->mapped()) { if (client->mapped()) {
count++; count++;
@ -855,7 +836,7 @@ unsigned int tray_manager::calculate_h() const {
* Calculate x position of client window * Calculate x position of client window
*/ */
int tray_manager::calculate_client_x(const xcb_window_t& win) { int tray_manager::calculate_client_x(const xcb_window_t& win) {
for (size_t i = 0; i < m_clients.size(); i++) { for (unsigned int i = 0; i < m_clients.size(); i++) {
if (m_clients[i]->match(win)) { if (m_clients[i]->match(win)) {
return m_opts.spacing + m_opts.width * i; return m_opts.spacing + m_opts.width * i;
} }
@ -912,8 +893,8 @@ void tray_manager::remove_client(xcb_window_t win, bool reconfigure) {
/** /**
* Get number of mapped clients * Get number of mapped clients
*/ */
size_t tray_manager::mapped_clients() const { unsigned int tray_manager::mapped_clients() const {
size_t mapped_clients = 0; unsigned int mapped_clients = 0;
for (auto&& client : m_clients) { for (auto&& client : m_clients) {
if (client->mapped()) { if (client->mapped()) {
@ -1104,7 +1085,7 @@ void tray_manager::handle(const evt::map_notify& evt) {
m_log.trace("tray: Received map_notify"); m_log.trace("tray: Received map_notify");
m_log.trace("tray: Set client mapped"); m_log.trace("tray: Set client mapped");
find_client(evt->window)->mapped(true); find_client(evt->window)->mapped(true);
size_t clientcount{mapped_clients()}; unsigned int clientcount{mapped_clients()};
if (clientcount > m_opts.configured_slots) { if (clientcount > m_opts.configured_slots) {
reconfigure(); reconfigure();
} }
@ -1133,9 +1114,9 @@ void tray_manager::handle(const evt::unmap_notify& evt) {
* This is used as a fallback in case the window restacking fails. It will * This is used as a fallback in case the window restacking fails. It will
* toggle the tray window whenever the visibility of the bar window changes. * toggle the tray window whenever the visibility of the bar window changes.
*/ */
bool tray_manager::on(const visibility_change& evt) { bool tray_manager::on(const signals::ui::visibility_change& evt) {
bool visible{evt.cast()}; bool visible{evt.cast()};
size_t clients{mapped_clients()}; unsigned int clients{mapped_clients()};
m_log.trace("tray: visibility_change (state=%i, activated=%i, mapped=%i, hidden=%i)", visible, m_log.trace("tray: visibility_change (state=%i, activated=%i, mapped=%i, hidden=%i)", visible,
static_cast<bool>(m_activated), static_cast<bool>(m_mapped), static_cast<bool>(m_hidden)); static_cast<bool>(m_activated), static_cast<bool>(m_mapped), static_cast<bool>(m_hidden));
@ -1157,7 +1138,7 @@ bool tray_manager::on(const visibility_change& evt) {
return true; return true;
} }
bool tray_manager::on(const dim_window& evt) { bool tray_manager::on(const signals::ui::dim_window& evt) {
if (m_activated) { if (m_activated) {
ewmh_util::set_wm_window_opacity(m_tray, evt.cast() * 0xFFFFFFFF); ewmh_util::set_wm_window_opacity(m_tray, evt.cast() * 0xFFFFFFFF);
} }