mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-07 14:06:00 +01:00
Merge pull request #661 from Ongy/wlr_idle_events
move activity_notify into events in wlr_idle
This commit is contained in:
commit
41c272b77a
2 changed files with 6 additions and 4 deletions
|
@ -19,7 +19,9 @@ struct wlr_idle {
|
||||||
struct wl_event_loop *event_loop;
|
struct wl_event_loop *event_loop;
|
||||||
|
|
||||||
struct wl_listener display_destroy;
|
struct wl_listener display_destroy;
|
||||||
|
struct {
|
||||||
struct wl_signal activity_notify;
|
struct wl_signal activity_notify;
|
||||||
|
} events;
|
||||||
|
|
||||||
void *data;
|
void *data;
|
||||||
};
|
};
|
||||||
|
|
|
@ -122,7 +122,7 @@ static void create_idle_timer(struct wl_client *client,
|
||||||
wl_signal_add(&timer->seat->events.destroy, &timer->seat_destroy);
|
wl_signal_add(&timer->seat->events.destroy, &timer->seat_destroy);
|
||||||
|
|
||||||
timer->input_listener.notify = handle_input_notification;
|
timer->input_listener.notify = handle_input_notification;
|
||||||
wl_signal_add(&idle->activity_notify, &timer->input_listener);
|
wl_signal_add(&idle->events.activity_notify, &timer->input_listener);
|
||||||
// create the timer
|
// create the timer
|
||||||
timer->idle_source =
|
timer->idle_source =
|
||||||
wl_event_loop_add_timer(idle->event_loop, idle_notify, timer);
|
wl_event_loop_add_timer(idle->event_loop, idle_notify, timer);
|
||||||
|
@ -181,7 +181,7 @@ struct wlr_idle *wlr_idle_create(struct wl_display *display) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
wl_list_init(&idle->idle_timers);
|
wl_list_init(&idle->idle_timers);
|
||||||
wl_signal_init(&idle->activity_notify);
|
wl_signal_init(&idle->events.activity_notify);
|
||||||
|
|
||||||
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) {
|
||||||
|
@ -204,5 +204,5 @@ struct wlr_idle *wlr_idle_create(struct wl_display *display) {
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
||||||
wlr_signal_emit_safe(&idle->activity_notify, seat);
|
wlr_signal_emit_safe(&idle->events.activity_notify, seat);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue