f73620
From 6be34265a67e9ca1e30fe42993d5743b01d3b010 Mon Sep 17 00:00:00 2001
f73620
From: rpm-build <rpm-build>
f73620
Date: Fri, 15 Sep 2017 08:55:44 +0100
f73620
Subject: [PATCH] rhel7: Fix build for el7
f73620
f73620
---
f73620
 .../evdev/clutter-virtual-input-device-evdev.c     |   1 +
f73620
 clutter/clutter/evdev/linux/input-event-codes.h    | 838 +++++++++++++++++++++
f73620
 src/backends/native/meta-input-settings-native.c   |   2 +-
f73620
 src/wayland/meta-wayland-tablet-tool.c             |   2 +-
f73620
 4 files changed, 841 insertions(+), 2 deletions(-)
f73620
 create mode 100644 clutter/clutter/evdev/linux/input-event-codes.h
f73620
f73620
diff --git a/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c b/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
f73620
index e487708..8443c0a 100644
f73620
--- a/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
f73620
+++ b/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
f73620
@@ -33,6 +33,7 @@
f73620
 #include "evdev/clutter-input-device-evdev.h"
f73620
 #include "evdev/clutter-seat-evdev.h"
f73620
 #include "evdev/clutter-virtual-input-device-evdev.h"
f73620
+#include "evdev/linux/input-event-codes.h"
f73620
 
f73620
 enum
f73620
 {
f73620
diff --git a/clutter/clutter/evdev/linux/input-event-codes.h b/clutter/clutter/evdev/linux/input-event-codes.h
f73620
new file mode 100644
f73620
index 0000000..e2b5c75
f73620
--- /dev/null
f73620
+++ b/clutter/clutter/evdev/linux/input-event-codes.h
f73620
@@ -0,0 +1,838 @@
f73620
+/*
f73620
+ * Input event codes
f73620
+ *
f73620
+ *    *** IMPORTANT ***
f73620
+ * This file is not only included from C-code but also from devicetree source
f73620
+ * files. As such this file MUST only contain comments and defines.
f73620
+ *
f73620
+ * Copyright (c) 1999-2002 Vojtech Pavlik
f73620
+ * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com>
f73620
+ *
f73620
+ * This program is free software; you can redistribute it and/or modify it
f73620
+ * under the terms of the GNU General Public License version 2 as published by
f73620
+ * the Free Software Foundation.
f73620
+ */
f73620
+#ifndef _INPUT_EVENT_CODES_H
f73620
+#define _INPUT_EVENT_CODES_H
f73620
+
f73620
+/*
f73620
+ * Device properties and quirks
f73620
+ */
f73620
+
f73620
+#define INPUT_PROP_POINTER		0x00	/* needs a pointer */
f73620
+#define INPUT_PROP_DIRECT		0x01	/* direct input devices */
f73620
+#define INPUT_PROP_BUTTONPAD		0x02	/* has button(s) under pad */
f73620
+#define INPUT_PROP_SEMI_MT		0x03	/* touch rectangle only */
f73620
+#define INPUT_PROP_TOPBUTTONPAD		0x04	/* softbuttons at top of pad */
f73620
+#define INPUT_PROP_POINTING_STICK	0x05	/* is a pointing stick */
f73620
+#define INPUT_PROP_ACCELEROMETER	0x06	/* has accelerometer */
f73620
+
f73620
+#define INPUT_PROP_MAX			0x1f
f73620
+#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
f73620
+
f73620
+/*
f73620
+ * Event types
f73620
+ */
f73620
+
f73620
+#define EV_SYN			0x00
f73620
+#define EV_KEY			0x01
f73620
+#define EV_REL			0x02
f73620
+#define EV_ABS			0x03
f73620
+#define EV_MSC			0x04
f73620
+#define EV_SW			0x05
f73620
+#define EV_LED			0x11
f73620
+#define EV_SND			0x12
f73620
+#define EV_REP			0x14
f73620
+#define EV_FF			0x15
f73620
+#define EV_PWR			0x16
f73620
+#define EV_FF_STATUS		0x17
f73620
+#define EV_MAX			0x1f
f73620
+#define EV_CNT			(EV_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Synchronization events.
f73620
+ */
f73620
+
f73620
+#define SYN_REPORT		0
f73620
+#define SYN_CONFIG		1
f73620
+#define SYN_MT_REPORT		2
f73620
+#define SYN_DROPPED		3
f73620
+#define SYN_MAX			0xf
f73620
+#define SYN_CNT			(SYN_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Keys and buttons
f73620
+ *
f73620
+ * Most of the keys/buttons are modeled after USB HUT 1.12
f73620
+ * (see http://www.usb.org/developers/hidpage).
f73620
+ * Abbreviations in the comments:
f73620
+ * AC - Application Control
f73620
+ * AL - Application Launch Button
f73620
+ * SC - System Control
f73620
+ */
f73620
+
f73620
+#define KEY_RESERVED		0
f73620
+#define KEY_ESC			1
f73620
+#define KEY_1			2
f73620
+#define KEY_2			3
f73620
+#define KEY_3			4
f73620
+#define KEY_4			5
f73620
+#define KEY_5			6
f73620
+#define KEY_6			7
f73620
+#define KEY_7			8
f73620
+#define KEY_8			9
f73620
+#define KEY_9			10
f73620
+#define KEY_0			11
f73620
+#define KEY_MINUS		12
f73620
+#define KEY_EQUAL		13
f73620
+#define KEY_BACKSPACE		14
f73620
+#define KEY_TAB			15
f73620
+#define KEY_Q			16
f73620
+#define KEY_W			17
f73620
+#define KEY_E			18
f73620
+#define KEY_R			19
f73620
+#define KEY_T			20
f73620
+#define KEY_Y			21
f73620
+#define KEY_U			22
f73620
+#define KEY_I			23
f73620
+#define KEY_O			24
f73620
+#define KEY_P			25
f73620
+#define KEY_LEFTBRACE		26
f73620
+#define KEY_RIGHTBRACE		27
f73620
+#define KEY_ENTER		28
f73620
+#define KEY_LEFTCTRL		29
f73620
+#define KEY_A			30
f73620
+#define KEY_S			31
f73620
+#define KEY_D			32
f73620
+#define KEY_F			33
f73620
+#define KEY_G			34
f73620
+#define KEY_H			35
f73620
+#define KEY_J			36
f73620
+#define KEY_K			37
f73620
+#define KEY_L			38
f73620
+#define KEY_SEMICOLON		39
f73620
+#define KEY_APOSTROPHE		40
f73620
+#define KEY_GRAVE		41
f73620
+#define KEY_LEFTSHIFT		42
f73620
+#define KEY_BACKSLASH		43
f73620
+#define KEY_Z			44
f73620
+#define KEY_X			45
f73620
+#define KEY_C			46
f73620
+#define KEY_V			47
f73620
+#define KEY_B			48
f73620
+#define KEY_N			49
f73620
+#define KEY_M			50
f73620
+#define KEY_COMMA		51
f73620
+#define KEY_DOT			52
f73620
+#define KEY_SLASH		53
f73620
+#define KEY_RIGHTSHIFT		54
f73620
+#define KEY_KPASTERISK		55
f73620
+#define KEY_LEFTALT		56
f73620
+#define KEY_SPACE		57
f73620
+#define KEY_CAPSLOCK		58
f73620
+#define KEY_F1			59
f73620
+#define KEY_F2			60
f73620
+#define KEY_F3			61
f73620
+#define KEY_F4			62
f73620
+#define KEY_F5			63
f73620
+#define KEY_F6			64
f73620
+#define KEY_F7			65
f73620
+#define KEY_F8			66
f73620
+#define KEY_F9			67
f73620
+#define KEY_F10			68
f73620
+#define KEY_NUMLOCK		69
f73620
+#define KEY_SCROLLLOCK		70
f73620
+#define KEY_KP7			71
f73620
+#define KEY_KP8			72
f73620
+#define KEY_KP9			73
f73620
+#define KEY_KPMINUS		74
f73620
+#define KEY_KP4			75
f73620
+#define KEY_KP5			76
f73620
+#define KEY_KP6			77
f73620
+#define KEY_KPPLUS		78
f73620
+#define KEY_KP1			79
f73620
+#define KEY_KP2			80
f73620
+#define KEY_KP3			81
f73620
+#define KEY_KP0			82
f73620
+#define KEY_KPDOT		83
f73620
+
f73620
+#define KEY_ZENKAKUHANKAKU	85
f73620
+#define KEY_102ND		86
f73620
+#define KEY_F11			87
f73620
+#define KEY_F12			88
f73620
+#define KEY_RO			89
f73620
+#define KEY_KATAKANA		90
f73620
+#define KEY_HIRAGANA		91
f73620
+#define KEY_HENKAN		92
f73620
+#define KEY_KATAKANAHIRAGANA	93
f73620
+#define KEY_MUHENKAN		94
f73620
+#define KEY_KPJPCOMMA		95
f73620
+#define KEY_KPENTER		96
f73620
+#define KEY_RIGHTCTRL		97
f73620
+#define KEY_KPSLASH		98
f73620
+#define KEY_SYSRQ		99
f73620
+#define KEY_RIGHTALT		100
f73620
+#define KEY_LINEFEED		101
f73620
+#define KEY_HOME		102
f73620
+#define KEY_UP			103
f73620
+#define KEY_PAGEUP		104
f73620
+#define KEY_LEFT		105
f73620
+#define KEY_RIGHT		106
f73620
+#define KEY_END			107
f73620
+#define KEY_DOWN		108
f73620
+#define KEY_PAGEDOWN		109
f73620
+#define KEY_INSERT		110
f73620
+#define KEY_DELETE		111
f73620
+#define KEY_MACRO		112
f73620
+#define KEY_MUTE		113
f73620
+#define KEY_VOLUMEDOWN		114
f73620
+#define KEY_VOLUMEUP		115
f73620
+#define KEY_POWER		116	/* SC System Power Down */
f73620
+#define KEY_KPEQUAL		117
f73620
+#define KEY_KPPLUSMINUS		118
f73620
+#define KEY_PAUSE		119
f73620
+#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */
f73620
+
f73620
+#define KEY_KPCOMMA		121
f73620
+#define KEY_HANGEUL		122
f73620
+#define KEY_HANGUEL		KEY_HANGEUL
f73620
+#define KEY_HANJA		123
f73620
+#define KEY_YEN			124
f73620
+#define KEY_LEFTMETA		125
f73620
+#define KEY_RIGHTMETA		126
f73620
+#define KEY_COMPOSE		127
f73620
+
f73620
+#define KEY_STOP		128	/* AC Stop */
f73620
+#define KEY_AGAIN		129
f73620
+#define KEY_PROPS		130	/* AC Properties */
f73620
+#define KEY_UNDO		131	/* AC Undo */
f73620
+#define KEY_FRONT		132
f73620
+#define KEY_COPY		133	/* AC Copy */
f73620
+#define KEY_OPEN		134	/* AC Open */
f73620
+#define KEY_PASTE		135	/* AC Paste */
f73620
+#define KEY_FIND		136	/* AC Search */
f73620
+#define KEY_CUT			137	/* AC Cut */
f73620
+#define KEY_HELP		138	/* AL Integrated Help Center */
f73620
+#define KEY_MENU		139	/* Menu (show menu) */
f73620
+#define KEY_CALC		140	/* AL Calculator */
f73620
+#define KEY_SETUP		141
f73620
+#define KEY_SLEEP		142	/* SC System Sleep */
f73620
+#define KEY_WAKEUP		143	/* System Wake Up */
f73620
+#define KEY_FILE		144	/* AL Local Machine Browser */
f73620
+#define KEY_SENDFILE		145
f73620
+#define KEY_DELETEFILE		146
f73620
+#define KEY_XFER		147
f73620
+#define KEY_PROG1		148
f73620
+#define KEY_PROG2		149
f73620
+#define KEY_WWW			150	/* AL Internet Browser */
f73620
+#define KEY_MSDOS		151
f73620
+#define KEY_COFFEE		152	/* AL Terminal Lock/Screensaver */
f73620
+#define KEY_SCREENLOCK		KEY_COFFEE
f73620
+#define KEY_ROTATE_DISPLAY	153	/* Display orientation for e.g. tablets */
f73620
+#define KEY_DIRECTION		KEY_ROTATE_DISPLAY
f73620
+#define KEY_CYCLEWINDOWS	154
f73620
+#define KEY_MAIL		155
f73620
+#define KEY_BOOKMARKS		156	/* AC Bookmarks */
f73620
+#define KEY_COMPUTER		157
f73620
+#define KEY_BACK		158	/* AC Back */
f73620
+#define KEY_FORWARD		159	/* AC Forward */
f73620
+#define KEY_CLOSECD		160
f73620
+#define KEY_EJECTCD		161
f73620
+#define KEY_EJECTCLOSECD	162
f73620
+#define KEY_NEXTSONG		163
f73620
+#define KEY_PLAYPAUSE		164
f73620
+#define KEY_PREVIOUSSONG	165
f73620
+#define KEY_STOPCD		166
f73620
+#define KEY_RECORD		167
f73620
+#define KEY_REWIND		168
f73620
+#define KEY_PHONE		169	/* Media Select Telephone */
f73620
+#define KEY_ISO			170
f73620
+#define KEY_CONFIG		171	/* AL Consumer Control Configuration */
f73620
+#define KEY_HOMEPAGE		172	/* AC Home */
f73620
+#define KEY_REFRESH		173	/* AC Refresh */
f73620
+#define KEY_EXIT		174	/* AC Exit */
f73620
+#define KEY_MOVE		175
f73620
+#define KEY_EDIT		176
f73620
+#define KEY_SCROLLUP		177
f73620
+#define KEY_SCROLLDOWN		178
f73620
+#define KEY_KPLEFTPAREN		179
f73620
+#define KEY_KPRIGHTPAREN	180
f73620
+#define KEY_NEW			181	/* AC New */
f73620
+#define KEY_REDO		182	/* AC Redo/Repeat */
f73620
+
f73620
+#define KEY_F13			183
f73620
+#define KEY_F14			184
f73620
+#define KEY_F15			185
f73620
+#define KEY_F16			186
f73620
+#define KEY_F17			187
f73620
+#define KEY_F18			188
f73620
+#define KEY_F19			189
f73620
+#define KEY_F20			190
f73620
+#define KEY_F21			191
f73620
+#define KEY_F22			192
f73620
+#define KEY_F23			193
f73620
+#define KEY_F24			194
f73620
+
f73620
+#define KEY_PLAYCD		200
f73620
+#define KEY_PAUSECD		201
f73620
+#define KEY_PROG3		202
f73620
+#define KEY_PROG4		203
f73620
+#define KEY_DASHBOARD		204	/* AL Dashboard */
f73620
+#define KEY_SUSPEND		205
f73620
+#define KEY_CLOSE		206	/* AC Close */
f73620
+#define KEY_PLAY		207
f73620
+#define KEY_FASTFORWARD		208
f73620
+#define KEY_BASSBOOST		209
f73620
+#define KEY_PRINT		210	/* AC Print */
f73620
+#define KEY_HP			211
f73620
+#define KEY_CAMERA		212
f73620
+#define KEY_SOUND		213
f73620
+#define KEY_QUESTION		214
f73620
+#define KEY_EMAIL		215
f73620
+#define KEY_CHAT		216
f73620
+#define KEY_SEARCH		217
f73620
+#define KEY_CONNECT		218
f73620
+#define KEY_FINANCE		219	/* AL Checkbook/Finance */
f73620
+#define KEY_SPORT		220
f73620
+#define KEY_SHOP		221
f73620
+#define KEY_ALTERASE		222
f73620
+#define KEY_CANCEL		223	/* AC Cancel */
f73620
+#define KEY_BRIGHTNESSDOWN	224
f73620
+#define KEY_BRIGHTNESSUP	225
f73620
+#define KEY_MEDIA		226
f73620
+
f73620
+#define KEY_SWITCHVIDEOMODE	227	/* Cycle between available video
f73620
+					   outputs (Monitor/LCD/TV-out/etc) */
f73620
+#define KEY_KBDILLUMTOGGLE	228
f73620
+#define KEY_KBDILLUMDOWN	229
f73620
+#define KEY_KBDILLUMUP		230
f73620
+
f73620
+#define KEY_SEND		231	/* AC Send */
f73620
+#define KEY_REPLY		232	/* AC Reply */
f73620
+#define KEY_FORWARDMAIL		233	/* AC Forward Msg */
f73620
+#define KEY_SAVE		234	/* AC Save */
f73620
+#define KEY_DOCUMENTS		235
f73620
+
f73620
+#define KEY_BATTERY		236
f73620
+
f73620
+#define KEY_BLUETOOTH		237
f73620
+#define KEY_WLAN		238
f73620
+#define KEY_UWB			239
f73620
+
f73620
+#define KEY_UNKNOWN		240
f73620
+
f73620
+#define KEY_VIDEO_NEXT		241	/* drive next video source */
f73620
+#define KEY_VIDEO_PREV		242	/* drive previous video source */
f73620
+#define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
f73620
+#define KEY_BRIGHTNESS_AUTO	244	/* Set Auto Brightness: manual
f73620
+					  brightness control is off,
f73620
+					  rely on ambient */
f73620
+#define KEY_BRIGHTNESS_ZERO	KEY_BRIGHTNESS_AUTO
f73620
+#define KEY_DISPLAY_OFF		245	/* display device to off state */
f73620
+
f73620
+#define KEY_WWAN		246	/* Wireless WAN (LTE, UMTS, GSM, etc.) */
f73620
+#define KEY_WIMAX		KEY_WWAN
f73620
+#define KEY_RFKILL		247	/* Key that controls all radios */
f73620
+
f73620
+#define KEY_MICMUTE		248	/* Mute / unmute the microphone */
f73620
+
f73620
+/* Code 255 is reserved for special needs of AT keyboard driver */
f73620
+
f73620
+#define BTN_MISC		0x100
f73620
+#define BTN_0			0x100
f73620
+#define BTN_1			0x101
f73620
+#define BTN_2			0x102
f73620
+#define BTN_3			0x103
f73620
+#define BTN_4			0x104
f73620
+#define BTN_5			0x105
f73620
+#define BTN_6			0x106
f73620
+#define BTN_7			0x107
f73620
+#define BTN_8			0x108
f73620
+#define BTN_9			0x109
f73620
+
f73620
+#define BTN_MOUSE		0x110
f73620
+#define BTN_LEFT		0x110
f73620
+#define BTN_RIGHT		0x111
f73620
+#define BTN_MIDDLE		0x112
f73620
+#define BTN_SIDE		0x113
f73620
+#define BTN_EXTRA		0x114
f73620
+#define BTN_FORWARD		0x115
f73620
+#define BTN_BACK		0x116
f73620
+#define BTN_TASK		0x117
f73620
+
f73620
+#define BTN_JOYSTICK		0x120
f73620
+#define BTN_TRIGGER		0x120
f73620
+#define BTN_THUMB		0x121
f73620
+#define BTN_THUMB2		0x122
f73620
+#define BTN_TOP			0x123
f73620
+#define BTN_TOP2		0x124
f73620
+#define BTN_PINKIE		0x125
f73620
+#define BTN_BASE		0x126
f73620
+#define BTN_BASE2		0x127
f73620
+#define BTN_BASE3		0x128
f73620
+#define BTN_BASE4		0x129
f73620
+#define BTN_BASE5		0x12a
f73620
+#define BTN_BASE6		0x12b
f73620
+#define BTN_DEAD		0x12f
f73620
+
f73620
+#define BTN_GAMEPAD		0x130
f73620
+#define BTN_SOUTH		0x130
f73620
+#define BTN_A			BTN_SOUTH
f73620
+#define BTN_EAST		0x131
f73620
+#define BTN_B			BTN_EAST
f73620
+#define BTN_C			0x132
f73620
+#define BTN_NORTH		0x133
f73620
+#define BTN_X			BTN_NORTH
f73620
+#define BTN_WEST		0x134
f73620
+#define BTN_Y			BTN_WEST
f73620
+#define BTN_Z			0x135
f73620
+#define BTN_TL			0x136
f73620
+#define BTN_TR			0x137
f73620
+#define BTN_TL2			0x138
f73620
+#define BTN_TR2			0x139
f73620
+#define BTN_SELECT		0x13a
f73620
+#define BTN_START		0x13b
f73620
+#define BTN_MODE		0x13c
f73620
+#define BTN_THUMBL		0x13d
f73620
+#define BTN_THUMBR		0x13e
f73620
+
f73620
+#define BTN_DIGI		0x140
f73620
+#define BTN_TOOL_PEN		0x140
f73620
+#define BTN_TOOL_RUBBER		0x141
f73620
+#define BTN_TOOL_BRUSH		0x142
f73620
+#define BTN_TOOL_PENCIL		0x143
f73620
+#define BTN_TOOL_AIRBRUSH	0x144
f73620
+#define BTN_TOOL_FINGER		0x145
f73620
+#define BTN_TOOL_MOUSE		0x146
f73620
+#define BTN_TOOL_LENS		0x147
f73620
+#define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
f73620
+#define BTN_TOUCH		0x14a
f73620
+#define BTN_STYLUS		0x14b
f73620
+#define BTN_STYLUS2		0x14c
f73620
+#define BTN_TOOL_DOUBLETAP	0x14d
f73620
+#define BTN_TOOL_TRIPLETAP	0x14e
f73620
+#define BTN_TOOL_QUADTAP	0x14f	/* Four fingers on trackpad */
f73620
+
f73620
+#define BTN_WHEEL		0x150
f73620
+#define BTN_GEAR_DOWN		0x150
f73620
+#define BTN_GEAR_UP		0x151
f73620
+
f73620
+#define KEY_OK			0x160
f73620
+#define KEY_SELECT		0x161
f73620
+#define KEY_GOTO		0x162
f73620
+#define KEY_CLEAR		0x163
f73620
+#define KEY_POWER2		0x164
f73620
+#define KEY_OPTION		0x165
f73620
+#define KEY_INFO		0x166	/* AL OEM Features/Tips/Tutorial */
f73620
+#define KEY_TIME		0x167
f73620
+#define KEY_VENDOR		0x168
f73620
+#define KEY_ARCHIVE		0x169
f73620
+#define KEY_PROGRAM		0x16a	/* Media Select Program Guide */
f73620
+#define KEY_CHANNEL		0x16b
f73620
+#define KEY_FAVORITES		0x16c
f73620
+#define KEY_EPG			0x16d
f73620
+#define KEY_PVR			0x16e	/* Media Select Home */
f73620
+#define KEY_MHP			0x16f
f73620
+#define KEY_LANGUAGE		0x170
f73620
+#define KEY_TITLE		0x171
f73620
+#define KEY_SUBTITLE		0x172
f73620
+#define KEY_ANGLE		0x173
f73620
+#define KEY_ZOOM		0x174
f73620
+#define KEY_MODE		0x175
f73620
+#define KEY_KEYBOARD		0x176
f73620
+#define KEY_SCREEN		0x177
f73620
+#define KEY_PC			0x178	/* Media Select Computer */
f73620
+#define KEY_TV			0x179	/* Media Select TV */
f73620
+#define KEY_TV2			0x17a	/* Media Select Cable */
f73620
+#define KEY_VCR			0x17b	/* Media Select VCR */
f73620
+#define KEY_VCR2		0x17c	/* VCR Plus */
f73620
+#define KEY_SAT			0x17d	/* Media Select Satellite */
f73620
+#define KEY_SAT2		0x17e
f73620
+#define KEY_CD			0x17f	/* Media Select CD */
f73620
+#define KEY_TAPE		0x180	/* Media Select Tape */
f73620
+#define KEY_RADIO		0x181
f73620
+#define KEY_TUNER		0x182	/* Media Select Tuner */
f73620
+#define KEY_PLAYER		0x183
f73620
+#define KEY_TEXT		0x184
f73620
+#define KEY_DVD			0x185	/* Media Select DVD */
f73620
+#define KEY_AUX			0x186
f73620
+#define KEY_MP3			0x187
f73620
+#define KEY_AUDIO		0x188	/* AL Audio Browser */
f73620
+#define KEY_VIDEO		0x189	/* AL Movie Browser */
f73620
+#define KEY_DIRECTORY		0x18a
f73620
+#define KEY_LIST		0x18b
f73620
+#define KEY_MEMO		0x18c	/* Media Select Messages */
f73620
+#define KEY_CALENDAR		0x18d
f73620
+#define KEY_RED			0x18e
f73620
+#define KEY_GREEN		0x18f
f73620
+#define KEY_YELLOW		0x190
f73620
+#define KEY_BLUE		0x191
f73620
+#define KEY_CHANNELUP		0x192	/* Channel Increment */
f73620
+#define KEY_CHANNELDOWN		0x193	/* Channel Decrement */
f73620
+#define KEY_FIRST		0x194
f73620
+#define KEY_LAST		0x195	/* Recall Last */
f73620
+#define KEY_AB			0x196
f73620
+#define KEY_NEXT		0x197
f73620
+#define KEY_RESTART		0x198
f73620
+#define KEY_SLOW		0x199
f73620
+#define KEY_SHUFFLE		0x19a
f73620
+#define KEY_BREAK		0x19b
f73620
+#define KEY_PREVIOUS		0x19c
f73620
+#define KEY_DIGITS		0x19d
f73620
+#define KEY_TEEN		0x19e
f73620
+#define KEY_TWEN		0x19f
f73620
+#define KEY_VIDEOPHONE		0x1a0	/* Media Select Video Phone */
f73620
+#define KEY_GAMES		0x1a1	/* Media Select Games */
f73620
+#define KEY_ZOOMIN		0x1a2	/* AC Zoom In */
f73620
+#define KEY_ZOOMOUT		0x1a3	/* AC Zoom Out */
f73620
+#define KEY_ZOOMRESET		0x1a4	/* AC Zoom */
f73620
+#define KEY_WORDPROCESSOR	0x1a5	/* AL Word Processor */
f73620
+#define KEY_EDITOR		0x1a6	/* AL Text Editor */
f73620
+#define KEY_SPREADSHEET		0x1a7	/* AL Spreadsheet */
f73620
+#define KEY_GRAPHICSEDITOR	0x1a8	/* AL Graphics Editor */
f73620
+#define KEY_PRESENTATION	0x1a9	/* AL Presentation App */
f73620
+#define KEY_DATABASE		0x1aa	/* AL Database App */
f73620
+#define KEY_NEWS		0x1ab	/* AL Newsreader */
f73620
+#define KEY_VOICEMAIL		0x1ac	/* AL Voicemail */
f73620
+#define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
f73620
+#define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
f73620
+#define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
f73620
+#define KEY_BRIGHTNESS_TOGGLE	KEY_DISPLAYTOGGLE
f73620
+#define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
f73620
+#define KEY_LOGOFF		0x1b1   /* AL Logoff */
f73620
+
f73620
+#define KEY_DOLLAR		0x1b2
f73620
+#define KEY_EURO		0x1b3
f73620
+
f73620
+#define KEY_FRAMEBACK		0x1b4	/* Consumer - transport controls */
f73620
+#define KEY_FRAMEFORWARD	0x1b5
f73620
+#define KEY_CONTEXT_MENU	0x1b6	/* GenDesc - system context menu */
f73620
+#define KEY_MEDIA_REPEAT	0x1b7	/* Consumer - transport control */
f73620
+#define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
f73620
+#define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
f73620
+#define KEY_IMAGES		0x1ba	/* AL Image Browser */
f73620
+
f73620
+#define KEY_DEL_EOL		0x1c0
f73620
+#define KEY_DEL_EOS		0x1c1
f73620
+#define KEY_INS_LINE		0x1c2
f73620
+#define KEY_DEL_LINE		0x1c3
f73620
+
f73620
+#define KEY_FN			0x1d0
f73620
+#define KEY_FN_ESC		0x1d1
f73620
+#define KEY_FN_F1		0x1d2
f73620
+#define KEY_FN_F2		0x1d3
f73620
+#define KEY_FN_F3		0x1d4
f73620
+#define KEY_FN_F4		0x1d5
f73620
+#define KEY_FN_F5		0x1d6
f73620
+#define KEY_FN_F6		0x1d7
f73620
+#define KEY_FN_F7		0x1d8
f73620
+#define KEY_FN_F8		0x1d9
f73620
+#define KEY_FN_F9		0x1da
f73620
+#define KEY_FN_F10		0x1db
f73620
+#define KEY_FN_F11		0x1dc
f73620
+#define KEY_FN_F12		0x1dd
f73620
+#define KEY_FN_1		0x1de
f73620
+#define KEY_FN_2		0x1df
f73620
+#define KEY_FN_D		0x1e0
f73620
+#define KEY_FN_E		0x1e1
f73620
+#define KEY_FN_F		0x1e2
f73620
+#define KEY_FN_S		0x1e3
f73620
+#define KEY_FN_B		0x1e4
f73620
+
f73620
+#define KEY_BRL_DOT1		0x1f1
f73620
+#define KEY_BRL_DOT2		0x1f2
f73620
+#define KEY_BRL_DOT3		0x1f3
f73620
+#define KEY_BRL_DOT4		0x1f4
f73620
+#define KEY_BRL_DOT5		0x1f5
f73620
+#define KEY_BRL_DOT6		0x1f6
f73620
+#define KEY_BRL_DOT7		0x1f7
f73620
+#define KEY_BRL_DOT8		0x1f8
f73620
+#define KEY_BRL_DOT9		0x1f9
f73620
+#define KEY_BRL_DOT10		0x1fa
f73620
+
f73620
+#define KEY_NUMERIC_0		0x200	/* used by phones, remote controls, */
f73620
+#define KEY_NUMERIC_1		0x201	/* and other keypads */
f73620
+#define KEY_NUMERIC_2		0x202
f73620
+#define KEY_NUMERIC_3		0x203
f73620
+#define KEY_NUMERIC_4		0x204
f73620
+#define KEY_NUMERIC_5		0x205
f73620
+#define KEY_NUMERIC_6		0x206
f73620
+#define KEY_NUMERIC_7		0x207
f73620
+#define KEY_NUMERIC_8		0x208
f73620
+#define KEY_NUMERIC_9		0x209
f73620
+#define KEY_NUMERIC_STAR	0x20a
f73620
+#define KEY_NUMERIC_POUND	0x20b
f73620
+#define KEY_NUMERIC_A		0x20c	/* Phone key A - HUT Telephony 0xb9 */
f73620
+#define KEY_NUMERIC_B		0x20d
f73620
+#define KEY_NUMERIC_C		0x20e
f73620
+#define KEY_NUMERIC_D		0x20f
f73620
+
f73620
+#define KEY_CAMERA_FOCUS	0x210
f73620
+#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
f73620
+
f73620
+#define KEY_TOUCHPAD_TOGGLE	0x212	/* Request switch touchpad on or off */
f73620
+#define KEY_TOUCHPAD_ON		0x213
f73620
+#define KEY_TOUCHPAD_OFF	0x214
f73620
+
f73620
+#define KEY_CAMERA_ZOOMIN	0x215
f73620
+#define KEY_CAMERA_ZOOMOUT	0x216
f73620
+#define KEY_CAMERA_UP		0x217
f73620
+#define KEY_CAMERA_DOWN		0x218
f73620
+#define KEY_CAMERA_LEFT		0x219
f73620
+#define KEY_CAMERA_RIGHT	0x21a
f73620
+
f73620
+#define KEY_ATTENDANT_ON	0x21b
f73620
+#define KEY_ATTENDANT_OFF	0x21c
f73620
+#define KEY_ATTENDANT_TOGGLE	0x21d	/* Attendant call on or off */
f73620
+#define KEY_LIGHTS_TOGGLE	0x21e	/* Reading light on or off */
f73620
+
f73620
+#define BTN_DPAD_UP		0x220
f73620
+#define BTN_DPAD_DOWN		0x221
f73620
+#define BTN_DPAD_LEFT		0x222
f73620
+#define BTN_DPAD_RIGHT		0x223
f73620
+
f73620
+#define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
f73620
+
f73620
+#define KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
f73620
+#define KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
f73620
+#define KEY_JOURNAL		0x242	/* AL Log/Journal/Timecard */
f73620
+#define KEY_CONTROLPANEL		0x243	/* AL Control Panel */
f73620
+#define KEY_APPSELECT		0x244	/* AL Select Task/Application */
f73620
+#define KEY_SCREENSAVER		0x245	/* AL Screen Saver */
f73620
+#define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
f73620
+
f73620
+#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
f73620
+#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
f73620
+
f73620
+#define KEY_KBDINPUTASSIST_PREV		0x260
f73620
+#define KEY_KBDINPUTASSIST_NEXT		0x261
f73620
+#define KEY_KBDINPUTASSIST_PREVGROUP		0x262
f73620
+#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263
f73620
+#define KEY_KBDINPUTASSIST_ACCEPT		0x264
f73620
+#define KEY_KBDINPUTASSIST_CANCEL		0x265
f73620
+
f73620
+/* Diagonal movement keys */
f73620
+#define KEY_RIGHT_UP			0x266
f73620
+#define KEY_RIGHT_DOWN			0x267
f73620
+#define KEY_LEFT_UP			0x268
f73620
+#define KEY_LEFT_DOWN			0x269
f73620
+
f73620
+#define KEY_ROOT_MENU			0x26a /* Show Device's Root Menu */
f73620
+/* Show Top Menu of the Media (e.g. DVD) */
f73620
+#define KEY_MEDIA_TOP_MENU		0x26b
f73620
+#define KEY_NUMERIC_11			0x26c
f73620
+#define KEY_NUMERIC_12			0x26d
f73620
+/*
f73620
+ * Toggle Audio Description: refers to an audio service that helps blind and
f73620
+ * visually impaired consumers understand the action in a program. Note: in
f73620
+ * some countries this is referred to as "Video Description".
f73620
+ */
f73620
+#define KEY_AUDIO_DESC			0x26e
f73620
+#define KEY_3D_MODE			0x26f
f73620
+#define KEY_NEXT_FAVORITE		0x270
f73620
+#define KEY_STOP_RECORD			0x271
f73620
+#define KEY_PAUSE_RECORD		0x272
f73620
+#define KEY_VOD				0x273 /* Video on Demand */
f73620
+#define KEY_UNMUTE			0x274
f73620
+#define KEY_FASTREVERSE			0x275
f73620
+#define KEY_SLOWREVERSE			0x276
f73620
+/*
f73620
+ * Control a data application associated with the currently viewed channel,
f73620
+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
f73620
+ */
f73620
+#define KEY_DATA			0x277
f73620
+#define KEY_ONSCREEN_KEYBOARD		0x278
f73620
+
f73620
+#define BTN_TRIGGER_HAPPY		0x2c0
f73620
+#define BTN_TRIGGER_HAPPY1		0x2c0
f73620
+#define BTN_TRIGGER_HAPPY2		0x2c1
f73620
+#define BTN_TRIGGER_HAPPY3		0x2c2
f73620
+#define BTN_TRIGGER_HAPPY4		0x2c3
f73620
+#define BTN_TRIGGER_HAPPY5		0x2c4
f73620
+#define BTN_TRIGGER_HAPPY6		0x2c5
f73620
+#define BTN_TRIGGER_HAPPY7		0x2c6
f73620
+#define BTN_TRIGGER_HAPPY8		0x2c7
f73620
+#define BTN_TRIGGER_HAPPY9		0x2c8
f73620
+#define BTN_TRIGGER_HAPPY10		0x2c9
f73620
+#define BTN_TRIGGER_HAPPY11		0x2ca
f73620
+#define BTN_TRIGGER_HAPPY12		0x2cb
f73620
+#define BTN_TRIGGER_HAPPY13		0x2cc
f73620
+#define BTN_TRIGGER_HAPPY14		0x2cd
f73620
+#define BTN_TRIGGER_HAPPY15		0x2ce
f73620
+#define BTN_TRIGGER_HAPPY16		0x2cf
f73620
+#define BTN_TRIGGER_HAPPY17		0x2d0
f73620
+#define BTN_TRIGGER_HAPPY18		0x2d1
f73620
+#define BTN_TRIGGER_HAPPY19		0x2d2
f73620
+#define BTN_TRIGGER_HAPPY20		0x2d3
f73620
+#define BTN_TRIGGER_HAPPY21		0x2d4
f73620
+#define BTN_TRIGGER_HAPPY22		0x2d5
f73620
+#define BTN_TRIGGER_HAPPY23		0x2d6
f73620
+#define BTN_TRIGGER_HAPPY24		0x2d7
f73620
+#define BTN_TRIGGER_HAPPY25		0x2d8
f73620
+#define BTN_TRIGGER_HAPPY26		0x2d9
f73620
+#define BTN_TRIGGER_HAPPY27		0x2da
f73620
+#define BTN_TRIGGER_HAPPY28		0x2db
f73620
+#define BTN_TRIGGER_HAPPY29		0x2dc
f73620
+#define BTN_TRIGGER_HAPPY30		0x2dd
f73620
+#define BTN_TRIGGER_HAPPY31		0x2de
f73620
+#define BTN_TRIGGER_HAPPY32		0x2df
f73620
+#define BTN_TRIGGER_HAPPY33		0x2e0
f73620
+#define BTN_TRIGGER_HAPPY34		0x2e1
f73620
+#define BTN_TRIGGER_HAPPY35		0x2e2
f73620
+#define BTN_TRIGGER_HAPPY36		0x2e3
f73620
+#define BTN_TRIGGER_HAPPY37		0x2e4
f73620
+#define BTN_TRIGGER_HAPPY38		0x2e5
f73620
+#define BTN_TRIGGER_HAPPY39		0x2e6
f73620
+#define BTN_TRIGGER_HAPPY40		0x2e7
f73620
+
f73620
+/* We avoid low common keys in module aliases so they don't get huge. */
f73620
+#define KEY_MIN_INTERESTING	KEY_MUTE
f73620
+#define KEY_MAX			0x2ff
f73620
+#define KEY_CNT			(KEY_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Relative axes
f73620
+ */
f73620
+
f73620
+#define REL_X			0x00
f73620
+#define REL_Y			0x01
f73620
+#define REL_Z			0x02
f73620
+#define REL_RX			0x03
f73620
+#define REL_RY			0x04
f73620
+#define REL_RZ			0x05
f73620
+#define REL_HWHEEL		0x06
f73620
+#define REL_DIAL		0x07
f73620
+#define REL_WHEEL		0x08
f73620
+#define REL_MISC		0x09
f73620
+#define REL_MAX			0x0f
f73620
+#define REL_CNT			(REL_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Absolute axes
f73620
+ */
f73620
+
f73620
+#define ABS_X			0x00
f73620
+#define ABS_Y			0x01
f73620
+#define ABS_Z			0x02
f73620
+#define ABS_RX			0x03
f73620
+#define ABS_RY			0x04
f73620
+#define ABS_RZ			0x05
f73620
+#define ABS_THROTTLE		0x06
f73620
+#define ABS_RUDDER		0x07
f73620
+#define ABS_WHEEL		0x08
f73620
+#define ABS_GAS			0x09
f73620
+#define ABS_BRAKE		0x0a
f73620
+#define ABS_HAT0X		0x10
f73620
+#define ABS_HAT0Y		0x11
f73620
+#define ABS_HAT1X		0x12
f73620
+#define ABS_HAT1Y		0x13
f73620
+#define ABS_HAT2X		0x14
f73620
+#define ABS_HAT2Y		0x15
f73620
+#define ABS_HAT3X		0x16
f73620
+#define ABS_HAT3Y		0x17
f73620
+#define ABS_PRESSURE		0x18
f73620
+#define ABS_DISTANCE		0x19
f73620
+#define ABS_TILT_X		0x1a
f73620
+#define ABS_TILT_Y		0x1b
f73620
+#define ABS_TOOL_WIDTH		0x1c
f73620
+
f73620
+#define ABS_VOLUME		0x20
f73620
+
f73620
+#define ABS_MISC		0x28
f73620
+
f73620
+#define ABS_MT_SLOT		0x2f	/* MT slot being modified */
f73620
+#define ABS_MT_TOUCH_MAJOR	0x30	/* Major axis of touching ellipse */
f73620
+#define ABS_MT_TOUCH_MINOR	0x31	/* Minor axis (omit if circular) */
f73620
+#define ABS_MT_WIDTH_MAJOR	0x32	/* Major axis of approaching ellipse */
f73620
+#define ABS_MT_WIDTH_MINOR	0x33	/* Minor axis (omit if circular) */
f73620
+#define ABS_MT_ORIENTATION	0x34	/* Ellipse orientation */
f73620
+#define ABS_MT_POSITION_X	0x35	/* Center X touch position */
f73620
+#define ABS_MT_POSITION_Y	0x36	/* Center Y touch position */
f73620
+#define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
f73620
+#define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
f73620
+#define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
f73620
+#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
f73620
+#define ABS_MT_DISTANCE		0x3b	/* Contact hover distance */
f73620
+#define ABS_MT_TOOL_X		0x3c	/* Center X tool position */
f73620
+#define ABS_MT_TOOL_Y		0x3d	/* Center Y tool position */
f73620
+
f73620
+
f73620
+#define ABS_MAX			0x3f
f73620
+#define ABS_CNT			(ABS_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Switch events
f73620
+ */
f73620
+
f73620
+#define SW_LID			0x00  /* set = lid shut */
f73620
+#define SW_TABLET_MODE		0x01  /* set = tablet mode */
f73620
+#define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
f73620
+#define SW_RFKILL_ALL		0x03  /* rfkill master switch, type "any"
f73620
+					 set = radio enabled */
f73620
+#define SW_RADIO		SW_RFKILL_ALL	/* deprecated */
f73620
+#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */
f73620
+#define SW_DOCK			0x05  /* set = plugged into dock */
f73620
+#define SW_LINEOUT_INSERT	0x06  /* set = inserted */
f73620
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
f73620
+#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */
f73620
+#define SW_CAMERA_LENS_COVER	0x09  /* set = lens covered */
f73620
+#define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
f73620
+#define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
f73620
+#define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
f73620
+#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
f73620
+#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
f73620
+#define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
f73620
+#define SW_MAX			0x0f
f73620
+#define SW_CNT			(SW_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Misc events
f73620
+ */
f73620
+
f73620
+#define MSC_SERIAL		0x00
f73620
+#define MSC_PULSELED		0x01
f73620
+#define MSC_GESTURE		0x02
f73620
+#define MSC_RAW			0x03
f73620
+#define MSC_SCAN		0x04
f73620
+#define MSC_TIMESTAMP		0x05
f73620
+#define MSC_MAX			0x07
f73620
+#define MSC_CNT			(MSC_MAX+1)
f73620
+
f73620
+/*
f73620
+ * LEDs
f73620
+ */
f73620
+
f73620
+#define LED_NUML		0x00
f73620
+#define LED_CAPSL		0x01
f73620
+#define LED_SCROLLL		0x02
f73620
+#define LED_COMPOSE		0x03
f73620
+#define LED_KANA		0x04
f73620
+#define LED_SLEEP		0x05
f73620
+#define LED_SUSPEND		0x06
f73620
+#define LED_MUTE		0x07
f73620
+#define LED_MISC		0x08
f73620
+#define LED_MAIL		0x09
f73620
+#define LED_CHARGING		0x0a
f73620
+#define LED_MAX			0x0f
f73620
+#define LED_CNT			(LED_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Autorepeat values
f73620
+ */
f73620
+
f73620
+#define REP_DELAY		0x00
f73620
+#define REP_PERIOD		0x01
f73620
+#define REP_MAX			0x01
f73620
+#define REP_CNT			(REP_MAX+1)
f73620
+
f73620
+/*
f73620
+ * Sounds
f73620
+ */
f73620
+
f73620
+#define SND_CLICK		0x00
f73620
+#define SND_BELL		0x01
f73620
+#define SND_TONE		0x02
f73620
+#define SND_MAX			0x07
f73620
+#define SND_CNT			(SND_MAX+1)
f73620
+
f73620
+#endif
f73620
diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c
f73620
index 8a62bb3..8a5ff5b 100644
f73620
--- a/src/backends/native/meta-input-settings-native.c
f73620
+++ b/src/backends/native/meta-input-settings-native.c
f73620
@@ -24,7 +24,7 @@
f73620
 #include "config.h"
f73620
 
f73620
 #include <clutter/evdev/clutter-evdev.h>
f73620
-#include <linux/input-event-codes.h>
f73620
+#include <clutter/evdev/linux/input-event-codes.h>
f73620
 #include <libinput.h>
f73620
 
f73620
 #include "meta-backend-native.h"
f73620
diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c
f73620
index 4b57d41..5675f48 100644
f73620
--- a/src/wayland/meta-wayland-tablet-tool.c
f73620
+++ b/src/wayland/meta-wayland-tablet-tool.c
f73620
@@ -41,7 +41,7 @@
f73620
 
f73620
 #ifdef HAVE_NATIVE_BACKEND
f73620
 #include "backends/native/meta-backend-native.h"
f73620
-#include <linux/input-event-codes.h>
f73620
+#include <clutter/evdev/linux/input-event-codes.h>
f73620
 #endif
f73620
 
f73620
 #define TABLET_AXIS_MAX 65535
f73620
-- 
f73620
1.8.3.1
f73620