From 31f84a59da72b31b932833ce1af7d78f0a67e185 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 26 Jun 2010 03:02:06 +0200 Subject: Implement clipping (slightly incorrect) and masking (bzr r9508.1.4) --- src/display/Makefile_insert | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 58e667402..7660d2c70 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -33,6 +33,8 @@ ink_common_sources += \ display/canvas-temporary-item-list.h \ display/canvas-text.h \ display/canvas-text.cpp \ + display/cairo-utils.h \ + display/cairo-utils.cpp \ display/curve.cpp \ display/curve.h \ display/display-forward.h \ -- cgit v1.2.3 From cf6ce8045cd7a019c263d557fd2ea6c3b8a0e669 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Mon, 28 Jun 2010 02:37:10 +0200 Subject: Text rendering. Factor out style handling into nr-style.h (bzr r9508.1.5) --- src/display/Makefile_insert | 110 ++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 54 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 7660d2c70..c6cdcbb6d 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -4,37 +4,22 @@ display/canvas-arena.$(OBJEXT): helper/sp-marshal.h display/sp-canvas.$(OBJEXT): helper/sp-marshal.h ink_common_sources += \ - display/nr-3dutils.h \ - display/nr-3dutils.cpp \ - display/nr-arena-forward.h \ - display/nr-arena.cpp \ - display/nr-arena.h \ - display/nr-arena-item.cpp \ - display/nr-arena-item.h \ - display/nr-arena-group.cpp \ - display/nr-arena-group.h \ - display/nr-arena-image.cpp \ - display/nr-arena-image.h \ - display/nr-arena-shape.cpp \ - display/nr-arena-shape.h \ - display/nr-arena-glyphs.cpp \ - display/nr-arena-glyphs.h \ + display/cairo-utils.cpp \ + display/cairo-utils.h \ display/canvas-arena.cpp \ display/canvas-arena.h \ + display/canvas-axonomgrid.cpp \ + display/canvas-axonomgrid.h \ display/canvas-bpath.cpp \ display/canvas-bpath.h \ display/canvas-grid.cpp \ display/canvas-grid.h \ - display/canvas-axonomgrid.cpp \ - display/canvas-axonomgrid.h \ display/canvas-temporary-item.cpp \ display/canvas-temporary-item.h \ display/canvas-temporary-item-list.cpp \ display/canvas-temporary-item-list.h \ - display/canvas-text.h \ display/canvas-text.cpp \ - display/cairo-utils.h \ - display/cairo-utils.cpp \ + display/canvas-text.h \ display/curve.cpp \ display/curve.h \ display/display-forward.h \ @@ -42,41 +27,34 @@ ink_common_sources += \ display/gnome-canvas-acetate.h \ display/guideline.cpp \ display/guideline.h \ - display/nr-plain-stuff-gdk.cpp \ - display/nr-plain-stuff-gdk.h \ - display/nr-plain-stuff.cpp \ - display/nr-plain-stuff.h \ - display/nr-svgfonts.cpp \ - display/nr-svgfonts.h \ - display/rendermode.h \ - display/snap-indicator.cpp \ - display/snap-indicator.h \ - display/sodipodi-ctrl.cpp \ - display/sodipodi-ctrl.h \ - display/sodipodi-ctrlrect.cpp \ - display/sodipodi-ctrlrect.h \ - display/sp-canvas-util.cpp \ - display/sp-canvas-util.h \ - display/sp-canvas.cpp \ - display/sp-canvas.h \ - display/sp-ctrlline.cpp \ - display/sp-ctrlline.h \ - display/sp-ctrlpoint.cpp \ - display/sp-ctrlpoint.h \ - display/sp-ctrlquadr.cpp \ - display/sp-ctrlquadr.h \ - display/nr-filter.cpp \ - display/nr-filter.h \ + display/inkscape-cairo.cpp \ + display/inkscape-cairo.h \ + display/nr-3dutils.cpp \ + display/nr-3dutils.h \ + display/nr-arena.cpp \ + display/nr-arena-forward.h \ + display/nr-arena-glyphs.cpp \ + display/nr-arena-glyphs.h \ + display/nr-arena-group.cpp \ + display/nr-arena-group.h \ + display/nr-arena.h \ + display/nr-arena-image.cpp \ + display/nr-arena-image.h \ + display/nr-arena-item.cpp \ + display/nr-arena-item.h \ + display/nr-arena-shape.cpp \ + display/nr-arena-shape.h \ display/nr-filter-blend.cpp \ display/nr-filter-blend.h \ display/nr-filter-colormatrix.cpp \ display/nr-filter-colormatrix.h \ display/nr-filter-component-transfer.cpp \ display/nr-filter-component-transfer.h \ - display/nr-filter-composite.h \ display/nr-filter-composite.cpp \ + display/nr-filter-composite.h \ display/nr-filter-convolve-matrix.cpp \ display/nr-filter-convolve-matrix.h \ + display/nr-filter.cpp \ display/nr-filter-diffuselighting.cpp \ display/nr-filter-diffuselighting.h \ display/nr-filter-displacement-map.cpp \ @@ -87,6 +65,7 @@ ink_common_sources += \ display/nr-filter-gaussian.h \ display/nr-filter-getalpha.cpp \ display/nr-filter-getalpha.h \ + display/nr-filter.h \ display/nr-filter-image.cpp \ display/nr-filter-image.h \ display/nr-filter-merge.cpp \ @@ -95,6 +74,7 @@ ink_common_sources += \ display/nr-filter-morphology.h \ display/nr-filter-offset.cpp \ display/nr-filter-offset.h \ + display/nr-filter-pixops.h \ display/nr-filter-primitive.cpp \ display/nr-filter-primitive.h \ display/nr-filter-slot.cpp \ @@ -105,21 +85,43 @@ ink_common_sources += \ display/nr-filter-tile.h \ display/nr-filter-turbulence.cpp \ display/nr-filter-turbulence.h \ - display/nr-filter-pixops.h \ display/nr-filter-types.h \ - display/nr-filter-units.h \ display/nr-filter-units.cpp \ - display/nr-filter-utils.h \ + display/nr-filter-units.h \ display/nr-filter-utils.cpp \ + display/nr-filter-utils.h \ + display/nr-light.cpp \ + display/nr-light.h \ + display/nr-light-types.h \ + display/nr-plain-stuff.cpp \ + display/nr-plain-stuff-gdk.cpp \ + display/nr-plain-stuff-gdk.h \ + display/nr-plain-stuff.h \ + display/nr-style.cpp \ + display/nr-style.h \ + display/nr-svgfonts.cpp \ + display/nr-svgfonts.h \ display/pixblock-scaler.cpp \ display/pixblock-scaler.h \ display/pixblock-transform.cpp \ display/pixblock-transform.h \ - display/inkscape-cairo.cpp \ - display/inkscape-cairo.h \ - display/nr-light.h \ - display/nr-light.cpp \ - display/nr-light-types.h + display/rendermode.h \ + display/snap-indicator.cpp \ + display/snap-indicator.h \ + display/sodipodi-ctrl.cpp \ + display/sodipodi-ctrl.h \ + display/sodipodi-ctrlrect.cpp \ + display/sodipodi-ctrlrect.h \ + display/sp-canvas.cpp \ + display/sp-canvas.h \ + display/sp-canvas-util.cpp \ + display/sp-canvas-util.h \ + display/sp-ctrlline.cpp \ + display/sp-ctrlline.h \ + display/sp-ctrlpoint.cpp \ + display/sp-ctrlpoint.h \ + display/sp-ctrlquadr.cpp \ + display/sp-ctrlquadr.h # ###################### # ### CxxTest stuff #### -- cgit v1.2.3 From 13b15b7b977eecbededd1734f5ab001f0c44d21f Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 30 Jun 2010 00:41:48 +0200 Subject: Consolidate Cairo utils in display/cairo-utils.h. Fix icons harder. (bzr r9508.1.8) --- src/display/Makefile_insert | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index c6cdcbb6d..da5ded824 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -27,8 +27,6 @@ ink_common_sources += \ display/gnome-canvas-acetate.h \ display/guideline.cpp \ display/guideline.h \ - display/inkscape-cairo.cpp \ - display/inkscape-cairo.h \ display/nr-3dutils.cpp \ display/nr-3dutils.h \ display/nr-arena.cpp \ -- cgit v1.2.3 From d204ded3f6106fd25ffbc43f32d5ec5ac3dcb26d Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 16 Jul 2010 22:06:46 +0200 Subject: Split out surface blending template into a separate file (bzr r9508.1.19) --- src/display/Makefile_insert | 1 + 1 file changed, 1 insertion(+) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index da5ded824..621dc43d5 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -4,6 +4,7 @@ display/canvas-arena.$(OBJEXT): helper/sp-marshal.h display/sp-canvas.$(OBJEXT): helper/sp-marshal.h ink_common_sources += \ + display/cairo-templates.h \ display/cairo-utils.cpp \ display/cairo-utils.h \ display/canvas-arena.cpp \ -- cgit v1.2.3 From 703a0cb1d2ce00692c10f33a095a3b99c1e28554 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 24 Jul 2010 00:00:31 +0200 Subject: Remove nr-filter-getalpha.(h|cpp) - no longer needed (bzr r9508.1.31) --- src/display/Makefile_insert | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 621dc43d5..3e8b6ff91 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -62,8 +62,6 @@ ink_common_sources += \ display/nr-filter-flood.h \ display/nr-filter-gaussian.cpp \ display/nr-filter-gaussian.h \ - display/nr-filter-getalpha.cpp \ - display/nr-filter-getalpha.h \ display/nr-filter.h \ display/nr-filter-image.cpp \ display/nr-filter-image.h \ -- cgit v1.2.3 From 30884b9e814d7baaa2299803e8cb76cf203ca084 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 4 Aug 2010 05:45:58 +0200 Subject: Wholesale cruft removal part 1 (bzr r9508.1.44) --- src/display/Makefile_insert | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 3e8b6ff91..843f5aa8f 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -91,17 +91,13 @@ ink_common_sources += \ display/nr-light.h \ display/nr-light-types.h \ display/nr-plain-stuff.cpp \ + display/nr-plain-stuff.h \ display/nr-plain-stuff-gdk.cpp \ display/nr-plain-stuff-gdk.h \ - display/nr-plain-stuff.h \ display/nr-style.cpp \ display/nr-style.h \ display/nr-svgfonts.cpp \ display/nr-svgfonts.h \ - display/pixblock-scaler.cpp \ - display/pixblock-scaler.h \ - display/pixblock-transform.cpp \ - display/pixblock-transform.h \ display/rendermode.h \ display/snap-indicator.cpp \ display/snap-indicator.h \ -- cgit v1.2.3 From 13e643c744ca21ea6f5a50d404bec8aac886a808 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 5 Aug 2010 06:01:01 +0200 Subject: Wholesale cruft removal part 5; completely remove RasterFont (bzr r9508.1.50) --- src/display/Makefile_insert | 1 - 1 file changed, 1 deletion(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 843f5aa8f..a860c6a44 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -71,7 +71,6 @@ ink_common_sources += \ display/nr-filter-morphology.h \ display/nr-filter-offset.cpp \ display/nr-filter-offset.h \ - display/nr-filter-pixops.h \ display/nr-filter-primitive.cpp \ display/nr-filter-primitive.h \ display/nr-filter-slot.cpp \ -- cgit v1.2.3 From aa844be794b36b44b624e579db7f0945b5d3927b Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 14 Aug 2010 21:22:11 +0200 Subject: Completely remove NRPixBlock (bzr r9508.1.67) --- src/display/Makefile_insert | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index a860c6a44..916dd6dc3 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -89,10 +89,6 @@ ink_common_sources += \ display/nr-light.cpp \ display/nr-light.h \ display/nr-light-types.h \ - display/nr-plain-stuff.cpp \ - display/nr-plain-stuff.h \ - display/nr-plain-stuff-gdk.cpp \ - display/nr-plain-stuff-gdk.h \ display/nr-style.cpp \ display/nr-style.h \ display/nr-svgfonts.cpp \ -- cgit v1.2.3 From 328fad57dbfb65e3bd31062021d5cc3081e68515 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 22 Jul 2011 04:09:27 +0200 Subject: Replace direct use of Cairo contexts and surfaces in the rendering tree with wrappers which keep some extra information about the surface, amd NRRect and NRRectL use with Geom::Rect and Geom::IntRect. Should simplify implementing filter primitive subregions. (bzr r10347.1.17) --- src/display/Makefile_insert | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index fc7c8e9ab..53f87efb1 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -23,6 +23,10 @@ ink_common_sources += \ display/canvas-text.h \ display/curve.cpp \ display/curve.h \ + display/drawing-context.cpp \ + display/drawing-context.h \ + display/drawing-surface.cpp \ + display/drawing-surface.h \ display/gnome-canvas-acetate.cpp \ display/gnome-canvas-acetate.h \ display/grayscale.cpp \ -- cgit v1.2.3 From 4dd33aa4d5c57706c7f64f63391174954160a308 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 6 Aug 2011 14:18:32 +0200 Subject: Rewrite NRArenaItem hierarchy into C++ (bzr r10347.1.21) --- src/display/Makefile_insert | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 53f87efb1..1c51f19a0 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -25,8 +25,18 @@ ink_common_sources += \ display/curve.h \ display/drawing-context.cpp \ display/drawing-context.h \ + display/drawing-group.cpp \ + display/drawing-group.h \ + display/drawing-image.cpp \ + display/drawing-image.h \ + display/drawing-item.cpp \ + display/drawing-item.h \ + display/drawing-shape.cpp \ + display/drawing-shape.h \ display/drawing-surface.cpp \ display/drawing-surface.h \ + display/drawing-text.cpp \ + display/drawing-text.h \ display/gnome-canvas-acetate.cpp \ display/gnome-canvas-acetate.h \ display/grayscale.cpp \ @@ -35,19 +45,9 @@ ink_common_sources += \ display/guideline.h \ display/nr-3dutils.cpp \ display/nr-3dutils.h \ + display/nr-arena.h \ display/nr-arena.cpp \ display/nr-arena-forward.h \ - display/nr-arena-glyphs.cpp \ - display/nr-arena-glyphs.h \ - display/nr-arena-group.cpp \ - display/nr-arena-group.h \ - display/nr-arena.h \ - display/nr-arena-image.cpp \ - display/nr-arena-image.h \ - display/nr-arena-item.cpp \ - display/nr-arena-item.h \ - display/nr-arena-shape.cpp \ - display/nr-arena-shape.h \ display/nr-filter-blend.cpp \ display/nr-filter-blend.h \ display/nr-filter-colormatrix.cpp \ -- cgit v1.2.3 From 75976ea07dba9b97186667524d0a76603de416af Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sun, 7 Aug 2011 12:53:12 +0200 Subject: Rewrite NRArena -> Inkscape::Drawing. Call render and update methods on the Drawing rather than on the root DrawingItem. (bzr r10347.1.25) --- src/display/Makefile_insert | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/display/Makefile_insert') diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 1c51f19a0..1c7a21dae 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -23,6 +23,8 @@ ink_common_sources += \ display/canvas-text.h \ display/curve.cpp \ display/curve.h \ + display/drawing.cpp \ + display/drawing.h \ display/drawing-context.cpp \ display/drawing-context.h \ display/drawing-group.cpp \ @@ -45,8 +47,6 @@ ink_common_sources += \ display/guideline.h \ display/nr-3dutils.cpp \ display/nr-3dutils.h \ - display/nr-arena.h \ - display/nr-arena.cpp \ display/nr-arena-forward.h \ display/nr-filter-blend.cpp \ display/nr-filter-blend.h \ -- cgit v1.2.3