![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/knot.cpp b/src/knot.cpp
index 12fa710663fd41a1a4c56bbe1cd57622f5186856..01ccca69337d59db83272dcb994d998e4ab364ef 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
static bool transform_escaped = false; // true iff resize or rotate was cancelled by esc.
-enum {
- PROP_0,
-
- PROP_SIZE,
- PROP_ANCHOR,
- PROP_SHAPE,
- PROP_MODE,
- PROP_FILL, PROP_FILL_MOUSEOVER, PROP_FILL_DRAGGING,
- PROP_STROKE, PROP_STROKE_MOUSEOVER, PROP_STROKE_DRAGGING,
- PROP_IMAGE, PROP_IMAGE_MOUSEOVER, PROP_IMAGE_DRAGGING,
- PROP_CURSOR, PROP_CURSOR_MOUSEOVER, PROP_CURSOR_DRAGGING,
- PROP_PIXBUF,
- PROP_TIP,
-
- PROP_LAST
-};
-
enum {
EVENT,
CLICKED,
static void sp_knot_class_init(SPKnotClass *klass);
static void sp_knot_init(SPKnot *knot);
static void sp_knot_dispose(GObject *object);
-static void sp_knot_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void sp_knot_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot);
static void sp_knot_set_flag(SPKnot *knot, guint flag, bool set);
-static void sp_knot_update_ctrl(SPKnot *knot);
static void sp_knot_set_ctrl_state(SPKnot *knot);
static GObjectClass *parent_class;
GObjectClass *object_class = (GObjectClass *) klass;
parent_class = (GObjectClass*) g_type_class_peek_parent(klass);
-
+
object_class->dispose = sp_knot_dispose;
- object_class->set_property = sp_knot_set_property;
- object_class->get_property = sp_knot_get_property;
-
- /* Huh :) */
-
- g_object_class_install_property(object_class,
- PROP_SIZE,
- g_param_spec_uint("size", "Size", "",
- 0,
- 0xffffffff,
- 0xff000000,
- (GParamFlags) G_PARAM_READWRITE));
- g_object_class_install_property(object_class,
- PROP_ANCHOR,
- g_param_spec_enum("anchor", "Anchor", "",
- GTK_TYPE_ANCHOR_TYPE,
- GTK_ANCHOR_CENTER,
- (GParamFlags) G_PARAM_READWRITE));
- g_object_class_install_property(object_class,
- PROP_SHAPE,
- g_param_spec_int("shape", "Shape", "",
- SP_KNOT_SHAPE_SQUARE,
- SP_KNOT_SHAPE_IMAGE,
- SP_KNOT_SHAPE_SQUARE,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_MODE,
- g_param_spec_int("mode", "Mode", "",
- SP_KNOT_MODE_COLOR,
- SP_KNOT_MODE_XOR,
- SP_KNOT_MODE_XOR,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_FILL,
- g_param_spec_uint("fill", "Fill", "",
- 0,
- 0xffffffff,
- 0xff000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_FILL_MOUSEOVER,
- g_param_spec_uint("fill_mouseover", "Fill mouse over", "",
- 0,
- 0xffffffff,
- 0xff000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_FILL_DRAGGING,
- g_param_spec_uint("fill_dragging", "Fill dragging", "",
- 0,
- 0xffffffff,
- 0xff000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_STROKE,
- g_param_spec_uint("stroke", "Stroke", "",
- 0,
- 0xffffffff,
- 0x01000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_STROKE_MOUSEOVER,
- g_param_spec_uint("stroke_mouseover", "Stroke mouseover", "",
- 0,
- 0xffffffff,
- 0x01000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_STROKE_DRAGGING,
- g_param_spec_uint("stroke_dragging", "Stroke dragging", "",
- 0,
- 0xffffffff,
- 0x01000000,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_IMAGE,
- g_param_spec_pointer("image", "Image", "",
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_IMAGE_MOUSEOVER,
- g_param_spec_pointer("image_mouseover", "Image mouseover", "",
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_IMAGE_DRAGGING,
- g_param_spec_pointer("image_dragging", "Image dragging", "",
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_CURSOR,
- g_param_spec_boxed("cursor", "Cursor", "",
- GDK_TYPE_CURSOR,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_CURSOR_MOUSEOVER,
- g_param_spec_boxed("cursor_mouseover", "Cursor mouseover", "",
- GDK_TYPE_CURSOR,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_CURSOR_DRAGGING,
- g_param_spec_boxed("cursor_dragging", "Cursor dragging", "",
- GDK_TYPE_CURSOR,
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_PIXBUF,
- g_param_spec_pointer("pixbuf", "Pixbuf", "",
- (GParamFlags) G_PARAM_READWRITE));
-
- g_object_class_install_property(object_class,
- PROP_TIP,
- g_param_spec_pointer("tip", "Tip", "",
- (GParamFlags) G_PARAM_READWRITE));
-
+
knot_signals[EVENT] = g_signal_new("event",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
sp_marshal_BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT);
-
+
knot_signals[CLICKED] = g_signal_new("clicked",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_FIRST,
sp_marshal_NONE__UINT,
G_TYPE_NONE, 1,
G_TYPE_UINT);
-
+
knot_signals[DOUBLECLICKED] = g_signal_new("doubleclicked",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_FIRST,
sp_marshal_NONE__UINT,
G_TYPE_NONE, 1,
G_TYPE_UINT);
-
+
knot_signals[GRABBED] = g_signal_new("grabbed",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_FIRST,
sp_marshal_NONE__UINT,
G_TYPE_NONE, 1,
G_TYPE_UINT);
-
+
knot_signals[UNGRABBED] = g_signal_new("ungrabbed",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_FIRST,
sp_marshal_NONE__UINT,
G_TYPE_NONE, 1,
G_TYPE_UINT);
-
+
knot_signals[MOVED] = g_signal_new("moved",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_FIRST,
sp_marshal_NONE__POINTER_UINT,
G_TYPE_NONE, 2,
G_TYPE_POINTER, G_TYPE_UINT);
-
+
knot_signals[REQUEST] = g_signal_new("request",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
sp_marshal_BOOLEAN__POINTER_UINT,
G_TYPE_BOOLEAN, 2,
G_TYPE_POINTER, G_TYPE_UINT);
-
+
knot_signals[DISTANCE] = g_signal_new("distance",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
knot->desktop = NULL;
knot->item = NULL;
knot->flags = 0;
-
+
knot->size = 8;
knot->pos = NR::Point(0, 0);
knot->grabbed_rel_pos = NR::Point(0, 0);
knot->shape = SP_KNOT_SHAPE_SQUARE;
knot->mode = SP_KNOT_MODE_XOR;
knot->tip = NULL;
-
+
knot->fill[SP_KNOT_STATE_NORMAL] = 0xffffff00;
knot->fill[SP_KNOT_STATE_MOUSEOVER] = 0xff0000ff;
knot->fill[SP_KNOT_STATE_DRAGGING] = 0x0000ffff;
}
}
-/**
- * Callback to set property.
- */
-static void sp_knot_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
- GdkCursor *cursor;
-
- SPKnot *knot = SP_KNOT(object);
-
- switch (prop_id) {
- case PROP_SIZE:
- knot->size = g_value_get_uint(value);
- break;
- case PROP_ANCHOR:
- knot->anchor = (GtkAnchorType) g_value_get_enum(value);
- break;
- case PROP_SHAPE:
- knot->shape = (SPKnotShapeType) g_value_get_int(value);
- break;
- case PROP_MODE:
- knot->mode = (SPKnotModeType) g_value_get_int(value);
- break;
- case PROP_FILL:
- knot->fill[SP_KNOT_STATE_NORMAL] =
- knot->fill[SP_KNOT_STATE_MOUSEOVER] =
- knot->fill[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_FILL_MOUSEOVER:
- knot->fill[SP_KNOT_STATE_MOUSEOVER] =
- knot->fill[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_FILL_DRAGGING:
- knot->fill[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_STROKE:
- knot->stroke[SP_KNOT_STATE_NORMAL] =
- knot->stroke[SP_KNOT_STATE_MOUSEOVER] =
- knot->stroke[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_STROKE_MOUSEOVER:
- knot->stroke[SP_KNOT_STATE_MOUSEOVER] =
- knot->stroke[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_STROKE_DRAGGING:
- knot->stroke[SP_KNOT_STATE_DRAGGING] = g_value_get_uint(value);
- break;
- case PROP_IMAGE:
- knot->image[SP_KNOT_STATE_NORMAL] =
- knot->image[SP_KNOT_STATE_MOUSEOVER] =
- knot->image[SP_KNOT_STATE_DRAGGING] = (guchar*) g_value_get_pointer(value);
- break;
- case PROP_IMAGE_MOUSEOVER:
- knot->image[SP_KNOT_STATE_MOUSEOVER] = (guchar*) g_value_get_pointer(value);
- break;
- case PROP_IMAGE_DRAGGING:
- knot->image[SP_KNOT_STATE_DRAGGING] = (guchar*) g_value_get_pointer(value);
- break;
- case PROP_CURSOR:
- cursor = (GdkCursor*) g_value_get_boxed(value);
- for (gint i = 0; i < SP_KNOT_VISIBLE_STATES; i++) {
- if (knot->cursor[i]) {
- gdk_cursor_unref(knot->cursor[i]);
- }
- knot->cursor[i] = cursor;
- if (cursor) {
- gdk_cursor_ref(cursor);
- }
- }
- break;
- case PROP_CURSOR_MOUSEOVER:
- cursor = (GdkCursor*) g_value_get_boxed(value);
- if (knot->cursor[SP_KNOT_STATE_MOUSEOVER]) {
- gdk_cursor_unref(knot->cursor[SP_KNOT_STATE_MOUSEOVER]);
- }
- knot->cursor[SP_KNOT_STATE_MOUSEOVER] = cursor;
- if (cursor) {
- gdk_cursor_ref(cursor);
- }
- break;
- case PROP_CURSOR_DRAGGING:
- cursor = (GdkCursor*) g_value_get_boxed(value);
- if (knot->cursor[SP_KNOT_STATE_DRAGGING]) {
- gdk_cursor_unref(knot->cursor[SP_KNOT_STATE_DRAGGING]);
- }
- knot->cursor[SP_KNOT_STATE_DRAGGING] = cursor;
- if (cursor) {
- gdk_cursor_ref(cursor);
- }
- break;
- case PROP_PIXBUF:
- knot->pixbuf = g_value_get_pointer(value);
- break;
- case PROP_TIP:
- knot->tip = g_strdup((const gchar *) g_value_get_pointer(value));
- break;
- default:
- g_assert_not_reached();
- break;
- }
-
- sp_knot_update_ctrl(knot);
-}
-
-/// Not reached.
-static void sp_knot_get_property(GObject *, guint, GValue *, GParamSpec *)
-{
- g_assert_not_reached();
-}
-
/**
* Update knot for dragging and tell canvas an item was grabbed.
*/
void sp_knot_start_dragging(SPKnot *knot, NR::Point p, gint x, gint y, guint32 etime)
{
// save drag origin
- xp = x;
+ xp = x;
yp = y;
within_tolerance = true;
case GDK_MOTION_NOTIFY:
if (grabbed) {
consumed = TRUE;
-
+
if ( within_tolerance
&& ( abs( (gint) event->motion.x - xp ) < tolerance )
&& ( abs( (gint) event->motion.y - yp ) < tolerance ) ) {
break; // do not drag if we're within tolerance from origin
}
-
- // Once the user has moved farther than tolerance from the original location
- // (indicating they intend to move the object, not click), then always process the
+
+ // Once the user has moved farther than tolerance from the original location
+ // (indicating they intend to move the object, not click), then always process the
// motion notify coordinates as given (no snapping back to origin)
- within_tolerance = false;
-
+ within_tolerance = false;
+
if (!moved) {
g_signal_emit(G_OBJECT (knot),
knot_signals[GRABBED], 0,
grabbed = FALSE;
moved = FALSE;
-
+
consumed = TRUE;
break;
case GDK_KEY_PRESS: // keybindings for knot
- switch (get_group0_keyval(&event->key)) {
+ switch (get_group0_keyval(&event->key)) {
case GDK_Escape:
sp_knot_set_flag(knot, SP_KNOT_GRABBED, FALSE);
if (!nograb) {
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;
- }
+ }
grabbed = FALSE;
moved = FALSE;
break;
{
g_return_if_fail(knot != NULL);
g_return_if_fail(SP_IS_KNOT (knot));
-
+
sp_knot_set_flag(knot, SP_KNOT_VISIBLE, TRUE);
}
p,
state,
&distance);
-
+
return distance;
}
}
/**
- * Move knot to new position, without emitting a MOVED signal. We can't be sure this artificial
- * move has moved the knot from under cursor, but it seems likely, so we clear SP_KNOT_MOUSEOVER.
+ * Move knot to new position, without emitting a MOVED signal.
*/
void sp_knot_moveto(SPKnot *knot, NR::Point *p)
{
g_return_if_fail(SP_IS_KNOT(knot));
knot->pos = *p;
-
+
if (knot->item) {
SP_CTRL(knot->item)->moveto (*p);
}
-
- sp_knot_set_flag(knot, SP_KNOT_MOUSEOVER, FALSE);
}
/**
{
g_assert(knot != NULL);
g_assert(SP_IS_KNOT (knot));
-
+
return knot->pos;
}
{
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));
-
+
if (set) {
knot->flags |= flag;
} else {
knot->flags &= ~flag;
}
-
+
switch (flag) {
case SP_KNOT_VISIBLE:
if (set) {
/**
* Update knot's pixbuf and set its control state.
*/
-static void sp_knot_update_ctrl(SPKnot *knot)
+void sp_knot_update_ctrl(SPKnot *knot)
{
if (!knot->item) {
return;
}
-
+
gtk_object_set(GTK_OBJECT(knot->item), "shape", knot->shape, NULL);
gtk_object_set(GTK_OBJECT(knot->item), "mode", knot->mode, NULL);
gtk_object_set(GTK_OBJECT(knot->item), "size", (gdouble) knot->size, NULL);