Skip to content

fix(backlight2): signal smooth adjustment completion explicitly instead of zeroing target_pct #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmanam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(backlight2): signal smooth adjustment completion explicitly instead of zeroing target_pct #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions src/modules/backlight2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ static void bl_dtor(void *data);
map_ret_code get_backlight(void *userdata, const char *key, void *data);

/* Setters */
static int set_backlight_value(bl_t *bl, double *target_pct, double smooth_step);
static int set_backlight_value(bl_t *bl, double *target_pct, double smooth_step, bool *reached);
static map_ret_code set_backlight(void *userdata, const char *key, void *data);

/* Helper methods */
Expand Down Expand Up @@ -117,7 +117,8 @@ static void receive(const msg_t *msg, const void *userdata) {
bl_t *bl = (bl_t *)ptr;
read(bl->smooth->fd, &t, sizeof(uint64_t));

int ret = set_backlight_value(bl, &bl->smooth->params.target_pct, bl->smooth->params.step);
bool reached = false;
int ret = set_backlight_value(bl, &bl->smooth->params.target_pct, bl->smooth->params.step, &reached);
if (ret != 0) {
m_log("failed to set backlight for %s\n", bl->sn);
/*
Expand All @@ -126,7 +127,7 @@ static void receive(const msg_t *msg, const void *userdata) {
* but they fail instead, leaving us to an infinite loop.
*/
stop_smooth(bl);
} else if (bl->smooth->params.target_pct == 0) {
} else if (reached) {
/* set_backlight_value advised us to stop smoothing as it ended */
stop_smooth(bl);
}
Expand Down Expand Up @@ -218,7 +219,7 @@ map_ret_code get_backlight(void *userdata, const char *key, void *data) {
}

/* Set a target_pct eventually computing smooth step */
static int set_backlight_value(bl_t *bl, double *target_pct, double smooth_step) {
static int set_backlight_value(bl_t *bl, double *target_pct, double smooth_step, bool *reached) {
const double next_pct = next_backlight_pct(bl, target_pct, smooth_step);
const int value = (int)round(bl->max * next_pct);
int ret = bl->plugin->set(bl, value);
Expand All @@ -234,7 +235,7 @@ static int set_backlight_value(bl_t *bl, double *target_pct, double smooth_step)
}
if (next_pct == *target_pct) {
m_log("%s reached target backlight: %.2lf.\n", bl->sn, next_pct);
*target_pct = 0; // eventually disable smooth (if called by set_backlight and not by timerfd)
*reached = true;
}
return ret;
}
Expand All @@ -247,9 +248,11 @@ static map_ret_code set_backlight(void *userdata, const char *key, void *data) {

stop_smooth(bl);

bool reached = false;
const bool needs_smooth = is_smooth(&params);
if (set_backlight_value(bl, &params.target_pct, needs_smooth ? params.step : 0) == 0) {
if (needs_smooth) {
if (set_backlight_value(bl, &params.target_pct, needs_smooth ? params.step : 0, &reached) == 0) {
/* only continue if there's something left to smooth */
if (needs_smooth && !reached) {
bl->smooth = calloc(1, sizeof(smooth_t));
if (bl->smooth) {
memcpy(&bl->smooth->params, &params, sizeof(smooth_params_t));
Expand Down