compositor->state = ec->prev_state;
drm_compositor_set_modes(ec);
weston_compositor_damage_all(compositor);
- udev_input_enable(&ec->input, ec->udev);
+ udev_input_enable(&ec->input);
} else {
weston_log("deactivating session\n");
udev_input_disable(&ec->input);
weston_compositor_damage_all(&compositor->base);
- udev_input_enable(&compositor->input, compositor->udev);
+ udev_input_enable(&compositor->input);
} else {
weston_log("leaving VT\n");
udev_input_disable(&compositor->input);
weston_log("activating session\n");
compositor->base.state = compositor->prev_state;
weston_compositor_damage_all(&compositor->base);
- udev_input_enable(&compositor->input, compositor->udev);
+ udev_input_enable(&compositor->input);
} else {
weston_log("deactivating session\n");
udev_input_disable(&compositor->input);
}
int
-udev_input_enable(struct udev_input *input, struct udev *udev)
+udev_input_enable(struct udev_input *input)
{
struct wl_event_loop *loop;
struct weston_compositor *c = input->compositor;
int fd;
- input->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+ input->udev_monitor = udev_monitor_new_from_netlink(input->udev, "udev");
if (!input->udev_monitor) {
weston_log("udev: failed to create the udev monitor\n");
return -1;
return -1;
}
- if (udev_input_add_devices(input, udev) < 0)
+ if (udev_input_add_devices(input, input->udev) < 0)
return -1;
input->enabled = 1;
memset(input, 0, sizeof *input);
input->seat_id = strdup(seat_id);
input->compositor = c;
- if (udev_input_enable(input, udev) < 0)
+ input->udev = udev;
+ input->udev = udev_ref(udev);
+ if (udev_input_enable(input) < 0)
goto err;
return 0;
udev_input_disable(input);
wl_list_for_each_safe(seat, next, &input->compositor->seat_list, base.link)
udev_seat_destroy(seat);
+ udev_unref(input->udev);
free(input->seat_id);
}
};
struct udev_input {
+ struct udev *udev;
struct udev_monitor *udev_monitor;
struct wl_event_source *udev_monitor_source;
char *seat_id;
int enabled;
};
-int udev_input_enable(struct udev_input *input, struct udev *udev);
+int udev_input_enable(struct udev_input *input);
void udev_input_disable(struct udev_input *input);
int udev_input_init(struct udev_input *input,
struct weston_compositor *c,