Skip to content

Commit

Permalink
client/wayland: Update Wayland protocol 1.31
Browse files Browse the repository at this point in the history
  • Loading branch information
@fujiwarat
fujiwarat committed Jul 27, 2023
1 parent c366736 commit e379baf
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 64 deletions.
84 changes: 47 additions & 37 deletions client/wayland/input-method-unstable-v1-client-protocol.h
View file
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner 1.16.92 */
/* Generated by wayland-scanner 1.22.0 */

#ifndef INPUT_METHOD_UNSTABLE_V1_CLIENT_PROTOCOL_H
#define INPUT_METHOD_UNSTABLE_V1_CLIENT_PROTOCOL_H
Expand Down Expand Up @@ -51,6 +51,8 @@ struct zwp_input_method_v1;
struct zwp_input_panel_surface_v1;
struct zwp_input_panel_v1;

#ifndef ZWP_INPUT_METHOD_CONTEXT_V1_INTERFACE
#define ZWP_INPUT_METHOD_CONTEXT_V1_INTERFACE
/**
* @page page_iface_zwp_input_method_context_v1 zwp_input_method_context_v1
* @section page_iface_zwp_input_method_context_v1_desc Description
Expand Down Expand Up @@ -109,6 +111,9 @@ struct zwp_input_panel_v1;
* interface version number is reset.
*/
extern const struct wl_interface zwp_input_method_context_v1_interface;
#endif
#ifndef ZWP_INPUT_METHOD_V1_INTERFACE
#define ZWP_INPUT_METHOD_V1_INTERFACE
/**
* @page page_iface_zwp_input_method_v1 zwp_input_method_v1
* @section page_iface_zwp_input_method_v1_desc Description
Expand All @@ -129,6 +134,9 @@ extern const struct wl_interface zwp_input_method_context_v1_interface;
* created which allows the input method to communicate with the text input.
*/
extern const struct wl_interface zwp_input_method_v1_interface;
#endif
#ifndef ZWP_INPUT_PANEL_V1_INTERFACE
#define ZWP_INPUT_PANEL_V1_INTERFACE
/**
* @page page_iface_zwp_input_panel_v1 zwp_input_panel_v1
* @section page_iface_zwp_input_panel_v1_desc Description
Expand All @@ -143,6 +151,9 @@ extern const struct wl_interface zwp_input_method_v1_interface;
* Only one client can bind this interface at a time.
*/
extern const struct wl_interface zwp_input_panel_v1_interface;
#endif
#ifndef ZWP_INPUT_PANEL_SURFACE_V1_INTERFACE
#define ZWP_INPUT_PANEL_SURFACE_V1_INTERFACE
/**
* @page page_iface_zwp_input_panel_surface_v1 zwp_input_panel_surface_v1
* @section page_iface_zwp_input_panel_surface_v1_api API
Expand All @@ -152,6 +163,7 @@ extern const struct wl_interface zwp_input_panel_v1_interface;
* @defgroup iface_zwp_input_panel_surface_v1 The zwp_input_panel_surface_v1 interface
*/
extern const struct wl_interface zwp_input_panel_surface_v1_interface;
#endif

/**
* @ingroup iface_zwp_input_method_context_v1
Expand Down Expand Up @@ -336,10 +348,8 @@ zwp_input_method_context_v1_get_version(struct zwp_input_method_context_v1 *zwp_
static inline void
zwp_input_method_context_v1_destroy(struct zwp_input_method_context_v1 *zwp_input_method_context_v1)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_DESTROY);

wl_proxy_destroy((struct wl_proxy *) zwp_input_method_context_v1);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), WL_MARSHAL_FLAG_DESTROY);
}

/**
Expand All @@ -358,8 +368,8 @@ zwp_input_method_context_v1_destroy(struct zwp_input_method_context_v1 *zwp_inpu
static inline void
zwp_input_method_context_v1_commit_string(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *text)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STRING, serial, text);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STRING, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, text);
}

/**
Expand All @@ -376,8 +386,8 @@ zwp_input_method_context_v1_commit_string(struct zwp_input_method_context_v1 *zw
static inline void
zwp_input_method_context_v1_preedit_string(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *text, const char *commit)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STRING, serial, text, commit);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STRING, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, text, commit);
}

/**
Expand All @@ -393,8 +403,8 @@ zwp_input_method_context_v1_preedit_string(struct zwp_input_method_context_v1 *z
static inline void
zwp_input_method_context_v1_preedit_styling(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t index, uint32_t length, uint32_t style)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STYLING, index, length, style);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STYLING, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, index, length, style);
}

/**
Expand All @@ -410,8 +420,8 @@ zwp_input_method_context_v1_preedit_styling(struct zwp_input_method_context_v1 *
static inline void
zwp_input_method_context_v1_preedit_cursor(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_CURSOR, index);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_CURSOR, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, index);
}

/**
Expand All @@ -425,8 +435,8 @@ zwp_input_method_context_v1_preedit_cursor(struct zwp_input_method_context_v1 *z
static inline void
zwp_input_method_context_v1_delete_surrounding_text(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index, uint32_t length)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_DELETE_SURROUNDING_TEXT, index, length);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_DELETE_SURROUNDING_TEXT, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, index, length);
}

/**
Expand All @@ -446,8 +456,8 @@ zwp_input_method_context_v1_delete_surrounding_text(struct zwp_input_method_cont
static inline void
zwp_input_method_context_v1_cursor_position(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index, int32_t anchor)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_CURSOR_POSITION, index, anchor);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_CURSOR_POSITION, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, index, anchor);
}

/**
Expand All @@ -456,8 +466,8 @@ zwp_input_method_context_v1_cursor_position(struct zwp_input_method_context_v1 *
static inline void
zwp_input_method_context_v1_modifiers_map(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, struct wl_array *map)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_MAP, map);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_MAP, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, map);
}

/**
Expand All @@ -471,8 +481,8 @@ zwp_input_method_context_v1_modifiers_map(struct zwp_input_method_context_v1 *zw
static inline void
zwp_input_method_context_v1_keysym(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_KEYSYM, serial, time, sym, state, modifiers);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_KEYSYM, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, time, sym, state, modifiers);
}

/**
Expand All @@ -488,8 +498,8 @@ zwp_input_method_context_v1_grab_keyboard(struct zwp_input_method_context_v1 *zw
{
struct wl_proxy *keyboard;

keyboard = wl_proxy_marshal_constructor((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_GRAB_KEYBOARD, &wl_keyboard_interface, NULL);
keyboard = wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_GRAB_KEYBOARD, &wl_keyboard_interface, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, NULL);

return (struct wl_keyboard *) keyboard;
}
Expand All @@ -507,8 +517,8 @@ zwp_input_method_context_v1_grab_keyboard(struct zwp_input_method_context_v1 *zw
static inline void
zwp_input_method_context_v1_key(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t time, uint32_t key, uint32_t state)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_KEY, serial, time, key, state);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_KEY, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, time, key, state);
}

/**
Expand All @@ -522,8 +532,8 @@ zwp_input_method_context_v1_key(struct zwp_input_method_context_v1 *zwp_input_me
static inline void
zwp_input_method_context_v1_modifiers(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS, serial, mods_depressed, mods_latched, mods_locked, group);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, mods_depressed, mods_latched, mods_locked, group);
}

/**
Expand All @@ -532,8 +542,8 @@ zwp_input_method_context_v1_modifiers(struct zwp_input_method_context_v1 *zwp_in
static inline void
zwp_input_method_context_v1_language(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *language)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_LANGUAGE, serial, language);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_LANGUAGE, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, language);
}

/**
Expand All @@ -542,8 +552,8 @@ zwp_input_method_context_v1_language(struct zwp_input_method_context_v1 *zwp_inp
static inline void
zwp_input_method_context_v1_text_direction(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t direction)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_TEXT_DIRECTION, serial, direction);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_method_context_v1,
ZWP_INPUT_METHOD_CONTEXT_V1_TEXT_DIRECTION, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1), 0, serial, direction);
}

/**
Expand Down Expand Up @@ -663,8 +673,8 @@ zwp_input_panel_v1_get_input_panel_surface(struct zwp_input_panel_v1 *zwp_input_
{
struct wl_proxy *id;

id = wl_proxy_marshal_constructor((struct wl_proxy *) zwp_input_panel_v1,
ZWP_INPUT_PANEL_V1_GET_INPUT_PANEL_SURFACE, &zwp_input_panel_surface_v1_interface, NULL, surface);
id = wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_panel_v1,
ZWP_INPUT_PANEL_V1_GET_INPUT_PANEL_SURFACE, &zwp_input_panel_surface_v1_interface, wl_proxy_get_version((struct wl_proxy *) zwp_input_panel_v1), 0, NULL, surface);

return (struct zwp_input_panel_surface_v1 *) id;
}
Expand Down Expand Up @@ -726,8 +736,8 @@ zwp_input_panel_surface_v1_destroy(struct zwp_input_panel_surface_v1 *zwp_input_
static inline void
zwp_input_panel_surface_v1_set_toplevel(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1, struct wl_output *output, uint32_t position)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_panel_surface_v1,
ZWP_INPUT_PANEL_SURFACE_V1_SET_TOPLEVEL, output, position);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_panel_surface_v1,
ZWP_INPUT_PANEL_SURFACE_V1_SET_TOPLEVEL, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_panel_surface_v1), 0, output, position);
}

/**
Expand All @@ -741,8 +751,8 @@ zwp_input_panel_surface_v1_set_toplevel(struct zwp_input_panel_surface_v1 *zwp_i
static inline void
zwp_input_panel_surface_v1_set_overlay_panel(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1)
{
wl_proxy_marshal((struct wl_proxy *) zwp_input_panel_surface_v1,
ZWP_INPUT_PANEL_SURFACE_V1_SET_OVERLAY_PANEL);
wl_proxy_marshal_flags((struct wl_proxy *) zwp_input_panel_surface_v1,
ZWP_INPUT_PANEL_SURFACE_V1_SET_OVERLAY_PANEL, NULL, wl_proxy_get_version((struct wl_proxy *) zwp_input_panel_surface_v1), 0);
}

#ifdef __cplusplus
Expand Down
54 changes: 27 additions & 27 deletions client/wayland/input-method-unstable-v1-protocol.c
View file
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner 1.16.92 */
/* Generated by wayland-scanner 1.22.0 */

/*
* Copyright © 2012, 2013 Intel Corporation
Expand Down Expand Up @@ -33,7 +33,7 @@ extern const struct wl_interface wl_surface_interface;
extern const struct wl_interface zwp_input_method_context_v1_interface;
extern const struct wl_interface zwp_input_panel_surface_v1_interface;

static const struct wl_interface *types[] = {
static const struct wl_interface *input_method_unstable_v1_types[] = {
NULL,
NULL,
NULL,
Expand All @@ -49,29 +49,29 @@ static const struct wl_interface *types[] = {
};

static const struct wl_message zwp_input_method_context_v1_requests[] = {
{ "destroy", "", types + 0 },
{ "commit_string", "us", types + 0 },
{ "preedit_string", "uss", types + 0 },
{ "preedit_styling", "uuu", types + 0 },
{ "preedit_cursor", "i", types + 0 },
{ "delete_surrounding_text", "iu", types + 0 },
{ "cursor_position", "ii", types + 0 },
{ "modifiers_map", "a", types + 0 },
{ "keysym", "uuuuu", types + 0 },
{ "grab_keyboard", "n", types + 5 },
{ "key", "uuuu", types + 0 },
{ "modifiers", "uuuuu", types + 0 },
{ "language", "us", types + 0 },
{ "text_direction", "uu", types + 0 },
{ "destroy", "", input_method_unstable_v1_types + 0 },
{ "commit_string", "us", input_method_unstable_v1_types + 0 },
{ "preedit_string", "uss", input_method_unstable_v1_types + 0 },
{ "preedit_styling", "uuu", input_method_unstable_v1_types + 0 },
{ "preedit_cursor", "i", input_method_unstable_v1_types + 0 },
{ "delete_surrounding_text", "iu", input_method_unstable_v1_types + 0 },
{ "cursor_position", "ii", input_method_unstable_v1_types + 0 },
{ "modifiers_map", "a", input_method_unstable_v1_types + 0 },
{ "keysym", "uuuuu", input_method_unstable_v1_types + 0 },
{ "grab_keyboard", "n", input_method_unstable_v1_types + 5 },
{ "key", "uuuu", input_method_unstable_v1_types + 0 },
{ "modifiers", "uuuuu", input_method_unstable_v1_types + 0 },
{ "language", "us", input_method_unstable_v1_types + 0 },
{ "text_direction", "uu", input_method_unstable_v1_types + 0 },
};

static const struct wl_message zwp_input_method_context_v1_events[] = {
{ "surrounding_text", "suu", types + 0 },
{ "reset", "", types + 0 },
{ "content_type", "uu", types + 0 },
{ "invoke_action", "uu", types + 0 },
{ "commit_state", "u", types + 0 },
{ "preferred_language", "s", types + 0 },
{ "surrounding_text", "suu", input_method_unstable_v1_types + 0 },
{ "reset", "", input_method_unstable_v1_types + 0 },
{ "content_type", "uu", input_method_unstable_v1_types + 0 },
{ "invoke_action", "uu", input_method_unstable_v1_types + 0 },
{ "commit_state", "u", input_method_unstable_v1_types + 0 },
{ "preferred_language", "s", input_method_unstable_v1_types + 0 },
};

WL_EXPORT const struct wl_interface zwp_input_method_context_v1_interface = {
Expand All @@ -81,8 +81,8 @@ WL_EXPORT const struct wl_interface zwp_input_method_context_v1_interface = {
};

static const struct wl_message zwp_input_method_v1_events[] = {
{ "activate", "n", types + 6 },
{ "deactivate", "o", types + 7 },
{ "activate", "n", input_method_unstable_v1_types + 6 },
{ "deactivate", "o", input_method_unstable_v1_types + 7 },
};

WL_EXPORT const struct wl_interface zwp_input_method_v1_interface = {
Expand All @@ -92,7 +92,7 @@ WL_EXPORT const struct wl_interface zwp_input_method_v1_interface = {
};

static const struct wl_message zwp_input_panel_v1_requests[] = {
{ "get_input_panel_surface", "no", types + 8 },
{ "get_input_panel_surface", "no", input_method_unstable_v1_types + 8 },
};

WL_EXPORT const struct wl_interface zwp_input_panel_v1_interface = {
Expand All @@ -102,8 +102,8 @@ WL_EXPORT const struct wl_interface zwp_input_panel_v1_interface = {
};

static const struct wl_message zwp_input_panel_surface_v1_requests[] = {
{ "set_toplevel", "ou", types + 10 },
{ "set_overlay_panel", "", types + 0 },
{ "set_toplevel", "ou", input_method_unstable_v1_types + 10 },
{ "set_overlay_panel", "", input_method_unstable_v1_types + 0 },
};

WL_EXPORT const struct wl_interface zwp_input_panel_surface_v1_interface = {
Expand Down

0 comments on commit e379baf

Please sign in to comment.