mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-03-01 13:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tray-child-window

Browse Source
This commit is contained in:
patrick96
2022-09-13 14:24:59 +02:00
parent 60173e5042 1d4e30c4be
commit 8ec9807145
4 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/controller.cpp
View File

@ -1,7 +1,5 @@
#include "components/controller.hpp"
#include <uv.h>
#include <csignal>
#include <utility>
@ -152,7 +150,7 @@ void controller::conn_cb() {
}
shared_ptr<xcb_generic_event_t> evt{};
while ((evt = shared_ptr<xcb_generic_event_t>(xcb_poll_for_event(m_connection), free)) != nullptr) {
while ((evt = m_connection.poll_for_event()) != nullptr) {
try {
m_connection.dispatch_event(evt);
} catch (xpp::connection_error& err) {
@ -256,14 +254,25 @@ void controller::read_events(bool confwatch) {
start_modules();
auto& poll_handle = m_loop.handle<PollHandle>(m_connection.get_file_descriptor());
poll_handle.start(
auto& x_poll_handle = m_loop.handle<PollHandle>(m_connection.get_file_descriptor());
x_poll_handle.start(
UV_READABLE, [this](const auto&) { conn_cb(); },
[this](const auto& e) {
m_log.err("libuv error while polling X connection: "s + uv_strerror(e.status));
stop(false);
});
auto& x_prepare_handle = m_loop.handle<PrepareHandle>();
x_prepare_handle.start([this]() {
/*
* We have to also handle events in the prepare handle (which runs right
* before polling for IO) to process any already queued X events which
* wouldn't trigger the uv_poll handle.
*/
conn_cb();
m_connection.flush();
});
for (auto s : {SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGALRM}) {
auto& signal_handle = m_loop.handle<SignalHandle>();
signal_handle.start(s, [this](const auto& e) { signal_handler(e.signum); });