tform: MouseWatcher sort should uniquify duplicates

Also change the code to use range-for when appropriate, which improves code readability.

panda/src/tform/mouseWatcher.cxx

@@ -491,11 +491,13 @@ output(ostream &out) const {
   LightMutexHolder holder(_lock);
   DataNode::output(out);
 
-  int count = _regions.size();
+  if (!_sorted) {
-  Groups::const_iterator gi;
+    ((MouseWatcher *)this)->do_sort_regions();
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+  }
-    MouseWatcherGroup *group = (*gi);
+
-    count += group->_regions.size();
+  size_t count = _regions.size();
+  for (MouseWatcherGroup *group : _groups) {
+    count += group->get_num_regions();
   }
 
   out << " (" << count << " regions)";
@@ -511,14 +513,10 @@ write(ostream &out, int indent_level) const {
   MouseWatcherBase::write(out, indent_level + 2);
 
   LightMutexHolder holder(_lock);
-  if (!_groups.empty()) {
+  for (MouseWatcherGroup *group : _groups) {
-    Groups::const_iterator gi;
+    indent(out, indent_level + 2)
-    for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+      << "Subgroup:\n";
-      MouseWatcherGroup *group = (*gi);
+    group->write(out, indent_level + 4);
-      indent(out, indent_level + 2)
-        << "Subgroup:\n";
-      group->write(out, indent_level + 4);
-    }
   }
 }
 
@@ -540,9 +538,12 @@ get_over_regions(MouseWatcher::Regions &regions, const LPoint2 &pos) const {
   // Ensure the vector is empty before we begin.
   regions.clear();
 
-  Regions::const_iterator ri;
+  // Make sure there are no duplicates in the regions vector.
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+  if (!_sorted) {
-    MouseWatcherRegion *region = (*ri);
+    ((MouseWatcher *)this)->do_sort_regions();
+  }
+
+  for (MouseWatcherRegion *region : _regions) {
     const LVecBase4 &frame = region->get_frame();
 
     if (region->get_active() &&
@@ -554,11 +555,10 @@ get_over_regions(MouseWatcher::Regions &regions, const LPoint2 &pos) const {
   }
 
   // Also check all of our sub-groups.
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+    group->sort_regions();
-    MouseWatcherGroup *group = (*gi);
+
-    for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
+    for (MouseWatcherRegion *region : group->_regions) {
-      MouseWatcherRegion *region = (*ri);
       const LVecBase4 &frame = region->get_frame();
 
       if (region->get_active() &&
@@ -750,9 +750,7 @@ do_show_regions(const NodePath &render2d, const string &bin_name,
   _show_regions_bin_name = bin_name;
   _show_regions_draw_order = draw_order;
 
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
-    MouseWatcherGroup *group = (*gi);
     group->show_regions(render2d, bin_name, draw_order);
   }
 }
@@ -770,9 +768,7 @@ do_hide_regions() {
   _show_regions_bin_name = string();
   _show_regions_draw_order = 0;
 
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
-    MouseWatcherGroup *group = (*gi);
     group->hide_regions();
   }
 }
@@ -1026,15 +1022,17 @@ keystroke(int keycode) {
   param.set_modifier_buttons(_mods);
   param.set_mouse(_mouse);
 
+  // Make sure there are no duplicates in the regions vector.
+  if (!_sorted) {
+    ((MouseWatcher *)this)->do_sort_regions();
+  }
+
   // Keystrokes go to all those regions that want keyboard events, regardless
   // of which is the "preferred" region (that is, without respect to the mouse
   // position).  However, we do set the outside flag according to whether the
   // given region is the preferred region or not.
 
-  Regions::const_iterator ri;
+  for (MouseWatcherRegion *region : _regions) {
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
-    MouseWatcherRegion *region = (*ri);
-
     if (region->get_keyboard()) {
       param.set_outside(region != _preferred_region);
       region->keystroke(param);
@@ -1043,12 +1041,10 @@ keystroke(int keycode) {
   }
 
   // Also check all of our sub-groups.
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+    group->sort_regions();
-    MouseWatcherGroup *group = (*gi);
-    for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
-      MouseWatcherRegion *region = (*ri);
 
+    for (MouseWatcherRegion *region : group->_regions) {
       if (region->get_keyboard()) {
         param.set_outside(region != _preferred_region);
         region->keystroke(param);
@@ -1072,13 +1068,15 @@ candidate(const wstring &candidate_string, size_t highlight_start,
   param.set_modifier_buttons(_mods);
   param.set_mouse(_mouse);
 
+  // Make sure there are no duplicates in the regions vector.
+  if (!_sorted) {
+    ((MouseWatcher *)this)->do_sort_regions();
+  }
+
   // Candidate strings go to all those regions that want keyboard events,
   // exactly like keystrokes, above.
 
-  Regions::const_iterator ri;
+  for (MouseWatcherRegion *region : _regions) {
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
-    MouseWatcherRegion *region = (*ri);
-
     if (region->get_keyboard()) {
       param.set_outside(region != _preferred_region);
       region->candidate(param);
@@ -1086,12 +1084,10 @@ candidate(const wstring &candidate_string, size_t highlight_start,
   }
 
   // Also check all of our sub-groups.
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+    group->sort_regions();
-    MouseWatcherGroup *group = (*gi);
-    for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
-      MouseWatcherRegion *region = (*ri);
 
+    for (MouseWatcherRegion *region : group->_regions) {
       if (region->get_keyboard()) {
         param.set_outside(region != _preferred_region);
         region->candidate(param);
@@ -1109,10 +1105,12 @@ void MouseWatcher::
 global_keyboard_press(const MouseWatcherParameter &param) {
   nassertv(_lock.debug_is_locked());
 
-  Regions::const_iterator ri;
+  // Make sure there are no duplicates in the regions vector.
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+  if (!_sorted) {
-    MouseWatcherRegion *region = (*ri);
+    ((MouseWatcher *)this)->do_sort_regions();
+  }
 
+  for (MouseWatcherRegion *region : _regions) {
     if (region != _preferred_region && region->get_keyboard()) {
       region->press(param);
       consider_keyboard_suppress(region);
@@ -1120,12 +1118,10 @@ global_keyboard_press(const MouseWatcherParameter &param) {
   }
 
   // Also check all of our sub-groups.
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+    group->sort_regions();
-    MouseWatcherGroup *group = (*gi);
-    for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
-      MouseWatcherRegion *region = (*ri);
 
+    for (MouseWatcherRegion *region : group->_regions) {
       if (region != _preferred_region && region->get_keyboard()) {
         region->press(param);
         consider_keyboard_suppress(region);
@@ -1142,22 +1138,22 @@ void MouseWatcher::
 global_keyboard_release(const MouseWatcherParameter &param) {
   nassertv(_lock.debug_is_locked());
 
-  Regions::const_iterator ri;
+  // Make sure there are no duplicates in the regions vector.
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+  if (!_sorted) {
-    MouseWatcherRegion *region = (*ri);
+    ((MouseWatcher *)this)->do_sort_regions();
+  }
 
+  for (MouseWatcherRegion *region : _regions) {
     if (region != _preferred_region && region->get_keyboard()) {
       region->release(param);
     }
   }
 
   // Also check all of our sub-groups.
-  Groups::const_iterator gi;
+  for (MouseWatcherGroup *group : _groups) {
-  for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
+    group->sort_regions();
-    MouseWatcherGroup *group = (*gi);
-    for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
-      MouseWatcherRegion *region = (*ri);
 
+    for (MouseWatcherRegion *region : group->_regions) {
       if (region != _preferred_region && region->get_keyboard()) {
         region->release(param);
       }

panda/src/tform/mouseWatcherBase.I

@@ -0,0 +1,32 @@
+/**
+ * PANDA 3D SOFTWARE
+ * Copyright (c) Carnegie Mellon University.  All rights reserved.
+ *
+ * All use of this software is subject to the terms of the revised BSD
+ * license.  You should have received a copy of this license along
+ * with this source code in a file named "LICENSE."
+ *
+ * @file mouseWatcherBase.I
+ * @author rdb
+ * @date 2018-06-12
+ */
+
+/**
+ * Sorts all the regions in this group into pointer order.
+ */
+INLINE void MouseWatcherBase::
+sort_regions() {
+  LightMutexHolder holder(_lock);
+  if (!_sorted) {
+    do_sort_regions();
+  }
+}
+
+/**
+ * Returns true if the group has already been sorted, false otherwise.
+ */
+INLINE bool MouseWatcherBase::
+is_sorted() const {
+  LightMutexHolder holder(_lock);
+  return _sorted;
+}

panda/src/tform/mouseWatcherBase.cxx

@@ -135,25 +135,6 @@ clear_regions() {
 #endif  // NDEBUG
 }
 
-/**
- * Sorts all the regions in this group into pointer order.
- */
-void MouseWatcherBase::
-sort_regions() {
-  LightMutexHolder holder(_lock);
-  do_sort_regions();
-}
-
-/**
- * Returns true if the group has already been sorted, false otherwise.
- */
-bool MouseWatcherBase::
-is_sorted() const {
-  LightMutexHolder holder(_lock);
-
-  return _sorted;
-}
-
 /**
  * Returns the number of regions in the group.
  */
@@ -261,7 +242,7 @@ update_regions() {
 void MouseWatcherBase::
 do_sort_regions() {
   if (!_sorted) {
-    sort(_regions.begin(), _regions.end());
+    _regions.sort_unique();
     _sorted = true;
   }
 }

panda/src/tform/mouseWatcherBase.h

@@ -41,8 +41,8 @@ PUBLISHED:
   MouseWatcherRegion *find_region(const std::string &name) const;
   void clear_regions();
 
-  void sort_regions();
+  INLINE void sort_regions();
-  bool is_sorted() const;
+  INLINE bool is_sorted() const;
   MAKE_PROPERTY(sorted, is_sorted);
 
   size_t get_num_regions() const;
@@ -110,4 +110,6 @@ private:
   friend class BlobWatcher;
 };
 
+#include "mouseWatcherBase.I"
+
 #endif

tests/tform/test_mousewatcher.py

@@ -0,0 +1,18 @@
+from panda3d.core import MouseWatcher, MouseWatcherRegion
+
+
+def test_mousewatcher_region_add():
+    region1 = MouseWatcherRegion("1", 0, 1, 0, 1)
+    region2 = MouseWatcherRegion("2", 0, 1, 0, 1)
+
+    mw = MouseWatcher()
+    assert len(mw.regions) == 0
+
+    mw.add_region(region1)
+    assert len(mw.regions) == 1
+
+    mw.add_region(region2)
+    assert len(mw.regions) == 2
+
+    mw.add_region(region1)
+    assert len(mw.regions) == 2