2002-11-18 Sven Neumann <sven@gimp.org> Finally landed the new GimpConfig based gimprc parser. It's not finished yet but we need to start somewhere. This release removes the old gimprc.[ch] files. The gimprc format changes slightly, but the changes are minimal. The Preferences dialog is temporarily disabled since it still needs to be ported. If you are are afraid, stay away from CVS for a few days ;-) * app/Makefile.am * app/gimprc.[ch]: removed the old gimprc system. * app/base/Makefile.am * app/base/base-config.[ch]: removed these files in favor of config/gimpbaseconfig.[ch]. * app/core/Makefile.am * app/core/gimpcoreconfig.[ch]: removed these files in favor of config/gimpcoreconfig.[ch]. * app/config/Makefile.am * app/config/config-types.h: moved typedefs into this new file. * app/config/gimpbaseconfig.[ch] * app/config/gimpcoreconfig.[ch] * app/config/gimpdisplayconfig.[ch] * app/config/gimpguiconfig.[ch] * app/config/gimprc.[ch] * app/config/test-config.c: brought into shape for real use. * app/base/base-types.h: include config/config-types.h here. Added a global GimpBaseConfig *base_config variable to ease migration. * app/gui/Makefile.am: temporarily disabled the preferences dialog. * app/app_procs.c * app/undo.c * app/undo_history.c * app/base/base.[ch] * app/base/gimphistogram.c * app/base/pixel-processor.c * app/base/temp-buf.c * app/base/tile-cache.c * app/core/core-types.h * app/core/gimp-documents.c * app/core/gimp.c * app/core/gimpbrush.c * app/core/gimpbrushgenerated.c * app/core/gimpcontext.c * app/core/gimpdrawable-transform.c * app/core/gimpimage-new.c * app/core/gimpimage.c * app/core/gimpimagefile.c * app/core/gimpmodules.c * app/core/gimppattern.c * app/display/Makefile.am * app/display/gimpdisplay-handlers.c * app/display/gimpdisplay.[ch] * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-handlers.c * app/display/gimpdisplayshell-layer-select.c * app/display/gimpdisplayshell-render.c * app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scroll.c * app/display/gimpdisplayshell-selection.c * app/display/gimpdisplayshell.[ch] * app/display/gimpnavigationview.c * app/file/file-save.c * app/gui/device-status-dialog.c * app/gui/dialogs-constructors.c * app/gui/file-commands.c * app/gui/file-new-dialog.c * app/gui/file-open-dialog.c * app/gui/file-save-dialog.c * app/gui/gui.c * app/gui/menus.c * app/gui/paths-dialog.c * app/gui/resize-dialog.c * app/gui/session.c * app/gui/test-commands.c * app/gui/tips-dialog.c * app/gui/tips-dialog.h * app/gui/user-install-dialog.c * app/gui/view-commands.c * app/paint/gimppaintcore.c * app/plug-in/plug-in.c * app/plug-in/plug-ins.c * app/tools/gimpbezierselecttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpinktool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimptexttool.[ch] * app/tools/selection_options.c * app/tools/tools.c * app/tools/transform_options.c * app/widgets/gimphelp.c * app/widgets/gimpitemfactory.c * app/widgets/gimpselectioneditor.c * app/xcf/xcf-load.c * tools/pdbgen/pdb/fileops.pdb * tools/pdbgen/pdb/gimprc.pdb * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/layer.pdb * tools/pdbgen/pdb/transform_tools.pdb: use the new config system instead of the old gimprc stuff. * etc/gimprc.in * etc/gimprc_user.in: adapted to the new gimprc format. Will update the man-page later... * app/pdb/fileops_cmds.c * app/pdb/gimprc_cmds.c * app/pdb/image_cmds.c * app/pdb/layer_cmds.c * app/pdb/transform_tools_cmds.c * libgimp/gimpgimprc_pdb.c: regenerated.
464 lines
13 KiB
C
464 lines
13 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
|
|
#include "display-types.h"
|
|
|
|
#include "config/gimpdisplayconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpimage.h"
|
|
|
|
#include "tools/tools-types.h"
|
|
|
|
#include "tools/tool_manager.h"
|
|
|
|
#include "gimpdisplay.h"
|
|
#include "gimpdisplayshell.h"
|
|
#include "gimpdisplayshell-scale.h"
|
|
#include "gimpdisplayshell-scroll.h"
|
|
#include "gimpstatusbar.h"
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static gdouble img2real (GimpDisplayShell *shell,
|
|
gboolean xdir,
|
|
gdouble a);
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_display_shell_scale_setup (GimpDisplayShell *shell)
|
|
{
|
|
GtkRuler *hruler;
|
|
GtkRuler *vruler;
|
|
gfloat sx, sy;
|
|
gfloat stepx, stepy;
|
|
gint image_width, image_height;
|
|
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
image_width = shell->gdisp->gimage->width;
|
|
image_height = shell->gdisp->gimage->height;
|
|
|
|
sx = SCALEX (shell, image_width);
|
|
sy = SCALEY (shell, image_height);
|
|
stepx = SCALEFACTOR_X (shell);
|
|
stepy = SCALEFACTOR_Y (shell);
|
|
|
|
shell->hsbdata->value = shell->offset_x;
|
|
shell->hsbdata->upper = sx;
|
|
shell->hsbdata->page_size = MIN (sx, shell->disp_width);
|
|
shell->hsbdata->page_increment = shell->disp_width / 2;
|
|
shell->hsbdata->step_increment = stepx;
|
|
|
|
shell->vsbdata->value = shell->offset_y;
|
|
shell->vsbdata->upper = sy;
|
|
shell->vsbdata->page_size = MIN (sy, shell->disp_height);
|
|
shell->vsbdata->page_increment = shell->disp_height / 2;
|
|
shell->vsbdata->step_increment = stepy;
|
|
|
|
gtk_adjustment_changed (shell->hsbdata);
|
|
gtk_adjustment_changed (shell->vsbdata);
|
|
|
|
hruler = GTK_RULER (shell->hrule);
|
|
vruler = GTK_RULER (shell->vrule);
|
|
|
|
hruler->lower = 0;
|
|
hruler->upper = img2real (shell, TRUE,
|
|
FUNSCALEX (shell, shell->disp_width));
|
|
hruler->max_size = img2real (shell, TRUE,
|
|
MAX (image_width, image_height));
|
|
|
|
vruler->lower = 0;
|
|
vruler->upper = img2real (shell, FALSE,
|
|
FUNSCALEY (shell, shell->disp_height));
|
|
vruler->max_size = img2real (shell, FALSE,
|
|
MAX (image_width, image_height));
|
|
|
|
if (sx < shell->disp_width)
|
|
{
|
|
shell->disp_xoffset = (shell->disp_width - sx) / 2;
|
|
|
|
hruler->lower -= img2real (shell, TRUE,
|
|
FUNSCALEX (shell,
|
|
(gdouble) shell->disp_xoffset));
|
|
hruler->upper -= img2real (shell, TRUE,
|
|
FUNSCALEX (shell,
|
|
(gdouble) shell->disp_xoffset));
|
|
}
|
|
else
|
|
{
|
|
shell->disp_xoffset = 0;
|
|
|
|
hruler->lower += img2real (shell, TRUE,
|
|
FUNSCALEX (shell,
|
|
(gdouble) shell->offset_x));
|
|
hruler->upper += img2real (shell, TRUE,
|
|
FUNSCALEX (shell,
|
|
(gdouble) shell->offset_x));
|
|
}
|
|
|
|
if (sy < shell->disp_height)
|
|
{
|
|
shell->disp_yoffset = (shell->disp_height - sy) / 2;
|
|
|
|
vruler->lower -= img2real (shell, FALSE,
|
|
FUNSCALEY (shell,
|
|
(gdouble) shell->disp_yoffset));
|
|
vruler->upper -= img2real (shell, FALSE,
|
|
FUNSCALEY (shell,
|
|
(gdouble) shell->disp_yoffset));
|
|
}
|
|
else
|
|
{
|
|
shell->disp_yoffset = 0;
|
|
|
|
vruler->lower += img2real (shell, FALSE,
|
|
FUNSCALEY (shell,
|
|
(gdouble) shell->offset_y));
|
|
vruler->upper += img2real (shell, FALSE,
|
|
FUNSCALEY (shell,
|
|
(gdouble) shell->offset_y));
|
|
}
|
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (hruler));
|
|
gtk_widget_queue_draw (GTK_WIDGET (vruler));
|
|
|
|
gimp_display_shell_scaled (shell);
|
|
|
|
#if 0
|
|
g_print ("offset_x: %d\n"
|
|
"offset_y: %d\n"
|
|
"disp_width: %d\n"
|
|
"disp_height: %d\n"
|
|
"disp_xoffset: %d\n"
|
|
"disp_yoffset: %d\n\n",
|
|
shell->offset_x, shell->offset_y,
|
|
shell->disp_width, shell->disp_height,
|
|
shell->disp_xoffset, shell->disp_yoffset);
|
|
#endif
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale_set_dot_for_dot (GimpDisplayShell *shell,
|
|
gboolean dot_for_dot)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
if (dot_for_dot != shell->dot_for_dot)
|
|
{
|
|
/* freeze the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, PAUSE,
|
|
shell->gdisp);
|
|
|
|
shell->dot_for_dot = dot_for_dot;
|
|
|
|
gimp_statusbar_resize_cursor (GIMP_STATUSBAR (shell->statusbar));
|
|
|
|
gimp_display_shell_scale_resize (shell,
|
|
GIMP_DISPLAY_CONFIG (shell->gdisp->gimage->gimp->config)->resize_windows_on_zoom,
|
|
TRUE);
|
|
|
|
/* re-enable the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME,
|
|
shell->gdisp);
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale (GimpDisplayShell *shell,
|
|
GimpZoomType zoom_type)
|
|
{
|
|
guchar scalesrc, scaledest;
|
|
gdouble offset_x, offset_y;
|
|
glong sx, sy;
|
|
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
/* user zoom control, so resolution versions not needed -- austin */
|
|
scalesrc = SCALESRC (shell);
|
|
scaledest = SCALEDEST (shell);
|
|
|
|
offset_x = shell->offset_x + (shell->disp_width / 2.0);
|
|
offset_y = shell->offset_y + (shell->disp_height / 2.0);
|
|
|
|
offset_x *= ((double) scalesrc / (double) scaledest);
|
|
offset_y *= ((double) scalesrc / (double) scaledest);
|
|
|
|
switch (zoom_type)
|
|
{
|
|
case GIMP_ZOOM_IN:
|
|
if (scalesrc > 1)
|
|
scalesrc--;
|
|
else
|
|
if (scaledest < 0x10)
|
|
scaledest++;
|
|
else
|
|
return;
|
|
break;
|
|
|
|
case GIMP_ZOOM_OUT:
|
|
if (scaledest > 1)
|
|
scaledest--;
|
|
else
|
|
if (scalesrc < 0x10)
|
|
scalesrc++;
|
|
else
|
|
return;
|
|
break;
|
|
|
|
default:
|
|
scalesrc = CLAMP (zoom_type % 100, 1, 0x10);
|
|
scaledest = CLAMP (zoom_type / 100, 1, 0x10);
|
|
break;
|
|
}
|
|
|
|
sx = (shell->gdisp->gimage->width * scaledest) / scalesrc;
|
|
sy = (shell->gdisp->gimage->height * scaledest) / scalesrc;
|
|
|
|
/* The slider value is a short, so make sure we are within its
|
|
* range. If we are trying to scale past it, then stop the scale
|
|
*/
|
|
if (sx < 0xffff && sy < 0xffff)
|
|
{
|
|
/* set the offsets */
|
|
offset_x *= ((gdouble) scaledest / (gdouble) scalesrc);
|
|
offset_y *= ((gdouble) scaledest / (gdouble) scalesrc);
|
|
|
|
gimp_display_shell_scale_by_values (shell,
|
|
(scaledest << 8) + scalesrc,
|
|
(offset_x - (shell->disp_width / 2)),
|
|
(offset_y - (shell->disp_height / 2)),
|
|
GIMP_DISPLAY_CONFIG (shell->gdisp->gimage->gimp->config)->resize_windows_on_zoom);
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale_fit (GimpDisplayShell *shell)
|
|
{
|
|
GimpDisplayConfig *config;
|
|
GimpImage *gimage;
|
|
|
|
gint image_width;
|
|
gint image_height;
|
|
gdouble zoom_x;
|
|
gdouble zoom_y;
|
|
gdouble zoom_factor;
|
|
gdouble zoom_delta;
|
|
gdouble min_zoom_delta = G_MAXFLOAT;
|
|
gint scalesrc = 1;
|
|
gint scaledest = 1;
|
|
gint i;
|
|
gint best_i = 0x10;
|
|
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
gimage = shell->gdisp->gimage;
|
|
|
|
image_width = gimage->width;
|
|
image_height = gimage->height;
|
|
|
|
config = GIMP_DISPLAY_CONFIG (gimage->gimp->config);
|
|
|
|
if (! shell->dot_for_dot)
|
|
{
|
|
image_width = ROUND (image_width *
|
|
config->monitor_xres / gimage->xresolution);
|
|
image_height = ROUND (image_height *
|
|
config->monitor_yres / gimage->yresolution);
|
|
}
|
|
|
|
zoom_x = (gdouble) shell->disp_width / (gdouble) image_width;
|
|
zoom_y = (gdouble) shell->disp_height / (gdouble) image_height;
|
|
|
|
if ((gdouble) image_height * zoom_x <= (gdouble) shell->disp_height)
|
|
{
|
|
zoom_factor = zoom_x;
|
|
}
|
|
else
|
|
{
|
|
zoom_factor = zoom_y;
|
|
}
|
|
|
|
if (zoom_factor < 1.0)
|
|
{
|
|
for (i = 0x10; i > 0; i--)
|
|
{
|
|
scalesrc = i;
|
|
scaledest = floor ((gdouble) scalesrc * zoom_factor);
|
|
|
|
if (scaledest < 0x1)
|
|
{
|
|
scaledest = 0x1;
|
|
}
|
|
|
|
zoom_delta = ABS ((gdouble) scaledest / (gdouble) scalesrc -
|
|
zoom_factor);
|
|
|
|
if (zoom_delta <= min_zoom_delta)
|
|
{
|
|
min_zoom_delta = zoom_delta;
|
|
best_i = i;
|
|
}
|
|
}
|
|
|
|
scalesrc = best_i;
|
|
scaledest = floor ((gdouble) scalesrc * zoom_factor);
|
|
|
|
if (scaledest < 0x1)
|
|
{
|
|
scaledest = 0x1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for (i = 0x10; i > 0; i--)
|
|
{
|
|
scaledest = i;
|
|
scalesrc = ceil ((gdouble) scaledest / zoom_factor);
|
|
|
|
if (scalesrc < 0x1)
|
|
{
|
|
scalesrc = 0x1;
|
|
}
|
|
|
|
zoom_delta = ABS ((gdouble) scaledest / (gdouble) scalesrc -
|
|
zoom_factor);
|
|
|
|
if (zoom_delta <= min_zoom_delta)
|
|
{
|
|
min_zoom_delta = zoom_delta;
|
|
best_i = i;
|
|
}
|
|
}
|
|
|
|
scaledest = best_i;
|
|
scalesrc = ceil ((gdouble) scaledest / zoom_factor);
|
|
|
|
if (scalesrc < 0x1)
|
|
{
|
|
scalesrc = 0x1;
|
|
}
|
|
}
|
|
|
|
gimp_display_shell_scale_by_values (shell,
|
|
(scaledest << 8) + scalesrc,
|
|
0,
|
|
0,
|
|
FALSE);
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale_by_values (GimpDisplayShell *shell,
|
|
gint scale,
|
|
gint offset_x,
|
|
gint offset_y,
|
|
gboolean resize_window)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
/* freeze the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, PAUSE,
|
|
shell->gdisp);
|
|
|
|
shell->scale = scale;
|
|
shell->offset_x = offset_x;
|
|
shell->offset_y = offset_y;
|
|
|
|
gimp_display_shell_scale_resize (shell, resize_window, TRUE);
|
|
|
|
/* re-enable the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME,
|
|
shell->gdisp);
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale_shrink_wrap (GimpDisplayShell *shell)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
gimp_display_shell_scale_resize (shell, TRUE, TRUE);
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scale_resize (GimpDisplayShell *shell,
|
|
gboolean resize_window,
|
|
gboolean redisplay)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
/* freeze the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, PAUSE,
|
|
shell->gdisp);
|
|
|
|
if (resize_window)
|
|
gimp_display_shell_shrink_wrap (shell);
|
|
|
|
gimp_display_shell_scroll_clamp_offsets (shell);
|
|
gimp_display_shell_scale_setup (shell);
|
|
|
|
if (resize_window || redisplay)
|
|
{
|
|
gimp_display_shell_expose_full (shell);
|
|
|
|
/* title may have changed if it includes the zoom ratio */
|
|
shell->title_dirty = TRUE;
|
|
|
|
gimp_display_shell_flush (shell);
|
|
}
|
|
|
|
/* re-enable the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME,
|
|
shell->gdisp);
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
/* scale image coord to realworld units (cm, inches, pixels)
|
|
*
|
|
* 27/Feb/1999 I tried inlining this, but the result was slightly
|
|
* slower (poorer cache locality, probably) -- austin
|
|
*/
|
|
static gdouble
|
|
img2real (GimpDisplayShell *shell,
|
|
gboolean xdir,
|
|
gdouble a)
|
|
{
|
|
gdouble res;
|
|
|
|
if (shell->dot_for_dot)
|
|
return a;
|
|
|
|
if (xdir)
|
|
res = shell->gdisp->gimage->xresolution;
|
|
else
|
|
res = shell->gdisp->gimage->yresolution;
|
|
|
|
return a * gimp_unit_get_factor (shell->gdisp->gimage->unit) / res;
|
|
}
|