| From edb0023742b2f1a1140cc77c3a3ad890f389ddd3 Mon Sep 17 00:00:00 2001 |
| From: Peter Hutterer <peter.hutterer@who-t.net> |
| Date: Wed, 5 Jan 2011 10:25:54 +1000 |
| Subject: [PATCH 16/18] Move the button assignments down in the array for easier updating. |
| |
| Having all BTN_* together makes it a tad easier to update them. |
| |
| Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
| --- |
| evtest.c | 65 +++++++++++++++++++++++++++++++------------------------------ |
| 1 files changed, 33 insertions(+), 32 deletions(-) |
| |
| diff --git a/evtest.c b/evtest.c |
| index 53ed2a8..a8bfed6 100644 |
| --- a/evtest.c |
| +++ b/evtest.c |
| @@ -166,38 +166,7 @@ char *keys[KEY_MAX + 1] = { |
| [KEY_ALTERASE] = "Alternate Erase", [KEY_CANCEL] = "Cancel", |
| [KEY_BRIGHTNESSDOWN] = "Brightness down", [KEY_BRIGHTNESSUP] = "Brightness up", |
| [KEY_MEDIA] = "Media", [KEY_UNKNOWN] = "Unknown", |
| - [BTN_0] = "Btn0", [BTN_1] = "Btn1", |
| - [BTN_2] = "Btn2", [BTN_3] = "Btn3", |
| - [BTN_4] = "Btn4", [BTN_5] = "Btn5", |
| - [BTN_6] = "Btn6", [BTN_7] = "Btn7", |
| - [BTN_8] = "Btn8", [BTN_9] = "Btn9", |
| - [BTN_LEFT] = "LeftBtn", [BTN_RIGHT] = "RightBtn", |
| - [BTN_MIDDLE] = "MiddleBtn", [BTN_SIDE] = "SideBtn", |
| - [BTN_EXTRA] = "ExtraBtn", [BTN_FORWARD] = "ForwardBtn", |
| - [BTN_BACK] = "BackBtn", [BTN_TASK] = "TaskBtn", |
| - [BTN_TRIGGER] = "Trigger", [BTN_THUMB] = "ThumbBtn", |
| - [BTN_THUMB2] = "ThumbBtn2", [BTN_TOP] = "TopBtn", |
| - [BTN_TOP2] = "TopBtn2", [BTN_PINKIE] = "PinkieBtn", |
| - [BTN_BASE] = "BaseBtn", [BTN_BASE2] = "BaseBtn2", |
| - [BTN_BASE3] = "BaseBtn3", [BTN_BASE4] = "BaseBtn4", |
| - [BTN_BASE5] = "BaseBtn5", [BTN_BASE6] = "BaseBtn6", |
| - [BTN_DEAD] = "BtnDead", [BTN_A] = "BtnA", |
| - [BTN_B] = "BtnB", [BTN_C] = "BtnC", |
| - [BTN_X] = "BtnX", [BTN_Y] = "BtnY", |
| - [BTN_Z] = "BtnZ", [BTN_TL] = "BtnTL", |
| - [BTN_TR] = "BtnTR", [BTN_TL2] = "BtnTL2", |
| - [BTN_TR2] = "BtnTR2", [BTN_SELECT] = "BtnSelect", |
| - [BTN_START] = "BtnStart", [BTN_MODE] = "BtnMode", |
| - [BTN_THUMBL] = "BtnThumbL", [BTN_THUMBR] = "BtnThumbR", |
| - [BTN_TOOL_PEN] = "ToolPen", [BTN_TOOL_RUBBER] = "ToolRubber", |
| - [BTN_TOOL_BRUSH] = "ToolBrush", [BTN_TOOL_PENCIL] = "ToolPencil", |
| - [BTN_TOOL_AIRBRUSH] = "ToolAirbrush", [BTN_TOOL_FINGER] = "ToolFinger", |
| - [BTN_TOOL_MOUSE] = "ToolMouse", [BTN_TOOL_LENS] = "ToolLens", |
| - [BTN_TOUCH] = "Touch", [BTN_STYLUS] = "Stylus", |
| - [BTN_STYLUS2] = "Stylus2", [BTN_TOOL_DOUBLETAP] = "Tool Doubletap", |
| - [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_TOOL_QUADTAP] = "Tool Quadtap", |
| - [BTN_GEAR_DOWN] = "WheelBtn", |
| - [BTN_GEAR_UP] = "Gear up", [KEY_OK] = "Ok", |
| + [KEY_OK] = "Ok", |
| [KEY_SELECT] = "Select", [KEY_GOTO] = "Goto", |
| [KEY_CLEAR] = "Clear", [KEY_POWER2] = "Power2", |
| [KEY_OPTION] = "Option", [KEY_INFO] = "Info", |
| @@ -293,6 +262,38 @@ char *keys[KEY_MAX + 1] = { |
| [KEY_TOUCHPAD_OFF] = "Touchpad Off", |
| #endif |
| |
| + [BTN_0] = "Btn0", [BTN_1] = "Btn1", |
| + [BTN_2] = "Btn2", [BTN_3] = "Btn3", |
| + [BTN_4] = "Btn4", [BTN_5] = "Btn5", |
| + [BTN_6] = "Btn6", [BTN_7] = "Btn7", |
| + [BTN_8] = "Btn8", [BTN_9] = "Btn9", |
| + [BTN_LEFT] = "LeftBtn", [BTN_RIGHT] = "RightBtn", |
| + [BTN_MIDDLE] = "MiddleBtn", [BTN_SIDE] = "SideBtn", |
| + [BTN_EXTRA] = "ExtraBtn", [BTN_FORWARD] = "ForwardBtn", |
| + [BTN_BACK] = "BackBtn", [BTN_TASK] = "TaskBtn", |
| + [BTN_TRIGGER] = "Trigger", [BTN_THUMB] = "ThumbBtn", |
| + [BTN_THUMB2] = "ThumbBtn2", [BTN_TOP] = "TopBtn", |
| + [BTN_TOP2] = "TopBtn2", [BTN_PINKIE] = "PinkieBtn", |
| + [BTN_BASE] = "BaseBtn", [BTN_BASE2] = "BaseBtn2", |
| + [BTN_BASE3] = "BaseBtn3", [BTN_BASE4] = "BaseBtn4", |
| + [BTN_BASE5] = "BaseBtn5", [BTN_BASE6] = "BaseBtn6", |
| + [BTN_DEAD] = "BtnDead", [BTN_A] = "BtnA", |
| + [BTN_B] = "BtnB", [BTN_C] = "BtnC", |
| + [BTN_X] = "BtnX", [BTN_Y] = "BtnY", |
| + [BTN_Z] = "BtnZ", [BTN_TL] = "BtnTL", |
| + [BTN_TR] = "BtnTR", [BTN_TL2] = "BtnTL2", |
| + [BTN_TR2] = "BtnTR2", [BTN_SELECT] = "BtnSelect", |
| + [BTN_START] = "BtnStart", [BTN_MODE] = "BtnMode", |
| + [BTN_THUMBL] = "BtnThumbL", [BTN_THUMBR] = "BtnThumbR", |
| + [BTN_TOOL_PEN] = "ToolPen", [BTN_TOOL_RUBBER] = "ToolRubber", |
| + [BTN_TOOL_BRUSH] = "ToolBrush", [BTN_TOOL_PENCIL] = "ToolPencil", |
| + [BTN_TOOL_AIRBRUSH] = "ToolAirbrush", [BTN_TOOL_FINGER] = "ToolFinger", |
| + [BTN_TOOL_MOUSE] = "ToolMouse", [BTN_TOOL_LENS] = "ToolLens", |
| + [BTN_TOUCH] = "Touch", [BTN_STYLUS] = "Stylus", |
| + [BTN_STYLUS2] = "Stylus2", [BTN_TOOL_DOUBLETAP] = "Tool Doubletap", |
| + [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_TOOL_QUADTAP] = "Tool Quadtap", |
| + [BTN_GEAR_DOWN] = "WheelBtn", |
| + [BTN_GEAR_UP] = "Gear up", |
| }; |
| |
| char *absval[6] = { "Value", "Min ", "Max ", "Fuzz ", "Flat ", "Resolution "}; |
| -- |
| 1.7.3.1 |
| |