[gimp] app: clean up static functions in the new tool-events.c file
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: clean up static functions in the new tool-events.c file
- Date: Thu, 24 Feb 2011 01:29:56 +0000 (UTC)
commit 3c0453b3c0fc93d0ef00b51f1e53424b55021bdc
Author: Michael Natterer <mitch gimp org>
Date: Wed Feb 23 06:22:24 2011 +0100
app: clean up static functions in the new tool-events.c file
app/display/gimpdisplayshell-tool-events.c | 1510 ++++++++++++++--------------
1 files changed, 771 insertions(+), 739 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index e316e0d..143e511 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -62,17 +62,49 @@
/* local function prototypes */
-static void gimp_display_shell_toggle_hide_docks (GimpDisplayShell *shell);
static GdkModifierType
gimp_display_shell_key_to_state (gint key);
-static GdkEvent * gimp_display_shell_compress_motion (GimpDisplayShell *shell);
+static void gimp_display_shell_check_device_cursor (GimpDisplayShell *shell);
+
+static void gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
+ gint x,
+ gint y);
+static void gimp_display_shell_stop_scrolling (GimpDisplayShell *shell);
+
+static void gimp_display_shell_space_pressed (GimpDisplayShell *shell,
+ GdkEvent *event);
+static void gimp_display_shell_space_released (GimpDisplayShell *shell,
+ GdkEvent *event);
+
+static void gimp_display_shell_update_focus (GimpDisplayShell *shell,
+ const GimpCoords *image_coords,
+ GdkModifierType state);
+static void gimp_display_shell_update_cursor (GimpDisplayShell *shell,
+ const GimpCoords *display_coords,
+ const GimpCoords *image_coords,
+ GdkModifierType state,
+ gboolean update_software_cursor);
+
+static void gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
+ GdkEvent *event,
+ GimpCoords *display_coords,
+ GdkModifierType *state,
+ guint32 *time);
+static void gimp_display_shell_untransform_event_coords (GimpDisplayShell *shell,
+ const GimpCoords *display_coords,
+ GimpCoords *image_coords,
+ gboolean *update_software_cursor);
+
+static void gimp_display_shell_toggle_hide_docks (GimpDisplayShell *shell);
static gboolean gimp_display_shell_flush_event_queue (GimpDisplayShell *shell);
static void gimp_display_shell_process_event_queue (GimpDisplayShell *shell,
GdkModifierType state,
guint32 time);
+static GdkEvent * gimp_display_shell_compress_motion (GimpDisplayShell *shell);
+
/* public functions */
@@ -191,478 +223,200 @@ gimp_display_shell_events (GtkWidget *widget,
return FALSE;
}
-static void
-gimp_display_shell_check_device_cursor (GimpDisplayShell *shell)
+static gboolean
+gimp_display_shell_canvas_no_image_events (GtkWidget *canvas,
+ GdkEvent *event,
+ GimpDisplayShell *shell)
{
- GimpDeviceInfo *current_device;
-
- current_device = gimp_devices_get_current (shell->display->gimp);
+ switch (event->type)
+ {
+ case GDK_BUTTON_PRESS:
+ {
+ GdkEventButton *bevent = (GdkEventButton *) event;
- shell->draw_cursor = ! gimp_device_info_has_cursor (current_device);
-}
+ if (bevent->button == 3)
+ {
+ gimp_ui_manager_ui_popup (shell->popup_manager,
+ "/dummy-menubar/image-popup",
+ GTK_WIDGET (shell),
+ NULL, NULL, NULL, NULL);
+ return TRUE;
+ }
+ }
+ break;
-static void
-gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
- gint x,
- gint y)
-{
- g_return_if_fail (! shell->scrolling);
+ case GDK_KEY_PRESS:
+ {
+ GdkEventKey *kevent = (GdkEventKey *) event;
- shell->scrolling = TRUE;
- shell->scroll_start_x = x + shell->offset_x;
- shell->scroll_start_y = y + shell->offset_y;
+ if (kevent->keyval == GDK_KEY_Tab ||
+ kevent->keyval == GDK_KEY_ISO_Left_Tab)
+ {
+ gimp_display_shell_toggle_hide_docks (shell);
+ return TRUE;
+ }
+ }
+ break;
- gimp_display_shell_set_override_cursor (shell, GDK_FLEUR);
+ default:
+ break;
+ }
- gtk_grab_add (shell->canvas);
+ return FALSE;
}
-static void
-gimp_display_shell_stop_scrolling (GimpDisplayShell *shell)
+gboolean
+gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
+ GdkEvent *event,
+ GimpDisplayShell *shell)
{
- g_return_if_fail (shell->scrolling);
+ GimpDisplay *display;
+ GimpImage *image;
+ Gimp *gimp;
+ GimpCoords display_coords;
+ GimpCoords image_coords;
+ GdkModifierType state;
+ guint32 time;
+ gboolean device_changed = FALSE;
+ gboolean return_val = FALSE;
+ gboolean update_sw_cursor = FALSE;
- shell->scrolling = FALSE;
- shell->scroll_start_x = 0;
- shell->scroll_start_y = 0;
+ g_return_val_if_fail (gtk_widget_get_realized (canvas), FALSE);
- gimp_display_shell_unset_override_cursor (shell);
+ /* are we in destruction? */
+ if (! shell->display || ! gimp_display_get_shell (shell->display))
+ return TRUE;
- gtk_grab_remove (shell->canvas);
-}
+ /* set the active display before doing any other canvas event processing */
+ if (gimp_display_shell_events (canvas, event, shell))
+ return TRUE;
-static void
-gimp_display_shell_space_pressed (GimpDisplayShell *shell,
- GdkEvent *event)
-{
- Gimp *gimp = gimp_display_get_gimp (shell->display);
+ /* ignore events on overlays, but make sure key events go through
+ * anyway because they are always originating from the toplevel
+ */
+ if (((GdkEventAny *) event)->window != gtk_widget_get_window (canvas))
+ {
+ if ((event->type != GDK_KEY_PRESS &&
+ event->type != GDK_KEY_RELEASE) ||
+ ! gtk_widget_has_focus (canvas))
+ {
+ return FALSE;
+ }
+ }
- if (shell->space_pressed)
- return;
+ display = shell->display;
+ gimp = gimp_display_get_gimp (display);
+ image = gimp_display_get_image (display);
- if (! gimp_display_shell_keyboard_grab (shell, event))
- return;
+ if (! image)
+ return gimp_display_shell_canvas_no_image_events (canvas, event, shell);
- switch (shell->display->config->space_bar_action)
+ /* Find out what device the event occurred upon */
+ if (! gimp->busy && gimp_devices_check_change (gimp, event))
{
- case GIMP_SPACE_BAR_ACTION_NONE:
- return;
+ gimp_display_shell_check_device_cursor (shell);
+ device_changed = TRUE;
+ }
- case GIMP_SPACE_BAR_ACTION_PAN:
+ gimp_display_shell_get_event_coords (shell, event,
+ &display_coords,
+ &state, &time);
+ gimp_display_shell_untransform_event_coords (shell,
+ &display_coords, &image_coords,
+ &update_sw_cursor);
+
+ /* If the device (and maybe the tool) has changed, update the new
+ * tool's state
+ */
+ if (device_changed && gtk_widget_has_focus (canvas))
+ {
+ gimp_display_shell_update_focus (shell, &image_coords, state);
+ }
+
+ switch (event->type)
+ {
+ case GDK_ENTER_NOTIFY:
{
- GimpCoords coords;
+ GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- if (! gimp_display_shell_pointer_grab (shell, event,
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK))
- {
- gimp_display_shell_keyboard_ungrab (shell, event);
- return;
- }
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): ENTER_NOTIFY", display);
- gimp_device_info_get_device_coords (gimp_devices_get_current (gimp),
- gtk_widget_get_window (shell->canvas),
- &coords);
+ if (cevent->mode != GDK_CROSSING_NORMAL)
+ return TRUE;
- gimp_display_shell_start_scrolling (shell, coords.x, coords.y);
+ update_sw_cursor = TRUE;
+
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
}
break;
- case GIMP_SPACE_BAR_ACTION_MOVE:
+ case GDK_LEAVE_NOTIFY:
{
- GimpTool *active_tool = tool_manager_get_active (gimp);
- GdkModifierType state;
-
- if (! active_tool || GIMP_IS_MOVE_TOOL (active_tool))
- return;
+ GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- shell->space_shaded_tool =
- gimp_object_get_name (active_tool->tool_info);
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): LEAVE_NOTIFY", display);
- gimp_context_set_tool (gimp_get_user_context (gimp),
- gimp_get_tool_info (gimp, "gimp-move-tool"));
+ if (cevent->mode != GDK_CROSSING_NORMAL)
+ return TRUE;
- gdk_event_get_state (event, &state);
+ shell->proximity = FALSE;
+ gimp_display_shell_clear_software_cursor (shell);
- tool_manager_focus_display_active (gimp, shell->display);
- tool_manager_modifier_state_active (gimp, state, shell->display);
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
}
break;
- }
- shell->space_pressed = TRUE;
-}
+ case GDK_PROXIMITY_IN:
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_IN", display);
-static void
-gimp_display_shell_space_released (GimpDisplayShell *shell,
- GdkEvent *event)
-{
- Gimp *gimp = gimp_display_get_gimp (shell->display);
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
+ break;
- if (! shell->space_pressed && ! shell->space_release_pending)
- return;
+ case GDK_PROXIMITY_OUT:
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_OUT", display);
- switch (shell->display->config->space_bar_action)
- {
- case GIMP_SPACE_BAR_ACTION_NONE:
- break;
+ shell->proximity = FALSE;
+ gimp_display_shell_clear_software_cursor (shell);
- case GIMP_SPACE_BAR_ACTION_PAN:
- gimp_display_shell_stop_scrolling (shell);
- gimp_display_shell_pointer_ungrab (shell, event);
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
break;
- case GIMP_SPACE_BAR_ACTION_MOVE:
+ case GDK_FOCUS_CHANGE:
{
- GdkModifierType state;
+ GdkEventFocus *fevent = (GdkEventFocus *) event;
- gimp_context_set_tool (gimp_get_user_context (gimp),
- gimp_get_tool_info (gimp,
- shell->space_shaded_tool));
- shell->space_shaded_tool = NULL;
+ if (fevent->in)
+ {
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): FOCUS_IN", display);
- gdk_event_get_state (event, &state);
+ if (G_UNLIKELY (! gtk_widget_has_focus (canvas)))
+ g_warning ("%s: FOCUS_IN but canvas has no focus", G_STRFUNC);
- tool_manager_focus_display_active (gimp, shell->display);
- tool_manager_modifier_state_active (gimp, state, shell->display);
- }
- break;
- }
-
- gimp_display_shell_keyboard_ungrab (shell, event);
-
- shell->space_pressed = FALSE;
- shell->space_release_pending = FALSE;
-}
-
-static void
-gimp_display_shell_update_focus (GimpDisplayShell *shell,
- const GimpCoords *image_coords,
- GdkModifierType state)
-{
- Gimp *gimp = gimp_display_get_gimp (shell->display);
-
- tool_manager_focus_display_active (gimp, shell->display);
- tool_manager_modifier_state_active (gimp, state, shell->display);
-
- if (image_coords)
- tool_manager_oper_update_active (gimp,
- image_coords, state,
- shell->proximity,
- shell->display);
-}
-
-static void
-gimp_display_shell_update_cursor (GimpDisplayShell *shell,
- const GimpCoords *display_coords,
- const GimpCoords *image_coords,
- GdkModifierType state,
- gboolean update_software_cursor)
-{
- GimpDisplay *display = shell->display;
- Gimp *gimp = gimp_display_get_gimp (display);
- GimpImage *image = gimp_display_get_image (display);
- GimpTool *active_tool;
-
- if (! shell->display->config->cursor_updating)
- return;
-
- active_tool = tool_manager_get_active (gimp);
-
- if (active_tool)
- {
- if ((! gimp_image_is_empty (image) ||
- gimp_tool_control_get_handle_empty_image (active_tool->control)) &&
- ! (state & (GDK_BUTTON1_MASK |
- GDK_BUTTON2_MASK |
- GDK_BUTTON3_MASK)))
- {
- tool_manager_cursor_update_active (gimp,
- image_coords, state,
- display);
- }
- else if (gimp_image_is_empty (image) &&
- ! gimp_tool_control_get_handle_empty_image (active_tool->control))
- {
- gimp_display_shell_set_cursor (shell,
- GIMP_CURSOR_MOUSE,
- gimp_tool_control_get_tool_cursor (active_tool->control),
- GIMP_CURSOR_MODIFIER_BAD);
- }
- }
- else
- {
- gimp_display_shell_set_cursor (shell,
- GIMP_CURSOR_MOUSE,
- GIMP_TOOL_CURSOR_NONE,
- GIMP_CURSOR_MODIFIER_BAD);
- }
-
- if (update_software_cursor)
- {
- GimpCursorPrecision precision = GIMP_CURSOR_PRECISION_PIXEL_CENTER;
-
- if (active_tool)
- precision = gimp_tool_control_get_precision (active_tool->control);
-
- gimp_display_shell_update_software_cursor (shell,
- precision,
- (gint) display_coords->x,
- (gint) display_coords->y,
- image_coords->x,
- image_coords->y);
- }
-}
-
-static void
-gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
- GdkEvent *event,
- GimpCoords *display_coords,
- GdkModifierType *state,
- guint32 *time)
-{
- Gimp *gimp = gimp_display_get_gimp (shell->display);
-
- gimp_device_info_get_event_coords (gimp_devices_get_current (gimp),
- gtk_widget_get_window (shell->canvas),
- event,
- display_coords);
-
- gimp_device_info_get_event_state (gimp_devices_get_current (gimp),
- gtk_widget_get_window (shell->canvas),
- event,
- state);
-
- *time = gdk_event_get_time (event);
-}
-
-static void
-gimp_display_shell_untransform_event_coords (GimpDisplayShell *shell,
- const GimpCoords *display_coords,
- GimpCoords *image_coords,
- gboolean *update_software_cursor)
-{
- Gimp *gimp = gimp_display_get_gimp (shell->display);
- GimpTool *active_tool;
-
- /* GimpCoords passed to tools are ALWAYS in image coordinates */
- gimp_display_shell_untransform_coords (shell,
- display_coords,
- image_coords);
-
- active_tool = tool_manager_get_active (gimp);
-
- if (active_tool && gimp_tool_control_get_snap_to (active_tool->control))
- {
- gint x, y, width, height;
-
- gimp_tool_control_get_snap_offsets (active_tool->control,
- &x, &y, &width, &height);
-
- if (gimp_display_shell_snap_coords (shell,
- image_coords,
- x, y, width, height))
- {
- if (update_software_cursor)
- *update_software_cursor = TRUE;
- }
- }
-}
-
-static gboolean
-gimp_display_shell_canvas_no_image_events (GtkWidget *canvas,
- GdkEvent *event,
- GimpDisplayShell *shell)
-{
- switch (event->type)
- {
- case GDK_BUTTON_PRESS:
- {
- GdkEventButton *bevent = (GdkEventButton *) event;
-
- if (bevent->button == 3)
- {
- gimp_ui_manager_ui_popup (shell->popup_manager,
- "/dummy-menubar/image-popup",
- GTK_WIDGET (shell),
- NULL, NULL, NULL, NULL);
- return TRUE;
- }
- }
- break;
-
- case GDK_KEY_PRESS:
- {
- GdkEventKey *kevent = (GdkEventKey *) event;
-
- if (kevent->keyval == GDK_KEY_Tab ||
- kevent->keyval == GDK_KEY_ISO_Left_Tab)
- {
- gimp_display_shell_toggle_hide_docks (shell);
- return TRUE;
- }
- }
- break;
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-gboolean
-gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
- GdkEvent *event,
- GimpDisplayShell *shell)
-{
- GimpDisplay *display;
- GimpImage *image;
- Gimp *gimp;
- GimpCoords display_coords;
- GimpCoords image_coords;
- GdkModifierType state;
- guint32 time;
- gboolean device_changed = FALSE;
- gboolean return_val = FALSE;
- gboolean update_sw_cursor = FALSE;
-
- g_return_val_if_fail (gtk_widget_get_realized (canvas), FALSE);
-
- /* are we in destruction? */
- if (! shell->display || ! gimp_display_get_shell (shell->display))
- return TRUE;
-
- /* set the active display before doing any other canvas event processing */
- if (gimp_display_shell_events (canvas, event, shell))
- return TRUE;
-
- /* ignore events on overlays, but make sure key events go through
- * anyway because they are always originating from the toplevel
- */
- if (((GdkEventAny *) event)->window != gtk_widget_get_window (canvas))
- {
- if ((event->type != GDK_KEY_PRESS &&
- event->type != GDK_KEY_RELEASE) ||
- ! gtk_widget_has_focus (canvas))
- {
- return FALSE;
- }
- }
-
- display = shell->display;
- gimp = gimp_display_get_gimp (display);
- image = gimp_display_get_image (display);
-
- if (! image)
- return gimp_display_shell_canvas_no_image_events (canvas, event, shell);
-
- /* Find out what device the event occurred upon */
- if (! gimp->busy && gimp_devices_check_change (gimp, event))
- {
- gimp_display_shell_check_device_cursor (shell);
- device_changed = TRUE;
- }
-
- gimp_display_shell_get_event_coords (shell, event,
- &display_coords,
- &state, &time);
- gimp_display_shell_untransform_event_coords (shell,
- &display_coords, &image_coords,
- &update_sw_cursor);
-
- /* If the device (and maybe the tool) has changed, update the new
- * tool's state
- */
- if (device_changed && gtk_widget_has_focus (canvas))
- {
- gimp_display_shell_update_focus (shell, &image_coords, state);
- }
-
- switch (event->type)
- {
- case GDK_ENTER_NOTIFY:
- {
- GdkEventCrossing *cevent = (GdkEventCrossing *) event;
-
- GIMP_LOG (TOOL_EVENTS, "event (display %p): ENTER_NOTIFY", display);
-
- if (cevent->mode != GDK_CROSSING_NORMAL)
- return TRUE;
-
- update_sw_cursor = TRUE;
-
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
- }
- break;
-
- case GDK_LEAVE_NOTIFY:
- {
- GdkEventCrossing *cevent = (GdkEventCrossing *) event;
-
- GIMP_LOG (TOOL_EVENTS, "event (display %p): LEAVE_NOTIFY", display);
-
- if (cevent->mode != GDK_CROSSING_NORMAL)
- return TRUE;
-
- shell->proximity = FALSE;
- gimp_display_shell_clear_software_cursor (shell);
-
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
- }
- break;
-
- case GDK_PROXIMITY_IN:
- GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_IN", display);
-
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
- break;
-
- case GDK_PROXIMITY_OUT:
- GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_OUT", display);
-
- shell->proximity = FALSE;
- gimp_display_shell_clear_software_cursor (shell);
-
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
- break;
-
- case GDK_FOCUS_CHANGE:
- {
- GdkEventFocus *fevent = (GdkEventFocus *) event;
-
- if (fevent->in)
- {
- GIMP_LOG (TOOL_EVENTS, "event (display %p): FOCUS_IN", display);
-
- if (G_UNLIKELY (! gtk_widget_has_focus (canvas)))
- g_warning ("%s: FOCUS_IN but canvas has no focus", G_STRFUNC);
-
- /* press modifier keys when the canvas gets the focus
- *
- * in "click to focus" mode, we did this on BUTTON_PRESS, so
- * do it here only if button_press_before_focus is FALSE
- */
- if (! shell->button_press_before_focus)
- {
- gimp_display_shell_update_focus (shell, &image_coords, state);
- }
- }
- else
- {
- GIMP_LOG (TOOL_EVENTS, "event (display %p): FOCUS_OUT", display);
+ /* press modifier keys when the canvas gets the focus
+ *
+ * in "click to focus" mode, we did this on BUTTON_PRESS, so
+ * do it here only if button_press_before_focus is FALSE
+ */
+ if (! shell->button_press_before_focus)
+ {
+ gimp_display_shell_update_focus (shell, &image_coords, state);
+ }
+ }
+ else
+ {
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): FOCUS_OUT", display);
if (G_LIKELY (gtk_widget_has_focus (canvas)))
g_warning ("%s: FOCUS_OUT but canvas has focus", G_STRFUNC);
@@ -1259,29 +1013,160 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GimpCoords *buf_coords = &g_array_index (shell->event_queue,
GimpCoords, 0);
- tool_manager_oper_update_active (gimp,
- buf_coords, state,
- shell->proximity,
- display);
+ tool_manager_oper_update_active (gimp,
+ buf_coords, state,
+ shell->proximity,
+ display);
+
+ /* remove used event */
+ g_array_remove_index (shell->event_queue, 0);
+ }
+
+ gimp_display_shell_push_event_history (shell, &image_coords);
+ shell->last_read_motion_time = time;
+ }
+
+ return_val = TRUE;
+ }
+ break;
+
+ case GDK_KEY_PRESS:
+ {
+ GdkEventKey *kevent = (GdkEventKey *) event;
+ GimpTool *active_tool;
+
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): KEY_PRESS (%d, %s)",
+ display, kevent->keyval,
+ gdk_keyval_name (kevent->keyval) ?
+ gdk_keyval_name (kevent->keyval) : "<none>");
+
+ active_tool = tool_manager_get_active (gimp);
+
+ if (state & GDK_BUTTON1_MASK)
+ {
+ switch (kevent->keyval)
+ {
+ case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
+ case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
+ case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+ {
+ GdkModifierType key;
+
+ key = gimp_display_shell_key_to_state (kevent->keyval);
+ state |= key;
+
+ if (active_tool &&
+ gimp_tool_control_is_active (active_tool->control) &&
+ ! gimp_image_is_empty (image))
+ {
+ tool_manager_active_modifier_state_active (gimp, state,
+ display);
+ }
+ }
+ break;
+ }
+ }
+ else
+ {
+ tool_manager_focus_display_active (gimp, display);
+
+ if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
+ {
+ if (tool_manager_key_press_active (gimp, kevent, display))
+ {
+ /* FIXME: need to do some of the stuff below, like
+ * calling oper_update()
+ */
+
+ return TRUE;
+ }
+ }
+
+ switch (kevent->keyval)
+ {
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_BackSpace:
+ case GDK_KEY_Escape:
+ case GDK_KEY_Left:
+ case GDK_KEY_Right:
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ if (gimp_image_is_empty (image) ||
+ ! tool_manager_key_press_active (gimp,
+ kevent,
+ display))
+ {
+ GimpController *keyboard = gimp_controllers_get_keyboard (gimp);
+
+ if (keyboard)
+ gimp_controller_keyboard_key_press (GIMP_CONTROLLER_KEYBOARD (keyboard),
+ kevent);
+ }
+
+ return_val = TRUE;
+ break;
+
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
+ gimp_display_shell_space_pressed (shell, event);
+ return_val = TRUE;
+ break;
+
+ case GDK_KEY_Tab:
+ case GDK_KEY_ISO_Left_Tab:
+ if (state & GDK_CONTROL_MASK)
+ {
+ if (! gimp_image_is_empty (image))
+ {
+ if (kevent->keyval == GDK_KEY_Tab)
+ gimp_display_shell_layer_select_init (shell,
+ 1, kevent->time);
+ else
+ gimp_display_shell_layer_select_init (shell,
+ -1, kevent->time);
+ }
+ }
+ else
+ {
+ gimp_display_shell_toggle_hide_docks (shell);
+ }
+
+ return_val = TRUE;
+ break;
+
+ /* Update the state based on modifiers being pressed */
+ case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
+ case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
+ case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+ {
+ GdkModifierType key;
+
+ key = gimp_display_shell_key_to_state (kevent->keyval);
+ state |= key;
- /* remove used event */
- g_array_remove_index (shell->event_queue, 0);
+ if (! gimp_image_is_empty (image))
+ tool_manager_modifier_state_active (gimp, state, display);
+ }
+
+ break;
}
- gimp_display_shell_push_event_history (shell, &image_coords);
- shell->last_read_motion_time = time;
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
}
-
- return_val = TRUE;
}
break;
- case GDK_KEY_PRESS:
+ case GDK_KEY_RELEASE:
{
GdkEventKey *kevent = (GdkEventKey *) event;
GimpTool *active_tool;
- GIMP_LOG (TOOL_EVENTS, "event (display %p): KEY_PRESS (%d, %s)",
+ GIMP_LOG (TOOL_EVENTS, "event (display %p): KEY_RELEASE (%d, %s)",
display, kevent->keyval,
gdk_keyval_name (kevent->keyval) ?
gdk_keyval_name (kevent->keyval) : "<none>");
@@ -1298,334 +1183,511 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{
GdkModifierType key;
- key = gimp_display_shell_key_to_state (kevent->keyval);
- state |= key;
+ key = gimp_display_shell_key_to_state (kevent->keyval);
+ state &= ~key;
+
+ if (active_tool &&
+ gimp_tool_control_is_active (active_tool->control) &&
+ ! gimp_image_is_empty (image))
+ {
+ tool_manager_active_modifier_state_active (gimp, state,
+ display);
+ }
+ }
+ break;
+ }
+ }
+ else
+ {
+ tool_manager_focus_display_active (gimp, display);
+
+ if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
+ {
+ if (tool_manager_key_release_active (gimp, kevent, display))
+ {
+ /* FIXME: need to do some of the stuff below, like
+ * calling oper_update()
+ */
+
+ return TRUE;
+ }
+ }
+
+ switch (kevent->keyval)
+ {
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
+ gimp_display_shell_space_released (shell, event);
+ return_val = TRUE;
+ break;
+
+ /* Update the state based on modifiers being pressed */
+ case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
+ case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
+ case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+ {
+ GdkModifierType key;
+
+ key = gimp_display_shell_key_to_state (kevent->keyval);
+ state &= ~key;
+
+ /* For all modifier keys: call the tools
+ * modifier_state *and* oper_update method so tools
+ * can choose if they are interested in the press
+ * itself or only in the resulting state
+ */
+ if (! gimp_image_is_empty (image))
+ tool_manager_modifier_state_active (gimp, state, display);
+ }
+
+ break;
+ }
+
+ tool_manager_oper_update_active (gimp,
+ &image_coords, state,
+ shell->proximity,
+ display);
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ /* if we reached this point in gimp_busy mode, return now */
+ if (gimp->busy)
+ return return_val;
+
+ /* cursor update */
+ gimp_display_shell_update_cursor (shell, &display_coords, &image_coords,
+ state, update_sw_cursor);
+
+ return return_val;
+}
+
+static gboolean
+gimp_display_shell_ruler_button_press (GtkWidget *widget,
+ GdkEventButton *event,
+ GimpDisplayShell *shell,
+ gboolean horizontal)
+{
+ GimpDisplay *display = shell->display;
+
+ if (display->gimp->busy)
+ return TRUE;
+
+ if (! gimp_display_get_image (display))
+ return TRUE;
+
+ if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+ {
+ GimpTool *active_tool;
+ gboolean sample_point;
+
+ active_tool = tool_manager_get_active (display->gimp);
+ sample_point = (event->state & GDK_CONTROL_MASK);
+
+ if (! ((sample_point && (GIMP_IS_COLOR_TOOL (active_tool) &&
+ ! GIMP_IS_IMAGE_MAP_TOOL (active_tool) &&
+ ! (GIMP_IS_PAINT_TOOL (active_tool) &&
+ ! GIMP_PAINT_TOOL (active_tool)->pick_colors)))
+
+ ||
+
+ (! sample_point && GIMP_IS_MOVE_TOOL (active_tool))))
+ {
+ GimpToolInfo *tool_info;
+
+ tool_info = gimp_get_tool_info (display->gimp,
+ sample_point ?
+ "gimp-color-picker-tool" :
+ "gimp-move-tool");
+
+ if (tool_info)
+ {
+ gimp_context_set_tool (gimp_get_user_context (display->gimp),
+ tool_info);
+
+ /* make sure the newly created tool has the right state
+ */
+ gimp_display_shell_update_focus (shell, NULL, event->state);
+ }
+ }
+
+ active_tool = tool_manager_get_active (display->gimp);
+
+ if (active_tool)
+ {
+ if (! gtk_widget_has_focus (shell->canvas))
+ {
+ gimp_display_shell_update_focus (shell, NULL, event->state);
+
+ shell->button_press_before_focus = TRUE;
+
+ /* we expect a FOCUS_IN event to follow, but can't rely
+ * on it, so force one
+ */
+ gdk_window_focus (gtk_widget_get_window (shell->canvas),
+ gdk_event_get_time ((GdkEvent *) event));
+ }
+
+ if (gimp_display_shell_pointer_grab (shell,
+ (GdkEvent *) event,
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_BUTTON1_MOTION_MASK |
+ GDK_BUTTON_RELEASE_MASK))
+ {
+ if (gimp_display_shell_keyboard_grab (shell,
+ (GdkEvent *) event))
+ {
+ if (sample_point)
+ gimp_color_tool_start_sample_point (active_tool, display);
+ else if (horizontal)
+ gimp_move_tool_start_hguide (active_tool, display);
+ else
+ gimp_move_tool_start_vguide (active_tool, display);
+
+ return TRUE;
+ }
+ else
+ {
+ gimp_display_shell_pointer_ungrab (shell,
+ (GdkEvent *) event);
+ }
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+gboolean
+gimp_display_shell_hruler_button_press (GtkWidget *widget,
+ GdkEventButton *event,
+ GimpDisplayShell *shell)
+{
+ return gimp_display_shell_ruler_button_press (widget, event, shell, TRUE);
+}
+
+gboolean
+gimp_display_shell_vruler_button_press (GtkWidget *widget,
+ GdkEventButton *event,
+ GimpDisplayShell *shell)
+{
+ return gimp_display_shell_ruler_button_press (widget, event, shell, FALSE);
+}
+
+
+/* private functions */
+
+static GdkModifierType
+gimp_display_shell_key_to_state (gint key)
+{
+ switch (key)
+ {
+ case GDK_KEY_Alt_L:
+ case GDK_KEY_Alt_R:
+ return GDK_MOD1_MASK;
+ case GDK_KEY_Shift_L:
+ case GDK_KEY_Shift_R:
+ return GDK_SHIFT_MASK;
+ case GDK_KEY_Control_L:
+ case GDK_KEY_Control_R:
+ return GDK_CONTROL_MASK;
+ default:
+ return 0;
+ }
+}
+
+static void
+gimp_display_shell_check_device_cursor (GimpDisplayShell *shell)
+{
+ GimpDeviceInfo *current_device;
+
+ current_device = gimp_devices_get_current (shell->display->gimp);
+
+ shell->draw_cursor = ! gimp_device_info_has_cursor (current_device);
+}
+
+static void
+gimp_display_shell_toggle_hide_docks (GimpDisplayShell *shell)
+{
+ GimpImageWindow *window = gimp_display_shell_get_window (shell);
- if (active_tool &&
- gimp_tool_control_is_active (active_tool->control) &&
- ! gimp_image_is_empty (image))
- {
- tool_manager_active_modifier_state_active (gimp, state,
- display);
- }
- }
- break;
- }
- }
- else
- {
- tool_manager_focus_display_active (gimp, display);
+ if (window)
+ gimp_ui_manager_activate_action (gimp_image_window_get_ui_manager (window),
+ "windows",
+ "windows-hide-docks");
+}
- if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
- {
- if (tool_manager_key_press_active (gimp, kevent, display))
- {
- /* FIXME: need to do some of the stuff below, like
- * calling oper_update()
- */
+static void
+gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
+ gint x,
+ gint y)
+{
+ g_return_if_fail (! shell->scrolling);
- return TRUE;
- }
- }
+ shell->scrolling = TRUE;
+ shell->scroll_start_x = x + shell->offset_x;
+ shell->scroll_start_y = y + shell->offset_y;
- switch (kevent->keyval)
- {
- case GDK_KEY_Return:
- case GDK_KEY_KP_Enter:
- case GDK_KEY_ISO_Enter:
- case GDK_KEY_BackSpace:
- case GDK_KEY_Escape:
- case GDK_KEY_Left:
- case GDK_KEY_Right:
- case GDK_KEY_Up:
- case GDK_KEY_Down:
- if (gimp_image_is_empty (image) ||
- ! tool_manager_key_press_active (gimp,
- kevent,
- display))
- {
- GimpController *keyboard = gimp_controllers_get_keyboard (gimp);
+ gimp_display_shell_set_override_cursor (shell, GDK_FLEUR);
- if (keyboard)
- gimp_controller_keyboard_key_press (GIMP_CONTROLLER_KEYBOARD (keyboard),
- kevent);
- }
+ gtk_grab_add (shell->canvas);
+}
- return_val = TRUE;
- break;
+static void
+gimp_display_shell_stop_scrolling (GimpDisplayShell *shell)
+{
+ g_return_if_fail (shell->scrolling);
- case GDK_KEY_space:
- case GDK_KEY_KP_Space:
- gimp_display_shell_space_pressed (shell, event);
- return_val = TRUE;
- break;
+ shell->scrolling = FALSE;
+ shell->scroll_start_x = 0;
+ shell->scroll_start_y = 0;
- case GDK_KEY_Tab:
- case GDK_KEY_ISO_Left_Tab:
- if (state & GDK_CONTROL_MASK)
- {
- if (! gimp_image_is_empty (image))
- {
- if (kevent->keyval == GDK_KEY_Tab)
- gimp_display_shell_layer_select_init (shell,
- 1, kevent->time);
- else
- gimp_display_shell_layer_select_init (shell,
- -1, kevent->time);
- }
- }
- else
- {
- gimp_display_shell_toggle_hide_docks (shell);
- }
+ gimp_display_shell_unset_override_cursor (shell);
- return_val = TRUE;
- break;
+ gtk_grab_remove (shell->canvas);
+}
- /* Update the state based on modifiers being pressed */
- case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
- case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
- case GDK_KEY_Control_L: case GDK_KEY_Control_R:
- {
- GdkModifierType key;
+static void
+gimp_display_shell_space_pressed (GimpDisplayShell *shell,
+ GdkEvent *event)
+{
+ Gimp *gimp = gimp_display_get_gimp (shell->display);
- key = gimp_display_shell_key_to_state (kevent->keyval);
- state |= key;
+ if (shell->space_pressed)
+ return;
- if (! gimp_image_is_empty (image))
- tool_manager_modifier_state_active (gimp, state, display);
- }
+ if (! gimp_display_shell_keyboard_grab (shell, event))
+ return;
- break;
- }
+ switch (shell->display->config->space_bar_action)
+ {
+ case GIMP_SPACE_BAR_ACTION_NONE:
+ return;
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
+ case GIMP_SPACE_BAR_ACTION_PAN:
+ {
+ GimpCoords coords;
+
+ if (! gimp_display_shell_pointer_grab (shell, event,
+ GDK_POINTER_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK))
+ {
+ gimp_display_shell_keyboard_ungrab (shell, event);
+ return;
}
+
+ gimp_device_info_get_device_coords (gimp_devices_get_current (gimp),
+ gtk_widget_get_window (shell->canvas),
+ &coords);
+
+ gimp_display_shell_start_scrolling (shell, coords.x, coords.y);
}
break;
- case GDK_KEY_RELEASE:
+ case GIMP_SPACE_BAR_ACTION_MOVE:
{
- GdkEventKey *kevent = (GdkEventKey *) event;
- GimpTool *active_tool;
+ GimpTool *active_tool = tool_manager_get_active (gimp);
+ GdkModifierType state;
- GIMP_LOG (TOOL_EVENTS, "event (display %p): KEY_RELEASE (%d, %s)",
- display, kevent->keyval,
- gdk_keyval_name (kevent->keyval) ?
- gdk_keyval_name (kevent->keyval) : "<none>");
+ if (! active_tool || GIMP_IS_MOVE_TOOL (active_tool))
+ return;
- active_tool = tool_manager_get_active (gimp);
+ shell->space_shaded_tool =
+ gimp_object_get_name (active_tool->tool_info);
- if (state & GDK_BUTTON1_MASK)
- {
- switch (kevent->keyval)
- {
- case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
- case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
- case GDK_KEY_Control_L: case GDK_KEY_Control_R:
- {
- GdkModifierType key;
+ gimp_context_set_tool (gimp_get_user_context (gimp),
+ gimp_get_tool_info (gimp, "gimp-move-tool"));
- key = gimp_display_shell_key_to_state (kevent->keyval);
- state &= ~key;
+ gdk_event_get_state (event, &state);
- if (active_tool &&
- gimp_tool_control_is_active (active_tool->control) &&
- ! gimp_image_is_empty (image))
- {
- tool_manager_active_modifier_state_active (gimp, state,
- display);
- }
- }
- break;
- }
- }
- else
- {
- tool_manager_focus_display_active (gimp, display);
+ tool_manager_focus_display_active (gimp, shell->display);
+ tool_manager_modifier_state_active (gimp, state, shell->display);
+ }
+ break;
+ }
- if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
- {
- if (tool_manager_key_release_active (gimp, kevent, display))
- {
- /* FIXME: need to do some of the stuff below, like
- * calling oper_update()
- */
+ shell->space_pressed = TRUE;
+}
- return TRUE;
- }
- }
+static void
+gimp_display_shell_space_released (GimpDisplayShell *shell,
+ GdkEvent *event)
+{
+ Gimp *gimp = gimp_display_get_gimp (shell->display);
- switch (kevent->keyval)
- {
- case GDK_KEY_space:
- case GDK_KEY_KP_Space:
- gimp_display_shell_space_released (shell, event);
- return_val = TRUE;
- break;
+ if (! shell->space_pressed && ! shell->space_release_pending)
+ return;
- /* Update the state based on modifiers being pressed */
- case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
- case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
- case GDK_KEY_Control_L: case GDK_KEY_Control_R:
- {
- GdkModifierType key;
+ switch (shell->display->config->space_bar_action)
+ {
+ case GIMP_SPACE_BAR_ACTION_NONE:
+ break;
- key = gimp_display_shell_key_to_state (kevent->keyval);
- state &= ~key;
+ case GIMP_SPACE_BAR_ACTION_PAN:
+ gimp_display_shell_stop_scrolling (shell);
+ gimp_display_shell_pointer_ungrab (shell, event);
+ break;
- /* For all modifier keys: call the tools
- * modifier_state *and* oper_update method so tools
- * can choose if they are interested in the press
- * itself or only in the resulting state
- */
- if (! gimp_image_is_empty (image))
- tool_manager_modifier_state_active (gimp, state, display);
- }
+ case GIMP_SPACE_BAR_ACTION_MOVE:
+ {
+ GdkModifierType state;
+
+ gimp_context_set_tool (gimp_get_user_context (gimp),
+ gimp_get_tool_info (gimp,
+ shell->space_shaded_tool));
+ shell->space_shaded_tool = NULL;
- break;
- }
+ gdk_event_get_state (event, &state);
- tool_manager_oper_update_active (gimp,
- &image_coords, state,
- shell->proximity,
- display);
- }
+ tool_manager_focus_display_active (gimp, shell->display);
+ tool_manager_modifier_state_active (gimp, state, shell->display);
}
break;
-
- default:
- break;
}
- /* if we reached this point in gimp_busy mode, return now */
- if (gimp->busy)
- return return_val;
-
- /* cursor update */
- gimp_display_shell_update_cursor (shell, &display_coords, &image_coords,
- state, update_sw_cursor);
+ gimp_display_shell_keyboard_ungrab (shell, event);
- return return_val;
+ shell->space_pressed = FALSE;
+ shell->space_release_pending = FALSE;
}
-static gboolean
-gimp_display_shell_ruler_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GimpDisplayShell *shell,
- gboolean horizontal)
+static void
+gimp_display_shell_update_focus (GimpDisplayShell *shell,
+ const GimpCoords *image_coords,
+ GdkModifierType state)
{
- GimpDisplay *display = shell->display;
-
- if (display->gimp->busy)
- return TRUE;
+ Gimp *gimp = gimp_display_get_gimp (shell->display);
- if (! gimp_display_get_image (display))
- return TRUE;
+ tool_manager_focus_display_active (gimp, shell->display);
+ tool_manager_modifier_state_active (gimp, state, shell->display);
- if (event->type == GDK_BUTTON_PRESS && event->button == 1)
- {
- GimpTool *active_tool;
- gboolean sample_point;
+ if (image_coords)
+ tool_manager_oper_update_active (gimp,
+ image_coords, state,
+ shell->proximity,
+ shell->display);
+}
- active_tool = tool_manager_get_active (display->gimp);
- sample_point = (event->state & GDK_CONTROL_MASK);
+static void
+gimp_display_shell_update_cursor (GimpDisplayShell *shell,
+ const GimpCoords *display_coords,
+ const GimpCoords *image_coords,
+ GdkModifierType state,
+ gboolean update_software_cursor)
+{
+ GimpDisplay *display = shell->display;
+ Gimp *gimp = gimp_display_get_gimp (display);
+ GimpImage *image = gimp_display_get_image (display);
+ GimpTool *active_tool;
- if (! ((sample_point && (GIMP_IS_COLOR_TOOL (active_tool) &&
- ! GIMP_IS_IMAGE_MAP_TOOL (active_tool) &&
- ! (GIMP_IS_PAINT_TOOL (active_tool) &&
- ! GIMP_PAINT_TOOL (active_tool)->pick_colors)))
+ if (! shell->display->config->cursor_updating)
+ return;
- ||
+ active_tool = tool_manager_get_active (gimp);
- (! sample_point && GIMP_IS_MOVE_TOOL (active_tool))))
+ if (active_tool)
+ {
+ if ((! gimp_image_is_empty (image) ||
+ gimp_tool_control_get_handle_empty_image (active_tool->control)) &&
+ ! (state & (GDK_BUTTON1_MASK |
+ GDK_BUTTON2_MASK |
+ GDK_BUTTON3_MASK)))
{
- GimpToolInfo *tool_info;
-
- tool_info = gimp_get_tool_info (display->gimp,
- sample_point ?
- "gimp-color-picker-tool" :
- "gimp-move-tool");
-
- if (tool_info)
- {
- gimp_context_set_tool (gimp_get_user_context (display->gimp),
- tool_info);
-
- /* make sure the newly created tool has the right state
- */
- gimp_display_shell_update_focus (shell, NULL, event->state);
- }
+ tool_manager_cursor_update_active (gimp,
+ image_coords, state,
+ display);
+ }
+ else if (gimp_image_is_empty (image) &&
+ ! gimp_tool_control_get_handle_empty_image (active_tool->control))
+ {
+ gimp_display_shell_set_cursor (shell,
+ GIMP_CURSOR_MOUSE,
+ gimp_tool_control_get_tool_cursor (active_tool->control),
+ GIMP_CURSOR_MODIFIER_BAD);
}
+ }
+ else
+ {
+ gimp_display_shell_set_cursor (shell,
+ GIMP_CURSOR_MOUSE,
+ GIMP_TOOL_CURSOR_NONE,
+ GIMP_CURSOR_MODIFIER_BAD);
+ }
- active_tool = tool_manager_get_active (display->gimp);
+ if (update_software_cursor)
+ {
+ GimpCursorPrecision precision = GIMP_CURSOR_PRECISION_PIXEL_CENTER;
if (active_tool)
- {
- if (! gtk_widget_has_focus (shell->canvas))
- {
- gimp_display_shell_update_focus (shell, NULL, event->state);
+ precision = gimp_tool_control_get_precision (active_tool->control);
- shell->button_press_before_focus = TRUE;
+ gimp_display_shell_update_software_cursor (shell,
+ precision,
+ (gint) display_coords->x,
+ (gint) display_coords->y,
+ image_coords->x,
+ image_coords->y);
+ }
+}
- /* we expect a FOCUS_IN event to follow, but can't rely
- * on it, so force one
- */
- gdk_window_focus (gtk_widget_get_window (shell->canvas),
- gdk_event_get_time ((GdkEvent *) event));
- }
+static void
+gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
+ GdkEvent *event,
+ GimpCoords *display_coords,
+ GdkModifierType *state,
+ guint32 *time)
+{
+ Gimp *gimp = gimp_display_get_gimp (shell->display);
- if (gimp_display_shell_pointer_grab (shell,
- (GdkEvent *) event,
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON1_MOTION_MASK |
- GDK_BUTTON_RELEASE_MASK))
- {
- if (gimp_display_shell_keyboard_grab (shell,
- (GdkEvent *) event))
- {
- if (sample_point)
- gimp_color_tool_start_sample_point (active_tool, display);
- else if (horizontal)
- gimp_move_tool_start_hguide (active_tool, display);
- else
- gimp_move_tool_start_vguide (active_tool, display);
+ gimp_device_info_get_event_coords (gimp_devices_get_current (gimp),
+ gtk_widget_get_window (shell->canvas),
+ event,
+ display_coords);
- return TRUE;
- }
- else
- {
- gimp_display_shell_pointer_ungrab (shell,
- (GdkEvent *) event);
- }
- }
- }
- }
+ gimp_device_info_get_event_state (gimp_devices_get_current (gimp),
+ gtk_widget_get_window (shell->canvas),
+ event,
+ state);
- return FALSE;
+ *time = gdk_event_get_time (event);
}
-gboolean
-gimp_display_shell_hruler_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GimpDisplayShell *shell)
+static void
+gimp_display_shell_untransform_event_coords (GimpDisplayShell *shell,
+ const GimpCoords *display_coords,
+ GimpCoords *image_coords,
+ gboolean *update_software_cursor)
{
- return gimp_display_shell_ruler_button_press (widget, event, shell, TRUE);
-}
+ Gimp *gimp = gimp_display_get_gimp (shell->display);
+ GimpTool *active_tool;
-gboolean
-gimp_display_shell_vruler_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GimpDisplayShell *shell)
-{
- return gimp_display_shell_ruler_button_press (widget, event, shell, FALSE);
-}
+ /* GimpCoords passed to tools are ALWAYS in image coordinates */
+ gimp_display_shell_untransform_coords (shell,
+ display_coords,
+ image_coords);
+ active_tool = tool_manager_get_active (gimp);
-/* private functions */
+ if (active_tool && gimp_tool_control_get_snap_to (active_tool->control))
+ {
+ gint x, y, width, height;
+
+ gimp_tool_control_get_snap_offsets (active_tool->control,
+ &x, &y, &width, &height);
+
+ if (gimp_display_shell_snap_coords (shell,
+ image_coords,
+ x, y, width, height))
+ {
+ if (update_software_cursor)
+ *update_software_cursor = TRUE;
+ }
+ }
+}
/* Event delay timeout handler & generic event flusher */
@@ -1716,36 +1778,6 @@ gimp_display_shell_process_event_queue (GimpDisplayShell *shell,
}
}
-static void
-gimp_display_shell_toggle_hide_docks (GimpDisplayShell *shell)
-{
- GimpImageWindow *window = gimp_display_shell_get_window (shell);
-
- if (window)
- gimp_ui_manager_activate_action (gimp_image_window_get_ui_manager (window),
- "windows",
- "windows-hide-docks");
-}
-
-static GdkModifierType
-gimp_display_shell_key_to_state (gint key)
-{
- switch (key)
- {
- case GDK_KEY_Alt_L:
- case GDK_KEY_Alt_R:
- return GDK_MOD1_MASK;
- case GDK_KEY_Shift_L:
- case GDK_KEY_Shift_R:
- return GDK_SHIFT_MASK;
- case GDK_KEY_Control_L:
- case GDK_KEY_Control_R:
- return GDK_CONTROL_MASK;
- default:
- return 0;
- }
-}
-
/* gimp_display_shell_compress_motion:
*
* This function walks the whole GDK event queue seeking motion events
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
