Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / display / canvas-arena.cpp

diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 86d1abe3adaf6478fad566723ce7bdcc024e0051..fb7ca9d78d482a070dfaa2995907afd8ff2fdf49 100644 (file)
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -1,5 +1,3 @@
-#define __SP_CANVAS_ARENA_C__
-
 /*
  * RGBA display list system for inkscape
  *
@@ -15,9 +13,8 @@
 #include <libnr/nr-blit.h>
 #include <gtk/gtksignal.h>
 
-#include <display/display-forward.h>
 #include <display/sp-canvas-util.h>
-#include <helper/sp-marshal.h>
+#include "helper/sp-marshal.h"
 #include <display/nr-arena.h>
 #include <display/nr-arena-group.h>
 #include <display/canvas-arena.h>
@@ -32,9 +29,9 @@ static void sp_canvas_arena_class_init(SPCanvasArenaClass *klass);
 static void sp_canvas_arena_init(SPCanvasArena *group);
 static void sp_canvas_arena_destroy(GtkObject *object);
 
-static void sp_canvas_arena_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags);
+static void sp_canvas_arena_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags);
 static void sp_canvas_arena_render (SPCanvasItem *item, SPCanvasBuf *buf);
-static double sp_canvas_arena_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item);
+static double sp_canvas_arena_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 static gint sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event);
 
 static gint sp_canvas_arena_send_event (SPCanvasArena *arena, GdkEvent *event);
@@ -137,7 +134,7 @@ sp_canvas_arena_destroy (GtkObject *object)
 }
 
 static void
-sp_canvas_arena_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
+sp_canvas_arena_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags)
 {
     SPCanvasArena *arena = SP_CANVAS_ARENA (item);
 
@@ -165,8 +162,8 @@ sp_canvas_arena_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
             ec.send_event = TRUE;
             ec.subwindow = ec.window;
             ec.time = GDK_CURRENT_TIME;
-            ec.x = arena->c[NR::X];
-            ec.y = arena->c[NR::Y];
+            ec.x = arena->c[Geom::X];
+            ec.y = arena->c[Geom::Y];
             /* fixme: */
             if (arena->active) {
                 ec.type = GDK_LEAVE_NOTIFY;
@@ -201,33 +198,33 @@ sp_canvas_arena_render (SPCanvasItem *item, SPCanvasBuf *buf)
     bh = buf->rect.y1 - buf->rect.y0;
     if ((bw < 1) || (bh < 1)) return;
 
-            NRRectL area;
-            NRPixBlock cb;
+    NRRectL area;
+    NRPixBlock cb;
 
-            area.x0 = buf->rect.x0;
-            area.y0 = buf->rect.y0;
-            area.x1 = buf->rect.x1;
-            area.y1 = buf->rect.y1;
+    area.x0 = buf->rect.x0;
+    area.y0 = buf->rect.y0;
+    area.x1 = buf->rect.x1;
+    area.y1 = buf->rect.y1;
 
-            nr_pixblock_setup_extern (&cb, NR_PIXBLOCK_MODE_R8G8B8A8P, area.x0, area.y0, area.x1, area.y1,
-                                      buf->buf,
-                                      buf->buf_rowstride,
-                                      FALSE, FALSE);
+    nr_pixblock_setup_extern (&cb, NR_PIXBLOCK_MODE_R8G8B8A8P, area.x0, area.y0, area.x1, area.y1,
+                              buf->buf,
+                              buf->buf_rowstride,
+                              FALSE, FALSE);
 
-            cb.visible_area = buf->visible_rect;
-            cairo_t *ct = nr_create_cairo_context (&area, &cb);
-            nr_arena_item_invoke_render (ct, arena->root, &area, &cb, 0);
+    cb.visible_area = buf->visible_rect;
+    cairo_t *ct = nr_create_cairo_context (&area, &cb);
+    nr_arena_item_invoke_render (ct, arena->root, &area, &cb, 0);
 
-                cairo_surface_t *cst = cairo_get_target(ct);
-                cairo_destroy (ct);
-                cairo_surface_finish (cst);
-                cairo_surface_destroy (cst);
+    cairo_surface_t *cst = cairo_get_target(ct);
+    cairo_destroy (ct);
+    cairo_surface_finish (cst);
+    cairo_surface_destroy (cst);
 
-            nr_pixblock_release (&cb);
+    nr_pixblock_release (&cb);
 }
 
 static double
-sp_canvas_arena_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)
+sp_canvas_arena_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item)
 {
     SPCanvasArena *arena = SP_CANVAS_ARENA (item);
 
@@ -267,7 +264,7 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event)
                 arena->cursor = TRUE;
 
                 /* TODO ... event -> arena transform? */
-                arena->c = NR::Point(event->crossing.x, event->crossing.y);
+                arena->c = Geom::Point(event->crossing.x, event->crossing.y);
 
                 /* fixme: Not sure abut this, but seems the right thing (Lauris) */
                 nr_arena_item_invoke_update (arena->root, NULL, &arena->gc, NR_ARENA_ITEM_STATE_PICK, NR_ARENA_ITEM_STATE_NONE);
@@ -288,7 +285,7 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event)
 
         case GDK_MOTION_NOTIFY:
             /* TODO ... event -> arena transform? */
-            arena->c = NR::Point(event->motion.x, event->motion.y);
+            arena->c = Geom::Point(event->motion.x, event->motion.y);
 
             /* fixme: Not sure abut this, but seems the right thing (Lauris) */
             nr_arena_item_invoke_update (arena->root, NULL, &arena->gc, NR_ARENA_ITEM_STATE_PICK, NR_ARENA_ITEM_STATE_NONE);
@@ -398,4 +395,4 @@ sp_canvas_arena_render_pixblock (SPCanvasArena *ca, NRPixBlock *pb)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :