Merge branch 'master' into to_push

1 files changed, 16 insertions, 1 deletions

diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index 258a43b..d15e10a 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -31,6 +31,12 @@
 
 #include <vector>
 
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
 using std::string;
 using std::vector;
 
@@ -280,10 +286,19 @@ void FocusableList::reset() {
 
 bool FocusableList::contains(const Focusable &win) const {
     Focusables::const_iterator it = m_list.begin(), it_end = m_list.end();
-    it = find(it, it_end, &win);
+    it = std::find(it, it_end, &win);
     return (it != it_end);
 }
 
+Focusable *FocusableList::find(const ClientPattern &pat) const {
+    Focusables::const_iterator it = m_list.begin(), it_end = m_list.end();
+    for (; it != it_end; ++it) {
+        if (pat.match(**it))
+            return *it;
+    }
+    return 0;
+}
+
 void FocusableList::attachChild(FocusableList &child) const {
     m_addsig.attach(&child);
     m_removesig.attach(&child);