callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

factored out utility function gimp_display_shell_update_focus() which sets

Browse Source 
2007-07-27  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c: factored out utility
	function gimp_display_shell_update_focus() which sets the active
	tool into the proper state after the canvas received focus.

	(gimp_display_shell_canvas_tool_events): use it here instead of
	duplicating the code 3 times.

	(gimp_display_shell_ruler_button_press): use it here too so the
	move and color tools don't do weird things in click-to-focus
	mode (when FOCUS_IN is delivered after BUTTON_PRESS).


svn path=/trunk/; revision=23020
This commit is contained in:
Michael Natterer
2007-07-27 09:39:12 +00:00
committed by Michael Natterer
parent b361037a52
commit 17287617d9
2 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2007-07-27 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c: factored out utility
function gimp_display_shell_update_focus() which sets the active
tool into the proper state after the canvas received focus.
(gimp_display_shell_canvas_tool_events): use it here instead of
duplicating the code 3 times.
(gimp_display_shell_ruler_button_press): use it here too so the
move and color tools don't do weird things in click-to-focus
mode (when FOCUS_IN is delivered after BUTTON_PRESS).
2007-07-27 Raphaël Quinet <raphael@gimp.org> 2007-07-27 Raphaël Quinet <raphael@gimp.org>
* plug-ins/jpeg/jpeg.[ch] * plug-ins/jpeg/jpeg.[ch]

87
app/display/gimpdisplayshell-callbacks.c
View File

@ -78,6 +78,15 @@
#include "gimp-intl.h" #include "gimp-intl.h"
/* #define DEBUG_TOOL_EVENTS */
#ifdef DEBUG_TOOL_EVENTS
#define D(stmnt) stmnt
#else
#define D(stmnt)
#endif
/* local function prototypes */ /* local function prototypes */
static void gimp_display_shell_vscrollbar_update (GtkAdjustment *adjustment, static void gimp_display_shell_vscrollbar_update (GtkAdjustment *adjustment,
@ -573,6 +582,23 @@ gimp_display_shell_space_released (GimpDisplayShell *shell,
shell->space_release_pending = FALSE; shell->space_release_pending = FALSE;
} }
static void
gimp_display_shell_update_focus (GimpDisplayShell *shell,
GimpCoords *image_coords,
GdkModifierType state)
{
Gimp *gimp = shell->display->image->gimp;
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);
}
gboolean gboolean
gimp_display_shell_canvas_tool_events (GtkWidget *canvas, gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GdkEvent *event, GdkEvent *event,
@ -649,6 +675,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{ {
GdkEventCrossing *cevent = (GdkEventCrossing *) event; GdkEventCrossing *cevent = (GdkEventCrossing *) event;
D (g_printerr ("tool event: ENTER_NOTIFY\n"));
if (cevent->mode != GDK_CROSSING_NORMAL) if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE; return TRUE;
@ -665,6 +693,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{ {
GdkEventCrossing *cevent = (GdkEventCrossing *) event; GdkEventCrossing *cevent = (GdkEventCrossing *) event;
D (g_printerr ("tool event: LEAVE_NOTIFY\n"));
if (cevent->mode != GDK_CROSSING_NORMAL) if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE; return TRUE;
@ -679,6 +709,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
break; break;
case GDK_PROXIMITY_IN: case GDK_PROXIMITY_IN:
D (g_printerr ("tool event: PROXIMITY_IN\n"));
tool_manager_oper_update_active (gimp, tool_manager_oper_update_active (gimp,
&image_coords, state, &image_coords, state,
shell->proximity, shell->proximity,
@ -686,6 +718,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
break; break;
case GDK_PROXIMITY_OUT: case GDK_PROXIMITY_OUT:
D (g_printerr ("tool event: PROXIMITY_OUT\n"));
shell->proximity = FALSE; shell->proximity = FALSE;
gimp_display_shell_clear_cursor (shell); gimp_display_shell_clear_cursor (shell);
@ -701,6 +735,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (fevent->in) if (fevent->in)
{ {
D (g_printerr ("tool event: FOCUS_IN\n"));
GTK_WIDGET_SET_FLAGS (canvas, GTK_HAS_FOCUS); GTK_WIDGET_SET_FLAGS (canvas, GTK_HAS_FOCUS);
/* press modifier keys when the canvas gets the focus /* press modifier keys when the canvas gets the focus
@ -710,17 +746,13 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
*/ */
if (! shell->button_press_before_focus) if (! shell->button_press_before_focus)
{ {
tool_manager_focus_display_active (gimp, display); gimp_display_shell_update_focus (shell, &image_coords, state);
tool_manager_modifier_state_active (gimp, state, display);
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
display);
} }
} }
else else
{ {
D (g_printerr ("tool event: FOCUS_OUT\n"));
GTK_WIDGET_UNSET_FLAGS (canvas, GTK_HAS_FOCUS); GTK_WIDGET_UNSET_FLAGS (canvas, GTK_HAS_FOCUS);
/* reset it here to be prepared for the next /* reset it here to be prepared for the next
@ -749,18 +781,14 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GdkEventButton *bevent = (GdkEventButton *) event; GdkEventButton *bevent = (GdkEventButton *) event;
GdkEventMask event_mask; GdkEventMask event_mask;
D (g_printerr ("tool event: BUTTON_PRESS\n"));
if (! GTK_WIDGET_HAS_FOCUS (canvas)) if (! GTK_WIDGET_HAS_FOCUS (canvas))
{ {
/* in "click to focus" mode, the BUTTON_PRESS arrives before /* in "click to focus" mode, the BUTTON_PRESS arrives before
* FOCUS_IN, so we have to update the tool's modifier state here * FOCUS_IN, so we have to update the tool's modifier state here
*/ */
tool_manager_focus_display_active (gimp, display); gimp_display_shell_update_focus (shell, &image_coords, state);
tool_manager_modifier_state_active (gimp, state, display);
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
display);
active_tool = tool_manager_get_active (gimp); active_tool = tool_manager_get_active (gimp);
@ -895,6 +923,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{ {
GdkEventButton *bevent = (GdkEventButton *) event; GdkEventButton *bevent = (GdkEventButton *) event;
D (g_printerr ("tool event: BUTTON_RELEASE\n"));
gimp_display_shell_autoscroll_stop (shell); gimp_display_shell_autoscroll_stop (shell);
if (gimp->busy) if (gimp->busy)
@ -930,13 +960,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
/* update the tool's modifier state because it didn't get /* update the tool's modifier state because it didn't get
* key events while BUTTON1 was down * key events while BUTTON1 was down
*/ */
tool_manager_focus_display_active (gimp, display); gimp_display_shell_update_focus (shell, &image_coords, state);
tool_manager_modifier_state_active (gimp, state, display);
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
display);
gtk_grab_remove (canvas); gtk_grab_remove (canvas);
@ -965,6 +989,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GdkScrollDirection direction; GdkScrollDirection direction;
GimpController *wheel; GimpController *wheel;
D (g_printerr ("tool event: SCROLL\n"));
wheel = gimp_controllers_get_wheel (gimp); wheel = gimp_controllers_get_wheel (gimp);
if (wheel && if (wheel &&
@ -1066,6 +1092,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GdkEventMotion *mevent = (GdkEventMotion *) event; GdkEventMotion *mevent = (GdkEventMotion *) event;
GdkEvent *compressed_motion = NULL; GdkEvent *compressed_motion = NULL;
D (g_printerr ("tool event: MOTION_NOTIFY\n"));
if (gimp->busy) if (gimp->busy)
return TRUE; return TRUE;
@ -1225,6 +1253,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
break; break;
case GDK_KEY_PRESS: case GDK_KEY_PRESS:
D (g_printerr ("tool event: KEY_PRESS\n"));
if (state & GDK_BUTTON1_MASK) if (state & GDK_BUTTON1_MASK)
{ {
GdkEventKey *kevent = (GdkEventKey *) event; GdkEventKey *kevent = (GdkEventKey *) event;
@ -1335,6 +1365,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
break; break;
case GDK_KEY_RELEASE: case GDK_KEY_RELEASE:
D (g_printerr ("tool event: KEY_RELEASE\n"));
if (state & GDK_BUTTON1_MASK) if (state & GDK_BUTTON1_MASK)
{ {
GdkEventKey *kevent = (GdkEventKey *) event; GdkEventKey *kevent = (GdkEventKey *) event;
@ -1499,6 +1531,19 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget,
if (active_tool) 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 (shell->canvas->window,
gdk_event_get_time ((GdkEvent *) event));
}
gdk_pointer_grab (shell->canvas->window, FALSE, gdk_pointer_grab (shell->canvas->window, FALSE,
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON1_MOTION_MASK | GDK_BUTTON1_MOTION_MASK |