[PATCH 2/2] Add wayland-protocol.h

[Benjamin Franzke]

2011/4/29 Casey Dahlin <cdahlin at redhat.com>:
> This file can store flag values and such constants as are useful to have at
> both ends of the protocol.
> ---
>  wayland/Makefile.am        |    1 +
>  wayland/wayland-client.h   |    1 +
>  wayland/wayland-protocol.h |   30 ++++++++++++++++++++++++++++++
>  wayland/wayland-server.h   |    1 +
>  4 files changed, 33 insertions(+), 0 deletions(-)
>  create mode 100644 wayland/wayland-protocol.h
>
> diff --git a/wayland/Makefile.am b/wayland/Makefile.am
> index ed31dfc..be6d6ab 100644
> --- a/wayland/Makefile.am
> +++ b/wayland/Makefile.am
> @@ -7,6 +7,7 @@ include_HEADERS =                               \
>        wayland-server.h                        \
>        wayland-client-protocol.h               \
>        wayland-client.h                        \
> +       wayland-protocol.h                      \
>        wayland-egl.h
>
>  libwayland_util_la_SOURCES =                   \
> diff --git a/wayland/wayland-client.h b/wayland/wayland-client.h
> index f1ac797..ae1e926 100644
> --- a/wayland/wayland-client.h
> +++ b/wayland/wayland-client.h
> @@ -45,6 +45,7 @@ void wl_proxy_set_user_data(struct wl_proxy *proxy, void *user_data);
>  void *wl_proxy_get_user_data(struct wl_proxy *proxy);
>
>  #include "wayland-client-protocol.h"
> +#include "wayland-protocol.h"
>
>  #define WL_DISPLAY_READABLE 0x01
>  #define WL_DISPLAY_WRITABLE 0x02
> diff --git a/wayland/wayland-protocol.h b/wayland/wayland-protocol.h
> new file mode 100644
> index 0000000..7660779
> --- /dev/null
> +++ b/wayland/wayland-protocol.h
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright © 2011 Casey Dahlin
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and its
> + * documentation for any purpose is hereby granted without fee, provided that
> + * the above copyright notice appear in all copies and that both that copyright
> + * notice and this permission notice appear in supporting documentation, and
> + * that the name of the copyright holders not be used in advertising or
> + * publicity pertaining to distribution of the software without specific,
> + * written prior permission.  The copyright holders make no representations
> + * about the suitability of this software for any purpose.  It is provided "as
> + * is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> + * OF THIS SOFTWARE.
> + */
> +
> +#ifndef _WAYLAND_PROTOCOL_H
> +#define _WAYLAND_PROTOCOL_H
> +
> +#define WL_OUTPUT_HORIZFLIP 0x01
> +#define WL_OUTPUT_VERTFLIP  0x02
> +#define WL_OUTPUT_CWROTATE  0x04
> +

Flags should be enumerated in the protocol.
So we'd need to extend wayland-scanner to allow that.

> +#endif
> diff --git a/wayland/wayland-server.h b/wayland/wayland-server.h
> index 649bb6b..2026c6a 100644
> --- a/wayland/wayland-server.h
> +++ b/wayland/wayland-server.h
> @@ -30,6 +30,7 @@ extern "C" {
>  #include <stdint.h>
>  #include "wayland-util.h"
>  #include "wayland-server-protocol.h"
> +#include "wayland-protocol.h"
>
>  enum {
>        WL_EVENT_READABLE = 0x01,
> --
> 1.7.5
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>