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

controller: Keep only eventloop in try-catch

Browse Source 
If an exception is thrown earlier, stopping the eventloop produces an
error.
This commit is contained in:
patrick96 2022-03-16 22:18:18 +01:00
parent 9b1afe7369
commit 6043f856b6
No known key found for this signature in database
GPG Key ID: 521E5E03AEBCA1A7
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/x11/background_manager.hpp
View File

@ -16,7 +16,7 @@ class logger;
namespace cairo {
class surface;
class xcb_surface;
} // namespace cairo
} // namespace cairo
class bg_slice {
public:
@ -31,7 +31,7 @@ class bg_slice {
*
* This function is fast, since the current desktop background is cached.
*/
cairo::surface* get_surface() const {
cairo::xcb_surface* get_surface() const {
return m_surface.get();
}

70
src/components/controller.cpp
View File

@ -238,45 +238,45 @@ void controller::screenshot_handler() {
void controller::read_events(bool confwatch) {
m_log.info("Entering event loop (thread-id=%lu)", this_thread::get_id());
try {
auto& poll_handle = m_loop.handle<PollHandle>(m_connection.get_file_descriptor());
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);
if (!m_writeback) {
m_bar->start();
}
auto& poll_handle = m_loop.handle<PollHandle>(m_connection.get_file_descriptor());
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);
});
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); });
}
if (confwatch) {
auto& fs_event_handle = m_loop.handle<FSEventHandle>();
fs_event_handle.start(
m_conf.filepath(), 0, [this](const auto& e) { confwatch_handler(e.path); },
[this, &fs_event_handle](const auto& e) {
m_log.err("libuv error while watching config file for changes: %s", uv_strerror(e.status));
fs_event_handle.close();
});
}
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); });
}
if (!m_snapshot_dst.empty()) {
// Trigger a single screenshot after 3 seconds
auto& timer_handle = m_loop.handle<TimerHandle>();
timer_handle.start(3000, 0, [this]() { screenshot_handler(); });
}
if (confwatch) {
auto& fs_event_handle = m_loop.handle<FSEventHandle>();
fs_event_handle.start(
m_conf.filepath(), 0, [this](const auto& e) { confwatch_handler(e.path); },
[this, &fs_event_handle](const auto& e) {
m_log.err("libuv error while watching config file for changes: %s", uv_strerror(e.status));
fs_event_handle.close();
});
}
if (!m_snapshot_dst.empty()) {
// Trigger a single screenshot after 3 seconds
auto& timer_handle = m_loop.handle<TimerHandle>();
timer_handle.start(3000, 0, [this]() { screenshot_handler(); });
}
if (!m_writeback) {
m_bar->start();
}
/*
* Immediately trigger and update so that the bar displays something.
*/
trigger_update(true);
/*
* Immediately trigger and update so that the bar displays something.
*/
trigger_update(true);
try {
m_loop.run();
} catch (const exception& err) {
m_log.err("Fatal Error in eventloop: %s", err.what());

2
src/x11/tray_manager.cpp
View File

@ -387,7 +387,7 @@ void tray_manager::reconfigure_bg() {
return m_log.err("tray: no context for drawing the background");
}
cairo::surface* surface = m_bg_slice->get_surface();
cairo::xcb_surface* surface = m_bg_slice->get_surface();
if (!surface) {
return m_log.err("tray: no root surface");
}