isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: add input device handling too

Browse Source 
Use the new hook in clutter-evdev to ask weston-launch for the
FDs of the input devices we need.

https://bugzilla.gnome.org/show_bug.cgi?id=705861
This commit is contained in:
Giovanni Campagna 2013-07-15 18:39:32 +02:00
parent a83049c103
commit 045d03014d
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/wayland/meta-wayland.c
View File

@ -24,6 +24,7 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/wayland/clutter-wayland-compositor.h> #include <clutter/wayland/clutter-wayland-compositor.h>
#include <clutter/wayland/clutter-wayland-surface.h> #include <clutter/wayland/clutter-wayland-surface.h>
#include <clutter/evdev/clutter-evdev.h>
#include <glib.h> #include <glib.h>
#include <sys/time.h> #include <sys/time.h>
@ -1406,6 +1407,8 @@ on_our_vt_enter (MetaTTY *tty,
g_warning ("Failed to become DRM master: %s", error->message); g_warning ("Failed to become DRM master: %s", error->message);
g_error_free (error); g_error_free (error);
} }
clutter_evdev_reclaim_devices ();
} }
static void static void
@ -1422,7 +1425,19 @@ on_our_vt_leave (MetaTTY *tty,
g_error_free (error); g_error_free (error);
} }
/* FIXME: we must release input devices as well! */ clutter_evdev_release_devices ();
}
static int
on_evdev_device_open (const char *path,
int flags,
gpointer user_data,
GError **error)
{
MetaWaylandCompositor *compositor = user_data;
return meta_weston_launch_open_input_device (compositor->weston_launch,
path, flags, error);
} }
void void
@ -1433,6 +1448,7 @@ meta_wayland_init (void)
ClutterBackend *backend; ClutterBackend *backend;
CoglContext *cogl_context; CoglContext *cogl_context;
CoglRenderer *cogl_renderer; CoglRenderer *cogl_renderer;
int weston_launch_fd;
memset (compositor, 0, sizeof (MetaWaylandCompositor)); memset (compositor, 0, sizeof (MetaWaylandCompositor));
@ -1469,6 +1485,13 @@ meta_wayland_init (void)
clutter_wayland_set_compositor_display (compositor->wayland_display); clutter_wayland_set_compositor_display (compositor->wayland_display);
/* We need to set this before clutter_init(), so we do it unconditionally.
It doesn't harm anyway to do it under X11 */
weston_launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
if (weston_launch_fd >= 0)
compositor->weston_launch = g_socket_new_from_fd (weston_launch_fd, NULL);
clutter_evdev_set_open_callback (on_evdev_device_open, compositor);
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
g_error ("Failed to initialize Clutter"); g_error ("Failed to initialize Clutter");
@ -1484,12 +1507,6 @@ meta_wayland_init (void)
if (compositor->drm_fd >= 0) if (compositor->drm_fd >= 0)
{ {
/* Running on bare metal, let's initalize DRM master and VT handling */ /* Running on bare metal, let's initalize DRM master and VT handling */
int weston_launch_fd;
weston_launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
if (weston_launch_fd >= 0)
compositor->weston_launch = g_socket_new_from_fd (weston_launch_fd, NULL);
compositor->tty = meta_tty_new (); compositor->tty = meta_tty_new ();
if (compositor->tty) if (compositor->tty)
{ {