5873ce46ad
Bug: 5064702 Introduced the concept of an InputListener to further decouple the InputReader from the InputDispatcher. The InputListener exposes just the minimum interface that the InputReader needs to communicate with the outside world. The InputReader passes arguments to the InputListener by reference, which makes it easy to queue them up. Consolidated all of the InputReader locks into one simple global Mutex. The reason this wasn't done before was due to potential re-entrance in outbound calls to the InputDispatcher. To fix this, the InputReader now queues up all of the events it wants to send using a QueuedInputListener, then flushes them outside of the critical section after all of the event processing is finished. Removing all of the InputMapper locks greatly simplifies the implementation. Added tests for new stylus features such as buttons, tool types, and hovering. Added some helpers to BitSet32 to handle common code patterns like finding the first marked bit and clearing it. Fixed a bug in VelocityTracker where the wrong pointer trace could get cleared when handling ACTION_POINTER_DOWN. Oops. Changed PointerCoords so it no longer stores useless zero axis values. Removed editAxisValue because it is not very useful when all zero value axes are absent and therefore cannot be edited in place. Added dispatch of stylus hover events. Added support for distance and tool types. Change-Id: I4cf14d134fcb1db7d10be5f2af7b37deef8f8468
108 lines
3.6 KiB
C++
108 lines
3.6 KiB
C++
/*
|
|
* 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 UTILS_BITSET_H
|
|
#define UTILS_BITSET_H
|
|
|
|
#include <stdint.h>
|
|
|
|
/*
|
|
* Contains some bit manipulation helpers.
|
|
*/
|
|
|
|
namespace android {
|
|
|
|
// A simple set of 32 bits that can be individually marked or cleared.
|
|
struct BitSet32 {
|
|
uint32_t value;
|
|
|
|
inline BitSet32() : value(0) { }
|
|
explicit inline BitSet32(uint32_t value) : value(value) { }
|
|
|
|
// Gets the value associated with a particular bit index.
|
|
static inline uint32_t valueForBit(uint32_t n) { return 0x80000000 >> n; }
|
|
|
|
// Clears the bit set.
|
|
inline void clear() { value = 0; }
|
|
|
|
// Returns the number of marked bits in the set.
|
|
inline uint32_t count() const { return __builtin_popcount(value); }
|
|
|
|
// Returns true if the bit set does not contain any marked bits.
|
|
inline bool isEmpty() const { return ! value; }
|
|
|
|
// Returns true if the bit set does not contain any unmarked bits.
|
|
inline bool isFull() const { return value == 0xffffffff; }
|
|
|
|
// Returns true if the specified bit is marked.
|
|
inline bool hasBit(uint32_t n) const { return value & valueForBit(n); }
|
|
|
|
// Marks the specified bit.
|
|
inline void markBit(uint32_t n) { value |= valueForBit(n); }
|
|
|
|
// Clears the specified bit.
|
|
inline void clearBit(uint32_t n) { value &= ~ valueForBit(n); }
|
|
|
|
// Finds the first marked bit in the set.
|
|
// Result is undefined if all bits are unmarked.
|
|
inline uint32_t firstMarkedBit() const { return __builtin_clz(value); }
|
|
|
|
// Finds the first unmarked bit in the set.
|
|
// Result is undefined if all bits are marked.
|
|
inline uint32_t firstUnmarkedBit() const { return __builtin_clz(~ value); }
|
|
|
|
// Finds the last marked bit in the set.
|
|
// Result is undefined if all bits are unmarked.
|
|
inline uint32_t lastMarkedBit() const { return 31 - __builtin_ctz(value); }
|
|
|
|
// Finds the first marked bit in the set and clears it. Returns the bit index.
|
|
// Result is undefined if all bits are unmarked.
|
|
inline uint32_t clearFirstMarkedBit() {
|
|
uint32_t n = firstMarkedBit();
|
|
clearBit(n);
|
|
return n;
|
|
}
|
|
|
|
// Finds the first unmarked bit in the set and marks it. Returns the bit index.
|
|
// Result is undefined if all bits are marked.
|
|
inline uint32_t markFirstUnmarkedBit() {
|
|
uint32_t n = firstUnmarkedBit();
|
|
markBit(n);
|
|
return n;
|
|
}
|
|
|
|
// Finds the last marked bit in the set and clears it. Returns the bit index.
|
|
// Result is undefined if all bits are unmarked.
|
|
inline uint32_t clearLastMarkedBit() {
|
|
uint32_t n = lastMarkedBit();
|
|
clearBit(n);
|
|
return n;
|
|
}
|
|
|
|
// Gets the index of the specified bit in the set, which is the number of
|
|
// marked bits that appear before the specified bit.
|
|
inline uint32_t getIndexOfBit(uint32_t n) const {
|
|
return __builtin_popcount(value & ~(0xffffffffUL >> n));
|
|
}
|
|
|
|
inline bool operator== (const BitSet32& other) const { return value == other.value; }
|
|
inline bool operator!= (const BitSet32& other) const { return value != other.value; }
|
|
};
|
|
|
|
} // namespace android
|
|
|
|
#endif // UTILS_BITSET_H
|