Merge branch 'master' into honeycomb-release (94d895d1) · Commits · e / os / platform_frameworks_native

include/ui/EventHub.h

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#define _RUNTIME_EVENT_HUB_H		#define _RUNTIME_EVENT_HUB_H

	#include <android/input.h>		#include <android/input.h>
			#include <ui/Keyboard.h>
	#include <utils/String8.h>		#include <utils/String8.h>
	#include <utils/threads.h>		#include <utils/threads.h>
	#include <utils/Log.h>		#include <utils/Log.h>
	@@ -246,10 +247,7 @@ private:
	uint32_t classes;		uint32_t classes;
	uint8_t* keyBitmask;		uint8_t* keyBitmask;
	KeyLayoutMap* layoutMap;		KeyLayoutMap* layoutMap;
	String8 keyMapName;		KeyMapInfo keyMapInfo;
	bool defaultKeyMap;
	String8 keyLayoutFilename;
	String8 keyCharacterMapFilename;
	int fd;		int fd;
	device_t* next;		device_t* next;

	@@ -267,8 +265,6 @@ private:
	const int32_t* keyCodes, uint8_t* outFlags) const;		const int32_t* keyCodes, uint8_t* outFlags) const;

	void configureKeyMap(device_t* device);		void configureKeyMap(device_t* device);
	bool probeKeyMap(device_t* device, const String8& keyMapName, bool defaultKeyMap);
	void selectKeyMap(device_t* device, const String8& keyMapName, bool defaultKeyMap);
	void setKeyboardProperties(device_t* device, bool firstKeyboard);		void setKeyboardProperties(device_t* device, bool firstKeyboard);
	void clearKeyboardProperties(device_t* device, bool firstKeyboard);		void clearKeyboardProperties(device_t* device, bool firstKeyboard);

include/ui/KeyCharacterMap.h

+148 −37

Original line number	Original line	Diff line number	Diff line
	@@ -18,55 +18,166 @@
	#define _UI_KEY_CHARACTER_MAP_H		#define _UI_KEY_CHARACTER_MAP_H

	#include <stdint.h>		#include <stdint.h>
	#include <utils/Vector.h>

	using namespace android;		#include <ui/Input.h>
			#include <utils/Errors.h>
			#include <utils/KeyedVector.h>
			#include <utils/Tokenizer.h>
			#include <utils/String8.h>
			#include <utils/Unicode.h>

	class KeyCharacterMap		namespace android {
	{
			/**
			* Describes a mapping from Android key codes to characters.
			* Also specifies other functions of the keyboard such as the keyboard type
			* and key modifier semantics.
			*/
			class KeyCharacterMap {
	public:		public:
			enum KeyboardType {
			KEYBOARD_TYPE_UNKNOWN = 0,
			KEYBOARD_TYPE_NUMERIC = 1,
			KEYBOARD_TYPE_PREDICTIVE = 2,
			KEYBOARD_TYPE_ALPHA = 3,
			KEYBOARD_TYPE_FULL = 4,
			KEYBOARD_TYPE_SPECIAL_FUNCTION = 5,
			};

	~KeyCharacterMap();		~KeyCharacterMap();

	// see the javadoc for android.text.method.KeyCharacterMap for what		static status_t load(const String8& filename, KeyCharacterMap** outMap);
	// these do		static status_t loadByDeviceId(int32_t deviceId, KeyCharacterMap** outMap);
	unsigned short get(int keycode, int meta);
	unsigned short getNumber(int keycode);		/* Gets the keyboard type. */
	unsigned short getMatch(int keycode, const unsigned short* chars,		int32_t getKeyboardType() const;
	int charsize, uint32_t modifiers);
	unsigned short getDisplayLabel(int keycode);		/* Gets the primary character for this key as in the label physically printed on it.
	bool getKeyData(int keycode, unsigned short *displayLabel,		* Returns 0 if none (eg. for non-printing keys). */
	unsigned short number, unsigned short results);		char16_t getDisplayLabel(int32_t keyCode) const;
	inline unsigned int getKeyboardType() { return m_type; }
	bool getEvents(uint16_t* chars, size_t len,		/* Gets the Unicode character for the number or symbol generated by the key
	Vector<int32_t>* keys, Vector<uint32_t>* modifiers);		* when the keyboard is used as a dialing pad.
			* Returns 0 if no number or symbol is generated.
	static KeyCharacterMap* load(int id);		*/
			char16_t getNumber(int32_t keyCode) const;

			/* Gets the Unicode character generated by the key and meta key modifiers.
			* Returns 0 if no character is generated.
			*/
			char16_t getCharacter(int32_t keyCode, int32_t metaState) const;

			/* Gets the first matching Unicode character that can be generated by the key,
			* preferring the one with the specified meta key modifiers.
			* Returns 0 if no matching character is generated.
			*/
			char16_t getMatch(int32_t keyCode, const char16_t* chars,
			size_t numChars, int32_t metaState) const;

			/* Gets a sequence of key events that could plausibly generate the specified
			* character sequence. Returns false if some of the characters cannot be generated.
			*/
			bool getEvents(int32_t deviceId, const char16_t* chars, size_t numChars,
			Vector<KeyEvent>& outEvents) const;

			private:
			struct Behavior {
			Behavior();

			/* The next behavior in the list, or NULL if none. */
			Behavior* next;

			/* The meta key modifiers for this behavior. */
			int32_t metaState;

			/* The character to insert. */
			char16_t character;

			/* The fallback keycode if the key is not handled. */
			int32_t fallbackKeyCode;
			};

			struct Key {
			Key();
			~Key();

			/* The single character label printed on the key, or 0 if none. */
			char16_t label;

			/* The number or symbol character generated by the key, or 0 if none. */
			char16_t number;

			/* The list of key behaviors sorted from most specific to least specific
			* meta key binding. */
			Behavior* firstBehavior;
			};

			class Parser {
			enum State {
			STATE_TOP = 0,
			STATE_KEY = 1,
			};

	enum {		enum {
	NUMERIC = 1,		PROPERTY_LABEL = 1,
	Q14 = 2,		PROPERTY_NUMBER = 2,
	QWERTY = 3 // or AZERTY or whatever		PROPERTY_META = 3,
	};		};

	#define META_MASK 3		struct Property {
			inline Property(int32_t property = 0, int32_t metaState = 0) :
			property(property), metaState(metaState) { }

			int32_t property;
			int32_t metaState;
			};

			KeyCharacterMap* mMap;
			Tokenizer* mTokenizer;
			State mState;
			int32_t mKeyCode;

			public:
			Parser(KeyCharacterMap* map, Tokenizer* tokenizer);
			~Parser();
			status_t parse();

	private:		private:
	struct Key		status_t parseType();
	{		status_t parseKey();
	int32_t keycode;		status_t parseKeyProperty();
	uint16_t display_label;		status_t parseModifier(const String8& token, int32_t* outMetaState);
	uint16_t number;		status_t parseCharacterLiteral(char16_t* outCharacter);
	uint16_t data[META_MASK + 1];
	};		};

			KeyedVector<int32_t, Key*> mKeys;
			int mType;

	KeyCharacterMap();		KeyCharacterMap();
	static KeyCharacterMap* try_file(const char* filename);
	Key* find_key(int keycode);
	bool find_char(uint16_t c, uint32_t* key, uint32_t* mods);

	unsigned int m_type;		bool findKey(char16_t ch, int32_t* outKeyCode, int32_t* outMetaState) const;
	unsigned int m_keyCount;
	Key* m_keys;		static void addKey(Vector<KeyEvent>& outEvents,
			int32_t deviceId, int32_t keyCode, int32_t metaState, bool down, nsecs_t time);
			static void addMetaKeys(Vector<KeyEvent>& outEvents,
			int32_t deviceId, int32_t metaState, bool down, nsecs_t time,
			int32_t* currentMetaState);
			static bool addSingleEphemeralMetaKey(Vector<KeyEvent>& outEvents,
			int32_t deviceId, int32_t metaState, bool down, nsecs_t time,
			int32_t keyCode, int32_t keyMetaState,
			int32_t* currentMetaState);
			static void addDoubleEphemeralMetaKey(Vector<KeyEvent>& outEvents,
			int32_t deviceId, int32_t metaState, bool down, nsecs_t time,
			int32_t leftKeyCode, int32_t leftKeyMetaState,
			int32_t rightKeyCode, int32_t rightKeyMetaState,
			int32_t eitherKeyMetaState,
			int32_t* currentMetaState);
			static void addLockedMetaKey(Vector<KeyEvent>& outEvents,
			int32_t deviceId, int32_t metaState, nsecs_t time,
			int32_t keyCode, int32_t keyMetaState,
			int32_t* currentMetaState);
	};		};

			} // namespace android

	#endif // _UI_KEY_CHARACTER_MAP_H		#endif // _UI_KEY_CHARACTER_MAP_H

include/ui/KeyLayoutMap.h

0 → 100644

+65 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2008 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_KEY_LAYOUT_MAP_H
			#define _UI_KEY_LAYOUT_MAP_H

			#include <stdint.h>
			#include <utils/Errors.h>
			#include <utils/KeyedVector.h>
			#include <utils/Tokenizer.h>

			namespace android {

			/**
			* Describes a mapping from keyboard scan codes to Android key codes.
			*/
			class KeyLayoutMap {
			public:
			~KeyLayoutMap();

			static status_t load(const String8& filename, KeyLayoutMap** outMap);

			status_t map(int32_t scanCode, int32_t* keyCode, uint32_t* flags) const;
			status_t findScanCodes(int32_t keyCode, Vector<int32_t>* outScanCodes) const;

			private:
			struct Key {
			int32_t keyCode;
			uint32_t flags;
			};

			KeyedVector<int32_t,Key> mKeys;

			KeyLayoutMap();

			class Parser {
			KeyLayoutMap* mMap;
			Tokenizer* mTokenizer;

			public:
			Parser(KeyLayoutMap* map, Tokenizer* tokenizer);
			~Parser();
			status_t parse();

			private:
			status_t parseKey();
			};
			};

			} // namespace android

			#endif // _UI_KEY_LAYOUT_MAP_H

include/ui/Keyboard.h

0 → 100644

+87 −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_KEYBOARD_H
			#define _UI_KEYBOARD_H

			#include <ui/Input.h>
			#include <utils/Errors.h>
			#include <utils/String8.h>

			namespace android {

			enum {
			/* Device id of the built in keyboard. */
			DEVICE_ID_BUILT_IN_KEYBOARD = 0,

			/* Device id of a generic virtual keyboard with a full layout that can be used
			* to synthesize key events. */
			DEVICE_ID_VIRTUAL_KEYBOARD = -1,
			};

			struct KeyMapInfo {
			String8 keyMapName;
			String8 keyLayoutFile;
			String8 keyCharacterMapFile;
			bool isDefaultKeyMap;

			KeyMapInfo() : isDefaultKeyMap(false) {
			}
			};

			/**
			* Resolves the key map to use for a particular keyboard device.
			*/
			extern status_t resolveKeyMap(const String8& deviceName, KeyMapInfo& outKeyMapInfo);

			/**
			* Sets keyboard system properties.
			*/
			extern void setKeyboardProperties(int32_t deviceId, const String8& deviceName,
			const KeyMapInfo& keyMapInfo);

			/**
			* Clears keyboard system properties.
			*/
			extern void clearKeyboardProperties(int32_t deviceId);

			/**
			* Gets the key character map filename for a device using inspecting system properties
			* and then falling back on a default key character map if necessary.
			* Returns a NAME_NOT_FOUND if none found.
			*/
			extern status_t getKeyCharacterMapFile(int32_t deviceId, String8& outKeyCharacterMapFile);

			/**
			* Gets a key code by its short form label, eg. "HOME".
			* Returns 0 if unknown.
			*/
			extern int32_t getKeyCodeByLabel(const char* label);

			/**
			* Gets a key flag by its short form label, eg. "WAKE".
			* Returns 0 if unknown.
			*/
			extern uint32_t getKeyFlagByLabel(const char* label);

			/**
			* Updates a meta state field when a key is pressed or released.
			*/
			extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);

			} // namespace android

			#endif // _UI_KEYBOARD_H

include/utils/String8.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <utils/Unicode.h>		#include <utils/Unicode.h>

	#include <string.h> // for strcmp		#include <string.h> // for strcmp
			#include <stdarg.h>

	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------

	@@ -70,6 +71,7 @@ public:

	status_t appendFormat(const char* fmt, ...)		status_t appendFormat(const char* fmt, ...)
	__attribute__((format (printf, 2, 3)));		__attribute__((format (printf, 2, 3)));
			status_t appendFormatV(const char* fmt, va_list args);

	// Note that this function takes O(N) time to calculate the value.		// Note that this function takes O(N) time to calculate the value.
	// No cache value is stored.		// No cache value is stored.