RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #199 from ianhattendorf/fix/backlight-disable-not-found 

Disable backlight module if no backlights found
pull/206/head
Alex 2019-03-01 09:31:49 +01:00 committed by GitHub
parent 0271e9bc1a ac6d833d4d
commit 2c411b9848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,7 +5,7 @@ vgcore.*
*.swp
packagecache
/subprojects/**/
/build
/build*
/dist
/meson.egg-info

28
src/modules/backlight.cpp
View File

@ -104,6 +104,18 @@ waybar::modules::Backlight::Backlight(const std::string &name,
config["device"].isString() ? config["device"].asString() : "") {
label_.set_name("backlight");
// Get initial state
{
std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
check_nn(udev_check.get(), "Udev check new failed");
enumerate_devices(devices_.begin(), devices_.end(),
std::back_inserter(devices_), udev_check.get());
if (devices_.empty()) {
throw std::runtime_error("No backlight found");
}
dp.emit();
}
udev_thread_ = [this] {
std::unique_ptr<udev, UdevDeleter> udev{udev_new()};
check_nn(udev.get(), "Udev new failed");
@ -129,22 +141,6 @@ waybar::modules::Backlight::Backlight(const std::string &name,
"epoll_ctl failed: {}");
epoll_event events[EPOLL_MAX_EVENTS];
// Get initial state
{
decltype(devices_) devices;
{
std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
devices = devices_;
}
enumerate_devices(devices.begin(), devices.end(),
std::back_inserter(devices), udev.get());
{
std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
devices_ = devices;
}
dp.emit();
}
while (udev_thread_.isRunning()) {
const int event_count =
epoll_wait(epoll_fd.get(), events, EPOLL_MAX_EVENTS,