Bug 737199, part 1: Import the Ice Cream Sandwich version of InputReader and... (31dc786f) · Commits · Tommy Webb / Tor Browser

widget/gonk/Makefile.in

+20 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,10 @@
		DEPTH = ../..
		topsrcdir = @top_srcdir@
		srcdir = @srcdir@
		VPATH = @srcdir@
		VPATH = \
		$(srcdir) \
		$(srcdir)/libui \
		$(NULL)

		include $(DEPTH)/config/autoconf.mk

		@@ -58,20 +61,35 @@ CPPSRCS = \
		nsWindow.cpp \
		nsLookAndFeel.cpp \
		nsIdleServiceGonk.cpp \
		EventHub.cpp \
		InputApplication.cpp \
		InputDispatcher.cpp \
		InputListener.cpp \
		InputReader.cpp \
		InputTransport.cpp \
		InputWindow.cpp \
		Keyboard.cpp \
		KeyCharacterMap.cpp \
		KeyLayoutMap.cpp \
		PixelFormat.cpp \
		VirtualKeyMap.cpp \
		$(NULL)

		SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

		include $(topsrcdir)/config/rules.mk

		DEFINES += -D_IMPL_NS_WIDGET
		DEFINES += -D_IMPL_NS_WIDGET -DHAVE_OFF64_T

		LOCAL_INCLUDES += \
		-I$(topsrcdir)/widget/xpwidgets \
		-I$(topsrcdir)/widget/shared \
		-I$(topsrcdir)/dom/system/android \
		-I$(topsrcdir)/content/events/src \
		-I$(topsrcdir)/gfx/skia/include/core \
		-I$(topsrcdir)/gfx/skia/include/config \
		-I$(srcdir) \
		$(NULL)


		include $(topsrcdir)/ipc/chromium/chromium-config.mk

widget/gonk/libui/DisplayInfo.h

0 → 100644

+52 −0

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

		#include <stdint.h>
		#include <sys/types.h>

		#include "PixelFormat.h"

		namespace android {

		struct DisplayInfo {
		uint32_t w;
		uint32_t h;
		PixelFormatInfo pixelFormatInfo;
		uint8_t orientation;
		uint8_t reserved[3];
		float fps;
		float density;
		float xdpi;
		float ydpi;
		};

		/* Display orientations as defined in Surface.java and ISurfaceComposer.h. */
		enum {
		DISPLAY_ORIENTATION_0 = 0,
		DISPLAY_ORIENTATION_90 = 1,
		DISPLAY_ORIENTATION_180 = 2,
		DISPLAY_ORIENTATION_270 = 3
		};


		}; // namespace android

		#endif // ANDROID_COMPOSER_DISPLAY_INFO_H

widget/gonk/libui/EventHub.cpp

0 → 100644

+1337 −0

File added.

Preview size limit exceeded, changes collapsed.

widget/gonk/libui/EventHub.h

0 → 100644

+377 −0

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

		#include "Input.h"
		#include "Keyboard.h"
		#include "KeyLayoutMap.h"
		#include "KeyCharacterMap.h"
		#include "VirtualKeyMap.h"
		#include <utils/String8.h>
		#include <utils/threads.h>
		#include <utils/Log.h>
		#include <utils/threads.h>
		#include <utils/List.h>
		#include <utils/Errors.h>
		#include <utils/PropertyMap.h>
		#include <utils/Vector.h>
		#include <utils/KeyedVector.h>

		#include <linux/input.h>
		#include <sys/epoll.h>

		/* Convenience constants. */

		#define BTN_FIRST 0x100 // first button scancode
		#define BTN_LAST 0x15f // last button scancode

		namespace android {

		/*
		* A raw event as retrieved from the EventHub.
		*/
		struct RawEvent {
		nsecs_t when;
		int32_t deviceId;
		int32_t type;
		int32_t scanCode;
		int32_t keyCode;
		int32_t value;
		uint32_t flags;
		};

		/* Describes an absolute axis. */
		struct RawAbsoluteAxisInfo {
		bool valid; // true if the information is valid, false otherwise

		int32_t minValue; // minimum value
		int32_t maxValue; // maximum value
		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
		int32_t resolution; // resolution in units per mm or radians per mm

		inline void clear() {
		valid = false;
		minValue = 0;
		maxValue = 0;
		flat = 0;
		fuzz = 0;
		resolution = 0;
		}
		};

		/*
		* Input device classes.
		*/
		enum {
		/* The input device is a keyboard or has buttons. */
		INPUT_DEVICE_CLASS_KEYBOARD = 0x00000001,

		/* The input device is an alpha-numeric keyboard (not just a dial pad). */
		INPUT_DEVICE_CLASS_ALPHAKEY = 0x00000002,

		/* The input device is a touchscreen or a touchpad (either single-touch or multi-touch). */
		INPUT_DEVICE_CLASS_TOUCH = 0x00000004,

		/* The input device is a cursor device such as a trackball or mouse. */
		INPUT_DEVICE_CLASS_CURSOR = 0x00000008,

		/* The input device is a multi-touch touchscreen. */
		INPUT_DEVICE_CLASS_TOUCH_MT = 0x00000010,

		/* The input device is a directional pad (implies keyboard, has DPAD keys). */
		INPUT_DEVICE_CLASS_DPAD = 0x00000020,

		/* The input device is a gamepad (implies keyboard, has BUTTON keys). */
		INPUT_DEVICE_CLASS_GAMEPAD = 0x00000040,

		/* The input device has switches. */
		INPUT_DEVICE_CLASS_SWITCH = 0x00000080,

		/* The input device is a joystick (implies gamepad, has joystick absolute axes). */
		INPUT_DEVICE_CLASS_JOYSTICK = 0x00000100,

		/* The input device is external (not built-in). */
		INPUT_DEVICE_CLASS_EXTERNAL = 0x80000000,
		};

		/*
		* Gets the class that owns an axis, in cases where multiple classes might claim
		* the same axis for different purposes.
		*/
		extern uint32_t getAbsAxisUsage(int32_t axis, uint32_t deviceClasses);

		/*
		* Grand Central Station for events.
		*
		* The event hub aggregates input events received across all known input
		* devices on the system, including devices that may be emulated by the simulator
		* environment. In addition, the event hub generates fake input events to indicate
		* when devices are added or removed.
		*
		* The event hub provides a stream of input events (via the getEvent function).
		* It also supports querying the current actual state of input devices such as identifying
		* which keys are currently down. Finally, the event hub keeps track of the capabilities of
		* individual input devices, such as their class and the set of key codes that they support.
		*/
		class EventHubInterface : public virtual RefBase {
		protected:
		EventHubInterface() { }
		virtual ~EventHubInterface() { }

		public:
		// Synthetic raw event type codes produced when devices are added or removed.
		enum {
		// Sent when a device is added.
		DEVICE_ADDED = 0x10000000,
		// Sent when a device is removed.
		DEVICE_REMOVED = 0x20000000,
		// Sent when all added/removed devices from the most recent scan have been reported.
		// This event is always sent at least once.
		FINISHED_DEVICE_SCAN = 0x30000000,

		FIRST_SYNTHETIC_EVENT = DEVICE_ADDED,
		};

		virtual uint32_t getDeviceClasses(int32_t deviceId) const = 0;

		virtual String8 getDeviceName(int32_t deviceId) const = 0;

		virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const = 0;

		virtual status_t getAbsoluteAxisInfo(int32_t deviceId, int axis,
		RawAbsoluteAxisInfo* outAxisInfo) const = 0;

		virtual bool hasRelativeAxis(int32_t deviceId, int axis) const = 0;

		virtual bool hasInputProperty(int32_t deviceId, int property) const = 0;

		virtual status_t mapKey(int32_t deviceId, int scancode,
		int32_t* outKeycode, uint32_t* outFlags) const = 0;

		virtual status_t mapAxis(int32_t deviceId, int scancode,
		AxisInfo* outAxisInfo) const = 0;

		// Sets devices that are excluded from opening.
		// This can be used to ignore input devices for sensors.
		virtual void setExcludedDevices(const Vector<String8>& devices) = 0;

		/*
		* Wait for events to become available and returns them.
		* After returning, the EventHub holds onto a wake lock until the next call to getEvent.
		* This ensures that the device will not go to sleep while the event is being processed.
		* If the device needs to remain awake longer than that, then the caller is responsible
		* for taking care of it (say, by poking the power manager user activity timer).
		*
		* The timeout is advisory only. If the device is asleep, it will not wake just to
		* service the timeout.
		*
		* Returns the number of events obtained, or 0 if the timeout expired.
		*/
		virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) = 0;

		/*
		* Query current input state.
		*/
		virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const = 0;
		virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const = 0;
		virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const = 0;
		virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis,
		int32_t* outValue) const = 0;

		/*
		* Examine key input devices for specific framework keycode support
		*/
		virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes, const int32_t* keyCodes,
		uint8_t* outFlags) const = 0;

		virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const = 0;
		virtual bool hasLed(int32_t deviceId, int32_t led) const = 0;
		virtual void setLedState(int32_t deviceId, int32_t led, bool on) = 0;

		virtual void getVirtualKeyDefinitions(int32_t deviceId,
		Vector<VirtualKeyDefinition>& outVirtualKeys) const = 0;

		virtual String8 getKeyCharacterMapFile(int32_t deviceId) const = 0;

		/* Requests the EventHub to reopen all input devices on the next call to getEvents(). */
		virtual void requestReopenDevices() = 0;

		/* Wakes up getEvents() if it is blocked on a read. */
		virtual void wake() = 0;

		/* Dump EventHub state to a string. */
		virtual void dump(String8& dump) = 0;

		/* Called by the heatbeat to ensures that the reader has not deadlocked. */
		virtual void monitor() = 0;
		};

		class EventHub : public EventHubInterface
		{
		public:
		EventHub();

		virtual uint32_t getDeviceClasses(int32_t deviceId) const;

		virtual String8 getDeviceName(int32_t deviceId) const;

		virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const;

		virtual status_t getAbsoluteAxisInfo(int32_t deviceId, int axis,
		RawAbsoluteAxisInfo* outAxisInfo) const;

		virtual bool hasRelativeAxis(int32_t deviceId, int axis) const;

		virtual bool hasInputProperty(int32_t deviceId, int property) const;

		virtual status_t mapKey(int32_t deviceId, int scancode,
		int32_t* outKeycode, uint32_t* outFlags) const;

		virtual status_t mapAxis(int32_t deviceId, int scancode,
		AxisInfo* outAxisInfo) const;

		virtual void setExcludedDevices(const Vector<String8>& devices);

		virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const;
		virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const;
		virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const;
		virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t* outValue) const;

		virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes,
		const int32_t* keyCodes, uint8_t* outFlags) const;

		virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize);

		virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const;
		virtual bool hasLed(int32_t deviceId, int32_t led) const;
		virtual void setLedState(int32_t deviceId, int32_t led, bool on);

		virtual void getVirtualKeyDefinitions(int32_t deviceId,
		Vector<VirtualKeyDefinition>& outVirtualKeys) const;

		virtual String8 getKeyCharacterMapFile(int32_t deviceId) const;

		virtual void requestReopenDevices();

		virtual void wake();

		virtual void dump(String8& dump);
		virtual void monitor();

		protected:
		virtual ~EventHub();

		private:
		struct Device {
		Device* next;

		int fd;
		const int32_t id;
		const String8 path;
		const InputDeviceIdentifier identifier;

		uint32_t classes;

		uint8_t keyBitmask[(KEY_MAX + 1) / 8];
		uint8_t absBitmask[(ABS_MAX + 1) / 8];
		uint8_t relBitmask[(REL_MAX + 1) / 8];
		uint8_t swBitmask[(SW_MAX + 1) / 8];
		uint8_t ledBitmask[(LED_MAX + 1) / 8];
		uint8_t propBitmask[(INPUT_PROP_MAX + 1) / 8];

		String8 configurationFile;
		PropertyMap* configuration;
		VirtualKeyMap* virtualKeyMap;
		KeyMap keyMap;

		Device(int fd, int32_t id, const String8& path, const InputDeviceIdentifier& identifier);
		~Device();

		void close();
		};

		status_t openDeviceLocked(const char *devicePath);
		status_t closeDeviceByPathLocked(const char *devicePath);

		void closeDeviceLocked(Device* device);
		void closeAllDevicesLocked();

		status_t scanDirLocked(const char *dirname);
		void scanDevicesLocked();
		status_t readNotifyLocked();

		Device* getDeviceLocked(int32_t deviceId) const;
		Device* getDeviceByPathLocked(const char* devicePath) const;

		bool hasKeycodeLocked(Device* device, int keycode) const;

		void loadConfigurationLocked(Device* device);
		status_t loadVirtualKeyMapLocked(Device* device);
		status_t loadKeyMapLocked(Device* device);

		bool isExternalDeviceLocked(Device* device);

		// Protect all internal state.
		mutable Mutex mLock;

		// The actual id of the built-in keyboard, or -1 if none.
		// EventHub remaps the built-in keyboard to id 0 externally as required by the API.
		int32_t mBuiltInKeyboardId;

		int32_t mNextDeviceId;

		KeyedVector<int32_t, Device*> mDevices;

		Device *mOpeningDevices;
		Device *mClosingDevices;

		bool mNeedToSendFinishedDeviceScan;
		bool mNeedToReopenDevices;
		bool mNeedToScanDevices;
		Vector<String8> mExcludedDevices;

		int mEpollFd;
		int mINotifyFd;
		int mWakeReadPipeFd;
		int mWakeWritePipeFd;

		// Ids used for epoll notifications not associated with devices.
		static const uint32_t EPOLL_ID_INOTIFY = 0x80000001;
		static const uint32_t EPOLL_ID_WAKE = 0x80000002;

		// Epoll FD list size hint.
		static const int EPOLL_SIZE_HINT = 8;

		// Maximum number of signalled FDs to handle at a time.
		static const int EPOLL_MAX_EVENTS = 16;

		// The array of pending epoll events and the index of the next event to be handled.
		struct epoll_event mPendingEventItems[EPOLL_MAX_EVENTS];
		size_t mPendingEventCount;
		size_t mPendingEventIndex;
		bool mPendingINotify;

		// Set to the number of CPUs.
		int32_t mNumCpus;
		};

		}; // namespace android

		#endif // _RUNTIME_EVENT_HUB_H

widget/gonk/libui/Input.h

0 → 100644

+897 −0

File added.

Preview size limit exceeded, changes collapsed.