From 646ef9c0269e7cf99f07d2a2896c35cf151a68a5 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Thu, 9 Feb 2017 14:51:53 +0100
Subject: [Bug #1662439] Instant crash when trying to move svg symbol.

Fixed bugs:
  - https://launchpad.net/bugs/1662439

(bzr r15498)
---
 src/document.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/document.cpp')

diff --git a/src/document.cpp b/src/document.cpp
index b69508751..b1f16fece 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -1474,7 +1474,9 @@ static SPItem *find_group_at_point(unsigned int dkey, SPGroup *group, Geom::Poin
         if (SP_IS_GROUP(&o) && SP_GROUP(&o)->effectiveLayerMode(dkey) != SPGroup::LAYER ) {
             SPItem *child = SP_ITEM(&o);
             Inkscape::DrawingItem *arenaitem = child->get_arenaitem(dkey);
-            arenaitem->drawing().update();
+            if (arenaitem) {
+                arenaitem->drawing().update();
+            }
 
             // seen remembers the last (topmost) of groups pickable at this point
             if (arenaitem && arenaitem->pick(p, delta, 1) != NULL) {
-- 
cgit v1.2.3


From 1510fb894b45a78aaa2ac9f1dca81357c010544a Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 22 Feb 2017 13:21:03 +0100
Subject: Allow any valid CSS selector.

(bzr r15539)
---
 src/document.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'src/document.cpp')

diff --git a/src/document.cpp b/src/document.cpp
index b1f16fece..c7115f906 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -62,6 +62,11 @@
 #include "sp-symbol.h"
 #include "xml/rebase-hrefs.h"
 
+#include "libcroco/cr-sel-eng.h"
+#include "libcroco/cr-selector.h"
+#include "libcroco/cr-parser.h"
+#include "src/xml/croco-node-iface.h"
+
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
 
@@ -1119,6 +1124,50 @@ std::vector<SPObject *> SPDocument::getObjectsByElement(Glib::ustring const &ele
     return objects;
 }
 
+void _getObjectsBySelectorRecursive(SPObject *parent,
+                                    CRSelEng *sel_eng, CRSimpleSel *simple_sel,
+                                    std::vector<SPObject *> &objects)
+{
+    if (parent) {
+        gboolean result = false;
+        cr_sel_eng_matches_node( sel_eng, simple_sel, parent->getRepr(), &result );
+        if (result) {
+            objects.push_back(parent);
+        }
+
+        // Check children
+        for (auto& child : parent->children) {
+            _getObjectsBySelectorRecursive(&child, sel_eng, simple_sel, objects);
+        }
+    }
+}
+
+std::vector<SPObject *> SPDocument::getObjectsBySelector(Glib::ustring const &selector) const
+{
+    // std::cout << "\nSPDocument::getObjectsBySelector: " << selector << std::endl;
+
+    std::vector<SPObject *> objects;
+    g_return_val_if_fail(!selector.empty(), objects);
+
+    static CRSelEng *sel_eng = NULL;
+    if (!sel_eng) {
+        sel_eng = cr_sel_eng_new();
+        cr_sel_eng_set_node_iface(sel_eng, &Inkscape::XML::croco_node_iface);
+    }
+
+    Glib::ustring my_selector = selector + " {";  // Parsing fails sometimes without '{'. Fix me
+    CRSelector *cr_selector = cr_selector_parse_from_buf ((guchar*)my_selector.c_str(), CR_UTF_8);
+    // char * cr_string = (char*)cr_selector_to_string( cr_selector );
+    // std::cout << "  selector: |" << (cr_string?cr_string:"Empty") << "|" << std::endl;
+    CRSelector const *cur = NULL;
+    for (cur = cr_selector; cur; cur = cur->next) {
+        if (cur->simple_sel ) {
+            _getObjectsBySelectorRecursive(root, sel_eng, cur->simple_sel, objects);
+        }
+    }
+    return objects;
+}
+
 void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object)
 {
     if (object) {
-- 
cgit v1.2.3