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

cache the display scale factors in the GimpDisplayShell struct and

Browse Source 
2007-03-14  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell.[ch]: cache the display scale
	factors in the GimpDisplayShell struct and recalculate it in
	gimp_display_shell_scale_factor_changed().

	* app/display/gimpdisplayshell-scale.c
	(gimp_display_shell_scale_set_dot_for_dot)
	* app/display/gimpdisplayshell-handlers.c
	(gimp_display_shell_resolution_changed_handler)
	(gimp_display_shell_monitor_res_notify_handler): update the scale
	factors by calling gimp_display_shell_scale_factor_changed().

	* app/display/gimpdisplayshell-transform.c
	* app/display/gimpnavigationeditor.c: code cleanup.


svn path=/trunk/; revision=22118
This commit is contained in:
Sven Neumann
2007-03-14 10:01:08 +00:00
committed by Sven Neumann
parent 7688860072
commit 74927c03a4
7 changed files with 99 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2007-03-14 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell.[ch]: cache the display scale
factors in the GimpDisplayShell struct and recalculate it in
gimp_display_shell_scale_factor_changed().
* app/display/gimpdisplayshell-scale.c
(gimp_display_shell_scale_set_dot_for_dot)
* app/display/gimpdisplayshell-handlers.c
(gimp_display_shell_resolution_changed_handler)
(gimp_display_shell_monitor_res_notify_handler): update the scale
factors by calling gimp_display_shell_scale_factor_changed().
* app/display/gimpdisplayshell-transform.c
* app/display/gimpnavigationeditor.c: code cleanup.
2007-03-14 Sven Neumann <sven@gimp.org> 2007-03-14 Sven Neumann <sven@gimp.org>
* app/base/pixel-surround.c (struct _PixelSurround): documentation. * app/base/pixel-surround.c (struct _PixelSurround): documentation.

4
app/display/gimpdisplayshell-handlers.c
View File

@ -416,6 +416,8 @@ static void
gimp_display_shell_resolution_changed_handler (GimpImage *image, gimp_display_shell_resolution_changed_handler (GimpImage *image,
GimpDisplayShell *shell) GimpDisplayShell *shell)
{ {
gimp_display_shell_scale_factor_changed (shell);
if (shell->dot_for_dot) if (shell->dot_for_dot)
{ {
gimp_display_shell_scale_setup (shell); gimp_display_shell_scale_setup (shell);
@ -585,6 +587,8 @@ gimp_display_shell_monitor_res_notify_handler (GObject *config,
shell->monitor_yres = GIMP_DISPLAY_CONFIG (config)->monitor_yres; shell->monitor_yres = GIMP_DISPLAY_CONFIG (config)->monitor_yres;
} }
gimp_display_shell_scale_factor_changed (shell);
if (! shell->dot_for_dot) if (! shell->dot_for_dot)
{ {
gimp_display_shell_scale_setup (shell); gimp_display_shell_scale_setup (shell);

2
app/display/gimpdisplayshell-scale.c
View File

@ -266,6 +266,8 @@ gimp_display_shell_scale_set_dot_for_dot (GimpDisplayShell *shell,
shell->dot_for_dot = dot_for_dot; shell->dot_for_dot = dot_for_dot;
gimp_display_shell_scale_factor_changed (shell);
gimp_display_shell_scale_resize (shell, gimp_display_shell_scale_resize (shell,
GIMP_DISPLAY_CONFIG (gimp->config)->resize_windows_on_zoom, GIMP_DISPLAY_CONFIG (gimp->config)->resize_windows_on_zoom,
TRUE); TRUE);

80
app/display/gimpdisplayshell-transform.c
View File

@ -48,20 +48,14 @@ gimp_display_shell_transform_coordinate (GimpDisplayShell *shell,
GimpCoords *image_coords, GimpCoords *image_coords,
GimpCoords *display_coords) GimpCoords *display_coords)
{ {
gdouble scalex;
gdouble scaley;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (image_coords != NULL); g_return_if_fail (image_coords != NULL);
g_return_if_fail (display_coords != NULL); g_return_if_fail (display_coords != NULL);
*display_coords = *image_coords; *display_coords = *image_coords;
scalex = SCALEFACTOR_X (shell); display_coords->x = SCALEFACTOR_X (shell) * image_coords->x;
scaley = SCALEFACTOR_Y (shell); display_coords->y = SCALEFACTOR_Y (shell) * image_coords->y;
display_coords->x = scalex * image_coords->x;
display_coords->y = scaley * image_coords->y;
display_coords->x += - shell->offset_x + shell->disp_xoffset; display_coords->x += - shell->offset_x + shell->disp_xoffset;
display_coords->y += - shell->offset_y + shell->disp_yoffset; display_coords->y += - shell->offset_y + shell->disp_yoffset;
@ -81,23 +75,17 @@ gimp_display_shell_untransform_coordinate (GimpDisplayShell *shell,
GimpCoords *display_coords, GimpCoords *display_coords,
GimpCoords *image_coords) GimpCoords *image_coords)
{ {
gdouble scalex;
gdouble scaley;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (display_coords != NULL); g_return_if_fail (display_coords != NULL);
g_return_if_fail (image_coords != NULL); g_return_if_fail (image_coords != NULL);
*image_coords = *display_coords; *image_coords = *display_coords;
scalex = SCALEFACTOR_X (shell);
scaley = SCALEFACTOR_Y (shell);
image_coords->x = display_coords->x - shell->disp_xoffset + shell->offset_x; image_coords->x = display_coords->x - shell->disp_xoffset + shell->offset_x;
image_coords->y = display_coords->y - shell->disp_yoffset + shell->offset_y; image_coords->y = display_coords->y - shell->disp_yoffset + shell->offset_y;
image_coords->x /= scalex; image_coords->x /= SCALEFACTOR_X (shell);
image_coords->y /= scaley; image_coords->y /= SCALEFACTOR_Y (shell);
} }
void void
@ -108,19 +96,13 @@ gimp_display_shell_transform_xy (GimpDisplayShell *shell,
gint *ny, gint *ny,
gboolean use_offsets) gboolean use_offsets)
{ {
gdouble scalex; gint offset_x = 0;
gdouble scaley; gint offset_y = 0;
gint offset_x = 0;
gint offset_y = 0;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL); g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL); g_return_if_fail (ny != NULL);
/* transform from image coordinates to screen coordinates */
scalex = SCALEFACTOR_X (shell);
scaley = SCALEFACTOR_Y (shell);
if (use_offsets) if (use_offsets)
{ {
GimpItem *item; GimpItem *item;
@ -129,8 +111,8 @@ gimp_display_shell_transform_xy (GimpDisplayShell *shell,
gimp_item_offsets (item, &offset_x, &offset_y); gimp_item_offsets (item, &offset_x, &offset_y);
} }
x = (scalex * (x + offset_x) - shell->offset_x); x = SCALEFACTOR_X (shell) * (x + offset_x) - shell->offset_x;
y = (scaley * (y + offset_y) - shell->offset_y); y = SCALEFACTOR_Y (shell) * (y + offset_y) - shell->offset_y;
/* The projected coordinates can easily overflow a gint in the case of big /* The projected coordinates can easily overflow a gint in the case of big
images at high zoom levels, so we clamp them here to avoid problems. */ images at high zoom levels, so we clamp them here to avoid problems. */
@ -166,10 +148,8 @@ gimp_display_shell_untransform_xy (GimpDisplayShell *shell,
gboolean round, gboolean round,
gboolean use_offsets) gboolean use_offsets)
{ {
gdouble scalex; gint offset_x = 0;
gdouble scaley; gint offset_y = 0;
gint offset_x = 0;
gint offset_y = 0;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL); g_return_if_fail (nx != NULL);
@ -178,10 +158,6 @@ gimp_display_shell_untransform_xy (GimpDisplayShell *shell,
x -= shell->disp_xoffset; x -= shell->disp_xoffset;
y -= shell->disp_yoffset; y -= shell->disp_yoffset;
/* transform from screen coordinates to image coordinates */
scalex = SCALEFACTOR_X (shell);
scaley = SCALEFACTOR_Y (shell);
if (use_offsets) if (use_offsets)
{ {
GimpItem *item; GimpItem *item;
@ -192,13 +168,13 @@ gimp_display_shell_untransform_xy (GimpDisplayShell *shell,
if (round) if (round)
{ {
*nx = ROUND ((x + shell->offset_x) / scalex - offset_x); *nx = ROUND ((x + shell->offset_x) / SCALEFACTOR_X (shell) - offset_x);
*ny = ROUND ((y + shell->offset_y) / scaley - offset_y); *ny = ROUND ((y + shell->offset_y) / SCALEFACTOR_Y (shell) - offset_y);
} }
else else
{ {
*nx = (gint) ((x + shell->offset_x) / scalex - offset_x); *nx = (gint) ((x + shell->offset_x) / SCALEFACTOR_X (shell) - offset_x);
*ny = (gint) ((y + shell->offset_y) / scaley - offset_y); *ny = (gint) ((y + shell->offset_y) / SCALEFACTOR_Y (shell) - offset_y);
} }
} }
@ -223,19 +199,13 @@ gimp_display_shell_transform_xy_f (GimpDisplayShell *shell,
gdouble *ny, gdouble *ny,
gboolean use_offsets) gboolean use_offsets)
{ {
gdouble scalex; gint offset_x = 0;
gdouble scaley; gint offset_y = 0;
gint offset_x = 0;
gint offset_y = 0;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL); g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL); g_return_if_fail (ny != NULL);
/* transform from gimp coordinates to screen coordinates */
scalex = SCALEFACTOR_X (shell);
scaley = SCALEFACTOR_Y (shell);
if (use_offsets) if (use_offsets)
{ {
GimpItem *item; GimpItem *item;
@ -244,8 +214,8 @@ gimp_display_shell_transform_xy_f (GimpDisplayShell *shell,
gimp_item_offsets (item, &offset_x, &offset_y); gimp_item_offsets (item, &offset_x, &offset_y);
} }
*nx = scalex * (x + offset_x) - shell->offset_x; *nx = SCALEFACTOR_X (shell) * (x + offset_x) - shell->offset_x;
*ny = scaley * (y + offset_y) - shell->offset_y; *ny = SCALEFACTOR_Y (shell) * (y + offset_y) - shell->offset_y;
*nx += shell->disp_xoffset; *nx += shell->disp_xoffset;
*ny += shell->disp_yoffset; *ny += shell->disp_yoffset;
@ -273,10 +243,8 @@ gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell,
gdouble *ny, gdouble *ny,
gboolean use_offsets) gboolean use_offsets)
{ {
gdouble scalex; gint offset_x = 0;
gdouble scaley; gint offset_y = 0;
gint offset_x = 0;
gint offset_y = 0;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL); g_return_if_fail (nx != NULL);
@ -285,10 +253,6 @@ gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell,
x -= shell->disp_xoffset; x -= shell->disp_xoffset;
y -= shell->disp_yoffset; y -= shell->disp_yoffset;
/* transform from screen coordinates to gimp coordinates */
scalex = SCALEFACTOR_X (shell);
scaley = SCALEFACTOR_Y (shell);
if (use_offsets) if (use_offsets)
{ {
GimpItem *item; GimpItem *item;
@ -297,8 +261,8 @@ gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell,
gimp_item_offsets (item, &offset_x, &offset_y); gimp_item_offsets (item, &offset_x, &offset_y);
} }
*nx = (x + shell->offset_x) / scalex - offset_x; *nx = (x + shell->offset_x) / SCALEFACTOR_X (shell) - offset_x;
*ny = (y + shell->offset_y) / scaley - offset_y; *ny = (y + shell->offset_y) / SCALEFACTOR_Y (shell) - offset_y;
} }
/** /**

28
app/display/gimpdisplayshell.c
View File

@ -221,6 +221,9 @@ gimp_display_shell_init (GimpDisplayShell *shell)
shell->offset_x = 0; shell->offset_x = 0;
shell->offset_y = 0; shell->offset_y = 0;
shell->scale_factor_x = 1.0;
shell->scale_factor_y = 1.0;
shell->last_scale = 0.0; shell->last_scale = 0.0;
shell->last_scale_time = 0; shell->last_scale_time = 0;
shell->last_offset_x = 0; shell->last_offset_x = 0;
@ -323,6 +326,11 @@ gimp_display_shell_init (GimpDisplayShell *shell)
GDK_VISIBILITY_NOTIFY_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_SCROLL_MASK)); GDK_SCROLL_MASK));
/* zoom model callback */
g_signal_connect_swapped (shell->zoom, "zoomed",
G_CALLBACK (gimp_display_shell_scale_factor_changed),
shell);
/* active display callback */ /* active display callback */
g_signal_connect (shell, "button-press-event", g_signal_connect (shell, "button-press-event",
G_CALLBACK (gimp_display_shell_events), G_CALLBACK (gimp_display_shell_events),
@ -1096,6 +1104,26 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
gimp_display_shell_scaled (shell); gimp_display_shell_scaled (shell);
} }
/*
* We used to calculate the scale factor in the SCALEFACTOR_X() and
* SCALEFACTOR_Y() macros. But since these are rather frequently
* called and the values rarely change, we now store them in the
* shell and call this function whenever they need to be recalculated.
*/
void
gimp_display_shell_scale_factor_changed (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
shell->scale_factor_x = (gimp_zoom_model_get_factor (shell->zoom)
* SCREEN_XRES (shell)
/ shell->display->image->xresolution);
shell->scale_factor_y = (gimp_zoom_model_get_factor (shell->zoom)
* SCREEN_YRES (shell)
/ shell->display->image->yresolution);
}
void void
gimp_display_shell_scaled (GimpDisplayShell *shell) gimp_display_shell_scaled (GimpDisplayShell *shell)
{ {

11
app/display/gimpdisplayshell.h
View File

@ -35,10 +35,8 @@
(s)->display->image->yresolution : (s)->monitor_yres) (s)->display->image->yresolution : (s)->monitor_yres)
/* calculate scale factors (double) */ /* calculate scale factors (double) */
#define SCALEFACTOR_X(s) (gimp_zoom_model_get_factor ((s)->zoom) \ #define SCALEFACTOR_X(s) (s->scale_factor_x)
* SCREEN_XRES(s) / (s)->display->image->xresolution) #define SCALEFACTOR_Y(s) (s->scale_factor_y)
#define SCALEFACTOR_Y(s) (gimp_zoom_model_get_factor ((s)->zoom) \
* SCREEN_YRES(s) / (s)->display->image->yresolution)
/* scale values */ /* scale values */
#define SCALEX(s,x) PROJ_ROUND ((x) * SCALEFACTOR_X(s)) #define SCALEX(s,x) PROJ_ROUND ((x) * SCALEFACTOR_X(s))
@ -83,6 +81,9 @@ struct _GimpDisplayShell
gint offset_x; /* offset of display image into raw image */ gint offset_x; /* offset of display image into raw image */
gint offset_y; gint offset_y;
gdouble scale_factor_x; /* cache for scale factor */
gdouble scale_factor_y; /* cache for scale factor */
gdouble last_scale; /* scale used when reverting zoom */ gdouble last_scale; /* scale used when reverting zoom */
guint last_scale_time; /* time when last_scale was set */ guint last_scale_time; /* time when last_scale was set */
gint last_offset_x; /* offsets used when reverting zoom */ gint last_offset_x; /* offsets used when reverting zoom */
@ -200,6 +201,8 @@ GtkWidget * gimp_display_shell_new (GimpDisplay *display,
void gimp_display_shell_reconnect (GimpDisplayShell *shell); void gimp_display_shell_reconnect (GimpDisplayShell *shell);
void gimp_display_shell_scale_factor_changed (GimpDisplayShell *shell);
void gimp_display_shell_scaled (GimpDisplayShell *shell); void gimp_display_shell_scaled (GimpDisplayShell *shell);
void gimp_display_shell_scrolled (GimpDisplayShell *shell); void gimp_display_shell_scrolled (GimpDisplayShell *shell);

49
app/display/gimpnavigationeditor.c
View File

@ -323,19 +323,19 @@ gimp_navigation_editor_new_private (GimpMenuFactory *menu_factory,
if (shell) if (shell)
{ {
GimpDisplayConfig *config; Gimp *gimp = shell->display->image->gimp;
GimpDisplayConfig *config = GIMP_DISPLAY_CONFIG (gimp->config);
GimpView *view; GimpView *view;
editor = g_object_new (GIMP_TYPE_NAVIGATION_EDITOR, NULL); editor = g_object_new (GIMP_TYPE_NAVIGATION_EDITOR, NULL);
config = GIMP_DISPLAY_CONFIG (shell->display->image->gimp->config); view = GIMP_VIEW (editor->view);
view = GIMP_VIEW (editor->view);
gimp_view_renderer_set_size (view->renderer, gimp_view_renderer_set_size (view->renderer,
config->nav_preview_size * 3, config->nav_preview_size * 3,
view->renderer->border_width); view->renderer->border_width);
gimp_view_renderer_set_context (view->renderer, gimp_view_renderer_set_context (view->renderer,
gimp_get_user_context (shell->display->image->gimp)); gimp_get_user_context (gimp));
gimp_navigation_editor_set_shell (editor, shell); gimp_navigation_editor_set_shell (editor, shell);
@ -492,18 +492,14 @@ gimp_navigation_editor_marker_changed (GimpNavigationView *view,
{ {
if (editor->shell) if (editor->shell)
{ {
gdouble xratio; GimpDisplayShell *shell = editor->shell;
gdouble yratio; gint xoffset;
gint xoffset; gint yoffset;
gint yoffset;
xratio = SCALEFACTOR_X (editor->shell); xoffset = RINT (x * SCALEFACTOR_X (shell) - shell->offset_x);
yratio = SCALEFACTOR_Y (editor->shell); yoffset = RINT (y * SCALEFACTOR_Y (shell) - shell->offset_y);
xoffset = RINT (x * xratio - editor->shell->offset_x); gimp_display_shell_scroll (shell, xoffset, yoffset);
yoffset = RINT (y * yratio - editor->shell->offset_y);
gimp_display_shell_scroll (editor->shell, xoffset, yoffset);
} }
} }
@ -638,22 +634,17 @@ gimp_navigation_editor_shell_reconnect (GimpDisplayShell *shell,
static void static void
gimp_navigation_editor_update_marker (GimpNavigationEditor *editor) gimp_navigation_editor_update_marker (GimpNavigationEditor *editor)
{ {
GimpViewRenderer *renderer; GimpViewRenderer *renderer = GIMP_VIEW (editor->view)->renderer;
gdouble xratio; GimpDisplayShell *shell = editor->shell;
gdouble yratio; gdouble xratio = SCALEFACTOR_X (shell);
gdouble yratio = SCALEFACTOR_Y (shell);
renderer = GIMP_VIEW (editor->view)->renderer; if (renderer->dot_for_dot != shell->dot_for_dot)
gimp_view_renderer_set_dot_for_dot (renderer, shell->dot_for_dot);
xratio = SCALEFACTOR_X (editor->shell);
yratio = SCALEFACTOR_Y (editor->shell);
if (renderer->dot_for_dot != editor->shell->dot_for_dot)
gimp_view_renderer_set_dot_for_dot (renderer,
editor->shell->dot_for_dot);
gimp_navigation_view_set_marker (GIMP_NAVIGATION_VIEW (editor->view), gimp_navigation_view_set_marker (GIMP_NAVIGATION_VIEW (editor->view),
editor->shell->offset_x / xratio, shell->offset_x / xratio,
editor->shell->offset_y / yratio, shell->offset_y / yratio,
editor->shell->disp_width / xratio, shell->disp_width / xratio,
editor->shell->disp_height / yratio); shell->disp_height / yratio);
} }