blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlr_idle: add helper to enable/disable all timers 

There was no way to tell wlr_idle to stop processing input events
and rearm timers all the time, such an API is required to have
some form of idle inhibitor.
This commit is contained in:
Dominique Martinet 2018-06-27 19:19:56 +09:00
parent 159835de24
commit d0b902b962
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wlr/types/wlr_idle.h
View File

@ -17,6 +17,7 @@ struct wlr_idle {
struct wl_global *wl_global; struct wl_global *wl_global;
struct wl_list idle_timers; // wlr_idle_timeout::link struct wl_list idle_timers; // wlr_idle_timeout::link
struct wl_event_loop *event_loop; struct wl_event_loop *event_loop;
bool enabled;
struct wl_listener display_destroy; struct wl_listener display_destroy;
struct { struct {
@ -33,6 +34,7 @@ struct wlr_idle_timeout {
struct wl_event_source *idle_source; struct wl_event_source *idle_source;
bool idle_state; bool idle_state;
bool enabled;
uint32_t timeout; // milliseconds uint32_t timeout; // milliseconds
struct wl_listener input_listener; struct wl_listener input_listener;
@ -50,4 +52,11 @@ void wlr_idle_destroy(struct wlr_idle *idle);
* compositor when there is an user activity event on that seat. * compositor when there is an user activity event on that seat.
*/ */
void wlr_idle_notify_activity(struct wlr_idle *idle, struct wlr_seat *seat); void wlr_idle_notify_activity(struct wlr_idle *idle, struct wlr_seat *seat);
/**
* Enable or disable timers for a given idle resource by seat.
* Passing a NULL seat means update timers for all seats.
*/
void wlr_idle_set_enabled(struct wlr_idle *idle, struct wlr_seat *seat,
bool enabled);
#endif #endif

31
types/wlr_idle.c
View File

@ -33,6 +33,9 @@ static int idle_notify(void *data) {
} }
static void handle_activity(struct wlr_idle_timeout *timer) { static void handle_activity(struct wlr_idle_timeout *timer) {
if (!timer->enabled) {
return;
}
// rearm the timer // rearm the timer
wl_event_source_timer_update(timer->idle_source, timer->timeout); wl_event_source_timer_update(timer->idle_source, timer->timeout);
// in case the previous state was sleeping send a resume event and switch state // in case the previous state was sleeping send a resume event and switch state
@ -106,6 +109,7 @@ static void create_idle_timer(struct wl_client *client,
timer->seat = client_seat->seat; timer->seat = client_seat->seat;
timer->timeout = timeout; timer->timeout = timeout;
timer->idle_state = false; timer->idle_state = false;
timer->enabled = idle->enabled;
timer->resource = wl_resource_create(client, timer->resource = wl_resource_create(client,
&org_kde_kwin_idle_timeout_interface, &org_kde_kwin_idle_timeout_interface,
wl_resource_get_version(idle_resource), id); wl_resource_get_version(idle_resource), id);
@ -135,14 +139,36 @@ static void create_idle_timer(struct wl_client *client,
wl_resource_post_no_memory(idle_resource); wl_resource_post_no_memory(idle_resource);
return; return;
} }
// arm the timer if (timer->enabled) {
wl_event_source_timer_update(timer->idle_source, timer->timeout); // arm the timer
wl_event_source_timer_update(timer->idle_source, timer->timeout);
}
} }
static const struct org_kde_kwin_idle_interface idle_impl = { static const struct org_kde_kwin_idle_interface idle_impl = {
.get_idle_timeout = create_idle_timer, .get_idle_timeout = create_idle_timer,
}; };
void wlr_idle_set_enabled(struct wlr_idle *idle, struct wlr_seat *seat,
bool enabled) {
if (idle->enabled == enabled) {
return;
}
wlr_log(L_DEBUG, "%s idle timers for %s",
enabled ? "Enabling" : "Disabling",
seat ? seat->name : "all seats");
idle->enabled = enabled;
struct wlr_idle_timeout *timer;
wl_list_for_each(timer, &idle->idle_timers, link) {
if (seat != NULL && timer->seat != seat) {
continue;
}
int timeout = enabled ? timer->timeout : 0;
wl_event_source_timer_update(timer->idle_source, timeout);
timer->enabled = enabled;
}
}
static void idle_bind(struct wl_client *wl_client, void *data, static void idle_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) { uint32_t version, uint32_t id) {
struct wlr_idle *idle = data; struct wlr_idle *idle = data;
@ -182,6 +208,7 @@ struct wlr_idle *wlr_idle_create(struct wl_display *display) {
} }
wl_list_init(&idle->idle_timers); wl_list_init(&idle->idle_timers);
wl_signal_init(&idle->events.activity_notify); wl_signal_init(&idle->events.activity_notify);
idle->enabled = true;
idle->event_loop = wl_display_get_event_loop(display); idle->event_loop = wl_display_get_event_loop(display);
if (idle->event_loop == NULL) { if (idle->event_loop == NULL) {