am 89ee578b: am fd035829: Add initial gamepad support. (6ac7674e) · Commits · e / os / android_frameworks_base

api/current.xml

+165 −0

Original line number	Original line	Diff line number	Diff line
	@@ -178411,6 +178411,171 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="KEYCODE_BUTTON_A"
			type="int"
			transient="false"
			volatile="false"
			value="96"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_B"
			type="int"
			transient="false"
			volatile="false"
			value="97"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_C"
			type="int"
			transient="false"
			volatile="false"
			value="98"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_L1"
			type="int"
			transient="false"
			volatile="false"
			value="102"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_L2"
			type="int"
			transient="false"
			volatile="false"
			value="104"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_MODE"
			type="int"
			transient="false"
			volatile="false"
			value="110"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_R1"
			type="int"
			transient="false"
			volatile="false"
			value="103"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_R2"
			type="int"
			transient="false"
			volatile="false"
			value="105"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_SELECT"
			type="int"
			transient="false"
			volatile="false"
			value="109"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_START"
			type="int"
			transient="false"
			volatile="false"
			value="108"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_THUMBL"
			type="int"
			transient="false"
			volatile="false"
			value="106"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_THUMBR"
			type="int"
			transient="false"
			volatile="false"
			value="107"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_X"
			type="int"
			transient="false"
			volatile="false"
			value="99"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_Y"
			type="int"
			transient="false"
			volatile="false"
			value="100"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="KEYCODE_BUTTON_Z"
			type="int"
			transient="false"
			volatile="false"
			value="101"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="KEYCODE_C"		<field name="KEYCODE_C"
	type="int"		type="int"
	transient="false"		transient="false"

core/java/android/view/KeyEvent.java

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -124,11 +124,27 @@ public class KeyEvent implements Parcelable {
	public static final int KEYCODE_PAGE_DOWN = 93;		public static final int KEYCODE_PAGE_DOWN = 93;
	public static final int KEYCODE_PICTSYMBOLS = 94; // switch symbol-sets (Emoji,Kao-moji)		public static final int KEYCODE_PICTSYMBOLS = 94; // switch symbol-sets (Emoji,Kao-moji)
	public static final int KEYCODE_SWITCH_CHARSET = 95; // switch char-sets (Kanji,Katakana)		public static final int KEYCODE_SWITCH_CHARSET = 95; // switch char-sets (Kanji,Katakana)
			public static final int KEYCODE_BUTTON_A = 96;
			public static final int KEYCODE_BUTTON_B = 97;
			public static final int KEYCODE_BUTTON_C = 98;
			public static final int KEYCODE_BUTTON_X = 99;
			public static final int KEYCODE_BUTTON_Y = 100;
			public static final int KEYCODE_BUTTON_Z = 101;
			public static final int KEYCODE_BUTTON_L1 = 102;
			public static final int KEYCODE_BUTTON_R1 = 103;
			public static final int KEYCODE_BUTTON_L2 = 104;
			public static final int KEYCODE_BUTTON_R2 = 105;
			public static final int KEYCODE_BUTTON_THUMBL = 106;
			public static final int KEYCODE_BUTTON_THUMBR = 107;
			public static final int KEYCODE_BUTTON_START = 108;
			public static final int KEYCODE_BUTTON_SELECT = 109;
			public static final int KEYCODE_BUTTON_MODE = 110;

	// NOTE: If you add a new keycode here you must also add it to:		// NOTE: If you add a new keycode here you must also add it to:
	// isSystem()		// isSystem()
	// native/include/android/keycodes.h		// native/include/android/keycodes.h
	// frameworks/base/include/ui/KeycodeLabels.h		// frameworks/base/include/ui/KeycodeLabels.h
			// external/webkit/WebKit/android/plugins/ANPKeyCodes.h
	// tools/puppet_master/PuppetMaster/nav_keys.py		// tools/puppet_master/PuppetMaster/nav_keys.py
	// frameworks/base/core/res/res/values/attrs.xml		// frameworks/base/core/res/res/values/attrs.xml
	// commands/monkey/Monkey.java		// commands/monkey/Monkey.java

core/res/res/values/attrs.xml

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -942,6 +942,21 @@
	<enum name="KEYCODE_PAGE_DOWN" value="93" />		<enum name="KEYCODE_PAGE_DOWN" value="93" />
	<enum name="KEYCODE_PICTSYMBOLS" value="94" />		<enum name="KEYCODE_PICTSYMBOLS" value="94" />
	<enum name="KEYCODE_SWITCH_CHARSET" value="95" />		<enum name="KEYCODE_SWITCH_CHARSET" value="95" />
			<enum name="KEYCODE_BUTTON_A" value="96" />
			<enum name="KEYCODE_BUTTON_B" value="97" />
			<enum name="KEYCODE_BUTTON_C" value="98" />
			<enum name="KEYCODE_BUTTON_X" value="99" />
			<enum name="KEYCODE_BUTTON_Y" value="100" />
			<enum name="KEYCODE_BUTTON_Z" value="101" />
			<enum name="KEYCODE_BUTTON_L1" value="102" />
			<enum name="KEYCODE_BUTTON_R1" value="103" />
			<enum name="KEYCODE_BUTTON_L2" value="104" />
			<enum name="KEYCODE_BUTTON_R2" value="105" />
			<enum name="KEYCODE_BUTTON_THUMBL" value="106" />
			<enum name="KEYCODE_BUTTON_THUMBR" value="107" />
			<enum name="KEYCODE_BUTTON_START" value="108" />
			<enum name="KEYCODE_BUTTON_SELECT" value="109" />
			<enum name="KEYCODE_BUTTON_MODE" value="110" />
	</attr>		</attr>

	<!-- ***************************************************************** -->		<!-- ***************************************************************** -->

include/ui/InputDevice.h

0 → 100644

+338 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2010 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#ifndef _UI_INPUT_DEVICE_H
			#define _UI_INPUT_DEVICE_H

			#include <ui/EventHub.h>
			#include <ui/Input.h>
			#include <utils/KeyedVector.h>
			#include <utils/threads.h>
			#include <utils/Timers.h>
			#include <utils/RefBase.h>
			#include <utils/String8.h>
			#include <utils/BitSet.h>

			#include <stddef.h>
			#include <unistd.h>

			/* Maximum pointer id value supported.
			* (This is limited by our use of BitSet32 to track pointer assignments.) */
			#define MAX_POINTER_ID 31

			/* Maximum number of historical samples to average. */
			#define AVERAGING_HISTORY_SIZE 5


			namespace android {

			extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);
			extern int32_t rotateKeyCode(int32_t keyCode, int32_t orientation);

			/*
			* An input device structure tracks the state of a single input device.
			*
			* This structure is only used by ReaderThread and is not intended to be shared with
			* DispatcherThread (because that would require locking). This works out fine because
			* DispatcherThread is only interested in cooked event data anyways and does not need
			* any of the low-level data from InputDevice.
			*/
			struct InputDevice {
			struct AbsoluteAxisInfo {
			bool valid; // set to true if axis parameters are known, false otherwise

			int32_t minValue; // minimum value
			int32_t maxValue; // maximum value
			int32_t range; // range of values, equal to maxValue - minValue
			int32_t flat; // center flat position, eg. flat == 8 means center is between -8 and 8
			int32_t fuzz; // error tolerance, eg. fuzz == 4 means value is +/- 4 due to noise
			};

			struct VirtualKey {
			int32_t keyCode;
			int32_t scanCode;
			uint32_t flags;

			// computed hit box, specified in touch screen coords based on known display size
			int32_t hitLeft;
			int32_t hitTop;
			int32_t hitRight;
			int32_t hitBottom;

			inline bool isHit(int32_t x, int32_t y) const {
			return x >= hitLeft && x <= hitRight && y >= hitTop && y <= hitBottom;
			}
			};

			struct KeyboardState {
			struct Current {
			int32_t metaState;
			nsecs_t downTime; // time of most recent key down
			} current;

			void reset();
			};

			struct TrackballState {
			struct Accumulator {
			enum {
			FIELD_BTN_MOUSE = 1,
			FIELD_REL_X = 2,
			FIELD_REL_Y = 4
			};

			uint32_t fields;

			bool btnMouse;
			int32_t relX;
			int32_t relY;

			inline void clear() {
			fields = 0;
			}

			inline bool isDirty() {
			return fields != 0;
			}
			} accumulator;

			struct Current {
			bool down;
			nsecs_t downTime;
			} current;

			struct Precalculated {
			float xScale;
			float yScale;
			float xPrecision;
			float yPrecision;
			} precalculated;

			void reset();
			};

			struct SingleTouchScreenState {
			struct Accumulator {
			enum {
			FIELD_BTN_TOUCH = 1,
			FIELD_ABS_X = 2,
			FIELD_ABS_Y = 4,
			FIELD_ABS_PRESSURE = 8,
			FIELD_ABS_TOOL_WIDTH = 16
			};

			uint32_t fields;

			bool btnTouch;
			int32_t absX;
			int32_t absY;
			int32_t absPressure;
			int32_t absToolWidth;

			inline void clear() {
			fields = 0;
			}

			inline bool isDirty() {
			return fields != 0;
			}
			} accumulator;

			struct Current {
			bool down;
			int32_t x;
			int32_t y;
			int32_t pressure;
			int32_t size;
			} current;

			void reset();
			};

			struct MultiTouchScreenState {
			struct Accumulator {
			enum {
			FIELD_ABS_MT_POSITION_X = 1,
			FIELD_ABS_MT_POSITION_Y = 2,
			FIELD_ABS_MT_TOUCH_MAJOR = 4,
			FIELD_ABS_MT_WIDTH_MAJOR = 8,
			FIELD_ABS_MT_TRACKING_ID = 16
			};

			uint32_t pointerCount;
			struct Pointer {
			uint32_t fields;

			int32_t absMTPositionX;
			int32_t absMTPositionY;
			int32_t absMTTouchMajor;
			int32_t absMTWidthMajor;
			int32_t absMTTrackingId;

			inline void clear() {
			fields = 0;
			}
			} pointers[MAX_POINTERS + 1]; // + 1 to remove the need for extra range checks

			inline void clear() {
			pointerCount = 0;
			pointers[0].clear();
			}

			inline bool isDirty() {
			return pointerCount != 0;
			}
			} accumulator;

			void reset();
			};

			struct PointerData {
			uint32_t id;
			int32_t x;
			int32_t y;
			int32_t pressure;
			int32_t size;
			};

			struct TouchData {
			uint32_t pointerCount;
			PointerData pointers[MAX_POINTERS];
			BitSet32 idBits;
			uint32_t idToIndex[MAX_POINTER_ID + 1];

			void copyFrom(const TouchData& other);

			inline void clear() {
			pointerCount = 0;
			idBits.clear();
			}
			};

			// common state used for both single-touch and multi-touch screens after the initial
			// touch decoding has been performed
			struct TouchScreenState {
			Vector<VirtualKey> virtualKeys;

			struct Parameters {
			bool useBadTouchFilter;
			bool useJumpyTouchFilter;
			bool useAveragingTouchFilter;

			AbsoluteAxisInfo xAxis;
			AbsoluteAxisInfo yAxis;
			AbsoluteAxisInfo pressureAxis;
			AbsoluteAxisInfo sizeAxis;
			} parameters;

			// The touch data of the current sample being processed.
			TouchData currentTouch;

			// The touch data of the previous sample that was processed. This is updated
			// incrementally while the current sample is being processed.
			TouchData lastTouch;

			// The time the primary pointer last went down.
			nsecs_t downTime;

			struct CurrentVirtualKeyState {
			enum Status {
			STATUS_UP,
			STATUS_DOWN,
			STATUS_CANCELED
			};

			Status status;
			nsecs_t downTime;
			int32_t keyCode;
			int32_t scanCode;
			} currentVirtualKey;

			struct AveragingTouchFilterState {
			// Individual history tracks are stored by pointer id
			uint32_t historyStart[MAX_POINTERS];
			uint32_t historyEnd[MAX_POINTERS];
			struct {
			struct {
			int32_t x;
			int32_t y;
			int32_t pressure;
			} pointers[MAX_POINTERS];
			} historyData[AVERAGING_HISTORY_SIZE];
			} averagingTouchFilter;

			struct JumpTouchFilterState {
			int32_t jumpyPointsDropped;
			} jumpyTouchFilter;

			struct Precalculated {
			int32_t xOrigin;
			float xScale;

			int32_t yOrigin;
			float yScale;

			int32_t pressureOrigin;
			float pressureScale;

			int32_t sizeOrigin;
			float sizeScale;
			} precalculated;

			void reset();

			bool applyBadTouchFilter();
			bool applyJumpyTouchFilter();
			void applyAveragingTouchFilter();
			void calculatePointerIds();

			bool isPointInsideDisplay(int32_t x, int32_t y) const;
			const InputDevice::VirtualKey* findVirtualKeyHit() const;
			};

			InputDevice(int32_t id, uint32_t classes, String8 name);

			int32_t id;
			uint32_t classes;
			String8 name;
			bool ignored;

			KeyboardState keyboard;
			TrackballState trackball;
			TouchScreenState touchScreen;
			union {
			SingleTouchScreenState singleTouchScreen;
			MultiTouchScreenState multiTouchScreen;
			};

			void reset();

			inline bool isKeyboard() const { return classes & INPUT_DEVICE_CLASS_KEYBOARD; }
			inline bool isAlphaKey() const { return classes & INPUT_DEVICE_CLASS_ALPHAKEY; }
			inline bool isTrackball() const { return classes & INPUT_DEVICE_CLASS_TRACKBALL; }
			inline bool isDPad() const { return classes & INPUT_DEVICE_CLASS_DPAD; }
			inline bool isSingleTouchScreen() const { return (classes
			& (INPUT_DEVICE_CLASS_TOUCHSCREEN \| INPUT_DEVICE_CLASS_TOUCHSCREEN_MT))
			== INPUT_DEVICE_CLASS_TOUCHSCREEN; }
			inline bool isMultiTouchScreen() const { return classes
			& INPUT_DEVICE_CLASS_TOUCHSCREEN_MT; }
			inline bool isTouchScreen() const { return classes
			& (INPUT_DEVICE_CLASS_TOUCHSCREEN \| INPUT_DEVICE_CLASS_TOUCHSCREEN_MT); }
			};

			} // namespace android

			#endif // _UI_INPUT_DEVICE_H

include/ui/InputReader.h

+1 −303

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@

	#include <ui/EventHub.h>		#include <ui/EventHub.h>
	#include <ui/Input.h>		#include <ui/Input.h>
			#include <ui/InputDevice.h>
	#include <ui/InputDispatcher.h>		#include <ui/InputDispatcher.h>
	#include <utils/KeyedVector.h>		#include <utils/KeyedVector.h>
	#include <utils/threads.h>		#include <utils/threads.h>
	@@ -30,311 +31,8 @@
	#include <stddef.h>		#include <stddef.h>
	#include <unistd.h>		#include <unistd.h>

	/* Maximum pointer id value supported.
	* (This is limited by our use of BitSet32 to track pointer assignments.) */
	#define MAX_POINTER_ID 32

	/* Maximum number of historical samples to average. */
	#define AVERAGING_HISTORY_SIZE 5


	namespace android {		namespace android {

	extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);
	extern int32_t rotateKeyCode(int32_t keyCode, int32_t orientation);

	/*
	* An input device structure tracks the state of a single input device.
	*
	* This structure is only used by ReaderThread and is not intended to be shared with
	* DispatcherThread (because that would require locking). This works out fine because
	* DispatcherThread is only interested in cooked event data anyways and does not need
	* any of the low-level data from InputDevice.
	*/
	struct InputDevice {
	struct AbsoluteAxisInfo {
	bool valid; // set to true if axis parameters are known, false otherwise

	int32_t minValue; // minimum value
	int32_t maxValue; // maximum value
	int32_t range; // range of values, equal to maxValue - minValue
	int32_t flat; // center flat position, eg. flat == 8 means center is between -8 and 8
	int32_t fuzz; // error tolerance, eg. fuzz == 4 means value is +/- 4 due to noise
	};

	struct VirtualKey {
	int32_t keyCode;
	int32_t scanCode;
	uint32_t flags;

	// computed hit box, specified in touch screen coords based on known display size
	int32_t hitLeft;
	int32_t hitTop;
	int32_t hitRight;
	int32_t hitBottom;

	inline bool isHit(int32_t x, int32_t y) const {
	return x >= hitLeft && x <= hitRight && y >= hitTop && y <= hitBottom;
	}
	};

	struct KeyboardState {
	struct Current {
	int32_t metaState;
	nsecs_t downTime; // time of most recent key down
	} current;

	void reset();
	};

	struct TrackballState {
	struct Accumulator {
	enum {
	FIELD_BTN_MOUSE = 1,
	FIELD_REL_X = 2,
	FIELD_REL_Y = 4
	};

	uint32_t fields;

	bool btnMouse;
	int32_t relX;
	int32_t relY;

	inline void clear() {
	fields = 0;
	}

	inline bool isDirty() {
	return fields != 0;
	}
	} accumulator;

	struct Current {
	bool down;
	nsecs_t downTime;
	} current;

	struct Precalculated {
	float xScale;
	float yScale;
	float xPrecision;
	float yPrecision;
	} precalculated;

	void reset();
	};

	struct SingleTouchScreenState {
	struct Accumulator {
	enum {
	FIELD_BTN_TOUCH = 1,
	FIELD_ABS_X = 2,
	FIELD_ABS_Y = 4,
	FIELD_ABS_PRESSURE = 8,
	FIELD_ABS_TOOL_WIDTH = 16
	};

	uint32_t fields;

	bool btnTouch;
	int32_t absX;
	int32_t absY;
	int32_t absPressure;
	int32_t absToolWidth;

	inline void clear() {
	fields = 0;
	}

	inline bool isDirty() {
	return fields != 0;
	}
	} accumulator;

	struct Current {
	bool down;
	int32_t x;
	int32_t y;
	int32_t pressure;
	int32_t size;
	} current;

	void reset();
	};

	struct MultiTouchScreenState {
	struct Accumulator {
	enum {
	FIELD_ABS_MT_POSITION_X = 1,
	FIELD_ABS_MT_POSITION_Y = 2,
	FIELD_ABS_MT_TOUCH_MAJOR = 4,
	FIELD_ABS_MT_WIDTH_MAJOR = 8,
	FIELD_ABS_MT_TRACKING_ID = 16
	};

	uint32_t pointerCount;
	struct Pointer {
	uint32_t fields;

	int32_t absMTPositionX;
	int32_t absMTPositionY;
	int32_t absMTTouchMajor;
	int32_t absMTWidthMajor;
	int32_t absMTTrackingId;

	inline void clear() {
	fields = 0;
	}
	} pointers[MAX_POINTERS + 1]; // + 1 to remove the need for extra range checks

	inline void clear() {
	pointerCount = 0;
	pointers[0].clear();
	}

	inline bool isDirty() {
	return pointerCount != 0;
	}
	} accumulator;

	void reset();
	};

	struct PointerData {
	uint32_t id;
	int32_t x;
	int32_t y;
	int32_t pressure;
	int32_t size;
	};

	struct TouchData {
	uint32_t pointerCount;
	PointerData pointers[MAX_POINTERS];
	BitSet32 idBits;
	uint32_t idToIndex[MAX_POINTER_ID];

	void copyFrom(const TouchData& other);

	inline void clear() {
	pointerCount = 0;
	idBits.clear();
	}
	};

	// common state used for both single-touch and multi-touch screens after the initial
	// touch decoding has been performed
	struct TouchScreenState {
	Vector<VirtualKey> virtualKeys;

	struct Parameters {
	bool useBadTouchFilter;
	bool useJumpyTouchFilter;
	bool useAveragingTouchFilter;

	AbsoluteAxisInfo xAxis;
	AbsoluteAxisInfo yAxis;
	AbsoluteAxisInfo pressureAxis;
	AbsoluteAxisInfo sizeAxis;
	} parameters;

	// The touch data of the current sample being processed.
	TouchData currentTouch;

	// The touch data of the previous sample that was processed. This is updated
	// incrementally while the current sample is being processed.
	TouchData lastTouch;

	// The time the primary pointer last went down.
	nsecs_t downTime;

	struct CurrentVirtualKeyState {
	enum Status {
	STATUS_UP,
	STATUS_DOWN,
	STATUS_CANCELED
	};

	Status status;
	nsecs_t downTime;
	int32_t keyCode;
	int32_t scanCode;
	} currentVirtualKey;

	struct AveragingTouchFilterState {
	// Individual history tracks are stored by pointer id
	uint32_t historyStart[MAX_POINTERS];
	uint32_t historyEnd[MAX_POINTERS];
	struct {
	struct {
	int32_t x;
	int32_t y;
	int32_t pressure;
	} pointers[MAX_POINTERS];
	} historyData[AVERAGING_HISTORY_SIZE];
	} averagingTouchFilter;

	struct JumpTouchFilterState {
	int32_t jumpyPointsDropped;
	} jumpyTouchFilter;

	struct Precalculated {
	int32_t xOrigin;
	float xScale;

	int32_t yOrigin;
	float yScale;

	int32_t pressureOrigin;
	float pressureScale;

	int32_t sizeOrigin;
	float sizeScale;
	} precalculated;

	void reset();

	bool applyBadTouchFilter();
	bool applyJumpyTouchFilter();
	void applyAveragingTouchFilter();
	void calculatePointerIds();

	bool isPointInsideDisplay(int32_t x, int32_t y) const;
	const InputDevice::VirtualKey* findVirtualKeyHit() const;
	};

	InputDevice(int32_t id, uint32_t classes, String8 name);

	int32_t id;
	uint32_t classes;
	String8 name;
	bool ignored;

	KeyboardState keyboard;
	TrackballState trackball;
	TouchScreenState touchScreen;
	union {
	SingleTouchScreenState singleTouchScreen;
	MultiTouchScreenState multiTouchScreen;
	};

	void reset();

	inline bool isKeyboard() const { return classes & INPUT_DEVICE_CLASS_KEYBOARD; }
	inline bool isAlphaKey() const { return classes & INPUT_DEVICE_CLASS_ALPHAKEY; }
	inline bool isTrackball() const { return classes & INPUT_DEVICE_CLASS_TRACKBALL; }
	inline bool isDPad() const { return classes & INPUT_DEVICE_CLASS_DPAD; }
	inline bool isSingleTouchScreen() const { return (classes
	& (INPUT_DEVICE_CLASS_TOUCHSCREEN \| INPUT_DEVICE_CLASS_TOUCHSCREEN_MT))
	== INPUT_DEVICE_CLASS_TOUCHSCREEN; }
	inline bool isMultiTouchScreen() const { return classes
	& INPUT_DEVICE_CLASS_TOUCHSCREEN_MT; }
	inline bool isTouchScreen() const { return classes
	& (INPUT_DEVICE_CLASS_TOUCHSCREEN \| INPUT_DEVICE_CLASS_TOUCHSCREEN_MT); }
	};


	/*		/*
	* Input reader policy interface.		* Input reader policy interface.
	*		*