Files
gimp/app/display/gimpdisplayshell-layer-select.c
Michael Natterer 02fde14c95 build display/ before tools/.
2001-11-08  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am: build display/ before tools/.

	* app/devices.c: devices_check_change(): added all events
	which have a GdkDevice pointer.

	* app/gimpprogress.c: include "display-types.h" instead of
	"core-types.h".

	* app/core/Makefile.am
	* app/core/gimpdrawable-bucket-fill.[ch]: new files: the bucket_fill
	stuff taken from tools/gimpbucketfilltool.[ch].

	* app/core/core-types.h: added "BucketFillMode".

	* app/core/gimpimage-mask-select.[ch]: cleanup.

	* app/core/gimpmarshal.list: added more marshallers for GimpTool's
	new signal signatures.

	* app/core/gimpmarshal.[ch]: regenerated.

	* app/display/Makefile.am
	* app/display/gimpdisplayshell-dnd.[ch]
	* app/display/gimpdisplayshell-layer-select.[ch]: new files: the
	canvas drop callbacks from gimpdisplayshell-callbacks.[ch] and
	the stuff formerly knows as gui/layer-select.[ch].

	* app/display/gimpdisplay.h: don't include "gui/gui-types.h".

	* app/display/gximage.c: include "display-types.h".

	* app/display/gimpdisplay-foreach.c
	* app/display/gimpdisplayshell.[ch]: call gdsplay_delete(), don't
	destroy the shell widget.

	* app/gui/Makefile.am
	* app/gui/layer-select.[ch]: removed.

	* app/gui/gradients-commands.c: fixed "Save as POV" fprintf()s.

	* app/gui/preferences-dialog.c: removed the layer_select stuff
	because it is useless with the new preview system.

	* app/gui/tool-options-dialog.c: send the correct data to the
	close_callback.

	* app/gui/tools-commands.c: changed to follow the new
	gimp_tool_initialize() semantics (see below).

	Tool & canvas event handling chainsawing:

	* app/tools/tools-types.h: new struct GimpCoords which contains
	x, y, pressure, tilt etc.

	* app/display/gimpdisplayshell-callbacks.[ch]: added utility
	functions which transparently retreive the current event's
	GimpCoords or take it from the device directly if the event has
	none. Pass GimpCoords _in_image_coordinates_ to all tool
	functions.

	Most important: don't pass GdkEvents and display coordinates to
	tools any more.

	* app/tools/gimptool.[ch]: changed virtual functions to take
	GimpCoords, time and state separately instead of GdkEvents.

	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpblendtool.c
	* app/tools/gimpbucketfilltool.[ch]
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpcroptool.[ch]
	* app/tools/gimpcurvestool.c
	* app/tools/gimpdodgeburntool.c
	* app/tools/gimpdrawtool.c
	* app/tools/gimpeditselectiontool.[ch]
	* app/tools/gimperasertool.c
	* app/tools/gimpfliptool.c
	* app/tools/gimpfreeselecttool.[ch]
	* app/tools/gimpfuzzyselecttool.c
	* app/tools/gimpinktool.c
	* app/tools/gimpiscissorstool.c
	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmeasuretool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimppainttool.c
	* app/tools/gimppathtool.[ch]
	* app/tools/gimprectselecttool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpselectiontool.[ch]
	* app/tools/gimpsmudgetool.c
	* app/tools/gimptexttool.c
	* app/tools/gimptransformtool.[ch]
	* app/tools/path_tool.[ch]
	* app/tools/selection_options.c: tons and tons of changes:

	- changed to use the new virtual function parameters.
	- removed zillions of gdisplay_untransform_coords().
	- get the active drawable's offsets manually in many cases.
	  (questionable, but IMHO ok because it's obvious and not simply a
	  "TRUE" passed to some function)
	- reordered some functions to be consistent across tools.
	- some tools had to be changed to work on image coords, not
	  display ones (esp. crop).
	- fixed strange rotate tool behaviour which should be backported
	  to stable.
	- some stuff i came across.
	- indentation and other paranoia.
	- rounding of coordinated may be broken in some tools.
	- new bugs guaranteed.

	* app/tools/tool_manager.[ch]: new semantic of
	tool_manager_initialize_active() (looked at the places where it
	was used from and put common code together). Should be a bit
	better now :)

	* app/tools/gimpblendtool.c
	* app/tools/transform_options.c: use the new GTK+ feature that a
	widget (toggle button) can be a frame's title for this tools' tool
	options.

	* app/widgets/widgets-types.h: stuff.

	* themes/Default/gtkrc: s/GtkDialog/GimpDialog/.

	* tools/pdbgen/Makefile.am: don't scan tools/gimpbucketfilltool.h
	any more.

	* tools/pdbgen/enums.pl: regenerated.

	* tools/pdbgen/pdb/tools.pdb: changed bucket_fill wrapper.

	* app/pdb/tools_cmds.c: regenerated.
2001-11-08 19:14:51 +00:00

290 lines
7.9 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 <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "display-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
#include "widgets/gimppreview.h"
#include "gimpdisplay-foreach.h"
#include "gimpdisplayshell-layer-select.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
typedef struct _LayerSelect LayerSelect;
struct _LayerSelect
{
GtkWidget *shell;
GtkWidget *preview;
GtkWidget *label;
GimpImage *gimage;
GimpLayer *current_layer;
};
/* local function prototypes */
static void layer_select_advance (LayerSelect *layer_select,
gint move);
static void layer_select_end (LayerSelect *layer_select,
guint32 time);
static void layer_select_set_image (LayerSelect *layer_select,
GimpImage *gimage);
static gint layer_select_events (GtkWidget *widget,
GdkEvent *event);
/* private variables */
static LayerSelect *layer_select = NULL;
/* public functions */
void
gimp_display_shell_layer_select_init (GimpImage *gimage,
gint move,
guint32 time)
{
GimpLayer *layer;
GtkWidget *frame1;
GtkWidget *frame2;
GtkWidget *hbox;
GtkWidget *alignment;
g_return_if_fail (GIMP_IS_IMAGE (gimage));
layer = gimp_image_get_active_layer (gimage);
if (! layer)
return;
if (! layer_select)
{
layer_select = g_new0 (LayerSelect, 1);
layer_select->preview = gimp_preview_new (GIMP_VIEWABLE (layer),
gimprc.preview_size, 1,
FALSE);
layer_select->label = gtk_label_new (NULL);
layer_select_set_image (layer_select, gimage);
layer_select_advance (layer_select, move);
/* The shell and main vbox */
layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_wmclass (GTK_WINDOW (layer_select->shell),
"layer_select", "Gimp");
gtk_window_set_title (GTK_WINDOW (layer_select->shell),
_("Layer Select"));
gtk_window_set_position (GTK_WINDOW (layer_select->shell),
GTK_WIN_POS_MOUSE);
gtk_widget_set_events (layer_select->shell, (GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK));
g_signal_connect (G_OBJECT (layer_select->shell), "event",
G_CALLBACK (layer_select_events),
layer_select);
frame1 = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_OUT);
gtk_container_add (GTK_CONTAINER (layer_select->shell), frame1);
frame2 = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (frame1), frame2);
hbox = gtk_hbox_new (FALSE, 1);
gtk_container_add (GTK_CONTAINER (frame2), hbox);
/* The preview */
alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
gtk_widget_show (alignment);
gtk_container_add (GTK_CONTAINER (alignment), layer_select->preview);
gtk_widget_show (layer_select->preview);
gtk_widget_show (alignment);
/* the layer name label */
gtk_box_pack_start (GTK_BOX (hbox),
layer_select->label, FALSE, FALSE, 2);
gtk_widget_show (layer_select->label);
gtk_widget_show (hbox);
gtk_widget_show (frame1);
gtk_widget_show (frame2);
gtk_widget_show (layer_select->shell);
}
else
{
layer_select_set_image (layer_select, gimage);
layer_select_advance (layer_select, move);
if (! GTK_WIDGET_VISIBLE (layer_select->shell))
gtk_widget_show (layer_select->shell);
}
gdk_keyboard_grab (layer_select->shell->window, FALSE, time);
}
/* private functions */
static void
layer_select_advance (LayerSelect *layer_select,
gint move)
{
GimpLayer *layer;
gint index;
index = 0;
if (move == 0)
return;
/* If there is a floating selection, allow no advancement */
if (gimp_image_floating_sel (layer_select->gimage))
return;
index = gimp_container_get_child_index (layer_select->gimage->layers,
GIMP_OBJECT (layer_select->current_layer));
index += move;
index = CLAMP (index, 0,
gimp_container_num_children (layer_select->gimage->layers) - 1);
layer = (GimpLayer *)
gimp_container_get_child_by_index (layer_select->gimage->layers, index);
if (layer && layer != layer_select->current_layer)
{
layer_select->current_layer = layer;
gimp_preview_set_viewable (GIMP_PREVIEW (layer_select->preview),
GIMP_VIEWABLE (layer_select->current_layer));
gtk_label_set_text (GTK_LABEL (layer_select->label),
GIMP_OBJECT (layer_select->current_layer)->name);
}
}
static void
layer_select_end (LayerSelect *layer_select,
guint32 time)
{
gdk_keyboard_ungrab (time);
gtk_widget_hide (layer_select->shell);
/* only reset the active layer if a new layer was specified */
if (layer_select->current_layer !=
gimp_image_get_active_layer (layer_select->gimage))
{
gimp_image_set_active_layer (layer_select->gimage,
layer_select->current_layer);
gdisplays_flush ();
}
}
static void
layer_select_set_image (LayerSelect *layer_select,
GimpImage *gimage)
{
layer_select->gimage = gimage;
layer_select->current_layer = gimp_image_get_active_layer (gimage);
gimp_preview_set_viewable (GIMP_PREVIEW (layer_select->preview),
GIMP_VIEWABLE (layer_select->current_layer));
gimp_preview_set_size (GIMP_PREVIEW (layer_select->preview),
gimprc.preview_size, 1);
gtk_label_set_text (GTK_LABEL (layer_select->label),
GIMP_OBJECT (layer_select->current_layer)->name);
}
static gint
layer_select_events (GtkWidget *widget,
GdkEvent *event)
{
GdkEventKey *kevent;
GdkEventButton *bevent;
switch (event->type)
{
case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event;
layer_select_end (layer_select, bevent->time);
break;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Tab:
if (kevent->state & GDK_MOD1_MASK)
layer_select_advance (layer_select, 1);
else if (kevent->state & GDK_CONTROL_MASK)
layer_select_advance (layer_select, -1);
break;
}
return TRUE;
break;
case GDK_KEY_RELEASE:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Alt_L: case GDK_Alt_R:
kevent->state &= ~GDK_MOD1_MASK;
break;
case GDK_Control_L: case GDK_Control_R:
kevent->state &= ~GDK_CONTROL_MASK;
break;
case GDK_Shift_L: case GDK_Shift_R:
kevent->state &= ~GDK_SHIFT_MASK;
break;
}
if (! (kevent->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)))
layer_select_end (layer_select, kevent->time);
return TRUE;
break;
default:
break;
}
return FALSE;
}