Skip to content

Remove deprecated modifiers names #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wismill wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove deprecated modifiers names #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changes/api/+remove-deprecated-vmod-names.breaking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The following deprecated modifiers names in `xkbcommon/xkbcommon-names.h` were removed:
- `XKB_MOD_NAME_ALT`: use `XKB_VMOD_NAME_ALT` instead.
- `XKB_MOD_NAME_LOGO`: use `XKB_VMOD_NAME_SUPER` instead.
- `XKB_MOD_NAME_NUM`: use `XKB_VMOD_NAME_NUM` instead.
48 changes: 0 additions & 48 deletions include/xkbcommon/xkbcommon-names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,54 +70,6 @@
#define XKB_VMOD_NAME_SUPER "Super"
/** @} */

/**
* @defgroup legacy-virtual-modifier-names Legacy virtual modifier names
*
* Usual [*virtual* modifiers][virtual modifiers] mappings to
* [*real* modifiers][real modifiers].
*
* @deprecated Use @ref virtual-modifier-names instead
*
* [virtual modifiers]: @ref virtual-modifier-def
* [real modifiers]: @ref real-modifier-def
*
* @{
*/
/**
* Usual [*real* modifier][real modifier] for the
* [*virtual* modifier][virtual modifier] `Alt`.
*
* @deprecated Use `::XKB_VMOD_NAME_ALT` instead.
* @since 1.10: deprecated
*
* [virtual modifier]: @ref virtual-modifier-def
* [real modifier]: @ref real-modifier-def
*/
#define XKB_MOD_NAME_ALT "Mod1"
/**
* Usual [*real* modifier][real modifier] for the
* [*virtual* modifier][virtual modifier] `Super`.
*
* @deprecated Use `::XKB_VMOD_NAME_SUPER` instead.
* @since 1.10: deprecated
*
* [virtual modifier]: @ref virtual-modifier-def
* [real modifier]: @ref real-modifier-def
*/
#define XKB_MOD_NAME_LOGO "Mod4"
/**
* Usual [*real* modifier][real modifier] for the
* [*virtual* modifier][virtual modifier] `NumLock`.
*
* @deprecated Use `::XKB_VMOD_NAME_NUM` instead.
* @since 1.10: deprecated
*
* [virtual modifier]: @ref virtual-modifier-def
* [real modifier]: @ref real-modifier-def
*/
#define XKB_MOD_NAME_NUM "Mod2"
/** @} */

/**
* @defgroup led-names LEDs names
*
Expand Down
5 changes: 0 additions & 5 deletions test/modifiers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ test_modifiers_names(struct xkb_context *context)
assert(test_real_mod(keymap, XKB_MOD_NAME_MOD4, XKB_MOD_INDEX_MOD4, Mod4Mask));
assert(test_real_mod(keymap, XKB_MOD_NAME_MOD5, XKB_MOD_INDEX_MOD5, Mod5Mask));

/* Usual virtual mods mappings */
assert(test_real_mod(keymap, XKB_MOD_NAME_ALT, XKB_MOD_INDEX_MOD1, Mod1Mask));
assert(test_real_mod(keymap, XKB_MOD_NAME_NUM, XKB_MOD_INDEX_MOD2, Mod2Mask));
assert(test_real_mod(keymap, XKB_MOD_NAME_LOGO, XKB_MOD_INDEX_MOD4, Mod4Mask));

/* Virtual modifiers
* The indexes depends on the keymap files */
assert(test_virtual_mod(keymap, XKB_VMOD_NAME_ALT, XKB_MOD_INDEX_MOD5 + 2, Mod1Mask));
Expand Down
Loading