~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/display/canvas-arena.cpp

Committer: cilix42
Date: 2008-09-18 17:48:42 UTC
Revision ID: cilix42@users.sourceforge.net-20080918174842-1ad33a7d7gqhv2hq

Next roud of NR ==> Geom conversion

files modified:
src/box3d.cpp

src/desktop-style.cpp

src/desktop.cpp

src/desktop.h

src/display/canvas-arena.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-axonomgrid.h

src/display/canvas-bpath.cpp

src/display/canvas-bpath.h

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/display/gnome-canvas-acetate.cpp

src/display/guideline.cpp

src/display/nr-arena-shape.cpp

src/display/sodipodi-ctrl.cpp

src/display/sodipodi-ctrl.h

src/display/sodipodi-ctrlrect.cpp

src/display/sodipodi-ctrlrect.h

src/display/sp-canvas-util.cpp

src/display/sp-canvas-util.h

src/display/sp-canvas.cpp

src/display/sp-canvas.h

src/display/sp-ctrlline.cpp

src/display/sp-ctrlline.h

src/display/sp-ctrlquadr.cpp

src/display/sp-ctrlquadr.h

src/document.cpp

src/document.h

src/dropper-context.cpp

src/dropper-context.h

src/dyna-draw-context.cpp

src/eraser-context.cpp

src/event-context.cpp

src/flood-context.cpp

src/gradient-context.cpp

src/gradient-context.h

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/libnr/nr-convert2geom.h

src/line-geometry.cpp

src/line-geometry.h

src/livarot/Shape.h

src/livarot/ShapeMisc.cpp

src/marker.cpp

src/marker.h

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/pencil-context.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/shape-editor.cpp

src/shape-editor.h

src/sp-flowtext.cpp

src/sp-image.cpp

src/sp-item-group.cpp

src/sp-item-group.h

src/sp-item.cpp

src/sp-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-root.cpp

src/sp-root.h

src/sp-shape.cpp

src/sp-symbol.cpp

src/sp-text.cpp

src/sp-tref.cpp

src/sp-tspan.cpp

src/sp-use.cpp

src/splivarot.cpp

src/text-context.cpp

src/text-editing.cpp

src/tweak-context.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/zoom-status.cpp

src/verbs.cpp

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

src/display/canvas-arena.cpp

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

}

138

139

static void

140

sp_canvas_arena_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)

140

sp_canvas_arena_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags)

141

{

142

SPCanvasArena *arena = SP_CANVAS_ARENA (item);

143

165

ec.send_event = TRUE;

166

ec.subwindow = ec.window;

167

ec.time = GDK_CURRENT_TIME;

168

ec.x = arena->c[NR::X];

169

ec.y = arena->c[NR::Y];

168

ec.x = arena->c[Geom::X];

169

ec.y = arena->c[Geom::Y];

170

/* fixme: */

171

if (arena->active) {

172

ec.type = GDK_LEAVE_NOTIFY;

227

}

228

229

static double

230

sp_canvas_arena_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)

230

sp_canvas_arena_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item)

231

{

232

SPCanvasArena *arena = SP_CANVAS_ARENA (item);

233

267

arena->cursor = TRUE;

268

269

/* TODO ... event -> arena transform? */

270

arena->c = NR::Point(event->crossing.x, event->crossing.y);

270

arena->c = Geom::Point(event->crossing.x, event->crossing.y);

271

272

/* fixme: Not sure abut this, but seems the right thing (Lauris) */

273

nr_arena_item_invoke_update (arena->root, NULL, &arena->gc, NR_ARENA_ITEM_STATE_PICK, NR_ARENA_ITEM_STATE_NONE);

288

289

case GDK_MOTION_NOTIFY:

290

/* TODO ... event -> arena transform? */

291

arena->c = NR::Point(event->motion.x, event->motion.y);

291

arena->c = Geom::Point(event->motion.x, event->motion.y);

292

293

/* fixme: Not sure abut this, but seems the right thing (Lauris) */

294

nr_arena_item_invoke_update (arena->root, NULL, &arena->gc, NR_ARENA_ITEM_STATE_PICK, NR_ARENA_ITEM_STATE_NONE);

Older »