b19deeb311
2003-10-14 Michael Natterer <mitch@gimp.org> Refactored modifier handling of displays and tools. Hopefully finally fixes bug #124135. * app/tools/gimptool.[ch] (struct GimpTool): added private members "focus_display" and "modifier_state" so tools are aware of their modifier state. * app/tools/gimptool.[ch] * app/tools/tool_manager.[ch]: removed all public modifier_key() API and added set_focus_display() and set_modifier_state() instead. * app/tools/tool_manager.c (tool_manager_select_tool) * app/display/gimpdisplay.c (gimp_display_delete): set the active_tool's focus_display to NULL. * app/display/gimpdisplayshell.[ch] (struct GimpDisplayShell): added almost the whole stuff that used to be static variables of gimp_display_shell_tool_events(). Cleaned up the struct a bit. * app/display/gimpdisplayshell-callbacks.c: removed utility function gimp_display_shell_update_tool_modifiers(). (gimp_display_shell_tool_events): - Replaced all calls to gimp_display_shell_update_tool_modifiers() and tool_manager_modifier_key_active() by tool_manager_modifier_state_active(). - Call tool_manager_focus_display_active() before setting the tool's modifier_state. Set the tool's focus_display to NULL when we get a focus_out event. - Don't grab/ungrab the keyboard twice when <space>-selecting the move tool. - Removed most static variables and use the new members of GimpDisplayShell. Don't remember any old modifier states since GimpTool does that by itself now.
76 lines
4 KiB
C
76 lines
4 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __TOOL_MANAGER_H__
|
|
#define __TOOL_MANAGER_H__
|
|
|
|
|
|
void tool_manager_init (Gimp *gimp);
|
|
void tool_manager_exit (Gimp *gimp);
|
|
|
|
GimpTool * tool_manager_get_active (Gimp *gimp);
|
|
|
|
void tool_manager_select_tool (Gimp *gimp,
|
|
GimpTool *tool);
|
|
|
|
void tool_manager_push_tool (Gimp *gimp,
|
|
GimpTool *tool);
|
|
void tool_manager_pop_tool (Gimp *gimp);
|
|
|
|
|
|
void tool_manager_initialize_active (Gimp *gimp,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_control_active (Gimp *gimp,
|
|
GimpToolAction action,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_button_press_active (Gimp *gimp,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_button_release_active (Gimp *gimp,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_motion_active (Gimp *gimp,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_arrow_key_active (Gimp *gimp,
|
|
GdkEventKey *kevent,
|
|
GimpDisplay *gdisp);
|
|
|
|
void tool_manager_focus_display_active (Gimp *gimp,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_modifier_state_active (Gimp *gimp,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
|
|
void tool_manager_oper_update_active (Gimp *gimp,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
void tool_manager_cursor_update_active (Gimp *gimp,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
|
|
|
|
#endif /* __TOOL_MANAGER_H__ */
|