kbproto unentanglement: action types

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

1 files changed, 41 insertions, 41 deletions

diff --git a/src/text.c b/src/text.c
index 3c10794..dca89e3 100644
--- a/src/text.c
+++ b/src/text.c
@@ -156,48 +156,48 @@ const LookupEntry useModMapValueNames[] = {
 };
 
 const LookupEntry actionTypeNames[] = {
-    { "NoAction", XkbSA_NoAction },
-    { "SetMods", XkbSA_SetMods },
-    { "LatchMods", XkbSA_LatchMods },
-    { "LockMods", XkbSA_LockMods },
-    { "SetGroup", XkbSA_SetGroup },
-    { "LatchGroup", XkbSA_LatchGroup },
-    { "LockGroup", XkbSA_LockGroup },
-    { "MovePtr", XkbSA_MovePtr },
-    { "MovePointer", XkbSA_MovePtr },
-    { "PtrBtn", XkbSA_PtrBtn },
-    { "PointerButton", XkbSA_PtrBtn },
-    { "LockPtrBtn", XkbSA_LockPtrBtn },
-    { "LockPtrButton", XkbSA_LockPtrBtn },
-    { "LockPointerButton", XkbSA_LockPtrBtn },
-    { "LockPointerBtn", XkbSA_LockPtrBtn },
-    { "SetPtrDflt", XkbSA_SetPtrDflt },
-    { "SetPointerDefault", XkbSA_SetPtrDflt },
-    { "Terminate", XkbSA_Terminate },
-    { "TerminateServer", XkbSA_Terminate },
-    { "SwitchScreen", XkbSA_SwitchScreen },
-    { "SetControls", XkbSA_SetControls },
-    { "LockControls", XkbSA_LockControls },
-    { "RedirectKey", XkbSA_RedirectKey },
-    { "Redirect", XkbSA_RedirectKey },
-    { "Private", PrivateAction },
+    { "NoAction", ACTION_TYPE_NONE },
+    { "SetMods", ACTION_TYPE_MOD_SET },
+    { "LatchMods", ACTION_TYPE_MOD_LATCH },
+    { "LockMods", ACTION_TYPE_MOD_LOCK },
+    { "SetGroup", ACTION_TYPE_GROUP_SET },
+    { "LatchGroup", ACTION_TYPE_GROUP_LATCH },
+    { "LockGroup", ACTION_TYPE_GROUP_LOCK },
+    { "MovePtr", ACTION_TYPE_PTR_MOVE },
+    { "MovePointer", ACTION_TYPE_PTR_MOVE },
+    { "PtrBtn", ACTION_TYPE_PTR_BUTTON },
+    { "PointerButton", ACTION_TYPE_PTR_BUTTON },
+    { "LockPtrBtn", ACTION_TYPE_PTR_LOCK },
+    { "LockPtrButton", ACTION_TYPE_PTR_LOCK },
+    { "LockPointerButton", ACTION_TYPE_PTR_LOCK },
+    { "LockPointerBtn", ACTION_TYPE_PTR_LOCK },
+    { "SetPtrDflt", ACTION_TYPE_PTR_DEFAULT },
+    { "SetPointerDefault", ACTION_TYPE_PTR_DEFAULT },
+    { "Terminate", ACTION_TYPE_TERMINATE },
+    { "TerminateServer", ACTION_TYPE_TERMINATE },
+    { "SwitchScreen", ACTION_TYPE_SWITCH_VT },
+    { "SetControls", ACTION_TYPE_CTRL_SET },
+    { "LockControls", ACTION_TYPE_CTRL_LOCK },
+    { "RedirectKey", ACTION_TYPE_KEY_REDIRECT },
+    { "Redirect", ACTION_TYPE_KEY_REDIRECT },
+    { "Private", ACTION_TYPE_PRIVATE },
     /* 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 },
+    { "ISOLock", ACTION_TYPE_NONE },
+    { "ActionMessage", ACTION_TYPE_NONE },
+    { "MessageAction", ACTION_TYPE_NONE },
+    { "Message", ACTION_TYPE_NONE },
+    { "DeviceBtn", ACTION_TYPE_NONE },
+    { "DevBtn", ACTION_TYPE_NONE },
+    { "DevButton", ACTION_TYPE_NONE },
+    { "DeviceButton", ACTION_TYPE_NONE },
+    { "LockDeviceBtn", ACTION_TYPE_NONE },
+    { "LockDevBtn", ACTION_TYPE_NONE },
+    { "LockDevButton", ACTION_TYPE_NONE },
+    { "LockDeviceButton", ACTION_TYPE_NONE },
+    { "DeviceValuator", ACTION_TYPE_NONE },
+    { "DevVal", ACTION_TYPE_NONE },
+    { "DeviceVal", ACTION_TYPE_NONE },
+    { "DevValuator", ACTION_TYPE_NONE },
     { NULL, 0 },
 };