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

keymap: remove struct xkb_key_redirect_action 

The file src/xkbcomp/action.c already doesn't handle this action type
and fails if it encounters it. So lets not pretend to do something with
it, and ignore it rather than failing.

If we/someone wants this we can consider implementing it.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2013-07-26 00:50:26 +03:00
parent 3a0adc0f5c
commit be38862b2a
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keymap.h
View File

@ -133,7 +133,6 @@ enum xkb_action_type {
ACTION_TYPE_SWITCH_VT, ACTION_TYPE_SWITCH_VT,
ACTION_TYPE_CTRL_SET, ACTION_TYPE_CTRL_SET,
ACTION_TYPE_CTRL_LOCK, ACTION_TYPE_CTRL_LOCK,
ACTION_TYPE_KEY_REDIRECT,
ACTION_TYPE_PRIVATE, ACTION_TYPE_PRIVATE,
_ACTION_TYPE_NUM_ENTRIES _ACTION_TYPE_NUM_ENTRIES
}; };
@ -213,16 +212,6 @@ struct xkb_switch_screen_action {
int8_t screen; int8_t screen;
}; };
struct xkb_redirect_key_action {
enum xkb_action_type type;
enum xkb_action_flags flags;
xkb_keycode_t new_kc;
uint8_t mods_mask;
uint8_t mods;
uint16_t vmods_mask;
uint16_t vmods;
};
struct xkb_pointer_action { struct xkb_pointer_action {
enum xkb_action_type type; enum xkb_action_type type;
enum xkb_action_flags flags; enum xkb_action_flags flags;
@ -250,7 +239,6 @@ union xkb_action {
struct xkb_controls_action ctrls; struct xkb_controls_action ctrls;
struct xkb_pointer_default_action dflt; struct xkb_pointer_default_action dflt;
struct xkb_switch_screen_action screen; struct xkb_switch_screen_action screen;
struct xkb_redirect_key_action redirect; /* XXX wholly unnecessary? */
struct xkb_pointer_action ptr; struct xkb_pointer_action ptr;
struct xkb_pointer_button_action btn; struct xkb_pointer_button_action btn;
struct xkb_private_action priv; struct xkb_private_action priv;

1
src/state.c
View File

@ -405,7 +405,6 @@ xkb_action_breaks_latch(const union xkb_action *action)
case ACTION_TYPE_PTR_LOCK: case ACTION_TYPE_PTR_LOCK:
case ACTION_TYPE_CTRL_SET: case ACTION_TYPE_CTRL_SET:
case ACTION_TYPE_CTRL_LOCK: case ACTION_TYPE_CTRL_LOCK:
case ACTION_TYPE_KEY_REDIRECT:
case ACTION_TYPE_SWITCH_VT: case ACTION_TYPE_SWITCH_VT:
case ACTION_TYPE_TERMINATE: case ACTION_TYPE_TERMINATE:
return true; return true;

4
src/text.c
View File

@ -175,10 +175,10 @@ const LookupEntry actionTypeNames[] = {
{ "SwitchScreen", ACTION_TYPE_SWITCH_VT }, { "SwitchScreen", ACTION_TYPE_SWITCH_VT },
{ "SetControls", ACTION_TYPE_CTRL_SET }, { "SetControls", ACTION_TYPE_CTRL_SET },
{ "LockControls", ACTION_TYPE_CTRL_LOCK }, { "LockControls", ACTION_TYPE_CTRL_LOCK },
{ "RedirectKey", ACTION_TYPE_KEY_REDIRECT },
{ "Redirect", ACTION_TYPE_KEY_REDIRECT },
{ "Private", ACTION_TYPE_PRIVATE }, { "Private", ACTION_TYPE_PRIVATE },
/* deprecated actions below here - unused */ /* deprecated actions below here - unused */
{ "RedirectKey", ACTION_TYPE_NONE },
{ "Redirect", ACTION_TYPE_NONE },
{ "ISOLock", ACTION_TYPE_NONE }, { "ISOLock", ACTION_TYPE_NONE },
{ "ActionMessage", ACTION_TYPE_NONE }, { "ActionMessage", ACTION_TYPE_NONE },
{ "MessageAction", ACTION_TYPE_NONE }, { "MessageAction", ACTION_TYPE_NONE },