summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/canvas-arena.cpp2
-rw-r--r--src/display/canvas-arena.h22
-rw-r--r--src/display/canvas-grid.cpp2
-rw-r--r--src/display/display-forward.h2
-rw-r--r--src/display/nr-arena.h10
-rw-r--r--src/display/sp-canvas.cpp2
-rw-r--r--src/display/sp-canvas.h17
7 files changed, 36 insertions, 21 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index bb710a021..f1a991434 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -83,7 +83,7 @@ sp_canvas_arena_class_init (SPCanvasArenaClass *klass)
signals[ARENA_EVENT] = gtk_signal_new ("arena_event",
GTK_RUN_LAST,
GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET (SPCanvasArenaClass, arena_event),
+ ((glong)((guint8*)&(klass->arena_event) - (guint8*)klass)),
sp_marshal_INT__POINTER_POINTER,
GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
diff --git a/src/display/canvas-arena.h b/src/display/canvas-arena.h
index f39ff1274..5e6188eee 100644
--- a/src/display/canvas-arena.h
+++ b/src/display/canvas-arena.h
@@ -1,5 +1,5 @@
-#ifndef __SP_CANVAS_ARENA_H__
-#define __SP_CANVAS_ARENA_H__
+#ifndef SEEN_SP_CANVAS_ARENA_H
+#define SEEN_SP_CANVAS_ARENA_H
/*
* RGBA display list system for inkscape
@@ -13,8 +13,10 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-struct SPCanvasArena;
-struct SPCanvasArenaClass;
+#include "../display/sp-canvas.h"
+#include "nr-arena-item.h"
+
+G_BEGIN_DECLS
#define SP_TYPE_CANVAS_ARENA (sp_canvas_arena_get_type ())
#define SP_CANVAS_ARENA(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CANVAS_ARENA, SPCanvasArena))
@@ -22,10 +24,10 @@ struct SPCanvasArenaClass;
#define SP_IS_CANVAS_ARENA(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CANVAS_ARENA))
#define SP_IS_CANVAS_ARENA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SP_TYPE_CANVAS_ARENA))
-#include "../display/sp-canvas.h"
-#include "nr-arena-item.h"
+typedef struct _SPCanvasArena SPCanvasArena;
+typedef struct _SPCanvasArenaClass SPCanvasArenaClass;
-struct SPCanvasArena {
+struct _SPCanvasArena {
SPCanvasItem item;
guint cursor : 1;
@@ -42,7 +44,7 @@ struct SPCanvasArena {
gdouble delta;
};
-struct SPCanvasArenaClass {
+struct _SPCanvasArenaClass {
SPCanvasItemClass parent_class;
gint (* arena_event) (SPCanvasArena *carena, NRArenaItem *item, GdkEvent *event);
@@ -55,4 +57,6 @@ void sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky);
void sp_canvas_arena_render_pixblock (SPCanvasArena *ca, NRPixBlock *pb);
-#endif
+G_END_DECLS
+
+#endif // SEEN_SP_CANVAS_ARENA_H
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 3d291f42a..a2443ca17 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -158,7 +158,7 @@ grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
};
CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type)
- : namelabel("", Gtk::ALIGN_CENTER), gridtype(type), visible(true), snap_enabled(true)
+ : namelabel("", Gtk::ALIGN_CENTER), visible(true), snap_enabled(true), gridtype(type)
{
repr = in_repr;
doc = in_doc;
diff --git a/src/display/display-forward.h b/src/display/display-forward.h
index 2af6f2c44..a28b7d03a 100644
--- a/src/display/display-forward.h
+++ b/src/display/display-forward.h
@@ -6,7 +6,7 @@
struct SPCanvas;
struct SPCanvasClass;
struct SPCanvasItem;
-struct SPCanvasItemClass;
+typedef struct _SPCanvasItemClass SPCanvasItemClass;
struct SPCanvasGroup;
struct SPCanvasGroupClass;
struct SPCurve;
diff --git a/src/display/nr-arena.h b/src/display/nr-arena.h
index 89cb58f39..b6d5a4539 100644
--- a/src/display/nr-arena.h
+++ b/src/display/nr-arena.h
@@ -13,6 +13,14 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
+typedef struct _SPCanvasArena SPCanvasArena;
+
+G_END_DECLS
+
#define NR_TYPE_ARENA (nr_arena_get_type ())
#define NR_ARENA(o) (NR_CHECK_INSTANCE_CAST ((o), NR_TYPE_ARENA, NRArena))
#define NR_IS_ARENA(o) (NR_CHECK_INSTANCE_TYPE ((o), NR_TYPE_ARENA))
@@ -36,8 +44,6 @@ enum {
RENDERMODE_OUTLINE
};
-struct SPCanvasArena;
-
struct NRArena : public NRActiveObject {
static NRArena *create() {
return reinterpret_cast<NRArena *>(nr_object_new(NR_TYPE_ARENA));
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 2af12b6c3..efc4fd112 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -147,7 +147,7 @@ sp_canvas_item_class_init (SPCanvasItemClass *klass)
item_signals[ITEM_EVENT] = g_signal_new ("event",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (SPCanvasItemClass, event),
+ ((glong)((guint8*)&(klass->event) - (guint8*)klass)),
NULL, NULL,
sp_marshal_BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1,
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 4b6d7b3b8..d8cc3157d 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -1,5 +1,5 @@
-#ifndef __SP_CANVAS_H__
-#define __SP_CANVAS_H__
+#ifndef SEEN_SP_CANVAS_H
+#define SEEN_SP_CANVAS_H
/** \file
* SPCanvas, SPCanvasBuf, and SPCanvasItem.
@@ -39,8 +39,11 @@
#include <libnr/nr-rect.h>
#include <libnr/nr-rect-l.h>
+G_BEGIN_DECLS
+
struct SPCanvas;
struct SPCanvasGroup;
+typedef struct _SPCanvasItemClass SPCanvasItemClass;
enum {
SP_CANVAS_UPDATE_REQUESTED = 1 << 0,
@@ -77,7 +80,7 @@ struct SPCanvasItem : public GtkObject {
/**
* The vtable of an SPCanvasItem.
*/
-struct SPCanvasItemClass : public GtkObjectClass {
+struct _SPCanvasItemClass : public GtkObjectClass {
void (* update) (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags);
void (* render) (SPCanvasItem *item, SPCanvasBuf *buf);
@@ -88,6 +91,8 @@ struct SPCanvasItemClass : public GtkObjectClass {
SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GtkType type, const gchar *first_arg_name, ...);
+G_END_DECLS
+
#define sp_canvas_item_set gtk_object_set
void sp_canvas_item_affine_absolute(SPCanvasItem *item, NR::Matrix const &aff);
@@ -198,15 +203,15 @@ void sp_canvas_request_redraw(SPCanvas *canvas, int x1, int y1, int x2, int y2);
void sp_canvas_force_full_redraw_after_interruptions(SPCanvas *canvas, unsigned int count);
void sp_canvas_end_forced_full_redraws(SPCanvas *canvas);
+bool sp_canvas_world_pt_inside_window(SPCanvas const *canvas, NR::Point const &world);
+
void sp_canvas_window_to_world(SPCanvas const *canvas, double winx, double winy, double *worldx, double *worldy);
void sp_canvas_world_to_window(SPCanvas const *canvas, double worldx, double worldy, double *winx, double *winy);
NR::Point sp_canvas_window_to_world(SPCanvas const *canvas, NR::Point const win);
NR::Point sp_canvas_world_to_window(SPCanvas const *canvas, NR::Point const world);
-bool sp_canvas_world_pt_inside_window(SPCanvas const *canvas, NR::Point const &world);
-
-#endif
+#endif // SEEN_SP_CANVAS_H
/*
Local Variables:
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 06:11:31 +0000