summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2013-04-28 22:48:03 +0000
committerJon A. Cruz <jon@joncruz.org>2013-04-28 22:48:03 +0000
commit192d134e8283fadf349eb41d66f63206c98c33d1 (patch)
tree11f47ff079215d7be226df5a84fcc75c9fcbf3e4 /src
parentWarning cleanup. (diff)
downloadinkscape-192d134e8283fadf349eb41d66f63206c98c33d1.tar.gz
inkscape-192d134e8283fadf349eb41d66f63206c98c33d1.zip
Temporily fix abiguous macros before later removal.
(bzr r12310)
Diffstat (limited to 'src')
-rw-r--r--src/arc-context.cpp6
-rw-r--r--src/box3d-context.cpp30
-rw-r--r--src/dialogs/dialog-events.cpp2
-rw-r--r--src/draw-context.cpp2
-rw-r--r--src/dropper-context.cpp2
-rw-r--r--src/dyna-draw-context.cpp12
-rw-r--r--src/eraser-context.cpp12
-rw-r--r--src/event-context.cpp24
-rw-r--r--src/flood-context.cpp2
-rw-r--r--src/gradient-context.cpp42
-rw-r--r--src/macros.h12
-rw-r--r--src/mesh-context.cpp44
-rw-r--r--src/pen-context.cpp48
-rw-r--r--src/rect-context.cpp8
-rw-r--r--src/select-context.cpp64
-rw-r--r--src/spiral-context.cpp6
-rw-r--r--src/spray-context.cpp32
-rw-r--r--src/star-context.cpp6
-rw-r--r--src/text-context.cpp78
-rw-r--r--src/tweak-context.cpp72
-rw-r--r--src/zoom-context.cpp4
21 files changed, 254 insertions, 254 deletions
diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index b5bdf58ef..34e4bbeab 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -314,12 +314,12 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-arc");
ret = TRUE;
}
@@ -349,7 +349,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index 1af5ed29f..a55aba00d 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -411,47 +411,47 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_bracketright:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, -180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, -180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
break;
case GDK_KEY_bracketleft:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, 180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, 180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
break;
case GDK_KEY_parenright:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, -180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, -180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
break;
case GDK_KEY_parenleft:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, 180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, 180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
break;
case GDK_KEY_braceright:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, -180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, -180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
break;
case GDK_KEY_braceleft:
- persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, 180/snaps, MOD__ALT);
+ persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, 180/snaps, MOD__ALT(event));
DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
_("Change perspective (angle of PLs)"));
ret = true;
@@ -459,7 +459,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
/* TODO: what is this???
case GDK_O:
- if (MOD__CTRL && MOD__SHIFT) {
+ if (MOD__CTRL(event) && MOD__SHIFT(event)) {
Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(),
6, 0xff00ff00);
}
@@ -469,7 +469,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_g:
case GDK_KEY_G:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_selection_to_guides(desktop);
ret = true;
}
@@ -477,7 +477,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_p:
case GDK_KEY_P:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
if (document->getCurrentPersp3D()) {
persp3d_print_debugging_info (document->getCurrentPersp3D());
}
@@ -487,11 +487,11 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-box3d");
ret = TRUE;
}
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
persp3d_toggle_VPs(selection->perspList(), Proj::X);
bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
ret = true;
@@ -500,7 +500,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_y:
case GDK_KEY_Y:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
persp3d_toggle_VPs(selection->perspList(), Proj::Y);
bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
ret = true;
@@ -509,7 +509,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_z:
case GDK_KEY_Z:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
persp3d_toggle_VPs(selection->perspList(), Proj::Z);
bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
ret = true;
@@ -537,7 +537,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp
index 1fb823bf0..6a12d973a 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/dialogs/dialog-events.cpp
@@ -112,7 +112,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
case GDK_KEY_w:
case GDK_KEY_W:
// close dialog
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
/* this code sends a delete_event to the dialog,
* instead of just destroying it, so that the
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index e62435004..869c1ae39 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -224,7 +224,7 @@ gint sp_draw_context_root_handler(SPEventContext *ec, GdkEvent *event)
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
ret = TRUE;
}
break;
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 05d22017e..57ddc1656 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -391,7 +391,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
ret = TRUE;
}
break;
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 742d52f09..605e487ab 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -854,7 +854,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
switch (get_group0_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->angle += 5.0;
if (dc->angle > 90.0)
dc->angle = 90.0;
@@ -864,7 +864,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->angle -= 5.0;
if (dc->angle < -90.0)
dc->angle = -90.0;
@@ -874,7 +874,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->width += 0.01;
if (dc->width > 1.0)
dc->width = 1.0;
@@ -884,7 +884,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->width -= 0.01;
if (dc->width < 0.01)
dc->width = 0.01;
@@ -906,7 +906,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-calligraphy");
ret = TRUE;
}
@@ -920,7 +920,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_z:
case GDK_KEY_Z:
- if (MOD__CTRL_ONLY && dc->is_drawing) {
+ if (MOD__CTRL_ONLY(event) && dc->is_drawing) {
// if drawing, cancel, otherwise pass it up for undo
calligraphic_cancel (dc);
ret = TRUE;
diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index cd0b1dc3b..b34e3352c 100644
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -567,7 +567,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
switch (get_group0_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->angle += 5.0;
if (dc->angle > 90.0)
dc->angle = 90.0;
@@ -577,7 +577,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->angle -= 5.0;
if (dc->angle < -90.0)
dc->angle = -90.0;
@@ -587,7 +587,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->width += 0.01;
if (dc->width > 1.0)
dc->width = 1.0;
@@ -597,7 +597,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
dc->width -= 0.01;
if (dc->width < 0.01)
dc->width = 0.01;
@@ -619,7 +619,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-eraser");
ret = TRUE;
}
@@ -634,7 +634,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_z:
case GDK_KEY_Z:
- if (MOD__CTRL_ONLY && dc->is_drawing) {
+ if (MOD__CTRL_ONLY(event) && dc->is_drawing) {
// if drawing, cancel, otherwise pass it up for undo
eraser_cancel (dc);
ret = TRUE;
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 6e5f0caad..cec3a6e68 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -588,7 +588,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_D:
case GDK_KEY_d:
- if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+ if (!MOD__SHIFT(event) && !MOD__CTRL(event) && !MOD__ALT(event)) {
sp_toggle_dropper(desktop);
ret = TRUE;
}
@@ -598,7 +598,7 @@ static gint sp_event_context_private_root_handler(
if (desktop->quick_zoomed()) {
ret = TRUE;
}
- if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+ if (!MOD__SHIFT(event) && !MOD__CTRL(event) && !MOD__ALT(event)) {
desktop->zoom_quick(true);
ret = TRUE;
}
@@ -607,7 +607,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_w:
case GDK_KEY_F4:
/* Close view */
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
sp_ui_close_view(NULL);
ret = TRUE;
}
@@ -615,7 +615,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_Left: // Ctrl Left
case GDK_KEY_KP_Left:
case GDK_KEY_KP_4:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, sp_desktop_canvas(desktop)));
gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
@@ -626,7 +626,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_Up: // Ctrl Up
case GDK_KEY_KP_Up:
case GDK_KEY_KP_8:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, sp_desktop_canvas(desktop)));
gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
@@ -637,7 +637,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_Right: // Ctrl Right
case GDK_KEY_KP_Right:
case GDK_KEY_KP_6:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, sp_desktop_canvas(desktop)));
gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
@@ -648,7 +648,7 @@ static gint sp_event_context_private_root_handler(
case GDK_KEY_Down: // Ctrl Down
case GDK_KEY_KP_Down:
case GDK_KEY_KP_2:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, sp_desktop_canvas(desktop)));
gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
@@ -657,7 +657,7 @@ static gint sp_event_context_private_root_handler(
}
break;
case GDK_KEY_F10:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_event_root_menu_popup(desktop, NULL, event);
ret = TRUE;
}
@@ -673,7 +673,7 @@ static gint sp_event_context_private_root_handler(
break;
case GDK_KEY_z:
case GDK_KEY_Z:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->zoom_grab_focus();
ret = TRUE;
}
@@ -1135,11 +1135,11 @@ void sp_event_show_modifier_tip(Inkscape::MessageContext *message_context,
gchar const *alt_tip) {
guint keyval = get_group0_keyval(&event->key);
- bool ctrl = ctrl_tip && (MOD__CTRL || (keyval == GDK_KEY_Control_L) || (keyval
+ bool ctrl = ctrl_tip && (MOD__CTRL(event) || (keyval == GDK_KEY_Control_L) || (keyval
== GDK_KEY_Control_R));
- bool shift = shift_tip && (MOD__SHIFT || (keyval == GDK_KEY_Shift_L) || (keyval
+ bool shift = shift_tip && (MOD__SHIFT(event) || (keyval == GDK_KEY_Shift_L) || (keyval
== GDK_KEY_Shift_R));
- bool alt = alt_tip && (MOD__ALT || (keyval == GDK_KEY_Alt_L) || (keyval
+ bool alt = alt_tip && (MOD__ALT(event) || (keyval == GDK_KEY_Alt_L) || (keyval
== GDK_KEY_Alt_R) || (keyval == GDK_KEY_Meta_L) || (keyval == GDK_KEY_Meta_R));
gchar *tip = g_strdup_printf("%s%s%s%s%s", (ctrl ? ctrl_tip : ""), (ctrl
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index a62be624c..bb6864f7e 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -1238,7 +1238,7 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
default:
diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index 8fd002d70..d2822fbe1 100644
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -710,7 +710,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-grad");
ret = TRUE;
}
@@ -718,7 +718,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_A:
case GDK_KEY_a:
- if (MOD__CTRL_ONLY && drag->isNonEmpty()) {
+ if (MOD__CTRL_ONLY(event) && drag->isNonEmpty()) {
drag->selectAll();
ret = TRUE;
}
@@ -726,7 +726,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_L:
case GDK_KEY_l:
- if (MOD__CTRL_ONLY && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__CTRL_ONLY(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_gradient_simplify(rc, 1e-4);
ret = TRUE;
}
@@ -745,15 +745,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Left: // move handle left
case GDK_KEY_KP_Left:
case GDK_KEY_KP_4:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(mul*-10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(mul*-10, 0); // shift
else drag->selected_move_screen(mul*-1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(mul*-10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(mul*-10*nudge, 0); // shift
else drag->selected_move(mul*-nudge, 0); // no shift
}
ret = TRUE;
@@ -762,15 +762,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Up: // move handle up
case GDK_KEY_KP_Up:
case GDK_KEY_KP_8:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, mul*10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(0, mul*10); // shift
else drag->selected_move_screen(0, mul*1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, mul*10*nudge); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(0, mul*10*nudge); // shift
else drag->selected_move(0, mul*nudge); // no shift
}
ret = TRUE;
@@ -779,15 +779,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Right: // move handle right
case GDK_KEY_KP_Right:
case GDK_KEY_KP_6:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(mul*10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(mul*10, 0); // shift
else drag->selected_move_screen(mul*1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(mul*10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(mul*10*nudge, 0); // shift
else drag->selected_move(mul*nudge, 0); // no shift
}
ret = TRUE;
@@ -796,15 +796,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Down: // move handle down
case GDK_KEY_KP_Down:
case GDK_KEY_KP_2:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, mul*-10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(0, mul*-10); // shift
else drag->selected_move_screen(0, mul*-1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, mul*-10*nudge); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(0, mul*-10*nudge); // shift
else drag->selected_move(0, mul*-nudge); // no shift
}
ret = TRUE;
@@ -812,7 +812,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_r:
case GDK_KEY_R:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_gradient_reverse_selected_gradients(desktop);
ret = TRUE;
}
@@ -828,7 +828,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
break;
diff --git a/src/macros.h b/src/macros.h
index 9a97820d8..b221ebdc2 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -35,12 +35,12 @@
#endif
// keyboard modifiers in an event
-#define MOD__SHIFT (event->key.state & GDK_SHIFT_MASK)
-#define MOD__CTRL (event->key.state & GDK_CONTROL_MASK)
-#define MOD__ALT (event->key.state & GDK_MOD1_MASK)
-#define MOD__SHIFT_ONLY ((event->key.state & GDK_SHIFT_MASK) && !(event->key.state & GDK_CONTROL_MASK) && !(event->key.state & GDK_MOD1_MASK))
-#define MOD__CTRL_ONLY (!(event->key.state & GDK_SHIFT_MASK) && (event->key.state & GDK_CONTROL_MASK) && !(event->key.state & GDK_MOD1_MASK))
-#define MOD__ALT_ONLY (!(event->key.state & GDK_SHIFT_MASK) && !(event->key.state & GDK_CONTROL_MASK) && (event->key.state & GDK_MOD1_MASK))
+#define MOD__SHIFT(event) ((event)->key.state & GDK_SHIFT_MASK)
+#define MOD__CTRL(event) ((event)->key.state & GDK_CONTROL_MASK)
+#define MOD__ALT(event) ((event)->key.state & GDK_MOD1_MASK)
+#define MOD__SHIFT_ONLY(event) (((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK))
+#define MOD__CTRL_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && ((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK))
+#define MOD__ALT_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && ((event)->key.state & GDK_MOD1_MASK))
/*
Local Variables:
diff --git a/src/mesh-context.cpp b/src/mesh-context.cpp
index 36712d15d..62a45f98b 100644
--- a/src/mesh-context.cpp
+++ b/src/mesh-context.cpp
@@ -747,7 +747,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_A:
case GDK_KEY_a:
- if (MOD__CTRL_ONLY && drag->isNonEmpty()) {
+ if (MOD__CTRL_ONLY(event) && drag->isNonEmpty()) {
drag->selectAll();
ret = TRUE;
}
@@ -766,15 +766,15 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Left: // move handle left
case GDK_KEY_KP_Left:
case GDK_KEY_KP_4:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(mul*-10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(mul*-10, 0); // shift
else drag->selected_move_screen(mul*-1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(mul*-10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(mul*-10*nudge, 0); // shift
else drag->selected_move(mul*-nudge, 0); // no shift
}
ret = TRUE;
@@ -783,15 +783,15 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Up: // move handle up
case GDK_KEY_KP_Up:
case GDK_KEY_KP_8:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, mul*10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(0, mul*10); // shift
else drag->selected_move_screen(0, mul*1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, mul*10*nudge); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(0, mul*10*nudge); // shift
else drag->selected_move(0, mul*nudge); // no shift
}
ret = TRUE;
@@ -801,15 +801,15 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Right: // move handle right
case GDK_KEY_KP_Right:
case GDK_KEY_KP_6:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(mul*10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(mul*10, 0); // shift
else drag->selected_move_screen(mul*1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(mul*10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(mul*10*nudge, 0); // shift
else drag->selected_move(mul*nudge, 0); // no shift
}
ret = TRUE;
@@ -819,15 +819,15 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Down: // move handle down
case GDK_KEY_KP_Down:
case GDK_KEY_KP_2:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, mul*-10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) drag->selected_move_screen(0, mul*-10); // shift
else drag->selected_move_screen(0, mul*-1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, mul*-10*nudge); // shift
+ if (MOD__SHIFT(event)) drag->selected_move(0, mul*-10*nudge); // shift
else drag->selected_move(0, mul*-nudge); // no shift
}
ret = TRUE;
@@ -855,7 +855,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_b: // Toggle mesh side between lineto and curveto.
case GDK_KEY_B:
- if (MOD__ALT && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_mesh_context_corner_operation ( rc, MG_CORNER_SIDE_TOGGLE );
ret = TRUE;
}
@@ -863,7 +863,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_c: // Convert mesh side from generic Bezier to Bezier approximating arc,
case GDK_KEY_C: // preserving handle direction.
- if (MOD__ALT && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_mesh_context_corner_operation ( rc, MG_CORNER_SIDE_ARC );
ret = TRUE;
}
@@ -871,7 +871,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_g: // Toggle mesh tensor points on/off
case GDK_KEY_G:
- if (MOD__ALT && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_mesh_context_corner_operation ( rc, MG_CORNER_TENSOR_TOGGLE );
ret = TRUE;
}
@@ -879,7 +879,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_j: // Smooth corner color
case GDK_KEY_J:
- if (MOD__ALT && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_mesh_context_corner_operation ( rc, MG_CORNER_COLOR_SMOOTH );
ret = TRUE;
}
@@ -887,7 +887,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_k: // Pick corner color
case GDK_KEY_K:
- if (MOD__ALT && drag->isNonEmpty() && drag->hasSelection()) {
+ if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
sp_mesh_context_corner_operation ( rc, MG_CORNER_COLOR_PICK );
ret = TRUE;
}
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 6e3ed201e..5972a6ca8 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -950,13 +950,13 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
case GDK_KEY_Left: // move last point left
case GDK_KEY_KP_Left:
- if (!MOD__CTRL) { // not ctrl
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) pen_lastpoint_move_screen(pc, -10, 0); // shift
+ if (!MOD__CTRL(event)) { // not ctrl
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) pen_lastpoint_move_screen(pc, -10, 0); // shift
else pen_lastpoint_move_screen(pc, -1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) pen_lastpoint_move(pc, -10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) pen_lastpoint_move(pc, -10*nudge, 0); // shift
else pen_lastpoint_move(pc, -nudge, 0); // no shift
}
ret = TRUE;
@@ -964,13 +964,13 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
break;
case GDK_KEY_Up: // move last point up
case GDK_KEY_KP_Up:
- if (!MOD__CTRL) { // not ctrl
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, 10); // shift
+ if (!MOD__CTRL(event)) { // not ctrl
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) pen_lastpoint_move_screen(pc, 0, 10); // shift
else pen_lastpoint_move_screen(pc, 0, 1); // no shift
}
else { // no alt
- if (MOD__SHIFT) pen_lastpoint_move(pc, 0, 10*nudge); // shift
+ if (MOD__SHIFT(event)) pen_lastpoint_move(pc, 0, 10*nudge); // shift
else pen_lastpoint_move(pc, 0, nudge); // no shift
}
ret = TRUE;
@@ -978,13 +978,13 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
break;
case GDK_KEY_Right: // move last point right
case GDK_KEY_KP_Right:
- if (!MOD__CTRL) { // not ctrl
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 10, 0); // shift
+ if (!MOD__CTRL(event)) { // not ctrl
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) pen_lastpoint_move_screen(pc, 10, 0); // shift
else pen_lastpoint_move_screen(pc, 1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) pen_lastpoint_move(pc, 10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) pen_lastpoint_move(pc, 10*nudge, 0); // shift
else pen_lastpoint_move(pc, nudge, 0); // no shift
}
ret = TRUE;
@@ -992,13 +992,13 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
break;
case GDK_KEY_Down: // move last point down
case GDK_KEY_KP_Down:
- if (!MOD__CTRL) { // not ctrl
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, -10); // shift
+ if (!MOD__CTRL(event)) { // not ctrl
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) pen_lastpoint_move_screen(pc, 0, -10); // shift
else pen_lastpoint_move_screen(pc, 0, -1); // no shift
}
else { // no alt
- if (MOD__SHIFT) pen_lastpoint_move(pc, 0, -10*nudge); // shift
+ if (MOD__SHIFT(event)) pen_lastpoint_move(pc, 0, -10*nudge); // shift
else pen_lastpoint_move(pc, 0, -nudge); // no shift
}
ret = TRUE;
@@ -1008,7 +1008,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
/*TODO: this is not yet enabled?? looks like some traces of the Geometry tool
case GDK_KEY_P:
case GDK_KEY_p:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::PARALLEL, 2);
ret = TRUE;
}
@@ -1016,7 +1016,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
case GDK_KEY_C:
case GDK_KEY_c:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::CIRCLE_3PTS, 3);
ret = TRUE;
}
@@ -1024,7 +1024,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
case GDK_KEY_B:
case GDK_KEY_b:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::PERP_BISECTOR, 2);
ret = TRUE;
}
@@ -1032,7 +1032,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
case GDK_KEY_A:
case GDK_KEY_a:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::ANGLE_BISECTOR, 3);
ret = TRUE;
}
@@ -1041,14 +1041,14 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
case GDK_KEY_U:
case GDK_KEY_u:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
pen_lastpoint_tocurve(pc);
ret = TRUE;
}
break;
case GDK_KEY_L:
case GDK_KEY_l:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
pen_lastpoint_toline(pc);
ret = TRUE;
}
@@ -1070,7 +1070,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
break;
case GDK_KEY_z:
case GDK_KEY_Z:
- if (MOD__CTRL_ONLY && pc->npoints != 0) {
+ if (MOD__CTRL_ONLY(event) && pc->npoints != 0) {
// if drawing, cancel, otherwise pass it up for undo
pen_cancel (pc);
ret = TRUE;
@@ -1078,7 +1078,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
break;
case GDK_KEY_g:
case GDK_KEY_G:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_selection_to_guides(SP_EVENT_CONTEXT(pc)->desktop);
ret = true;
}
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 040127ae3..06745564f 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -359,13 +359,13 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-rect");
ret = TRUE;
}
@@ -373,7 +373,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_g:
case GDK_KEY_G:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_selection_to_guides(desktop);
ret = true;
}
@@ -406,7 +406,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 9a88bcf20..449cf9b61 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -849,7 +849,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
{
guint keyval = get_group0_keyval(&event->key);
- bool alt = ( MOD__ALT
+ bool alt = ( MOD__ALT(event)
|| (keyval == GDK_KEY_Alt_L)
|| (keyval == GDK_KEY_Alt_R)
|| (keyval == GDK_KEY_Meta_L)
@@ -890,15 +890,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
switch (get_group0_keyval (&event->key)) {
case GDK_KEY_Left: // move selection left
case GDK_KEY_KP_Left:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*-10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, mul*-10, 0); // shift
else sp_selection_move_screen(desktop, mul*-1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) sp_selection_move(desktop, mul*-10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) sp_selection_move(desktop, mul*-10*nudge, 0); // shift
else sp_selection_move(desktop, mul*-nudge, 0); // no shift
}
ret = TRUE;
@@ -906,15 +906,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_Up: // move selection up
case GDK_KEY_KP_Up:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, 0, mul*10); // shift
else sp_selection_move_screen(desktop, 0, mul*1); // no shift
}
else { // no alt
- if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*10*nudge); // shift
+ if (MOD__SHIFT(event)) sp_selection_move(desktop, 0, mul*10*nudge); // shift
else sp_selection_move(desktop, 0, mul*nudge); // no shift
}
ret = TRUE;
@@ -922,15 +922,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_Right: // move selection right
case GDK_KEY_KP_Right:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*10, 0); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, mul*10, 0); // shift
else sp_selection_move_screen(desktop, mul*1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) sp_selection_move(desktop, mul*10*nudge, 0); // shift
+ if (MOD__SHIFT(event)) sp_selection_move(desktop, mul*10*nudge, 0); // shift
else sp_selection_move(desktop, mul*nudge, 0); // no shift
}
ret = TRUE;
@@ -938,15 +938,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_Down: // move selection down
case GDK_KEY_KP_Down:
- if (!MOD__CTRL) { // not ctrl
+ if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__ALT) { // alt
- if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*-10); // shift
+ if (MOD__ALT(event)) { // alt
+ if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, 0, mul*-10); // shift
else sp_selection_move_screen(desktop, 0, mul*-1); // no shift
}
else { // no alt
- if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*-10*nudge); // shift
+ if (MOD__SHIFT(event)) sp_selection_move(desktop, 0, mul*-10*nudge); // shift
else sp_selection_move(desktop, 0, mul*-nudge); // no shift
}
ret = TRUE;
@@ -960,7 +960,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_a:
case GDK_KEY_A:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
sp_edit_select_all(desktop);
ret = TRUE;
}
@@ -975,17 +975,17 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx");
ret = TRUE;
}
break;
case GDK_KEY_bracketleft:
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
sp_selection_rotate_screen(selection, mul*1);
- } else if (MOD__CTRL) {
+ } else if (MOD__CTRL(event)) {
sp_selection_rotate(selection, 90);
} else if (snaps) {
sp_selection_rotate(selection, 180.0/snaps);
@@ -993,11 +993,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
ret = TRUE;
break;
case GDK_KEY_bracketright:
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
sp_selection_rotate_screen(selection, -1*mul);
- } else if (MOD__CTRL) {
+ } else if (MOD__CTRL(event)) {
sp_selection_rotate(selection, -90);
} else if (snaps) {
sp_selection_rotate(selection, -180.0/snaps);
@@ -1006,11 +1006,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_less:
case GDK_KEY_comma:
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
sp_selection_scale_screen(selection, -2*mul);
- } else if (MOD__CTRL) {
+ } else if (MOD__CTRL(event)) {
sp_selection_scale_times(selection, 0.5);
} else {
gint mul = 1 + gobble_key_events(
@@ -1021,11 +1021,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_greater:
case GDK_KEY_period:
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
sp_selection_scale_screen(selection, 2*mul);
- } else if (MOD__CTRL) {
+ } else if (MOD__CTRL(event)) {
sp_selection_scale_times(selection, 2);
} else {
gint mul = 1 + gobble_key_events(
@@ -1035,7 +1035,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
ret = TRUE;
break;
case GDK_KEY_Return:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
if (selection->singleItem()) {
SPItem *clicked_item = selection->singleItem();
if ( SP_IS_GROUP(clicked_item) ||
@@ -1050,14 +1050,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
}
break;
case GDK_KEY_BackSpace:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
sp_select_context_up_one_layer(desktop);
ret = TRUE;
}
break;
case GDK_KEY_s:
case GDK_KEY_S:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
if (!selection->isEmpty()) {
seltrans->increaseState();
}
@@ -1066,7 +1066,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_KEY_g:
case GDK_KEY_G:
- if (MOD__SHIFT_ONLY) {
+ if (MOD__SHIFT_ONLY(event)) {
sp_selection_to_guides(desktop);
ret = true;
}
@@ -1082,7 +1082,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
if (key_is_a_modifier (keyval))
event_context->defaultMessageContext()->clear();
- bool alt = ( MOD__ALT
+ bool alt = ( MOD__ALT(event)
|| (keyval == GDK_KEY_Alt_L)
|| (keyval == GDK_KEY_Alt_R)
|| (keyval == GDK_KEY_Meta_L)
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index 459a56161..b7bf5aead 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -310,12 +310,12 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-spiral");
ret = TRUE;
}
@@ -346,7 +346,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index 6a5684891..b8172fa4c 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -642,7 +642,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
tc->has_dilated = false;
if(tc->is_dilating && event->button.button == 1 && !event_context->space_panning) {
- sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT);
+ sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
}
tc->has_dilated = true;
@@ -735,7 +735,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
if (!tc->has_dilated) {
// if we did not rub, do a light tap
tc->pressure = 0.03;
- sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT);
+ sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
}
tc->is_dilating = false;
tc->has_dilated = false;
@@ -761,28 +761,28 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
switch (get_group0_keyval (&event->key)) {
case GDK_KEY_j:
case GDK_KEY_J:
- if (MOD__SHIFT_ONLY) {
- sp_spray_switch_mode(tc, SPRAY_MODE_COPY, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_spray_switch_mode(tc, SPRAY_MODE_COPY, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_k:
case GDK_KEY_K:
- if (MOD__SHIFT_ONLY) {
- sp_spray_switch_mode(tc, SPRAY_MODE_CLONE, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_spray_switch_mode(tc, SPRAY_MODE_CLONE, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_l:
case GDK_KEY_L:
- if (MOD__SHIFT_ONLY) {
- sp_spray_switch_mode(tc, SPRAY_MODE_SINGLE_PATH, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_spray_switch_mode(tc, SPRAY_MODE_SINGLE_PATH, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->population += 0.01;
if (tc->population > 1.0) {
tc->population = 1.0;
@@ -793,7 +793,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
break;
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->population -= 0.01;
if (tc->population < 0.0) {
tc->population = 0.0;
@@ -804,7 +804,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
break;
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->width += 0.01;
if (tc->width > 1.0) {
tc->width = 1.0;
@@ -817,7 +817,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
break;
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->width -= 0.01;
if (tc->width < 0.01) {
tc->width = 0.01;
@@ -843,7 +843,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo("altx-spray");
ret = TRUE;
}
@@ -858,7 +858,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
@@ -875,11 +875,11 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
break;
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
- sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT);
+ sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT(event));
tc->_message_context->clear();
break;
default:
- sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT);
+ sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT(event));
break;
}
}
diff --git a/src/star-context.cpp b/src/star-context.cpp
index e2d6961f0..5fb33a180 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -326,12 +326,12 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-star");
ret = TRUE;
}
@@ -361,7 +361,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
diff --git a/src/text-context.cpp b/src/text-context.cpp
index 1ee21e732..80f568830 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -728,12 +728,12 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
// there is an active text object in this context, or a new object was just created
if (tc->unimode || !tc->imc
- || (MOD__CTRL && MOD__SHIFT) // input methods tend to steal this for unimode,
+ || (MOD__CTRL(event) && MOD__SHIFT(event)) // input methods tend to steal this for unimode,
// but we have our own so make sure they don't swallow it
|| !gtk_im_context_filter_keypress(tc->imc, (GdkEventKey*) event)) {
//IM did not consume the key, or we're in unimode
- if (!MOD__CTRL_ONLY && tc->unimode) {
+ if (!MOD__CTRL_ONLY(event) && tc->unimode) {
/* TODO: ISO 14755 (section 3 Definitions) says that we should also
accept the first 6 characters of alphabets other than the latin
alphabet "if the Latin alphabet is not used". The below is also
@@ -829,13 +829,13 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
switch (group0_keyval) {
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-text");
return TRUE;
}
break;
case GDK_KEY_space:
- if (MOD__CTRL_ONLY) {
+ if (MOD__CTRL_ONLY(event)) {
/* No-break space */
if (!tc->text) { // printable key; create text if none (i.e. if nascent_object)
sp_text_context_setup_text(tc);
@@ -852,7 +852,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
break;
case GDK_KEY_U:
case GDK_KEY_u:
- if (MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT)) {
+ if (MOD__CTRL_ONLY(event) || (MOD__CTRL(event) && MOD__SHIFT(event))) {
if (tc->unimode) {
tc->unimode = false;
event_context->defaultMessageContext()->clear();
@@ -869,7 +869,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
break;
case GDK_KEY_B:
case GDK_KEY_b:
- if (MOD__CTRL_ONLY && tc->text) {
+ if (MOD__CTRL_ONLY(event) && tc->text) {
SPStyle const *style = sp_te_style_at_position(tc->text, std::min(tc->text_sel_start, tc->text_sel_end));
SPCSSAttr *css = sp_repr_css_attr_new();
if (style->font_weight.computed == SP_CSS_FONT_WEIGHT_NORMAL
@@ -891,7 +891,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
break;
case GDK_KEY_I:
case GDK_KEY_i:
- if (MOD__CTRL_ONLY && tc->text) {
+ if (MOD__CTRL_ONLY(event) && tc->text) {
SPStyle const *style = sp_te_style_at_position(tc->text, std::min(tc->text_sel_start, tc->text_sel_end));
SPCSSAttr *css = sp_repr_css_attr_new();
if (style->font_style.computed != SP_CSS_FONT_STYLE_NORMAL)
@@ -910,7 +910,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_A:
case GDK_KEY_a:
- if (MOD__CTRL_ONLY && tc->text) {
+ if (MOD__CTRL_ONLY(event) && tc->text) {
Inkscape::Text::Layout const *layout = te_get_layout(tc->text);
if (layout) {
tc->text_sel_start = layout->begin();
@@ -1012,10 +1012,10 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_KP_Left:
case GDK_KEY_KP_4:
if (tc->text) {
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(mul*-10, 0));
else
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(mul*-1, 0));
@@ -1024,7 +1024,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
DocumentUndo::maybeDone(sp_desktop_document(desktop), "kern:left", SP_VERB_CONTEXT_TEXT,
_("Kern to the left"));
} else {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.cursorLeftWithControl();
else
tc->text_sel_end.cursorLeft();
@@ -1037,10 +1037,10 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_KP_Right:
case GDK_KEY_KP_6:
if (tc->text) {
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(mul*10, 0));
else
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(mul*1, 0));
@@ -1049,7 +1049,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
DocumentUndo::maybeDone(sp_desktop_document(desktop), "kern:right", SP_VERB_CONTEXT_TEXT,
_("Kern to the right"));
} else {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.cursorRightWithControl();
else
tc->text_sel_end.cursorRight();
@@ -1062,10 +1062,10 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_KP_Up:
case GDK_KEY_KP_8:
if (tc->text) {
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(0, mul*-10));
else
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(0, mul*-1));
@@ -1074,7 +1074,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
DocumentUndo::maybeDone(sp_desktop_document(desktop), "kern:up", SP_VERB_CONTEXT_TEXT,
_("Kern up"));
} else {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.cursorUpWithControl();
else
tc->text_sel_end.cursorUp();
@@ -1087,10 +1087,10 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_KP_Down:
case GDK_KEY_KP_2:
if (tc->text) {
- if (MOD__ALT) {
+ if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(0, mul*10));
else
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, Geom::Point(0, mul*1));
@@ -1099,7 +1099,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
DocumentUndo::maybeDone(sp_desktop_document(desktop), "kern:down", SP_VERB_CONTEXT_TEXT,
_("Kern down"));
} else {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.cursorDownWithControl();
else
tc->text_sel_end.cursorDown();
@@ -1111,7 +1111,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_Home:
case GDK_KEY_KP_Home:
if (tc->text) {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.thisStartOfShape();
else
tc->text_sel_end.thisStartOfLine();
@@ -1122,7 +1122,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_End:
case GDK_KEY_KP_End:
if (tc->text) {
- if (MOD__CTRL)
+ if (MOD__CTRL(event))
tc->text_sel_end.nextStartOfShape();
else
tc->text_sel_end.thisEndOfLine();
@@ -1161,9 +1161,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
return TRUE;
case GDK_KEY_bracketleft:
if (tc->text) {
- if (MOD__ALT || MOD__CTRL) {
- if (MOD__ALT) {
- if (MOD__SHIFT) {
+ if (MOD__ALT(event) || MOD__CTRL(event)) {
+ if (MOD__ALT(event)) {
+ if (MOD__SHIFT(event)) {
// FIXME: alt+shift+[] does not work, don't know why
sp_te_adjust_rotation_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, -10);
} else {
@@ -1182,9 +1182,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
break;
case GDK_KEY_bracketright:
if (tc->text) {
- if (MOD__ALT || MOD__CTRL) {
- if (MOD__ALT) {
- if (MOD__SHIFT) {
+ if (MOD__ALT(event) || MOD__CTRL(event)) {
+ if (MOD__ALT(event)) {
+ if (MOD__SHIFT(event)) {
// FIXME: alt+shift+[] does not work, don't know why
sp_te_adjust_rotation_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, 10);
} else {
@@ -1204,16 +1204,16 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_less:
case GDK_KEY_comma:
if (tc->text) {
- if (MOD__ALT) {
- if (MOD__CTRL) {
- if (MOD__SHIFT)
+ if (MOD__ALT(event)) {
+ if (MOD__CTRL(event)) {
+ if (MOD__SHIFT(event))
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, -10);
else
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, -1);
DocumentUndo::maybeDone(sp_desktop_document(desktop), "linespacing:dec", SP_VERB_CONTEXT_TEXT,
_("Contract line spacing"));
} else {
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, -10);
else
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, -1);
@@ -1229,16 +1229,16 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
case GDK_KEY_greater:
case GDK_KEY_period:
if (tc->text) {
- if (MOD__ALT) {
- if (MOD__CTRL) {
- if (MOD__SHIFT)
+ if (MOD__ALT(event)) {
+ if (MOD__CTRL(event)) {
+ if (MOD__SHIFT(event))
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, 10);
else
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, 1);
DocumentUndo::maybeDone(sp_desktop_document(desktop), "linespacing:inc", SP_VERB_CONTEXT_TEXT,
_("Expand line spacing"));
} else {
- if (MOD__SHIFT)
+ if (MOD__SHIFT(event))
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, 10);
else
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, desktop, 1);
@@ -1256,7 +1256,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
}
if (cursor_moved) {
- if (!MOD__SHIFT)
+ if (!MOD__SHIFT(event))
tc->text_sel_start = tc->text_sel_end;
if (old_start != tc->text_sel_start || old_end != tc->text_sel_end) {
sp_text_context_update_cursor(tc);
@@ -1272,7 +1272,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
group0_keyval == GDK_KEY_Down ||
group0_keyval == GDK_KEY_KP_Up ||
group0_keyval == GDK_KEY_KP_Down )
- && !MOD__CTRL_ONLY) {
+ && !MOD__CTRL_ONLY(event)) {
return TRUE;
} else if (group0_keyval == GDK_KEY_Escape) { // cancel rubberband
if (tc->creating) {
@@ -1283,7 +1283,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
}
Inkscape::Rubberband::get(desktop)->stop();
}
- } else if ((group0_keyval == GDK_KEY_x || group0_keyval == GDK_KEY_X) && MOD__ALT_ONLY) {
+ } else if ((group0_keyval == GDK_KEY_x || group0_keyval == GDK_KEY_X) && MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-text");
return TRUE;
}
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 28e4c1629..694c497e3 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -1233,7 +1233,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
if (!tc->has_dilated) {
// if we did not rub, do a light tap
tc->pressure = 0.03;
- sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT);
+ sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
}
tc->is_dilating = false;
tc->has_dilated = false;
@@ -1300,24 +1300,24 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
case GDK_KEY_m:
case GDK_KEY_M:
case GDK_KEY_0:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_i:
case GDK_KEY_I:
case GDK_KEY_1:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_IN_OUT, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_IN_OUT, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_z:
case GDK_KEY_Z:
case GDK_KEY_2:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_JITTER, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_JITTER, MOD__SHIFT(event));
ret = TRUE;
}
break;
@@ -1326,84 +1326,84 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
case GDK_KEY_greater:
case GDK_KEY_period:
case GDK_KEY_3:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_SCALE, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_SCALE, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_bracketright:
case GDK_KEY_bracketleft:
case GDK_KEY_4:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_ROTATE, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_ROTATE, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_d:
case GDK_KEY_D:
case GDK_KEY_5:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_MORELESS, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_MORELESS, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_p:
case GDK_KEY_P:
case GDK_KEY_6:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_PUSH, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_PUSH, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_s:
case GDK_KEY_S:
case GDK_KEY_7:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_a:
case GDK_KEY_A:
case GDK_KEY_8:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_ATTRACT_REPEL, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_ATTRACT_REPEL, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_r:
case GDK_KEY_R:
case GDK_KEY_9:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_ROUGHEN, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_ROUGHEN, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_c:
case GDK_KEY_C:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_COLORPAINT, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_COLORPAINT, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_j:
case GDK_KEY_J:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_COLORJITTER, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_COLORJITTER, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_b:
case GDK_KEY_B:
- if (MOD__SHIFT_ONLY) {
- sp_tweak_switch_mode(tc, TWEAK_MODE_BLUR, MOD__SHIFT);
+ if (MOD__SHIFT_ONLY(event)) {
+ sp_tweak_switch_mode(tc, TWEAK_MODE_BLUR, MOD__SHIFT(event));
ret = TRUE;
}
break;
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->force += 0.05;
if (tc->force > 1.0) {
tc->force = 1.0;
@@ -1414,7 +1414,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->force -= 0.05;
if (tc->force < 0.0) {
tc->force = 0.0;
@@ -1425,7 +1425,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->width += 0.01;
if (tc->width > 1.0) {
tc->width = 1.0;
@@ -1437,7 +1437,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
- if (!MOD__CTRL_ONLY) {
+ if (!MOD__CTRL_ONLY(event)) {
tc->width -= 0.01;
if (tc->width < 0.01) {
tc->width = 0.01;
@@ -1463,7 +1463,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_x:
case GDK_KEY_X:
- if (MOD__ALT_ONLY) {
+ if (MOD__ALT_ONLY(event)) {
desktop->setToolboxFocusTo ("altx-tweak");
ret = TRUE;
}
@@ -1476,12 +1476,12 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
- sp_tweak_switch_mode_temporarily(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT);
+ sp_tweak_switch_mode_temporarily(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT(event));
break;
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
@@ -1498,11 +1498,11 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
break;
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
- sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
+ sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT(event));
tc->_message_context->clear();
break;
default:
- sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
+ sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT(event));
break;
}
}
diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp
index 7a5e4f90e..8b06c3e08 100644
--- a/src/zoom-context.cpp
+++ b/src/zoom-context.cpp
@@ -205,7 +205,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_KP_Up:
case GDK_KEY_KP_Down:
// prevent the zoom field from activation
- if (!MOD__CTRL_ONLY)
+ if (!MOD__CTRL_ONLY(event))
ret = TRUE;
break;
case GDK_KEY_Shift_L:
@@ -216,7 +216,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default:
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 15:39:56 +0000