summaryrefslogtreecommitdiff
path: root/src/text.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-08-21 14:40:51 +0100
committerDaniel Stone <daniel@fooishbar.org>2012-09-10 19:23:35 +0100
commit314965b1f093fc8cd551e3e64fe1ed699205f2e3 (patch)
tree2647690ee3d229b06d6c5dc833d15bd269bdc71d /src/text.c
parentb04d896ab25cca055e5bcc3d2e58d9c9fb6ef3c4 (diff)
downloadlibxkbcommon-314965b1f093fc8cd551e3e64fe1ed699205f2e3.tar.gz
libxkbcommon-314965b1f093fc8cd551e3e64fe1ed699205f2e3.tar.bz2
libxkbcommon-314965b1f093fc8cd551e3e64fe1ed699205f2e3.zip
Remove deprecated actions
We didn't do anything with ISO_Lock, ActionMessage, RedirectKey, and the device-specifying variants of the pointer actions, so remove those. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/text.c b/src/text.c
index c31b2ff..3c10794 100644
--- a/src/text.c
+++ b/src/text.c
@@ -173,30 +173,31 @@ const LookupEntry actionTypeNames[] = {
{ "LockPointerBtn", XkbSA_LockPtrBtn },
{ "SetPtrDflt", XkbSA_SetPtrDflt },
{ "SetPointerDefault", XkbSA_SetPtrDflt },
- { "ISOLock", XkbSA_ISOLock },
{ "Terminate", XkbSA_Terminate },
{ "TerminateServer", XkbSA_Terminate },
{ "SwitchScreen", XkbSA_SwitchScreen },
{ "SetControls", XkbSA_SetControls },
{ "LockControls", XkbSA_LockControls },
- { "ActionMessage", XkbSA_ActionMessage },
- { "MessageAction", XkbSA_ActionMessage },
- { "Message", XkbSA_ActionMessage },
{ "RedirectKey", XkbSA_RedirectKey },
{ "Redirect", XkbSA_RedirectKey },
- { "DeviceBtn", XkbSA_DeviceBtn },
- { "DevBtn", XkbSA_DeviceBtn },
- { "DevButton", XkbSA_DeviceBtn },
- { "DeviceButton", XkbSA_DeviceBtn },
- { "LockDeviceBtn", XkbSA_LockDeviceBtn },
- { "LockDevBtn", XkbSA_LockDeviceBtn },
- { "LockDevButton", XkbSA_LockDeviceBtn },
- { "LockDeviceButton", XkbSA_LockDeviceBtn },
- { "DeviceValuator", XkbSA_DeviceValuator },
- { "DevVal", XkbSA_DeviceValuator },
- { "DeviceVal", XkbSA_DeviceValuator },
- { "DevValuator", XkbSA_DeviceValuator },
{ "Private", PrivateAction },
+ /* deprecated actions below here - unused */
+ { "ISOLock", XkbSA_NoAction },
+ { "ActionMessage", XkbSA_NoAction },
+ { "MessageAction", XkbSA_NoAction },
+ { "Message", XkbSA_NoAction },
+ { "DeviceBtn", XkbSA_NoAction },
+ { "DevBtn", XkbSA_NoAction },
+ { "DevButton", XkbSA_NoAction },
+ { "DeviceButton", XkbSA_NoAction },
+ { "LockDeviceBtn", XkbSA_NoAction },
+ { "LockDevBtn", XkbSA_NoAction },
+ { "LockDevButton", XkbSA_NoAction },
+ { "LockDeviceButton", XkbSA_NoAction },
+ { "DeviceValuator", XkbSA_NoAction },
+ { "DevVal", XkbSA_NoAction },
+ { "DeviceVal", XkbSA_NoAction },
+ { "DevValuator", XkbSA_NoAction },
{ NULL, 0 },
};