|
|
@ -12,7 +12,7 @@
|
|
|
|
static void destroy_inhibitor(struct sway_idle_inhibitor_v1 *inhibitor) {
|
|
|
|
static void destroy_inhibitor(struct sway_idle_inhibitor_v1 *inhibitor) {
|
|
|
|
wl_list_remove(&inhibitor->link);
|
|
|
|
wl_list_remove(&inhibitor->link);
|
|
|
|
wl_list_remove(&inhibitor->destroy.link);
|
|
|
|
wl_list_remove(&inhibitor->destroy.link);
|
|
|
|
sway_idle_inhibit_v1_check_active(inhibitor->manager);
|
|
|
|
sway_idle_inhibit_v1_check_active();
|
|
|
|
free(inhibitor);
|
|
|
|
free(inhibitor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -35,7 +35,6 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inhibitor->manager = manager;
|
|
|
|
|
|
|
|
inhibitor->mode = INHIBIT_IDLE_APPLICATION;
|
|
|
|
inhibitor->mode = INHIBIT_IDLE_APPLICATION;
|
|
|
|
inhibitor->wlr_inhibitor = wlr_inhibitor;
|
|
|
|
inhibitor->wlr_inhibitor = wlr_inhibitor;
|
|
|
|
wl_list_insert(&manager->inhibitors, &inhibitor->link);
|
|
|
|
wl_list_insert(&manager->inhibitors, &inhibitor->link);
|
|
|
@ -43,33 +42,34 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
|
|
|
|
inhibitor->destroy.notify = handle_destroy;
|
|
|
|
inhibitor->destroy.notify = handle_destroy;
|
|
|
|
wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy);
|
|
|
|
wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy);
|
|
|
|
|
|
|
|
|
|
|
|
sway_idle_inhibit_v1_check_active(manager);
|
|
|
|
sway_idle_inhibit_v1_check_active();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sway_idle_inhibit_v1_user_inhibitor_register(struct sway_view *view,
|
|
|
|
void sway_idle_inhibit_v1_user_inhibitor_register(struct sway_view *view,
|
|
|
|
enum sway_idle_inhibit_mode mode) {
|
|
|
|
enum sway_idle_inhibit_mode mode) {
|
|
|
|
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
|
|
|
|
|
|
|
|
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor =
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor =
|
|
|
|
calloc(1, sizeof(struct sway_idle_inhibitor_v1));
|
|
|
|
calloc(1, sizeof(struct sway_idle_inhibitor_v1));
|
|
|
|
if (!inhibitor) {
|
|
|
|
if (!inhibitor) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inhibitor->manager = server.idle_inhibit_manager_v1;
|
|
|
|
|
|
|
|
inhibitor->mode = mode;
|
|
|
|
inhibitor->mode = mode;
|
|
|
|
inhibitor->view = view;
|
|
|
|
inhibitor->view = view;
|
|
|
|
wl_list_insert(&inhibitor->manager->inhibitors, &inhibitor->link);
|
|
|
|
wl_list_insert(&manager->inhibitors, &inhibitor->link);
|
|
|
|
|
|
|
|
|
|
|
|
inhibitor->destroy.notify = handle_destroy;
|
|
|
|
inhibitor->destroy.notify = handle_destroy;
|
|
|
|
wl_signal_add(&view->events.unmap, &inhibitor->destroy);
|
|
|
|
wl_signal_add(&view->events.unmap, &inhibitor->destroy);
|
|
|
|
|
|
|
|
|
|
|
|
sway_idle_inhibit_v1_check_active(inhibitor->manager);
|
|
|
|
sway_idle_inhibit_v1_check_active();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
|
|
|
|
struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
|
|
|
|
struct sway_view *view) {
|
|
|
|
struct sway_view *view) {
|
|
|
|
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
|
|
|
|
wl_list_for_each(inhibitor, &manager->inhibitors, link) {
|
|
|
|
link) {
|
|
|
|
|
|
|
|
if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
|
|
|
|
if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
|
|
|
|
inhibitor->view == view) {
|
|
|
|
inhibitor->view == view) {
|
|
|
|
return inhibitor;
|
|
|
|
return inhibitor;
|
|
|
@ -80,9 +80,9 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
|
|
|
|
|
|
|
|
|
|
|
|
struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_view(
|
|
|
|
struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_view(
|
|
|
|
struct sway_view *view) {
|
|
|
|
struct sway_view *view) {
|
|
|
|
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
|
|
|
|
wl_list_for_each(inhibitor, &manager->inhibitors, link) {
|
|
|
|
link) {
|
|
|
|
|
|
|
|
if (inhibitor->mode == INHIBIT_IDLE_APPLICATION &&
|
|
|
|
if (inhibitor->mode == INHIBIT_IDLE_APPLICATION &&
|
|
|
|
view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) {
|
|
|
|
view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) {
|
|
|
|
return inhibitor;
|
|
|
|
return inhibitor;
|
|
|
@ -131,8 +131,8 @@ bool sway_idle_inhibit_v1_is_active(struct sway_idle_inhibitor_v1 *inhibitor) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sway_idle_inhibit_v1_check_active(
|
|
|
|
void sway_idle_inhibit_v1_check_active(void) {
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager) {
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
struct sway_idle_inhibitor_v1 *inhibitor;
|
|
|
|
bool inhibited = false;
|
|
|
|
bool inhibited = false;
|
|
|
|
wl_list_for_each(inhibitor, &manager->inhibitors, link) {
|
|
|
|
wl_list_for_each(inhibitor, &manager->inhibitors, link) {
|
|
|
@ -140,28 +140,22 @@ void sway_idle_inhibit_v1_check_active(
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
wlr_idle_set_enabled(manager->idle, NULL, !inhibited);
|
|
|
|
wlr_idle_set_enabled(server.idle, NULL, !inhibited);
|
|
|
|
wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited);
|
|
|
|
wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
|
|
|
|
bool sway_idle_inhibit_manager_v1_init(void) {
|
|
|
|
struct wl_display *wl_display, struct wlr_idle *idle) {
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
|
|
|
|
struct sway_idle_inhibit_manager_v1 *manager =
|
|
|
|
|
|
|
|
calloc(1, sizeof(struct sway_idle_inhibit_manager_v1));
|
|
|
|
|
|
|
|
if (!manager) {
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display);
|
|
|
|
manager->wlr_manager = wlr_idle_inhibit_v1_create(server.wl_display);
|
|
|
|
if (!manager->wlr_manager) {
|
|
|
|
if (!manager->wlr_manager) {
|
|
|
|
free(manager);
|
|
|
|
return false;
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
manager->idle = idle;
|
|
|
|
|
|
|
|
wl_signal_add(&manager->wlr_manager->events.new_inhibitor,
|
|
|
|
wl_signal_add(&manager->wlr_manager->events.new_inhibitor,
|
|
|
|
&manager->new_idle_inhibitor_v1);
|
|
|
|
&manager->new_idle_inhibitor_v1);
|
|
|
|
manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1;
|
|
|
|
manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1;
|
|
|
|
wl_list_init(&manager->inhibitors);
|
|
|
|
wl_list_init(&manager->inhibitors);
|
|
|
|
|
|
|
|
|
|
|
|
return manager;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|