morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

logind: fetch initial button state when device is registered late

Browse Source 
If buttons that are not initialized from startup due to still
being processed by udev, the initial state is not checked.
This commit is contained in:
Morgan
2025-12-04 11:20:38 +09:00
parent 450f4ed58a
commit 52ec8abc44
3 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/login/logind-core.c
View File

@@ -328,8 +328,8 @@ int manager_process_seat_device(Manager *m, sd_device *d) {
return 0;
}
int manager_process_button_device(Manager *m, sd_device *d) {
const char *sysname;
int manager_process_button_device(Manager *m, sd_device *d, Button **ret_button) {
const char *sysname, *sn;
Button *b;
int r;
@@ -340,29 +340,43 @@ int manager_process_button_device(Manager *m, sd_device *d) {
return r;
if (device_for_action(d, SD_DEVICE_REMOVE) ||
sd_device_has_current_tag(d, "power-switch") <= 0)
sd_device_has_current_tag(d, "power-switch") <= 0) {
button_free(hashmap_get(m->buttons, sysname));
else {
const char *sn;
r = manager_add_button(m, sysname, &b);
if (r < 0)
return r;
r = device_get_seat(d, &sn);
if (r < 0)
return r;
button_set_seat(b, sn);
r = button_open(b);
if (r < 0) /* event device doesn't have any keys or switches relevant to us? (or any other error
* opening the device?) let's close the button again. */
button_free(b);
goto no_match;
}
b = hashmap_get(m->buttons, sysname);
if (b)
goto no_match;
r = manager_add_button(m, sysname, &b);
if (r < 0)
return r;
r = device_get_seat(d, &sn);
if (r < 0)
return r;
button_set_seat(b, sn);
r = button_open(b);
if (r < 0) {
/* event device doesn't have any keys or switches relevant to us? (or any other error
* opening the device?) let's close the button again. */
button_free(b);
goto no_match;
}
if (ret_button)
*ret_button = b;
return 1;
no_match:
if (ret_button)
*ret_button = NULL;
return 0;
}

12
src/login/logind.c
View File

@@ -236,7 +236,7 @@ static int manager_enumerate_buttons(Manager *m) {
FOREACH_DEVICE(e, d) {
if (device_is_processed(d) <= 0)
continue;
RET_GATHER(r, manager_process_button_device(m, d));
RET_GATHER(r, manager_process_button_device(m, d, /* ret_button= */ NULL));
}
return r;
@@ -739,10 +739,18 @@ static int manager_dispatch_vcsa_udev(sd_device_monitor *monitor, sd_device *dev
static int manager_dispatch_button_udev(sd_device_monitor *monitor, sd_device *device, void *userdata) {
Manager *m = ASSERT_PTR(userdata);
Button *b;
int r;
assert(device);
manager_process_button_device(m, device);
r = manager_process_button_device(m, device, &b);
if (r < 0)
return 0;
if (r > 0)
(void) button_check_switches(b);
return 0;
}

2
src/login/logind.h
View File

@@ -153,7 +153,7 @@ int manager_add_user_by_uid(Manager *m, uid_t uid, User **ret_user);
int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **ret_inhibitor);
int manager_process_seat_device(Manager *m, sd_device *d);
int manager_process_button_device(Manager *m, sd_device *d);
int manager_process_button_device(Manager *m, sd_device *d, Button **ret_button);
int manager_spawn_autovt(Manager *m, unsigned vtnr);