Auto generate wayland protocol

Replaces any checked-in wayland protocol files with auto-generation.

In some cases this means renaming include files that didn't use "standard"
names, or adding missing xml files.  Any source edits are simple search and
replace, there should be no functional changes.
devs/derekf/wip_viewporter
Derek Foreman 6 years ago
parent b7d37e9d51
commit e4da5ba56a
  1. 2
      .gitignore
  2. 28
      src/bin/Makefile.mk
  3. 2
      src/bin/e_comp_wl.c
  4. 14
      src/bin/e_comp_wl_extensions.c
  5. 26
      src/bin/generated/e_comp_wl_screenshooter_server.c
  6. 47
      src/bin/generated/e_comp_wl_screenshooter_server.h
  7. 75
      src/bin/generated/linux-dmabuf-unstable-v1-protocol.c
  8. 448
      src/bin/generated/linux-dmabuf-unstable-v1-server-protocol.h
  9. 32
      src/bin/generated/session-recovery.c
  10. 62
      src/bin/generated/session-recovery.h
  11. 41
      src/bin/generated/www-protocol.c
  12. 77
      src/bin/generated/www-protocol.h
  13. 18
      src/modules/Makefile_shot.mk
  14. 29
      src/modules/Makefile_wl_desktop_shell.mk
  15. 25
      src/modules/Makefile_wl_text_input.mk
  16. 20
      src/modules/Makefile_wl_weekeyboard.mk
  17. 20
      src/modules/shot/e_mod_main.c
  18. 26
      src/modules/shot/screenshooter-client-protocol.c
  19. 68
      src/modules/shot/screenshooter-client-protocol.h
  20. 125
      src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
  21. 661
      src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
  22. 114
      src/modules/wl_desktop_shell/e_input_method_protocol.c
  23. 418
      src/modules/wl_desktop_shell/e_input_method_protocol.h
  24. 12
      src/modules/wl_desktop_shell/e_mod_input_panel.c
  25. 2
      src/modules/wl_desktop_shell/e_mod_main.c
  26. 62
      src/modules/wl_text_input/e_mod_main.c
  27. 114
      src/modules/wl_text_input/input-method-protocol.c
  28. 418
      src/modules/wl_text_input/input-method-protocol.h
  29. 92
      src/modules/wl_text_input/text-protocol.c
  30. 448
      src/modules/wl_text_input/text-protocol.h
  31. 98
      src/modules/wl_weekeyboard/e_mod_main.c
  32. 439
      src/modules/wl_weekeyboard/input-method-client-protocol.h
  33. 118
      src/modules/wl_weekeyboard/input-method-protocol.c
  34. 540
      src/modules/wl_weekeyboard/text-client-protocol.h
  35. 92
      src/modules/wl_weekeyboard/text-protocol.c
  36. 12
      src/protocol/screenshooter.xml
  37. 28
      src/protocol/www.xml

2
.gitignore vendored

@ -47,3 +47,5 @@ default.edj
*.eo.c
*.eo.h
Session.vim
#Ignore all autogenerated wayland protocol
*-protocol.[ch]

@ -427,21 +427,31 @@ endef
#End of weston stuff
enlightenment_src += \
src/bin/generated/linux-dmabuf-unstable-v1-server-protocol.h \
src/bin/generated/linux-dmabuf-unstable-v1-protocol.c \
src/bin/generated/www-protocol.c \
src/bin/generated/www-protocol.h \
src/bin/generated/session-recovery.c \
src/bin/generated/session-recovery.h \
src/bin/generated/e_comp_wl_screenshooter_server.c \
src/bin/generated/e_comp_wl_screenshooter_server.h \
src/bin/e_comp_wl_data.c \
src/bin/e_comp_wl_input.c \
src/bin/e_comp_wl_dmabuf.c \
src/bin/e_comp_wl.c \
src/bin/e_comp_wl_extensions.c
enlightenment_gen_src +=
enlightenment_gen_src += \
src/bin/generated/linux-dmabuf-unstable-v1-server-protocol.h \
src/bin/generated/linux-dmabuf-unstable-v1-protocol.c \
src/bin/generated/session-recovery-protocol.c \
src/bin/generated/session-recovery-server-protocol.h \
src/bin/generated/www-protocol.c \
src/bin/generated/www-server-protocol.h \
src/bin/generated/screenshooter-protocol.c \
src/bin/generated/screenshooter-server-protocol.h
src/bin/e_comp_wl_extensions.c: \
src/bin/generated/screenshooter-server-protocol.h \
src/bin/generated/session-recovery-server-protocol.h
src/bin/e_comp_wl.c: \
src/bin/generated/www-server-protocol.h
src/bin/e_comp_wl_dmabuf.c: \
src/bin/generated/linux-dmabuf-unstable-v1-server-protocol.h
endif

@ -5,7 +5,7 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include "www-protocol.h"
#include "www-server-protocol.h"
/* When a wayland is released with this macro we can remove the ifdefs */
#ifdef WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION

@ -3,9 +3,9 @@
#include <uuid.h>
#include "e_comp_wl_screenshooter_server.h"
#include "session-recovery.h"
#include "www-protocol.h"
#include "screenshooter-server-protocol.h"
#include "session-recovery-server-protocol.h"
#include "www-server-protocol.h"
static void
_e_comp_wl_extensions_client_move_begin(void *d EINA_UNUSED, E_Client *ec)
@ -145,7 +145,7 @@ _e_comp_wl_screenshooter_cb_shoot(struct wl_client *client EINA_UNUSED, struct w
wl_shm_buffer_end_access(shm_buffer);
free(pixels);
screenshooter_send_done(resource);
zwp_screenshooter_send_done(resource);
}
static void
@ -208,7 +208,7 @@ static const struct zwp_e_session_recovery_interface _e_session_recovery_interfa
_e_comp_wl_session_recovery_destroy_uuid,
};
static const struct screenshooter_interface _e_screenshooter_interface =
static const struct zwp_screenshooter_interface _e_screenshooter_interface =
{
_e_comp_wl_screenshooter_cb_shoot
};
@ -236,7 +236,7 @@ _e_comp_wl_##NAME##_cb_bind(struct wl_client *client, void *data EINA_UNUSED, ui
}
GLOBAL_BIND_CB(session_recovery, zwp_e_session_recovery_interface)
GLOBAL_BIND_CB(screenshooter, screenshooter_interface)
GLOBAL_BIND_CB(screenshooter, zwp_screenshooter_interface)
GLOBAL_BIND_CB(www, www_interface)
@ -277,7 +277,7 @@ e_comp_wl_extensions_init(void)
/* try to add session_recovery to wayland globals */
GLOBAL_CREATE_OR_RETURN(session_recovery, zwp_e_session_recovery_interface, 1);
GLOBAL_CREATE_OR_RETURN(screenshooter, screenshooter_interface, 1);
GLOBAL_CREATE_OR_RETURN(screenshooter, zwp_screenshooter_interface, 1);
GLOBAL_CREATE_OR_RETURN(www, www_interface, 1);
ecore_event_handler_add(ECORE_WL2_EVENT_SYNC_DONE, _dmabuf_add, NULL);

@ -1,26 +0,0 @@
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_buffer_interface;
extern const struct wl_interface wl_output_interface;
static const struct wl_interface *types[] = {
&wl_output_interface,
&wl_buffer_interface,
};
static const struct wl_message screenshooter_requests[] = {
{ "shoot", "oo", types + 0 },
};
static const struct wl_message screenshooter_events[] = {
{ "done", "", types + 0 },
};
WL_EXPORT const struct wl_interface screenshooter_interface = {
"screenshooter", 1,
1, screenshooter_requests,
1, screenshooter_events,
};

@ -1,47 +0,0 @@
#ifndef SCREENSHOOTER_SERVER_PROTOCOL_H
#define SCREENSHOOTER_SERVER_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-server.h"
struct wl_client;
struct wl_resource;
struct screenshooter;
struct wl_buffer;
struct wl_output;
extern const struct wl_interface screenshooter_interface;
struct screenshooter_interface {
/**
* shoot - (none)
* @output: (none)
* @buffer: (none)
*/
void (*shoot)(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *output,
struct wl_resource *buffer);
};
#define SCREENSHOOTER_DONE 0
#define SCREENSHOOTER_DONE_SINCE_VERSION 1
static inline void
screenshooter_send_done(struct wl_resource *resource_)
{
wl_resource_post_event(resource_, SCREENSHOOTER_DONE);
}
#ifdef __cplusplus
}
#endif
#endif

@ -1,75 +0,0 @@
/*
* Copyright © 2014, 2015 Collabora, Ltd.
*
* 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.
*/
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_buffer_interface;
extern const struct wl_interface zwp_linux_buffer_params_v1_interface;
static const struct wl_interface *types[] = {
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
&zwp_linux_buffer_params_v1_interface,
&wl_buffer_interface,
};
static const struct wl_message zwp_linux_dmabuf_v1_requests[] = {
{ "destroy", "", types + 0 },
{ "create_params", "n", types + 6 },
};
static const struct wl_message zwp_linux_dmabuf_v1_events[] = {
{ "format", "u", types + 0 },
};
WL_EXPORT const struct wl_interface zwp_linux_dmabuf_v1_interface = {
"zwp_linux_dmabuf_v1", 1,
2, zwp_linux_dmabuf_v1_requests,
1, zwp_linux_dmabuf_v1_events,
};
static const struct wl_message zwp_linux_buffer_params_v1_requests[] = {
{ "destroy", "", types + 0 },
{ "add", "huuuuu", types + 0 },
{ "create", "iiuu", types + 0 },
};
static const struct wl_message zwp_linux_buffer_params_v1_events[] = {
{ "created", "n", types + 7 },
{ "failed", "", types + 0 },
};
WL_EXPORT const struct wl_interface zwp_linux_buffer_params_v1_interface = {
"zwp_linux_buffer_params_v1", 1,
3, zwp_linux_buffer_params_v1_requests,
2, zwp_linux_buffer_params_v1_events,
};

@ -1,448 +0,0 @@
#ifndef LINUX_DMABUF_UNSTABLE_V1_SERVER_PROTOCOL_H
#define LINUX_DMABUF_UNSTABLE_V1_SERVER_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-server.h"
struct wl_client;
struct wl_resource;
/**
* @page page_linux_dmabuf_unstable_v1 The linux_dmabuf_unstable_v1 protocol
* @section page_ifaces_linux_dmabuf_unstable_v1 Interfaces
* - @subpage page_iface_zwp_linux_dmabuf_v1 - factory for creating dmabuf-based wl_buffers
* - @subpage page_iface_zwp_linux_buffer_params_v1 - parameters for creating a dmabuf-based wl_buffer
* @section page_copyright_linux_dmabuf_unstable_v1 Copyright
* <pre>
*
* Copyright © 2014, 2015 Collabora, Ltd.
*
* 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.
* </pre>
*/
struct wl_buffer;
struct zwp_linux_buffer_params_v1;
struct zwp_linux_dmabuf_v1;
/**
* @page page_iface_zwp_linux_dmabuf_v1 zwp_linux_dmabuf_v1
* @section page_iface_zwp_linux_dmabuf_v1_desc Description
*
* Following the interfaces from:
* https://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_image_dma_buf_import.txt
* and the Linux DRM sub-system's AddFb2 ioctl.
*
* This interface offers a way to create generic dmabuf-based
* wl_buffers. Immediately after a client binds to this interface,
* the set of supported formats is sent with 'format' events.
*
* The following are required from clients:
*
* - Clients must ensure that either all data in the dma-buf is
* coherent for all subsequent read access or that coherency is
* correctly handled by the underlying kernel-side dma-buf
* implementation.
*
* - Don't make any more attachments after sending the buffer to the
* compositor. Making more attachments later increases the risk of
* the compositor not being able to use (re-import) an existing
* dmabuf-based wl_buffer.
*
* The underlying graphics stack must ensure the following:
*
* - The dmabuf file descriptors relayed to the server will stay valid
* for the whole lifetime of the wl_buffer. This means the server may
* at any time use those fds to import the dmabuf into any kernel
* sub-system that might accept it.
*
* To create a wl_buffer from one or more dmabufs, a client creates a
* zwp_linux_dmabuf_params_v1 object with zwp_linux_dmabuf_v1.create_params
* request. All planes required by the intended format are added with
* the 'add' request. Finally, 'create' request is issued. The server
* will reply with either 'created' event which provides the final
* wl_buffer or 'failed' event saying that it cannot use the dmabufs
* provided.
*
* Warning! The protocol described in this file is experimental and
* backward incompatible changes may be made. Backward compatible changes
* may be added together with the corresponding interface version bump.
* Backward incompatible changes are done by bumping the version number in
* the protocol and interface names and resetting the interface version.
* Once the protocol is to be declared stable, the 'z' prefix and the
* version number in the protocol and interface names are removed and the
* interface version number is reset.
* @section page_iface_zwp_linux_dmabuf_v1_api API
* See @ref iface_zwp_linux_dmabuf_v1.
*/
/**
* @defgroup iface_zwp_linux_dmabuf_v1 The zwp_linux_dmabuf_v1 interface
*
* Following the interfaces from:
* https://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_image_dma_buf_import.txt
* and the Linux DRM sub-system's AddFb2 ioctl.
*
* This interface offers a way to create generic dmabuf-based
* wl_buffers. Immediately after a client binds to this interface,
* the set of supported formats is sent with 'format' events.
*
* The following are required from clients:
*
* - Clients must ensure that either all data in the dma-buf is
* coherent for all subsequent read access or that coherency is
* correctly handled by the underlying kernel-side dma-buf
* implementation.
*
* - Don't make any more attachments after sending the buffer to the
* compositor. Making more attachments later increases the risk of
* the compositor not being able to use (re-import) an existing
* dmabuf-based wl_buffer.
*
* The underlying graphics stack must ensure the following:
*
* - The dmabuf file descriptors relayed to the server will stay valid
* for the whole lifetime of the wl_buffer. This means the server may
* at any time use those fds to import the dmabuf into any kernel
* sub-system that might accept it.
*
* To create a wl_buffer from one or more dmabufs, a client creates a
* zwp_linux_dmabuf_params_v1 object with zwp_linux_dmabuf_v1.create_params
* request. All planes required by the intended format are added with
* the 'add' request. Finally, 'create' request is issued. The server
* will reply with either 'created' event which provides the final
* wl_buffer or 'failed' event saying that it cannot use the dmabufs
* provided.
*
* Warning! The protocol described in this file is experimental and
* backward incompatible changes may be made. Backward compatible changes
* may be added together with the corresponding interface version bump.
* Backward incompatible changes are done by bumping the version number in
* the protocol and interface names and resetting the interface version.
* Once the protocol is to be declared stable, the 'z' prefix and the
* version number in the protocol and interface names are removed and the
* interface version number is reset.
*/
extern const struct wl_interface zwp_linux_dmabuf_v1_interface;
/**
* @page page_iface_zwp_linux_buffer_params_v1 zwp_linux_buffer_params_v1
* @section page_iface_zwp_linux_buffer_params_v1_desc Description
*
* This temporary object is a collection of dmabufs and other
* parameters that together form a single logical buffer. The temporary
* object may eventually create one wl_buffer unless cancelled by
* destroying it before requesting 'create'.
*
* Single-planar formats only require one dmabuf, however
* multi-planar formats may require more than one dmabuf. For all
* formats, 'add' request must be called once per plane (even if the
* underlying dmabuf fd is identical).
*
* You must use consecutive plane indices ('plane_idx' argument for 'add')
* from zero to the number of planes used by the drm_fourcc format code.
* All planes required by the format must be given exactly once, but can
* be given in any order. Each plane index can be set only once.
* @section page_iface_zwp_linux_buffer_params_v1_api API
* See @ref iface_zwp_linux_buffer_params_v1.
*/
/**
* @defgroup iface_zwp_linux_buffer_params_v1 The zwp_linux_buffer_params_v1 interface
*
* This temporary object is a collection of dmabufs and other
* parameters that together form a single logical buffer. The temporary
* object may eventually create one wl_buffer unless cancelled by
* destroying it before requesting 'create'.
*
* Single-planar formats only require one dmabuf, however
* multi-planar formats may require more than one dmabuf. For all
* formats, 'add' request must be called once per plane (even if the
* underlying dmabuf fd is identical).
*
* You must use consecutive plane indices ('plane_idx' argument for 'add')
* from zero to the number of planes used by the drm_fourcc format code.
* All planes required by the format must be given exactly once, but can
* be given in any order. Each plane index can be set only once.
*/
extern const struct wl_interface zwp_linux_buffer_params_v1_interface;
/**
* @ingroup iface_zwp_linux_dmabuf_v1
* @struct zwp_linux_dmabuf_v1_interface
*/
struct zwp_linux_dmabuf_v1_interface {
/**
* unbind the factory
*
* Objects created through this interface, especially wl_buffers,
* will remain valid.
*/
void (*destroy)(struct wl_client *client,
struct wl_resource *resource);
/**
* create a temporary object for buffer parameters
*
* This temporary object is used to collect multiple dmabuf
* handles into a single batch to create a wl_buffer. It can only
* be used once and should be destroyed after an 'created' or
* 'failed' event has been received.
* @param params_id the new temporary
*/
void (*create_params)(struct wl_client *client,
struct wl_resource *resource,
uint32_t params_id);
};
#define ZWP_LINUX_DMABUF_V1_FORMAT 0
/**
* @ingroup iface_zwp_linux_dmabuf_v1
*/
#define ZWP_LINUX_DMABUF_V1_FORMAT_SINCE_VERSION 1
/**
* @ingroup iface_zwp_linux_dmabuf_v1
* Sends an format event to the client owning the resource.
* @param resource_ The client's resource
* @param format DRM_FORMAT code
*/
static inline void
zwp_linux_dmabuf_v1_send_format(struct wl_resource *resource_, uint32_t format)
{
wl_resource_post_event(resource_, ZWP_LINUX_DMABUF_V1_FORMAT, format);
}
#ifndef ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ENUM
#define ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ENUM
enum zwp_linux_buffer_params_v1_error {
/**
* the dmabuf_batch object has already been used to create a wl_buffer
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ALREADY_USED = 0,
/**
* plane index out of bounds
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_IDX = 1,
/**
* the plane index was already set
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_SET = 2,
/**
* missing or too many planes to create a buffer
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE = 3,
/**
* format not supported
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_FORMAT = 4,
/**
* invalid width or height
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_DIMENSIONS = 5,
/**
* offset + stride * height goes out of dmabuf bounds
*/
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS = 6,
};
#endif /* ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ENUM */
#ifndef ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_ENUM
#define ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_ENUM
enum zwp_linux_buffer_params_v1_flags {
/**
* contents are y-inverted
*/
ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT = 1,
/**
* content is interlaced
*/
ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_INTERLACED = 2,
/**
* bottom field first
*/
ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_BOTTOM_FIRST = 4,
};
#endif /* ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_ENUM */
/**
* @ingroup iface_zwp_linux_buffer_params_v1
* @struct zwp_linux_buffer_params_v1_interface
*/
struct zwp_linux_buffer_params_v1_interface {
/**
* delete this object, used or not
*
* Cleans up the temporary data sent to the server for
* dmabuf-based wl_buffer creation.
*/
void (*destroy)(struct wl_client *client,
struct wl_resource *resource);
/**
* add a dmabuf to the temporary set
*
* This request adds one dmabuf to the set in this
* zwp_linux_buffer_params_v1.
*
* The 64-bit unsigned value combined from modifier_hi and
* modifier_lo is the dmabuf layout modifier. DRM AddFB2 ioctl
* calls this the fb modifier, which is defined in drm_mode.h of
* Linux UAPI. This is an opaque token. Drivers use this token to
* express tiling, compression, etc. driver-specific modifications
* to the base format defined by the DRM fourcc code.
*
* This request raises the PLANE_IDX error if plane_idx is too
* large. The error PLANE_SET is raised if attempting to set a
* plane that was already set.
* @param fd dmabuf fd
* @param plane_idx plane index
* @param offset offset in bytes
* @param stride stride in bytes
* @param modifier_hi high 32 bits of layout modifier
* @param modifier_lo low 32 bits of layout modifier
*/
void (*add)(struct wl_client *client,
struct wl_resource *resource,
int32_t fd,
uint32_t plane_idx,
uint32_t offset,
uint32_t stride,
uint32_t modifier_hi,
uint32_t modifier_lo);
/**
* create a wl_buffer from the given dmabufs
*
* This asks for creation of a wl_buffer from the added dmabuf
* buffers. The wl_buffer is not created immediately but returned
* via the 'created' event if the dmabuf sharing succeeds. The
* sharing may fail at runtime for reasons a client cannot predict,
* in which case the 'failed' event is triggered.
*
* The 'format' argument is a DRM_FORMAT code, as defined by the
* libdrm's drm_fourcc.h. The Linux kernel's DRM sub-system is the
* authoritative source on how the format codes should work.
*
* The 'flags' is a bitfield of the flags defined in enum "flags".
* 'y_invert' means the that the image needs to be y-flipped.
*
* Flag 'interlaced' means that the frame in the buffer is not
* progressive as usual, but interlaced. An interlaced buffer as
* supported here must always contain both top and bottom fields.
* The top field always begins on the first pixel row. The temporal
* ordering between the two fields is top field first, unless
* 'bottom_first' is specified. It is undefined whether
* 'bottom_first' is ignored if 'interlaced' is not set.
*
* This protocol does not convey any information about field rate,
* duration, or timing, other than the relative ordering between
* the two fields in one buffer. A compositor may have to estimate
* the intended field rate from the incoming buffer rate. It is
* undefined whether the time of receiving wl_surface.commit with a
* new buffer attached, applying the wl_surface state,
* wl_surface.frame callback trigger, presentation, or any other
* point in the compositor cycle is used to measure the frame or
* field times. There is no support for detecting missed or late
* frames/fields/buffers either, and there is no support whatsoever
* for cooperating with interlaced compositor output.
*
* The composited image quality resulting from the use of
* interlaced buffers is explicitly undefined. A compositor may use
* elaborate hardware features or software to deinterlace and
* create progressive output frames from a sequence of interlaced
* input buffers, or it may produce substandard image quality.
* However, compositors that cannot guarantee reasonable image
* quality in all cases are recommended to just reject all
* interlaced buffers.
*
* Any argument errors, including non-positive width or height,
* mismatch between the number of planes and the format, bad
* format, bad offset or stride, may be indicated by fatal protocol
* errors: INCOMPLETE, INVALID_FORMAT, INVALID_DIMENSIONS,
* OUT_OF_BOUNDS.
*
* Dmabuf import errors in the server that are not obvious client
* bugs are returned via the 'failed' event as non-fatal. This
* allows attempting dmabuf sharing and falling back in the client
* if it fails.
*
* This request can be sent only once in the object's lifetime,
* after which the only legal request is destroy. This object
* should be destroyed after issuing 'create' request. Attempting
* to use this object after issuing 'create' raises ALREADY_USED
* protocol error.
*
* It is not mandatory to issue 'create'. If a client wants to
* cancel the buffer creation, it can just destroy this object.
* @param width base plane width in pixels
* @param height base plane height in pixels
* @param format DRM_FORMAT code
* @param flags see enum flags
*/
void (*create)(struct wl_client *client,
struct wl_resource *resource,
int32_t width,
int32_t height,
uint32_t format,
uint32_t flags);
};
#define ZWP_LINUX_BUFFER_PARAMS_V1_CREATED 0
#define ZWP_LINUX_BUFFER_PARAMS_V1_FAILED 1
/**
* @ingroup iface_zwp_linux_buffer_params_v1
*/
#define ZWP_LINUX_BUFFER_PARAMS_V1_CREATED_SINCE_VERSION 1
/**
* @ingroup iface_zwp_linux_buffer_params_v1
*/
#define ZWP_LINUX_BUFFER_PARAMS_V1_FAILED_SINCE_VERSION 1
/**
* @ingroup iface_zwp_linux_buffer_params_v1
* Sends an created event to the client owning the resource.
* @param resource_ The client's resource
* @param buffer the newly created wl_buffer
*/
static inline void
zwp_linux_buffer_params_v1_send_created(struct wl_resource *resource_, struct wl_resource *buffer)
{
wl_resource_post_event(resource_, ZWP_LINUX_BUFFER_PARAMS_V1_CREATED, buffer);
}
/**
* @ingroup iface_zwp_linux_buffer_params_v1
* Sends an failed event to the client owning the resource.
* @param resource_ The client's resource
*/
static inline void
zwp_linux_buffer_params_v1_send_failed(struct wl_resource *resource_)
{
wl_resource_post_event(resource_, ZWP_LINUX_BUFFER_PARAMS_V1_FAILED);
}
#ifdef __cplusplus
}
#endif
#endif

@ -1,32 +0,0 @@
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_surface_interface;
static const struct wl_interface *types[] = {
&wl_surface_interface,
&wl_surface_interface,
NULL,
&wl_surface_interface,
NULL,
&wl_surface_interface,
NULL,
};
static const struct wl_message zwp_e_session_recovery_requests[] = {
{ "get_uuid", "o", types + 0 },
{ "set_uuid", "os", types + 1 },
{ "destroy_uuid", "os", types + 3 },
};
static const struct wl_message zwp_e_session_recovery_events[] = {
{ "create_uuid", "os", types + 5 },
};
WL_EXPORT const struct wl_interface zwp_e_session_recovery_interface = {
"zwp_e_session_recovery", 1,
3, zwp_e_session_recovery_requests,
1, zwp_e_session_recovery_events,
};

@ -1,62 +0,0 @@
#ifndef E_SESSION_RECOVERY_SERVER_PROTOCOL_H
#define E_SESSION_RECOVERY_SERVER_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-server.h"
struct wl_client;
struct wl_resource;
struct wl_surface;
struct zwp_e_session_recovery;
extern const struct wl_interface zwp_e_session_recovery_interface;
struct zwp_e_session_recovery_interface {
/**
* get_uuid - (none)
* @surface: (none)
*/
void (*get_uuid)(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *surface);
/**
* set_uuid - (none)
* @surface: (none)
* @uuid: (none)
*/
void (*set_uuid)(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *surface,
const char *uuid);
/**
* destroy_uuid - (none)
* @surface: (none)
* @uuid: (none)
*/
void (*destroy_uuid)(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *surface,
const char *uuid);
};
#define ZWP_E_SESSION_RECOVERY_CREATE_UUID 0
#define ZWP_E_SESSION_RECOVERY_CREATE_UUID_SINCE_VERSION 1
static inline void
zwp_e_session_recovery_send_create_uuid(struct wl_resource *resource_, struct wl_resource *surface, const char *uuid)
{
wl_resource_post_event(resource_, ZWP_E_SESSION_RECOVERY_CREATE_UUID, surface, uuid);
}
#ifdef __cplusplus
}
#endif
#endif

@ -1,41 +0,0 @@
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_surface_interface;
extern const struct wl_interface www_surface_interface;
static const struct wl_interface *types[] = {
NULL,
NULL,
NULL,
&www_surface_interface,
&wl_surface_interface,
};
static const struct wl_message www_requests[] = {
{ "create", "no", types + 3 },
};
WL_EXPORT const struct wl_interface www_interface = {
"www", 1,
1, www_requests,
0, NULL,
};
static const struct wl_message www_surface_requests[] = {
{ "destroy", "", types + 0 },
};
static const struct wl_message www_surface_events[] = {
{ "status", "iiu", types + 0 },
{ "start_drag", "", types + 0 },
{ "end_drag", "", types + 0 },
};
WL_EXPORT const struct wl_interface www_surface_interface = {
"www_surface", 1,
1, www_surface_requests,
3, www_surface_events,
};

@ -1,77 +0,0 @@
#ifndef ZWP_WWW_SERVER_PROTOCOL_H
#define ZWP_WWW_SERVER_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-server.h"
struct wl_client;
struct wl_resource;
struct wl_surface;
struct www;
struct www_surface;
extern const struct wl_interface www_interface;
extern const struct wl_interface www_surface_interface;
struct www_interface {
/**
* create - Create an object for WWW notifications
* @id: (none)
* @surface: (none)
*
*
*/
void (*create)(struct wl_client *client,
struct wl_resource *resource,
uint32_t id,
struct wl_resource *surface);
};
struct www_surface_interface {
/**
* destroy - Destroy a www_surface
*
*
*/
void (*destroy)(struct wl_client *client,
struct wl_resource *resource);
};
#define WWW_SURFACE_STATUS 0
#define WWW_SURFACE_START_DRAG 1
#define WWW_SURFACE_END_DRAG 2
#define WWW_SURFACE_STATUS_SINCE_VERSION 1
#define WWW_SURFACE_START_DRAG_SINCE_VERSION 1
#define WWW_SURFACE_END_DRAG_SINCE_VERSION 1
static inline void
www_surface_send_status(struct wl_resource *resource_, int32_t x_rel, int32_t y_rel, uint32_t timestamp)
{
wl_resource_post_event(resource_, WWW_SURFACE_STATUS, x_rel, y_rel, timestamp);
}
static inline void
www_surface_send_start_drag(struct wl_resource *resource_)
{
wl_resource_post_event(resource_, WWW_SURFACE_START_DRAG);
}
static inline void
www_surface_send_end_drag(struct wl_resource *resource_)
{
wl_resource_post_event(resource_, WWW_SURFACE_END_DRAG);
}
#ifdef __cplusplus
}
#endif
#endif

@ -1,7 +1,5 @@
EXTRA_DIST += src/modules/shot/module.desktop.in \
src/modules/shot/e-module-shot.edj \
src/modules/shot/screenshooter-client-protocol.h \
src/modules/shot/screenshooter-client-protocol.c
src/modules/shot/e-module-shot.edj
if USE_MODULE_SHOT
shotdir = $(MDIR)/shot
@ -11,6 +9,7 @@ shot_DATA = src/modules/shot/e-module-shot.edj \
shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH)
shotpkg_LTLIBRARIES = src/modules/shot/module.la
nodist_src_modules_shot_module_la_SOURCES =
src_modules_shot_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
src_modules_shot_module_la_CPPFLAGS = \
$(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
@ -19,9 +18,18 @@ src_modules_shot_module_la_SOURCES = \
src/modules/shot/e_mod_main.c
if HAVE_WAYLAND
src_modules_shot_module_la_SOURCES += \
src/modules/shot/screenshooter-client-protocol.c \
shot_wayland_sources = \
src/modules/shot/screenshooter-protocol.c \
src/modules/shot/screenshooter-client-protocol.h
nodist_src_modules_shot_module_la_SOURCES += \
$(shot_wayland_sources)
MAINTAINERCLEANFILES += \
$(shot_wayland_sources)
src/modules/shot/e_mod_main.c: \
src/modules/shot/screenshooter-client-protocol.h
endif
PHONIES += shot install-shot

@ -1,10 +1,7 @@
EXTRA_DIST += src/modules/wl_desktop_shell/module.desktop.in \
src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \
src/modules/wl_desktop_shell/module.desktop.in \
src/modules/wl_desktop_shell/e_input_method_protocol.h \
src/modules/wl_desktop_shell/e_input_method_protocol.c \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
src/modules/wl_desktop_shell/module.desktop.in
if USE_MODULE_WL_DESKTOP_SHELL
wl_desktop_shelldir = $(MDIR)/wl_desktop_shell
wl_desktop_shell_DATA = src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \
@ -13,6 +10,12 @@ wl_desktop_shell_DATA = src/modules/wl_desktop_shell/e-module-wl_desktop_shell.e
wl_desktop_shellpkgdir = $(MDIR)/wl_desktop_shell/$(MODULE_ARCH)
wl_desktop_shellpkg_LTLIBRARIES = src/modules/wl_desktop_shell/module.la
wl_desktop_shell_wayland_sources = \
src/modules/wl_desktop_shell/xdg-shell-unstable-v5-protocol.c \
src/modules/wl_desktop_shell/xdg-shell-unstable-v5-server-protocol.h \
src/modules/wl_desktop_shell/input-method-unstable-v1-protocol.c \
src/modules/wl_desktop_shell/input-method-unstable-v1-server-protocol.h
src_modules_wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES)
src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
src_modules_wl_desktop_shell_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
@ -21,11 +24,17 @@ src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_wl_desktop_shell_module_la_SOURCES = \
src/modules/wl_desktop_shell/e_mod_main.c \
src/modules/wl_desktop_shell/e_mod_main.h \
src/modules/wl_desktop_shell/e_mod_input_panel.c \
src/modules/wl_desktop_shell/e_input_method_protocol.c \
src/modules/wl_desktop_shell/e_input_method_protocol.h \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
src/modules/wl_desktop_shell/e_mod_input_panel.c
nodist_src_modules_wl_desktop_shell_module_la_SOURCES = \
$(wl_desktop_shell_wayland_sources)
MAINTAINERCLEANFILES += \
$(wl_desktop_shell_wayland_sources)
src/modules/wl_desktop_shell/e_mod_main.c: \
src/modules/wl_desktop_shell/xdg-shell-unstable-v5-server-protocol.h \
src/modules/wl_desktop_shell/input-method-unstable-v1-server-protocol.h
PHONIES += wl_desktop_shell install-wl_desktop_shell
wl_desktop_shell: $(wl_desktop_shellpkg_LTLIBRARIES) $(wl_desktop_shell_DATA)

@ -1,25 +1,28 @@
EXTRA_DIST += \
src/modules/wl_text_input/text-protocol.h \
src/modules/wl_text_input/text-protocol.c \
src/modules/wl_text_input/input-method-protocol.h \
src/modules/wl_text_input/input-method-protocol.c
if USE_MODULE_WL_TEXT_INPUT
wl_text_inputdir = $(MDIR)/wl_text_input
wl_text_inputpkgdir = $(MDIR)/wl_text_input/$(MODULE_ARCH)
wl_text_inputpkg_LTLIBRARIES = src/modules/wl_text_input/module.la
wl_text_input_wayland_sources = \
src/modules/wl_text_input/text-input-unstable-v1-protocol.c \
src/modules/wl_text_input/text-input-unstable-v1-server-protocol.h \
src/modules/wl_text_input/input-method-unstable-v1-protocol.c \
src/modules/wl_text_input/input-method-unstable-v1-server-protocol.h
src_modules_wl_text_input_module_la_DEPENDENCIES = $(MDEPENDENCIES)
src_modules_wl_text_input_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
src_modules_wl_text_input_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
src_modules_wl_text_input_module_la_LDFLAGS = $(MOD_LDFLAGS)
nodist_src_modules_wl_text_input_module_la_SOURCES = \
$(wl_text_input_wayland_sources)
src_modules_wl_text_input_module_la_SOURCES = \
src/modules/wl_text_input/e_mod_main.c \
src/modules/wl_text_input/text-protocol.c \
src/modules/wl_text_input/text-protocol.h \
src/modules/wl_text_input/input-method-protocol.c \
src/modules/wl_text_input/input-method-protocol.h
src/modules/wl_text_input/e_mod_main.c
MAINTAINERCLEANFILES += \
$(wl_text_input_wayland_sources)
src/modules/wl_text_input/e_mod_main.c: src/modules/wl_text_input/text-input-unstable-v1-server-protocol.h\
src/modules/wl_text_input/input-method-unstable-v1-server-protocol.h
PHONIES += wl_text_input install-wl_text_input
wl_text_input: $(wl_text_inputpkg_LTLIBRARIES) $(wl_text_input_DATA)

@ -20,14 +20,24 @@ src_modules_wl_weekeyboard_module_la_CPPFLAGS = \
-DPKGDATADIR='"$pkgdatadir)"'
src_modules_wl_weekeyboard_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
src_modules_wl_weekeyboard_module_la_LDFLAGS = $(MOD_LDFLAGS)
wl_weekeyboard_wayland_sources = \
src/modules/wl_weekeyboard/input-method-unstable-v1-protocol.c \
src/modules/wl_weekeyboard/input-method-unstable-v1-client-protocol.h \
src/modules/wl_weekeyboard/text-input-unstable-v1-protocol.c \
src/modules/wl_weekeyboard/text-input-unstable-v1-client-protocol.h
nodist_src_modules_wl_weekeyboard_module_la_SOURCES = \
$(wl_weekeyboard_wayland_sources)
src_modules_wl_weekeyboard_module_la_SOURCES = \
src/modules/wl_weekeyboard/e_mod_main.c \
src/modules/wl_weekeyboard/wkb-log.h \
src/modules/wl_weekeyboard/wkb-log.c \
src/modules/wl_weekeyboard/input-method-protocol.c \
src/modules/wl_weekeyboard/input-method-client-protocol.h \
src/modules/wl_weekeyboard/text-protocol.c \
src/modules/wl_weekeyboard/text-client-protocol.h
src/modules/wl_weekeyboard/wkb-log.c
src/modules/wl_weekeyboard/e_mod_main.c:\
src/modules/wl_weekeyboard/input-method-unstable-v1-client-protocol.h\
src/modules/wl_weekeyboard/text-input-unstable-v1-client-protocol.h
MAINTAINERCLEANFILES += \
$(wl_weekeyboard_wayland_sources)
PHONIES += wl_weekeyboard install-wl_weekeyboard
wl_weekeyboard: $(wl_weekeyboardpkg_LTLIBRARIES) $(wl_weekeyboard_DATA)

@ -43,7 +43,7 @@ static E_Client_Menu_Hook *border_hook = NULL;
#ifdef HAVE_WAYLAND
Eina_Bool copy_done = EINA_FALSE;
static struct screenshooter *_wl_screenshooter;
static struct zwp_screenshooter *_wl_screenshooter;
static Eina_List *_outputs;
struct screenshooter_output
{
@ -66,12 +66,12 @@ _win_cancel_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
#ifdef HAVE_WAYLAND
static void
_wl_cb_screenshot_done(void *data EINA_UNUSED, struct screenshooter *screenshooter EINA_UNUSED)
_wl_cb_screenshot_done(void *data EINA_UNUSED, struct zwp_screenshooter *screenshooter EINA_UNUSED)
{
copy_done = EINA_TRUE;
}
static const struct screenshooter_listener _screenshooter_listener =
static const struct zwp_screenshooter_listener _screenshooter_listener =
{
_wl_cb_screenshot_done
};
@ -966,7 +966,9 @@ _wl_shot_now(E_Zone *zone, E_Client *ec, const char *params)
output->buffer =
_create_shm_buffer(shm, output->w, output->h, &output->data);
screenshooter_shoot(_wl_screenshooter, output->output, output->buffer);
zwp_screenshooter_shoot(_wl_screenshooter,
output->output,
output->buffer);
copy_done = EINA_FALSE;
while (!copy_done)
@ -1297,16 +1299,16 @@ _wl_init()
global = (Ecore_Wl2_Global *)data;
if ((!_wl_screenshooter) &&
(!strcmp(global->interface, "screenshooter")))
(!strcmp(global->interface, "zwp_screenshooter")))
{
_wl_screenshooter =
wl_registry_bind(reg, global->id,
&screenshooter_interface, global->version);
&zwp_screenshooter_interface, global->version);
if (_wl_screenshooter)
screenshooter_add_listener(_wl_screenshooter,
&_screenshooter_listener,
_wl_screenshooter);
zwp_screenshooter_add_listener(_wl_screenshooter,
&_screenshooter_listener,
_wl_screenshooter);
}
else if (!strcmp(global->interface, "wl_output"))
{

@ -1,26 +0,0 @@
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_buffer_interface;
extern const struct wl_interface wl_output_interface;
static const struct wl_interface *types[] = {
&wl_output_interface,
&wl_buffer_interface,
};
static const struct wl_message screenshooter_requests[] = {
{ "shoot", "oo", types + 0 },
};
static const struct wl_message screenshooter_events[] = {
{ "done", "", types + 0 },
};
WL_EXPORT const struct wl_interface screenshooter_interface = {
"screenshooter", 1,
1, screenshooter_requests,
1, screenshooter_events,
};

@ -1,68 +0,0 @@
#ifndef SCREENSHOOTER_CLIENT_PROTOCOL_H
#define SCREENSHOOTER_CLIENT_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-client.h"
struct wl_client;
struct wl_resource;
struct screenshooter;
struct wl_buffer;
struct wl_output;
extern const struct wl_interface screenshooter_interface;
struct screenshooter_listener {
/**
* done - (none)
*/
void (*done)(void *data,
struct screenshooter *screenshooter);
};
static inline int
screenshooter_add_listener(struct screenshooter *screenshooter,
const struct screenshooter_listener *listener, void *data)
{
return wl_proxy_add_listener((struct wl_proxy *) screenshooter,
(void (**)(void)) listener, data);
}
#define SCREENSHOOTER_SHOOT 0
static inline void
screenshooter_set_user_data(struct screenshooter *screenshooter, void *user_data)
{
wl_proxy_set_user_data((struct wl_proxy *) screenshooter, user_data);
}
static inline void *
screenshooter_get_user_data(struct screenshooter *screenshooter)
{
return wl_proxy_get_user_data((struct wl_proxy *) screenshooter);
}
static inline void
screenshooter_destroy(struct screenshooter *screenshooter)
{
wl_proxy_destroy((struct wl_proxy *) screenshooter);
}
static inline void
screenshooter_shoot(struct screenshooter *screenshooter, struct wl_output *output, struct wl_buffer *buffer)
{
wl_proxy_marshal((struct wl_proxy *) screenshooter,
SCREENSHOOTER_SHOOT, output, buffer);
}
#ifdef __cplusplus
}
#endif
#endif

@ -1,125 +0,0 @@
/*
* Copyright © 2008-2013 Kristian Høgsberg
* Copyright © 2013 Rafael Antognolli
* Copyright © 2013 Jasper St. Pierre
* Copyright © 2010-2013 Intel Corporation
*
* 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