Merge branch terrible and branch awful

[ipdf/code.git] / src / document.h

diff --git a/src/document.h b/src/document.h
index d6f41f3..f98833a 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -34,6 +34,9 @@ namespace IPDF
                                Load(filename);
                                if (font_filename != "")
                                        SetFont(font_filename);
+#ifndef QUADTREE_DISABLED
+                               m_current_insert_node = -1;
+#endif
                        }
                        virtual ~Document() 
                        {
@@ -54,7 +57,8 @@ namespace IPDF
 
                        unsigned AddPath(unsigned start_index, unsigned end_index, const Colour & shading=Colour(0.6,0.6,0.6,1), const Colour & stroke=Colour(0,0,0,0));
                        unsigned AddBezier(const Bezier & bezier);
-                       unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0, QuadTreeIndex qtnode = 0);
+                       int AddClip(ObjectType type, const Rect & bounds, unsigned data_index, const Rect & clip_rect);
+                       unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0, QuadTreeIndex qtnode = -1);
                        unsigned AddBezierData(const Bezier & bezier);
                        unsigned AddPathData(const Path & path);
 
@@ -91,9 +95,12 @@ namespace IPDF
                        QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);
                        QuadTreeIndex GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren mytype);
                        void OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex parent, QuadTreeNodeChildren type);
+                       void OverlayQuadParent(QuadTreeIndex orig_child, QuadTreeIndex child, QuadTreeNodeChildren type);
                        void PropagateQuadChanges(QuadTreeIndex node);
                        // Returns the number of objects the current object formed when clipped, the objects in question are added to the end of the document.
                        int ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type);
+
+                       void SetQuadtreeInsertNode(QuadTreeIndex node) { m_current_insert_node = node; }
 #endif
 
                        void ClearObjects()
@@ -109,7 +116,10 @@ namespace IPDF
 #ifndef QUADTREE_DISABLED
                        QuadTree m_quadtree;
                        void GenBaseQuadtree();
+
+                       QuadTreeIndex m_current_insert_node;
 #endif
+                       bool m_document_dirty;
                        unsigned m_count;
                        unsigned char * m_font_data;
                        stbtt_fontinfo m_font;