fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-31 15:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: The compositor is now jiust a regular global object

Browse source 
We have to provide our own bind callback and add a wlsc_compositor pointer
to wlsc_input_device, but on the whole it's nice cleanup.
This commit is contained in:
Kristian Høgsberg 2011-11-23 10:39:34 -05:00 • committed by Jonas Ådahl
parent 32a940e01a
commit fb0da2d026
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compositor/evdev.c
View file

@ -226,8 +226,7 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
struct evdev_motion_accumulator accumulator;
uint32_t time;
ec = (struct wlsc_compositor *)
device->master->base.input_device.compositor;
ec = device->master->base.compositor;
if (!ec->focus)
return 1;
@ -344,7 +343,7 @@ evdev_input_device_create(struct evdev_input *master,
if (device == NULL)
return NULL;
ec = (struct wlsc_compositor *) master->base.input_device.compositor;
ec = master->base.compositor;
device->output =
container_of(ec->output_list.next, struct wlsc_output, link);
@ -394,7 +393,7 @@ device_added(struct udev_device *udev_device, struct evdev_input *master)
if (strcmp(device_seat, master->seat_id))
return;
c = (struct wlsc_compositor *) master->base.input_device.compositor;
c = master->base.compositor;
devnode = udev_device_get_devnode(udev_device);
if (evdev_input_device_create(master, c->wl_display, devnode))
fprintf(stderr, "evdev input device: added: %s\n", devnode);
@ -450,8 +449,7 @@ static int
evdev_config_udev_monitor(struct udev *udev, struct evdev_input *master)
{
struct wl_event_loop *loop;
struct wlsc_compositor *c =
(struct wlsc_compositor *) master->base.input_device.compositor;
struct wlsc_compositor *c = master->base.compositor;
master->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
if (!master->udev_monitor)