Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/include/display_device/retry_scheduler.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ namespace display_device {
}

try {
SchedulerStopToken scheduler_stop_token {[&]() {
SchedulerStopToken scheduler_stop_token {[this]() {
clearThreadLoopUnlocked();
}};
m_retry_function(*m_iface, scheduler_stop_token);
Expand DownExpand Up@@ -232,7 +232,7 @@ namespace display_device {
}

std::lock_guard lock {m_mutex};
SchedulerStopToken stop_token {[&]() {
SchedulerStopToken stop_token {[this]() {
stopUnlocked();
}};

Expand Down
23 changes: 13 additions & 10 deletions src/windows/settings_manager_apply.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,17 +221,18 @@ namespace display_device {
}
}

const auto try_change {[&](const std::string &new_device, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_primary_device, &dd_api, &guard_fn, &system_settings_touched](const std::string &new_device, const auto info_preamble, const auto error_log) {
if (current_primary_device != new_device) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_device);
if (!m_dd_api->setAsPrimary(new_device)) {
if (!dd_api.setAsPrimary(new_device)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::primaryGuardFn(*m_dd_api, current_primary_device);
guard_fn = win_utils::primaryGuardFn(dd_api, current_primary_device);
}

return true;
Expand DownExpand Up@@ -275,10 +276,11 @@ namespace display_device {
}
}

const auto try_change {[&](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_display_modes, &dd_api, &guard_fn, &new_state, &system_settings_touched](const DeviceDisplayModeMap &new_modes, const auto info_preamble, const auto error_log) {
if (current_display_modes != new_modes) {
DD_LOG(info) << info_preamble << toJson(new_modes);
if (!m_dd_api->setDisplayModes(new_modes)) {
if (!dd_api.setDisplayModes(new_modes)) {
system_settings_touched = true;
DD_LOG(error) << error_log;
return false;
Expand All@@ -287,9 +289,9 @@ namespace display_device {
// It is possible that the display modes will not actually change even though the "current != new" condition is true.
// This is because of some additional internal checks that determine whether the change is actually needed.
// Therefore we should check the current display modes after the fact!
if (current_display_modes != m_dd_api->getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
if (current_display_modes != dd_api.getCurrentDisplayModes(win_utils::flattenTopology(new_state.m_modified.m_topology))) {
system_settings_touched = true;
guard_fn = win_utils::modeGuardFn(*m_dd_api, current_display_modes);
guard_fn = win_utils::modeGuardFn(dd_api, current_display_modes);
}
}

Expand DownExpand Up@@ -336,17 +338,18 @@ namespace display_device {
}
}

const auto try_change {[&](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
auto &dd_api {*m_dd_api};
const auto try_change {[&current_hdr_states, &dd_api, &guard_fn, &system_settings_touched](const HdrStateMap &new_states, const auto info_preamble, const auto error_log) {
if (current_hdr_states != new_states) {
system_settings_touched = true;

DD_LOG(info) << info_preamble << toJson(new_states);
if (!m_dd_api->setHdrStates(new_states)) {
if (!dd_api.setHdrStates(new_states)) {
DD_LOG(error) << error_log;
return false;
}

guard_fn = win_utils::hdrStateGuardFn(*m_dd_api, current_hdr_states);
guard_fn = win_utils::hdrStateGuardFn(dd_api, current_hdr_states);
}

return true;
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/general/test_retry_scheduler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ TEST_F_S(Schedule, SchedulingDurations) {
// Note: in this test we care that the delay is not less than the requested one, but we
// do not really have an upper ceiling...

const auto schedule_and_get_average_delays {[&](const std::vector<std::chrono::milliseconds> &durations) {
const auto schedule_and_get_average_delays {[this](const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
});
Expand DownExpand Up@@ -152,7 +152,7 @@ TEST_F_S(Schedule, SchedulerInteruptAndReplacement) {
}

TEST_F_S(Schedule, StoppedImmediately) {
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([](auto, auto &stop_token) {
stop_token.requestStop();
},
{.m_sleep_durations = {1000ms}});
Expand All@@ -169,7 +169,7 @@ TEST_F_S(Schedule, Execution, Immediate) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -211,7 +211,7 @@ TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -253,7 +253,7 @@ TEST_F_S(Schedule, Execution, ScheduledOnly) {
int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&](auto, auto &stop_token) {
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;
Expand DownExpand Up@@ -290,7 +290,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
auto &logger {display_device::Logger::get()};

int counter_a {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_a](auto, auto &) {
counter_a++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -304,7 +304,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
});

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
},
{.m_sleep_durations = {1ms}});
Expand All@@ -313,7 +313,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

// Verify that scheduler still works
int counter_b {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter_b](auto, auto &) {
counter_b++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -335,7 +335,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

bool first_call {true};
EXPECT_EQ(output, "");
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
}
Expand All@@ -350,7 +350,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {

// Verify that scheduler still works
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -381,7 +381,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {

TEST_F_S(Execute, SchedulerNotStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -391,7 +391,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -410,7 +410,7 @@ TEST_F_S(Execute, SchedulerNotStopped) {

TEST_F_S(Execute, SchedulerStopped) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -420,7 +420,7 @@ TEST_F_S(Execute, SchedulerStopped) {

int counter_before_sleep {0};
int counter_after_sleep {0};
m_impl.execute([&](auto, auto &stop_token) {
m_impl.execute([&counter, &counter_after_sleep, &counter_before_sleep](auto, auto &stop_token) {
counter_before_sleep = counter;
std::this_thread::sleep_for(15ms);
counter_after_sleep = counter;
Expand All@@ -440,7 +440,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -454,7 +454,7 @@ TEST_F_S(Execute, SchedulerStopped, ExceptThatItWasNotRunning) {

TEST_F_S(Execute, ExceptionThrown) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -477,7 +477,7 @@ TEST_F_S(Execute, ExceptionThrown) {

TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -501,7 +501,7 @@ TEST_F_S(Execute, ExceptionThrown, BeforeStopToken) {

TEST_F_S(Execute, ExceptionThrown, AfterStopToken) {
int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand DownExpand Up@@ -612,7 +612,7 @@ TEST_F_S(Stop) {
EXPECT_FALSE(m_impl.isScheduled());

int counter {0};
m_impl.schedule([&](auto, auto &) {
m_impl.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand All@@ -630,7 +630,7 @@ TEST_F_S(ThreadCleanupInDestructor) {
{
display_device::RetryScheduler<TestIface> scheduler {std::make_unique<TestIface>()};

scheduler.schedule([&](auto, auto &) {
scheduler.schedule([&counter](auto, auto &) {
counter++;
},
{.m_sleep_durations = {1ms}});
Expand Down
Loading