diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-07-29 05:30:40 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-07-29 05:30:40 +0000 |
| commit | 2a0331c2926e877ee41ed62e3c5be1b387245236 (patch) | |
| tree | 2338dbdacdeecf88c646c3344bcc40fd81ae3a28 /src/event-context.cpp | |
| parent | differentiate the SP_ITEM_REFERENCE_FLAGS, even though it is not currently used (diff) | |
| download | inkscape-2a0331c2926e877ee41ed62e3c5be1b387245236.tar.gz inkscape-2a0331c2926e877ee41ed62e3c5be1b387245236.zip | |
optional panning by space
(bzr r3340)
Diffstat (limited to 'src/event-context.cpp')
| -rw-r--r-- | src/event-context.cpp | 53 |
1 files changed, 45 insertions, 8 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp index 37711e914..47c5fac26 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -30,6 +30,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtkmain.h> #include <gtk/gtkmenu.h> +#include <glibmm/i18n.h> #include "display/sp-canvas.h" #include "xml/node-event-vector.h" @@ -130,6 +131,7 @@ sp_event_context_init(SPEventContext *event_context) event_context->_message_context = NULL; event_context->_selcue = NULL; event_context->_grdrag = NULL; + event_context->space_panning = false; } /** @@ -344,10 +346,19 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, yp = (gint) event->button.y; within_tolerance = true; + button_w = NR::Point(event->button.x, event->button.y); + switch (event->button.button) { + case 1: + if (event_context->space_panning) { + panning = 1; + sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), + GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + NULL, event->button.time-1); + ret = TRUE; + } + break; case 2: - button_w = NR::Point(event->button.x, - event->button.y); if (event->button.state == GDK_SHIFT_MASK) { zoom_rb = 2; } else { @@ -361,8 +372,6 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case 3: if (event->button.state & GDK_SHIFT_MASK || event->button.state & GDK_CONTROL_MASK) { - button_w = NR::Point(event->button.x, - event->button.y); panning = 3; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, @@ -379,7 +388,9 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_MOTION_NOTIFY: if (panning) { if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK)) - || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) { + || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK)) + || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK)) + ) { /* Gdk seems to lose button release for us sometimes :-( */ panning = 0; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), @@ -402,7 +413,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, // gobble subsequent motion events to prevent "sticking" // when scrolling is slow gobble_motion_events(panning == 2 ? - GDK_BUTTON2_MASK : GDK_BUTTON3_MASK); + GDK_BUTTON2_MASK : + (panning == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK)); NR::Point const motion_w(event->motion.x, event->motion.y); NR::Point const moved_w( motion_w - button_w ); @@ -548,8 +560,14 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } break; case GDK_space: - sp_toggle_selector(desktop); - ret= TRUE; + if (prefs_get_int_attribute("options.spacepans","value", 0) == 1) { + event_context->space_panning = true; + event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE, _("<b>Space+mouse drag</b> to pan canvas")); + ret= TRUE; + } else { + sp_toggle_selector(desktop); + ret= TRUE; + } break; case GDK_z: case GDK_Z: @@ -562,6 +580,25 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, break; } break; + case GDK_KEY_RELEASE: + switch (get_group0_keyval(&event->key)) { + case GDK_space: + if (event_context->space_panning) { + event_context->space_panning = false; + event_context->_message_context->clear(); + if (panning == 1) { + panning = 0; + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + event->key.time); + desktop->updateNow(); + } + ret= TRUE; + } + break; + default: + break; + } + break; case GDK_SCROLL: /* shift + wheel, pan left--right */ if (event->scroll.state & GDK_SHIFT_MASK) { |