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.
170 lines
4.8 KiB
C
170 lines
4.8 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 "display-types.h"
|
|
|
|
#include "core/gimpimage.h"
|
|
|
|
#include "tools/tools-types.h"
|
|
|
|
#include "tools/tool_manager.h"
|
|
|
|
#include "gimpdisplay.h"
|
|
#include "gimpdisplay-foreach.h"
|
|
#include "gimpdisplayshell.h"
|
|
#include "gimpdisplayshell-scale.h"
|
|
#include "gimpdisplayshell-scroll.h"
|
|
|
|
|
|
gboolean
|
|
gimp_display_shell_scroll (GimpDisplayShell *shell,
|
|
gint x_offset,
|
|
gint y_offset)
|
|
{
|
|
gint old_x, old_y;
|
|
gint src_x, src_y;
|
|
gint dest_x, dest_y;
|
|
GdkEvent *event;
|
|
|
|
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
|
|
|
|
old_x = shell->offset_x;
|
|
old_y = shell->offset_y;
|
|
|
|
shell->offset_x += x_offset;
|
|
shell->offset_y += y_offset;
|
|
|
|
gimp_display_shell_scroll_clamp_offsets (shell);
|
|
|
|
/* the actual changes in offset */
|
|
x_offset = (shell->offset_x - old_x);
|
|
y_offset = (shell->offset_y - old_y);
|
|
|
|
if (x_offset || y_offset)
|
|
{
|
|
/* FIXME: I'm sure this is useless if all other places are correct --mitch
|
|
*/
|
|
gimp_display_shell_scale_setup (shell);
|
|
|
|
src_x = (x_offset < 0) ? 0 : x_offset;
|
|
src_y = (y_offset < 0) ? 0 : y_offset;
|
|
dest_x = (x_offset < 0) ? -x_offset : 0;
|
|
dest_y = (y_offset < 0) ? -y_offset : 0;
|
|
|
|
/* reset the old values so that the tool can accurately redraw */
|
|
shell->offset_x = old_x;
|
|
shell->offset_y = old_y;
|
|
|
|
/* freeze the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, PAUSE,
|
|
shell->gdisp);
|
|
|
|
/* set the offsets back to the new values */
|
|
shell->offset_x += x_offset;
|
|
shell->offset_y += y_offset;
|
|
|
|
gdk_draw_drawable (shell->canvas->window,
|
|
shell->render_gc,
|
|
shell->canvas->window,
|
|
src_x, src_y,
|
|
dest_x, dest_y,
|
|
(shell->disp_width - abs (x_offset)),
|
|
(shell->disp_height - abs (y_offset)));
|
|
|
|
/* re-enable the active tool */
|
|
tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME,
|
|
shell->gdisp);
|
|
|
|
/* scale the image into the exposed regions */
|
|
if (x_offset)
|
|
{
|
|
src_x = (x_offset < 0) ? 0 : shell->disp_width - x_offset;
|
|
src_y = 0;
|
|
|
|
gimp_display_shell_add_expose_area (shell,
|
|
src_x, src_y,
|
|
abs (x_offset),
|
|
shell->disp_height);
|
|
}
|
|
|
|
if (y_offset)
|
|
{
|
|
src_x = 0;
|
|
src_y = (y_offset < 0) ? 0 : shell->disp_height - y_offset;
|
|
|
|
gimp_display_shell_add_expose_area (shell,
|
|
src_x, src_y,
|
|
shell->disp_width,
|
|
abs (y_offset));
|
|
}
|
|
|
|
if (x_offset || y_offset)
|
|
{
|
|
gimp_display_flush (shell->gdisp);
|
|
}
|
|
|
|
gimp_display_shell_scrolled (shell);
|
|
|
|
/* Make sure graphics expose events are processed before scrolling
|
|
* again
|
|
*/
|
|
while ((event = gdk_event_get_graphics_expose (shell->canvas->window)))
|
|
{
|
|
gdk_window_invalidate_rect (shell->canvas->window,
|
|
&event->expose.area,
|
|
FALSE);
|
|
|
|
if (event->expose.count == 0)
|
|
{
|
|
gdk_event_free (event);
|
|
break;
|
|
}
|
|
|
|
gdk_event_free (event);
|
|
}
|
|
|
|
gdk_window_process_updates (shell->canvas->window, FALSE);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_scroll_clamp_offsets (GimpDisplayShell *shell)
|
|
{
|
|
gint sx, sy;
|
|
|
|
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
|
|
|
sx = SCALEX (shell, shell->gdisp->gimage->width);
|
|
sy = SCALEY (shell, shell->gdisp->gimage->height);
|
|
|
|
shell->offset_x = CLAMP (shell->offset_x, 0,
|
|
MAX (sx - shell->disp_width, 0));
|
|
|
|
shell->offset_y = CLAMP (shell->offset_y, 0,
|
|
MAX (sy - shell->disp_height, 0));
|
|
}
|