touchui: Convert XI2 MT tracking id to slot id for gesture recognizer

views/touchui/touch_factory.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_TOUCHUI_TOUCH_FACTORY_H_
 #define VIEWS_TOUCHUI_TOUCH_FACTORY_H_
 #pragma once
 
 #include <bitset>
 #include <vector>
 
 #include "base/memory/singleton.h"
+#include "base/hash_tables.h"
 #include "base/timer.h"
 #include "views/views_export.h"
 
 typedef unsigned long Cursor;
 typedef unsigned long Window;
 typedef struct _XDisplay Display;
 typedef union _XEvent XEvent;
 
 namespace views {
 
@@ skipping 47 matching lines @@
   void SetupXI2ForXWindow(::Window xid);
 
   // Keeps a list of touch devices so that it is possible to determine if a
   // pointer event is a touch-event or a mouse-event. The list is reset each
   // time this is called.
   void SetTouchDeviceList(const std::vector<unsigned int>& devices);
 
   // Is the device a touch-device?
   bool IsTouchDevice(unsigned int deviceid) const;
 
-#if !defined(USE_XI2_MT)
+#if defined(USE_XI2_MT)
+  // Allocate a slot id according to tracking id.
+  int AllocateSlotIdForTrackingId(uint32 tracking_id);

[sadrul, 2011/09/19 16:13:36]

Let's call this GetSlotIdForTracking, and update the doc to explain that this
tries to find an existing slot-id first, and allocates a new one when there
isn't one already.

[ningxin.hu, 2011/09/20 16:08:49]

Thanks for the comment. Will do that.

+
+  // Release the slot id according to tracking id.

[sadrul, 2011/09/19 16:13:36]

Releases

[ningxin.hu, 2011/09/20 16:08:49]

Will correct. Thanks.

+  void ReleaseSlotIdForTrackingId(uint32 tracking_id);
+#endif
+
   // Is the slot ID currently used?
   bool IsSlotUsed(int slot) const;
 
   // Marks a slot as being used/unused.
   void SetSlotUsed(int slot, bool used);
-#endif
 
   // Grabs the touch devices for the specified window on the specified display.
   // Returns if grab was successful for all touch devices.
   bool GrabTouchDevices(Display* display, ::Window window);
 
   // Ungrabs the touch devices. Returns if ungrab was successful for all touch
   // devices.
   bool UngrabTouchDevices(Display* display);
 
   // Updates the root window to show (or hide) the cursor. Also indicate whether
@@ skipping 86 matching lines @@
   // index at the expense of space. If the kMaxDeviceNum grows larger that the
   // space waste becomes a concern, the 2D lookup table can be replaced by a
   // hash map.
   signed char valuator_lookup_[kMaxDeviceNum][TP_LAST_ENTRY];
 
   // Index table to find the min & max value of the TouchParam on a specific
   // device.
   int touch_param_min_[kMaxDeviceNum][TP_LAST_ENTRY];
   int touch_param_max_[kMaxDeviceNum][TP_LAST_ENTRY];
 
-#if !defined(USE_XI2_MT)
   // Maximum simultaneous touch points.
   static const int kMaxTouchPoints = 32;
 
   // A lookup table for slots in use for a touch event.
   std::bitset<kMaxTouchPoints> slots_used_;
+
+#if defined(USE_XI2_MT)
+  // A hash table for tracking id to slot id mapping
+  typedef base::hash_map<uint32, int> TrackingIdMap;
+  TrackingIdMap tracking_id_map_;
 #endif
-
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_TOUCHUI_TOUCH_FACTORY_H_