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

app: rename the functions dealing with GimpDisplayShell's software cursor

Browse Source 
to gimp_display_shell_foo_software_cursor() in order to remove
confusion with the functions that deal with the windowing system's
cursor.
This commit is contained in:
Michael Natterer
2011-02-20 14:43:09 +01:00
parent 72638e3a8f
commit f7bb5f460c
3 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,7 +787,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
return TRUE; return TRUE;
shell->proximity = FALSE; shell->proximity = FALSE;
gimp_display_shell_clear_cursor (shell); gimp_display_shell_clear_software_cursor (shell);
tool_manager_oper_update_active (gimp, tool_manager_oper_update_active (gimp,
&image_coords, state, &image_coords, state,
@ -809,7 +809,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_OUT", display); GIMP_LOG (TOOL_EVENTS, "event (display %p): PROXIMITY_OUT", display);
shell->proximity = FALSE; shell->proximity = FALSE;
gimp_display_shell_clear_cursor (shell); gimp_display_shell_clear_software_cursor (shell);
tool_manager_oper_update_active (gimp, tool_manager_oper_update_active (gimp,
&image_coords, state, &image_coords, state,
@ -1797,12 +1797,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (active_tool) if (active_tool)
precision = gimp_tool_control_get_precision (active_tool->control); precision = gimp_tool_control_get_precision (active_tool->control);
gimp_display_shell_update_cursor (shell, gimp_display_shell_update_software_cursor (shell,
precision, precision,
(gint) display_coords.x, (gint) display_coords.x,
(gint) display_coords.y, (gint) display_coords.y,
image_coords.x, image_coords.x,
image_coords.y); image_coords.y);
} }
return return_val; return return_val;

14
app/display/gimpdisplayshell-cursor.c
View File

@ -117,12 +117,12 @@ gimp_display_shell_unset_override_cursor (GimpDisplayShell *shell)
} }
void void
gimp_display_shell_update_cursor (GimpDisplayShell *shell, gimp_display_shell_update_software_cursor (GimpDisplayShell *shell,
GimpCursorPrecision precision, GimpCursorPrecision precision,
gint display_x, gint display_x,
gint display_y, gint display_y,
gdouble image_x, gdouble image_x,
gdouble image_y) gdouble image_y)
{ {
GimpStatusbar *statusbar; GimpStatusbar *statusbar;
GimpSessionInfo *session_info; GimpSessionInfo *session_info;
@ -184,7 +184,7 @@ gimp_display_shell_update_cursor (GimpDisplayShell *shell,
} }
void void
gimp_display_shell_clear_cursor (GimpDisplayShell *shell) gimp_display_shell_clear_software_cursor (GimpDisplayShell *shell)
{ {
GimpStatusbar *statusbar; GimpStatusbar *statusbar;
GimpSessionInfo *session_info; GimpSessionInfo *session_info;

37
app/display/gimpdisplayshell-cursor.h
View File

@ -19,22 +19,29 @@
#define __GIMP_DISPLAY_SHELL_CURSOR_H__ #define __GIMP_DISPLAY_SHELL_CURSOR_H__
void gimp_display_shell_set_cursor (GimpDisplayShell *shell, /* functions dealing with the normal windowing system cursor */
GimpCursorType cursor_type,
GimpToolCursorType tool_cursor,
GimpCursorModifier modifier);
void gimp_display_shell_unset_cursor (GimpDisplayShell *shell);
void gimp_display_shell_set_override_cursor (GimpDisplayShell *shell,
GimpCursorType cursor_type);
void gimp_display_shell_unset_override_cursor (GimpDisplayShell *shell);
void gimp_display_shell_update_cursor (GimpDisplayShell *shell, void gimp_display_shell_set_cursor (GimpDisplayShell *shell,
GimpCursorPrecision precision, GimpCursorType cursor_type,
gint display_x, GimpToolCursorType tool_cursor,
gint display_y, GimpCursorModifier modifier);
gdouble image_x, void gimp_display_shell_unset_cursor (GimpDisplayShell *shell);
gdouble image_y); void gimp_display_shell_set_override_cursor (GimpDisplayShell *shell,
void gimp_display_shell_clear_cursor (GimpDisplayShell *shell); GimpCursorType cursor_type);
void gimp_display_shell_unset_override_cursor (GimpDisplayShell *shell);
/* functions dealing with the software cursor that is drawn to the
* canvas by GIMP
*/
void gimp_display_shell_update_software_cursor (GimpDisplayShell *shell,
GimpCursorPrecision precision,
gint display_x,
gint display_y,
gdouble image_x,
gdouble image_y);
void gimp_display_shell_clear_software_cursor (GimpDisplayShell *shell);
#endif /* __GIMP_DISPLAY_SHELL_CURSOR_H__ */ #endif /* __GIMP_DISPLAY_SHELL_CURSOR_H__ */