From bcb2a4e942e235b96281c138fd732348335b3296 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 18 Nov 2007 16:13:14 +0000 Subject: [PATCH] improve debug output. 2007-11-18 Michael Natterer * app/display/gimpdisplayshell-callbacks.c (gimp_display_shell_canvas_tool_events): improve debug output. svn path=/trunk/; revision=24183 --- ChangeLog | 5 + app/display/gimpdisplayshell-callbacks.c | 316 ++++++++++++----------- 2 files changed, 168 insertions(+), 153 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e415fe6f0..d14a378e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-18 Michael Natterer + + * app/display/gimpdisplayshell-callbacks.c + (gimp_display_shell_canvas_tool_events): improve debug output. + 2007-11-17 Sven Neumann * app/base/base-utils.c (get_physical_memory_size): added a cast diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 874b1df983..2fe737be15 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -774,7 +774,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, GdkEventButton *bevent = (GdkEventButton *) event; GdkEventMask event_mask; - GIMP_LOG (TOOLS, "event (display %p): BUTTON_PRESS", display); + GIMP_LOG (TOOLS, "event (display %p): BUTTON_PRESS (%d)", + display, bevent->button); if (! GTK_WIDGET_HAS_FOCUS (canvas)) { @@ -920,7 +921,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, { GdkEventButton *bevent = (GdkEventButton *) event; - GIMP_LOG (TOOLS, "event (display %p): BUTTON_RELEASE", display); + GIMP_LOG (TOOLS, "event (display %p): BUTTON_RELEASE (%d)", + display, bevent->button); gimp_display_shell_autoscroll_stop (shell); @@ -986,7 +988,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, GdkScrollDirection direction; GimpController *wheel; - GIMP_LOG (TOOLS, "event (display %p): SCROLL", display); + GIMP_LOG (TOOLS, "event (display %p): SCROLL (%d)", + display, sevent->direction); wheel = gimp_controllers_get_wheel (gimp); @@ -1250,185 +1253,192 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, break; case GDK_KEY_PRESS: - GIMP_LOG (TOOLS, "event (display %p): KEY_PRESS", display); + { + GdkEventKey *kevent = (GdkEventKey *) event; - if (state & GDK_BUTTON1_MASK) - { - GdkEventKey *kevent = (GdkEventKey *) event; + GIMP_LOG (TOOLS, "event (display %p): KEY_PRESS (%d, %s)", + display, kevent->keyval, + gdk_keyval_name (kevent->keyval) ? + gdk_keyval_name (kevent->keyval) : ""); - switch (kevent->keyval) - { - case GDK_Alt_L: case GDK_Alt_R: - case GDK_Shift_L: case GDK_Shift_R: - case GDK_Control_L: case GDK_Control_R: + if (state & GDK_BUTTON1_MASK) + { + switch (kevent->keyval) { - 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 - { - GdkEventKey *kevent = (GdkEventKey *) event; - - tool_manager_focus_display_active (gimp, display); - - switch (kevent->keyval) - { - case GDK_Return: - case GDK_KP_Enter: - case GDK_BackSpace: - case GDK_Delete: - case GDK_Escape: - case GDK_Left: - case GDK_Right: - case GDK_Up: - case GDK_Down: - if (gimp_image_is_empty (image) || - ! tool_manager_key_press_active (gimp, - kevent, - display)) + case GDK_Alt_L: case GDK_Alt_R: + case GDK_Shift_L: case GDK_Shift_R: + case GDK_Control_L: case GDK_Control_R: { - GimpController *keyboard = gimp_controllers_get_keyboard (gimp); + GdkModifierType key; - if (keyboard) - gimp_controller_keyboard_key_press (GIMP_CONTROLLER_KEYBOARD (keyboard), - kevent); - } + key = gimp_display_shell_key_to_state (kevent->keyval); + state |= key; - return_val = TRUE; - break; - - case GDK_space: - gimp_display_shell_space_pressed (shell, state, time); - return_val = TRUE; - break; - - case GDK_Tab: - case GDK_ISO_Left_Tab: - if (state & GDK_CONTROL_MASK) - { - if (! gimp_image_is_empty (image)) + if (active_tool && + gimp_tool_control_is_active (active_tool->control) && + ! gimp_image_is_empty (image)) { - if (kevent->keyval == GDK_Tab) - gimp_display_shell_layer_select_init (shell, - 1, kevent->time); - else - gimp_display_shell_layer_select_init (shell, - -1, kevent->time); + tool_manager_active_modifier_state_active (gimp, state, + display); } } - else + break; + } + } + else + { + tool_manager_focus_display_active (gimp, display); + + switch (kevent->keyval) + { + case GDK_Return: + case GDK_KP_Enter: + case GDK_BackSpace: + case GDK_Delete: + case GDK_Escape: + case GDK_Left: + case GDK_Right: + case GDK_Up: + case GDK_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_space: + gimp_display_shell_space_pressed (shell, state, time); + return_val = TRUE; + break; + + case GDK_Tab: + case GDK_ISO_Left_Tab: + if (state & GDK_CONTROL_MASK) + { + if (! gimp_image_is_empty (image)) + { + if (kevent->keyval == GDK_Tab) + gimp_display_shell_layer_select_init (shell, + 1, kevent->time); + else + gimp_display_shell_layer_select_init (shell, + -1, kevent->time); + } + } + else + { + gimp_dialog_factories_toggle (); + } + + return_val = TRUE; + break; + + /* Update the state based on modifiers being pressed */ + case GDK_Alt_L: case GDK_Alt_R: + case GDK_Shift_L: case GDK_Shift_R: + case GDK_Control_L: case GDK_Control_R: { - gimp_dialog_factories_toggle (); + GdkModifierType key; + + key = gimp_display_shell_key_to_state (kevent->keyval); + state |= key; + + if (! gimp_image_is_empty (image)) + tool_manager_modifier_state_active (gimp, state, display); } - return_val = TRUE; - break; - - /* Update the state based on modifiers being pressed */ - case GDK_Alt_L: case GDK_Alt_R: - case GDK_Shift_L: case GDK_Shift_R: - case GDK_Control_L: case GDK_Control_R: - { - GdkModifierType key; - - key = gimp_display_shell_key_to_state (kevent->keyval); - state |= key; - - if (! gimp_image_is_empty (image)) - tool_manager_modifier_state_active (gimp, state, display); + break; } - break; - } - - tool_manager_oper_update_active (gimp, - &image_coords, state, - shell->proximity, - display); - } + tool_manager_oper_update_active (gimp, + &image_coords, state, + shell->proximity, + display); + } + } break; case GDK_KEY_RELEASE: - GIMP_LOG (TOOLS, "event (display %p): KEY_RELEASE", display); + { + GdkEventKey *kevent = (GdkEventKey *) event; - if (state & GDK_BUTTON1_MASK) - { - GdkEventKey *kevent = (GdkEventKey *) event; + GIMP_LOG (TOOLS, "event (display %p): KEY_RELEASE (%d, %s)", + display, kevent->keyval, + gdk_keyval_name (kevent->keyval) ? + gdk_keyval_name (kevent->keyval) : ""); - switch (kevent->keyval) - { - case GDK_Alt_L: case GDK_Alt_R: - case GDK_Shift_L: case GDK_Shift_R: - case GDK_Control_L: case GDK_Control_R: + if (state & GDK_BUTTON1_MASK) + { + switch (kevent->keyval) { - GdkModifierType key; + case GDK_Alt_L: case GDK_Alt_R: + case GDK_Shift_L: case GDK_Shift_R: + case GDK_Control_L: case GDK_Control_R: + { + 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); - } + 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; } - break; - } - } - else - { - GdkEventKey *kevent = (GdkEventKey *) event; + } + else + { + tool_manager_focus_display_active (gimp, display); - tool_manager_focus_display_active (gimp, display); - - switch (kevent->keyval) - { - case GDK_space: - gimp_display_shell_space_released (shell, state, time); - return_val = TRUE; - break; - - /* Update the state based on modifiers being pressed */ - case GDK_Alt_L: case GDK_Alt_R: - case GDK_Shift_L: case GDK_Shift_R: - case GDK_Control_L: case GDK_Control_R: + switch (kevent->keyval) { - GdkModifierType key; + case GDK_space: + gimp_display_shell_space_released (shell, state, time); + return_val = TRUE; + break; - key = gimp_display_shell_key_to_state (kevent->keyval); - state &= ~key; + /* Update the state based on modifiers being pressed */ + case GDK_Alt_L: case GDK_Alt_R: + case GDK_Shift_L: case GDK_Shift_R: + case GDK_Control_L: case GDK_Control_R: + { + GdkModifierType 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); + 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; } - break; - } - - tool_manager_oper_update_active (gimp, - &image_coords, state, - shell->proximity, - display); - } + tool_manager_oper_update_active (gimp, + &image_coords, state, + shell->proximity, + display); + } + } break; default: