Skip to content
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

Jump to bottom

fix(src/modules): fixed backlight module starting on wayland compositor not supporting Screen module protocol #286

Merged
merged 2 commits into from
Dec 1, 2023
Merged

fix(src/modules): fixed backlight module starting on wayland compositor not supporting Screen module protocol #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46cb8da
fix(src/modules): fixed backlight module starting on wayland composit…
FedeDP Nov 30, 2023
1b5d239
chore: updated todo.
FedeDP Nov 30, 2023
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
3 changes: 3 additions & 0 deletions TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## 4.11

- [x] Fix running where Screen is not supported (ie: wayland compositors that do not support the protocol)
- [x] do not skip access check for OLD CONFIG.

## 5.0

### Generic
Expand Down
2 changes: 1 addition & 1 deletion src/modules/gamma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ static void init(void) {
M_SUB(DAYTIME_UPD);
M_SUB(NEXT_DAYEVT_UPD);
M_SUB(SUSPEND_UPD);
m_become(waiting_daytime);

// Store current temperature to later restore it if requested
SYSBUS_ARG_REPLY(args, parse_bus_reply, &initial_temp, CLIGHTD_SERVICE, "/org/clightd/clightd/Gamma", "org.clightd.clightd.Gamma", "Get");
Expand All @@ -62,6 +61,7 @@ static void init(void) {
WARN("Failed to init. Killing module.\n");
module_deregister((self_t **)&self());
} else {
m_become(waiting_daytime);
init_Gamma_api();
}
}
Expand Down
35 changes: 18 additions & 17 deletions src/modules/screen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

static void receive_waiting_state(const msg_t *msg, UNUSED const void *userdata);
static int parse_bus_reply(sd_bus_message *reply, const char *member, void *userdata);
static int get_screen_brightness(void);
static int get_screen_brightness(bool emit);
static void timeout_callback(int old_val, bool reset);
static void pause_screen(bool pause, enum mod_pause type, bool reset_screen_br);
static int set_contrib(sd_bus *bus, const char *path, const char *interface, const char *property,
Expand Down Expand Up @@ -38,10 +38,15 @@ static void init(void) {
M_SUB(NO_AUTOCALIB_UPD);
M_SUB(INHIBIT_UPD);
M_SUB(CONTRIB_REQ);

m_become(waiting_state);

init_Screen_api();

if (get_screen_brightness(false) != 0) {
// We are on an unsupported wayland compositor; kill ourself immediately without further message processing
WARN("Failed to init. Killing module.\n");
module_deregister((self_t **)&self());
} else {
m_become(waiting_state);
init_Screen_api();
}
}

static bool check(void) {
Expand All @@ -62,12 +67,6 @@ static void destroy(void) {
static void receive_waiting_state(const msg_t *msg, UNUSED const void *userdata) {
switch (MSG_TYPE()) {
case UPOWER_UPD: {
if (get_screen_brightness() != 0) {
WARN("Failed to init. Killing module.\n");
module_deregister((self_t **)&self());
return;
}

m_unbecome();

/* Start paused if screen timeout for current ac state is <= 0 */
Expand All @@ -89,12 +88,12 @@ static void receive(const msg_t *msg, UNUSED const void *userdata) {
case AMBIENT_BR_UPD:
pause_screen(state.ambient_br < conf.bl_conf.shutter_threshold, CLOGGED, false);
if (!paused_state) {
get_screen_brightness();
get_screen_brightness(true);
}
break;
case FD_UPD:
read_timer(screen_fd);
get_screen_brightness();
get_screen_brightness(true);
set_timeout(conf.screen_conf.timeout[state.ac_state], 0, screen_fd, 0);
break;
case UPOWER_UPD: {
Expand Down Expand Up @@ -156,21 +155,23 @@ static void receive(const msg_t *msg, UNUSED const void *userdata) {
static int parse_bus_reply(sd_bus_message *reply, const char *member, void *userdata) {
int r = -EINVAL;
if (!strcmp(member, "GetEmittedBrightness")) {
r = sd_bus_message_read(reply, "d", &state.screen_br);
r = sd_bus_message_read(reply, "d", userdata);
}
return r;
}

static int get_screen_brightness(void) {
static int get_screen_brightness(bool emit) {
if (paused_state) {
return 0;
}

SYSBUS_ARG_REPLY(args, parse_bus_reply, NULL, CLIGHTD_SERVICE, "/org/clightd/clightd/Screen", "org.clightd.clightd.Screen", "GetEmittedBrightness");
double new_br = 0.0f;
SYSBUS_ARG_REPLY(args, parse_bus_reply, &new_br, CLIGHTD_SERVICE, "/org/clightd/clightd/Screen", "org.clightd.clightd.Screen", "GetEmittedBrightness");

screen_msg.bl.old = state.screen_br;
int ret = call(&args, "ss", fetch_display(), fetch_env());
if (ret == 0) {
if (ret == 0 && emit) {
state.screen_br = new_br;
screen_msg.bl.new = state.screen_br;
M_PUB(&screen_msg);
}
Expand Down