![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/knot.cpp b/src/knot.cpp
index 15fde68ff287cd43e8ab003989e7f28bcb7808c1..d65b64299ab4a34f7f9b0e3edb152d20796b1621 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
#define KNOT_EVENT_MASK (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | \
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | \
+ GDK_POINTER_MOTION_MASK | \
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)
static bool nograb = false;
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;
*/
static void sp_knot_class_init(SPKnotClass *klass)
{
- GObjectClass *object_class = (GObjectClass *) klass;
+ 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),
knot->shape = SP_KNOT_SHAPE_SQUARE;
knot->mode = SP_KNOT_MODE_XOR;
knot->tip = NULL;
+ knot->_event_handler_id = 0;
+ knot->pressure = 0;
knot->fill[SP_KNOT_STATE_NORMAL] = 0xffffff00;
knot->fill[SP_KNOT_STATE_MOUSEOVER] = 0xff0000ff;
gdk_pointer_ungrab (GDK_CURRENT_TIME);
}
+ if (knot->_event_handler_id > 0)
+ {
+ g_signal_handler_disconnect(G_OBJECT (knot->item), knot->_event_handler_id);
+ knot->_event_handler_id = 0;
+ }
+
if (knot->item) {
gtk_object_destroy (GTK_OBJECT (knot->item));
knot->item = NULL;
knot->tip = NULL;
}
- if (((GObjectClass *) (parent_class))->dispose) {
- (* ((GObjectClass *) (parent_class))->dispose) (object);
+ if (parent_class->dispose) {
+ (*parent_class->dispose) (object);
}
}
-/**
- * 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.
*/
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));
- tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+ /* Run client universal event handler, if present */
gboolean consumed = FALSE;
- /* Run client universal event handler, if present */
-
- g_signal_emit(G_OBJECT(knot), knot_signals[EVENT], 0, event, &consumed);
+ g_signal_emit(knot, knot_signals[EVENT], 0, event, &consumed);
if (consumed) {
return TRUE;
}
+ g_object_ref(knot);
+ tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+
switch (event->type) {
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
- g_signal_emit(G_OBJECT(knot), knot_signals[DOUBLECLICKED], 0, event->button.state);
+ g_signal_emit(knot, knot_signals[DOUBLECLICKED], 0, event->button.state);
grabbed = FALSE;
moved = FALSE;
break;
case GDK_BUTTON_RELEASE:
if (event->button.button == 1) {
+ knot->pressure = 0;
if (transform_escaped) {
transform_escaped = false;
consumed = TRUE;
sp_knot_set_flag(knot,
SP_KNOT_DRAGGING,
FALSE);
- g_signal_emit(G_OBJECT (knot),
+ g_signal_emit(knot,
knot_signals[UNGRABBED], 0,
event->button.state);
} else {
- g_signal_emit(G_OBJECT (knot),
+ g_signal_emit(knot,
knot_signals[CLICKED], 0,
event->button.state);
}
// motion notify coordinates as given (no snapping back to origin)
within_tolerance = false;
+ if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &knot->pressure))
+ knot->pressure = CLAMP (knot->pressure, 0, 1);
+ else
+ knot->pressure = 0.5;
+
if (!moved) {
- g_signal_emit(G_OBJECT (knot),
+ g_signal_emit(knot,
knot_signals[GRABBED], 0,
event->motion.state);
sp_knot_set_flag(knot,
sp_knot_set_flag(knot,
SP_KNOT_DRAGGING,
FALSE);
- g_signal_emit(G_OBJECT(knot),
+ g_signal_emit(knot,
knot_signals[UNGRABBED], 0,
event->button.state);
- sp_document_undo(SP_DT_DOCUMENT(knot->desktop));
+ sp_document_undo(sp_desktop_document(knot->desktop));
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;
break;
}
+ g_object_unref(knot);
return consumed;
}
knot->tip = g_strdup (tip);
}
- knot->item = sp_canvas_item_new(SP_DT_CONTROLS (desktop),
+ knot->item = sp_canvas_item_new(sp_desktop_controls (desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"size", 8.0,
"mode", SP_KNOT_MODE_XOR,
NULL);
- gtk_signal_connect(GTK_OBJECT(knot->item), "event",
- GTK_SIGNAL_FUNC(sp_knot_handler), knot);
+ knot->_event_handler_id = gtk_signal_connect(GTK_OBJECT(knot->item), "event",
+ GTK_SIGNAL_FUNC(sp_knot_handler), knot);
return knot;
}
gboolean done = FALSE;
- g_signal_emit(G_OBJECT (knot),
+ g_signal_emit(knot,
knot_signals[REQUEST], 0,
p,
state,
gdouble distance = NR::L2(*p - knot->pos);
- g_signal_emit(G_OBJECT(knot),
+ g_signal_emit(knot,
knot_signals[DISTANCE], 0,
p,
state,
SP_CTRL(knot->item)->moveto (*p);
}
- g_signal_emit(G_OBJECT (knot),
+ g_signal_emit(knot,
knot_signals[MOVED], 0,
p,
state);
}
/**
- * 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)
{
if (knot->item) {
SP_CTRL(knot->item)->moveto (*p);
}
-
- sp_knot_set_flag(knot, SP_KNOT_MOUSEOVER, FALSE);
}
/**
/**
* Set flag in knot, with side effects.
*/
-static void sp_knot_set_flag(SPKnot *knot, guint flag, bool set)
+void sp_knot_set_flag(SPKnot *knot, guint flag, bool set)
{
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));
/**
* 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;