StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename serialise to serialize 

Yes, British English is correct, but unfortunately we've lost that
battle.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-05-09 20:20:12 +01:00
parent 5a3771d149
commit 2761b1a332
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/xkbcommon/xkbcommon.h
View File

@ -314,7 +314,7 @@ xkb_map_new_from_fd(struct xkb_ctx *ctx,
enum xkb_map_compile_flags flags);
/**
* Creates an XKB keymap from a full text XKB keymap serialised into one
* Creates an XKB keymap from a full text XKB keymap serialized into one
* enormous string.
*/
struct xkb_keymap *
@ -505,13 +505,13 @@ enum xkb_state_match {
/**
* Updates a state object from a set of explicit masks. This entrypoint is
* really only for window systems and the like, where a master process
* holds an xkb_state, then serialises it over a wire protocol, and clients
* then use the serialisation to feed in to their own xkb_state.
* holds an xkb_state, then serializes it over a wire protocol, and clients
* then use the serialization to feed in to their own xkb_state.
*
* All parameters must always be passed, or the resulting state may be
* incoherent.
*
* The serialisation is lossy and will not survive round trips; it must only
* The serialization is lossy and will not survive round trips; it must only
* be used to feed slave state objects, and must not be used to update the
* master state.
*
@ -528,7 +528,7 @@ xkb_state_update_mask(struct xkb_state *state,
/**
* The counterpart to xkb_state_update_mask, to be used on the server side
* of serialisation. Returns a xkb_mod_mask_t representing the given
* of serialization. Returns a xkb_mod_mask_t representing the given
* component(s) of the state.
*
* This function should not be used in regular clients; please use the
@ -537,15 +537,15 @@ xkb_state_update_mask(struct xkb_state *state,
* Can return NULL on failure.
*/
xkb_mod_mask_t
xkb_state_serialise_mods(struct xkb_state *state,
xkb_state_serialize_mods(struct xkb_state *state,
enum xkb_state_component component);
/**
* The group equivalent of xkb_state_serialise_mods: please see its
* The group equivalent of xkb_state_serialize_mods: please see its
* documentation.
*/
xkb_group_index_t
xkb_state_serialise_group(struct xkb_state *state,
xkb_state_serialize_group(struct xkb_state *state,
enum xkb_state_component component);
/**

8
src/state.c
View File

@ -578,7 +578,7 @@ xkb_state_update_key(struct xkb_state *state, xkb_keycode_t key,
/**
* Updates the state from a set of explicit masks as gained from
* xkb_state_serialise_mods and xkb_state_serialise_groups. As noted in the
* xkb_state_serialize_mods and xkb_state_serialize_groups. As noted in the
* documentation for these functions in xkbcommon.h, this round-trip is
* lossy, and should only be used to update a slave state mirroring the
* master, e.g. in a client/server window system.
@ -619,7 +619,7 @@ xkb_state_update_mask(struct xkb_state *state,
* the same disclaimers as in xkb_state_update_mask.
*/
_X_EXPORT xkb_mod_mask_t
xkb_state_serialise_mods(struct xkb_state *state,
xkb_state_serialize_mods(struct xkb_state *state,
enum xkb_state_component type)
{
xkb_mod_mask_t ret = 0;
@ -642,7 +642,7 @@ xkb_state_serialise_mods(struct xkb_state *state,
* in xkb_state_update_mask.
*/
_X_EXPORT xkb_group_index_t
xkb_state_serialise_group(struct xkb_state *state,
xkb_state_serialize_group(struct xkb_state *state,
enum xkb_state_component type)
{
xkb_group_index_t ret = 0;
@ -692,7 +692,7 @@ static int
match_mod_masks(struct xkb_state *state, enum xkb_state_match match,
uint32_t wanted)
{
uint32_t active = xkb_state_serialise_mods(state, XKB_STATE_EFFECTIVE);
uint32_t active = xkb_state_serialize_mods(state, XKB_STATE_EFFECTIVE);
if (!(match & XKB_STATE_MATCH_NON_EXCLUSIVE) && (active & ~wanted))
return 0;

16
test/state.c
View File

@ -192,23 +192,23 @@ test_serialisation(struct xkb_keymap *keymap)
xkb_state_update_key(state, KEY_CAPSLOCK + EVDEV_OFFSET, XKB_KEY_DOWN);
xkb_state_update_key(state, KEY_CAPSLOCK + EVDEV_OFFSET, XKB_KEY_UP);
base_mods = xkb_state_serialise_mods(state, XKB_STATE_DEPRESSED);
base_mods = xkb_state_serialize_mods(state, XKB_STATE_DEPRESSED);
assert(base_mods == 0);
latched_mods = xkb_state_serialise_mods(state, XKB_STATE_LATCHED);
latched_mods = xkb_state_serialize_mods(state, XKB_STATE_LATCHED);
assert(latched_mods == 0);
locked_mods = xkb_state_serialise_mods(state, XKB_STATE_LOCKED);
locked_mods = xkb_state_serialize_mods(state, XKB_STATE_LOCKED);
assert(locked_mods == (1 << caps));
effective_mods = xkb_state_serialise_mods(state, XKB_STATE_EFFECTIVE);
effective_mods = xkb_state_serialize_mods(state, XKB_STATE_EFFECTIVE);
assert(effective_mods == locked_mods);
xkb_state_update_key(state, KEY_LEFTSHIFT + EVDEV_OFFSET, XKB_KEY_DOWN);
base_mods = xkb_state_serialise_mods(state, XKB_STATE_DEPRESSED);
base_mods = xkb_state_serialize_mods(state, XKB_STATE_DEPRESSED);
assert(base_mods == (1 << shift));
latched_mods = xkb_state_serialise_mods(state, XKB_STATE_LATCHED);
latched_mods = xkb_state_serialize_mods(state, XKB_STATE_LATCHED);
assert(latched_mods == 0);
locked_mods = xkb_state_serialise_mods(state, XKB_STATE_LOCKED);
locked_mods = xkb_state_serialize_mods(state, XKB_STATE_LOCKED);
assert(locked_mods == (1 << caps));
effective_mods = xkb_state_serialise_mods(state, XKB_STATE_EFFECTIVE);
effective_mods = xkb_state_serialize_mods(state, XKB_STATE_EFFECTIVE);
assert(effective_mods == (base_mods | locked_mods));
base_mods |= (1 << ctrl);