diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-05-06 23:16:10 +0200 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-05-06 23:17:11 +0200 |
| commit | f2de6c7ba006f4db3379632a9b0895b17d0c0285 (patch) | |
| tree | 840bed36b987fef37443cf883debdb50cee2183f /compositor | |
| parent | 4721a3c9129a35cfb864bff857e66459fb560df2 (diff) | |
compositor-openwfd: Update to tty, cursor and cflags changes
Diffstat (limited to 'compositor')
| -rw-r--r-- | compositor/compositor-openwfd.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/compositor/compositor-openwfd.c b/compositor/compositor-openwfd.c index f561e35..0ddde52 100644 --- a/compositor/compositor-openwfd.c +++ b/compositor/compositor-openwfd.c @@ -16,6 +16,8 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -163,7 +165,7 @@ wfd_output_prepare_scanout_surface(struct wlsc_output *output_base, static int wfd_output_set_cursor(struct wlsc_output *output_base, - struct wl_input_device *input) + struct wlsc_input_device *input) { return -1; } @@ -507,7 +509,15 @@ wfd_destroy(struct wlsc_compositor *ec) free(d); } -struct wlsc_compositor * +/* FIXME: Just add a stub here for now + * handle drm{Set,Drop}Master in owfdrm somehow */ +static void +vt_func(struct wlsc_compositor *compositor, int event) +{ + return; +} + +static struct wlsc_compositor * wfd_compositor_create(struct wl_display *display, int connector) { struct wfd_compositor *ec; @@ -574,12 +584,15 @@ wfd_compositor_create(struct wl_display *display, int connector) wl_event_loop_add_fd(loop, wfdDeviceEventGetFD(ec->dev, ec->event), WL_EVENT_READABLE, on_wfd_event, ec); - ec->tty = tty_create(&ec->base); + ec->tty = tty_create(&ec->base, vt_func); return &ec->base; } struct wlsc_compositor * +backend_init(struct wl_display *display, char *options); + +struct wlsc_compositor * backend_init(struct wl_display *display, char *options) { int connector = 0, i; |