Commit ec4cc4f8 authored by David Odin's avatar David Odin

app/widgets/gimpnavigationpreview.c renamed these files to ...

* app/widgets/gimpnavigationpreview.c
* app/widgets/gimpnavigationpreview.h: renamed these files to ...

* app/widgets/gimpnavigationview.c
* app/widgets/gimpnavigationview.h: to these.
  And renamed the GimpNavigationPreview type to GimpNavigationView.

Hopefully, this is the last change in file names for the Preview->View
renaming process.

* app/display/gimpnavigationeditor.c

* app/widgets/Makefile.am
* app/widgets/widgets-types.h: Changed accordingly.
parent c27a5a30
2004-08-27 DindinX <david@dindinx.org>
* app/widgets/gimpnavigationpreview.c
* app/widgets/gimpnavigationpreview.h: renamed these files to ...
* app/widgets/gimpnavigationview.c
* app/widgets/gimpnavigationview.h: to these.
And renamed the GimpNavigationPreview type to GimpNavigationView.
Hopefully, this is the last change in file names for the Preview->View
renaming process.
* app/display/gimpnavigationeditor.c
* app/widgets/Makefile.am
* app/widgets/widgets-types.h: Changed accordingly.
2004-08-26 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem.[ch]: removed "gboolean use_default_values"
......
......@@ -38,7 +38,7 @@
#include "widgets/gimpdocked.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpnavigationpreview.h"
#include "widgets/gimpnavigationview.h"
#include "widgets/gimpviewrenderer.h"
#include "gimpdisplay.h"
......@@ -69,15 +69,15 @@ static GtkWidget * gimp_navigation_editor_new_private (GimpDisplayShell *sh
static gboolean gimp_navigation_editor_button_release (GtkWidget *widget,
GdkEventButton *bevent,
GimpDisplayShell *shell);
static void gimp_navigation_editor_marker_changed (GimpNavigationPreview *preview,
gdouble x,
gdouble y,
GimpNavigationEditor *editor);
static void gimp_navigation_editor_zoom (GimpNavigationPreview *preview,
GimpZoomType direction,
GimpNavigationEditor *editor);
static void gimp_navigation_editor_scroll (GimpNavigationPreview *preview,
GdkScrollDirection direction,
static void gimp_navigation_editor_marker_changed (GimpNavigationView *view,
gdouble x,
gdouble y,
GimpNavigationEditor *editor);
static void gimp_navigation_editor_zoom (GimpNavigationView *view,
GimpZoomType direction,
GimpNavigationEditor *editor);
static void gimp_navigation_editor_scroll (GimpNavigationView *view,
GdkScrollDirection direction,
GimpNavigationEditor *editor);
static void gimp_navigation_editor_zoom_adj_changed (GtkAdjustment *adj,
......@@ -170,7 +170,7 @@ gimp_navigation_editor_init (GimpNavigationEditor *editor)
gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
editor->view = gimp_view_new_by_types (GIMP_TYPE_NAVIGATION_PREVIEW,
editor->view = gimp_view_new_by_types (GIMP_TYPE_NAVIGATION_VIEW,
GIMP_TYPE_IMAGE,
GIMP_PREVIEW_SIZE_MEDIUM, 0, TRUE);
gtk_container_add (GTK_CONTAINER (frame), editor->view);
......@@ -320,11 +320,11 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
gint click_x,
gint click_y)
{
GimpNavigationEditor *editor;
GimpNavigationPreview *preview;
GdkScreen *screen;
gint x, y;
gint x_org, y_org;
GimpNavigationEditor *editor;
GimpNavigationView *view;
GdkScreen *screen;
gint x, y;
gint x_org, y_org;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GTK_IS_WIDGET (widget));
......@@ -363,7 +363,7 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
gtk_window_set_screen (GTK_WINDOW (shell->nav_popup), screen);
preview = GIMP_NAVIGATION_PREVIEW (editor->view);
view = GIMP_NAVIGATION_VIEW (editor->view);
/* decide where to put the popup */
gdk_window_get_origin (widget->window, &x_org, &y_org);
......@@ -371,13 +371,13 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
#define BORDER_PEN_WIDTH 3
x = (x_org + click_x -
preview->p_x -
0.5 * (preview->p_width - BORDER_PEN_WIDTH) -
view->p_x -
0.5 * (view->p_width - BORDER_PEN_WIDTH) -
2 * widget->style->xthickness);
y = (y_org + click_y -
preview->p_y -
0.5 * (preview->p_height - BORDER_PEN_WIDTH) -
view->p_y -
0.5 * (view->p_height - BORDER_PEN_WIDTH) -
2 * widget->style->ythickness);
/* If the popup doesn't fit into the screen, we have a problem.
......@@ -391,10 +391,10 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
*/
x = CLAMP (x, 0, (gdk_screen_get_width (screen) -
GIMP_VIEW (preview)->renderer->width -
GIMP_VIEW (view)->renderer->width -
4 * widget->style->xthickness));
y = CLAMP (y, 0, (gdk_screen_get_height (screen) -
GIMP_VIEW (preview)->renderer->height -
GIMP_VIEW (view)->renderer->height -
4 * widget->style->ythickness));
gtk_window_move (GTK_WINDOW (shell->nav_popup), x, y);
......@@ -403,12 +403,12 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
gdk_flush ();
/* fill in then grab pointer */
preview->motion_offset_x = 0.5 * (preview->p_width - BORDER_PEN_WIDTH);
preview->motion_offset_y = 0.5 * (preview->p_height - BORDER_PEN_WIDTH);
view->motion_offset_x = 0.5 * (view->p_width - BORDER_PEN_WIDTH);
view->motion_offset_y = 0.5 * (view->p_height - BORDER_PEN_WIDTH);
#undef BORDER_PEN_WIDTH
gimp_navigation_preview_grab_pointer (preview);
gimp_navigation_view_grab_pointer (view);
}
......@@ -550,10 +550,10 @@ gimp_navigation_editor_button_release (GtkWidget *widget,
}
static void
gimp_navigation_editor_marker_changed (GimpNavigationPreview *preview,
gdouble x,
gdouble y,
GimpNavigationEditor *editor)
gimp_navigation_editor_marker_changed (GimpNavigationView *view,
gdouble x,
gdouble y,
GimpNavigationEditor *editor)
{
if (editor->shell)
{
......@@ -573,9 +573,9 @@ gimp_navigation_editor_marker_changed (GimpNavigationPreview *preview,
}
static void
gimp_navigation_editor_zoom (GimpNavigationPreview *preview,
GimpZoomType direction,
GimpNavigationEditor *editor)
gimp_navigation_editor_zoom (GimpNavigationView *view,
GimpZoomType direction,
GimpNavigationEditor *editor)
{
g_return_if_fail (direction != GIMP_ZOOM_TO);
......@@ -586,9 +586,9 @@ gimp_navigation_editor_zoom (GimpNavigationPreview *preview,
}
static void
gimp_navigation_editor_scroll (GimpNavigationPreview *preview,
GdkScrollDirection direction,
GimpNavigationEditor *editor)
gimp_navigation_editor_scroll (GimpNavigationView *view,
GdkScrollDirection direction,
GimpNavigationEditor *editor)
{
if (editor->shell)
{
......@@ -754,9 +754,9 @@ gimp_navigation_editor_update_marker (GimpNavigationEditor *editor)
gimp_view_renderer_set_dot_for_dot (renderer,
editor->shell->dot_for_dot);
gimp_navigation_preview_set_marker (GIMP_NAVIGATION_PREVIEW (editor->view),
editor->shell->offset_x / xratio,
editor->shell->offset_y / yratio,
editor->shell->disp_width / xratio,
editor->shell->disp_height / yratio);
gimp_navigation_view_set_marker (GIMP_NAVIGATION_VIEW (editor->view),
editor->shell->offset_x / xratio,
editor->shell->offset_y / yratio,
editor->shell->disp_width / xratio,
editor->shell->disp_height / yratio);
}
......@@ -174,8 +174,8 @@ libappwidgets_a_sources = \
gimpmenufactory.h \
gimpmessagebox.c \
gimpmessagebox.h \
gimpnavigationpreview.c \
gimpnavigationpreview.h \
gimpnavigationview.c \
gimpnavigationview.h \
gimppaletteeditor.c \
gimppaletteeditor.h \
gimppaletteselect.c \
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* GimpNavigationPreview Widget
* Copyright (C) 2001-2002 Michael Natterer <mitch@gimp.org>
*
* partly based on app/nav_window
* Copyright (C) 1999 Andy Thomas <alt@gimp.org>
*
* 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 "libgimpmath/gimpmath.h"
#include "widgets-types.h"
#include "core/gimpimage.h"
#include "core/gimpmarshal.h"
#include "gimpnavigationpreview.h"
#include "gimpviewrenderer.h"
#define BORDER_PEN_WIDTH 3
enum
{
MARKER_CHANGED,
ZOOM,
SCROLL,
LAST_SIGNAL
};
static void gimp_navigation_preview_class_init (GimpNavigationPreviewClass *klass);
static void gimp_navigation_preview_init (GimpNavigationPreview *preview);
static void gimp_navigation_preview_realize (GtkWidget *widget);
static void gimp_navigation_preview_unrealize (GtkWidget *widget);
static void gimp_navigation_preview_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gboolean gimp_navigation_preview_expose (GtkWidget *widget,
GdkEventExpose *eevent);
static gboolean gimp_navigation_preview_button_press (GtkWidget *widget,
GdkEventButton *bevent);
static gboolean gimp_navigation_preview_button_release (GtkWidget *widget,
GdkEventButton *bevent);
static gboolean gimp_navigation_preview_scroll (GtkWidget *widget,
GdkEventScroll *sevent);
static gboolean gimp_navigation_preview_motion_notify (GtkWidget *widget,
GdkEventMotion *mevent);
static gboolean gimp_navigation_preview_key_press (GtkWidget *widget,
GdkEventKey *kevent);
static void gimp_navigation_preview_transform (GimpNavigationPreview *nav_preview);
static void gimp_navigation_preview_draw_marker (GimpNavigationPreview *nav_preview,
GdkRectangle *area);
static guint preview_signals[LAST_SIGNAL] = { 0 };
static GimpViewClass *parent_class = NULL;
GType
gimp_navigation_preview_get_type (void)
{
static GType preview_type = 0;
if (! preview_type)
{
static const GTypeInfo preview_info =
{
sizeof (GimpNavigationPreviewClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gimp_navigation_preview_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpNavigationPreview),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_navigation_preview_init,
};
preview_type = g_type_register_static (GIMP_TYPE_VIEW,
"GimpNavigationPreview",
&preview_info, 0);
}
return preview_type;
}
static void
gimp_navigation_preview_class_init (GimpNavigationPreviewClass *klass)
{
GtkWidgetClass *widget_class;
widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
preview_signals[MARKER_CHANGED] =
g_signal_new ("marker_changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpNavigationPreviewClass, marker_changed),
NULL, NULL,
gimp_marshal_VOID__DOUBLE_DOUBLE,
G_TYPE_NONE, 2,
G_TYPE_DOUBLE,
G_TYPE_DOUBLE);
preview_signals[ZOOM] =
g_signal_new ("zoom",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpNavigationPreviewClass, zoom),
NULL, NULL,
gimp_marshal_VOID__ENUM,
G_TYPE_NONE, 1,
GIMP_TYPE_ZOOM_TYPE);
preview_signals[SCROLL] =
g_signal_new ("scroll",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpNavigationPreviewClass, scroll),
NULL, NULL,
gimp_marshal_VOID__ENUM,
G_TYPE_NONE, 1,
GDK_TYPE_SCROLL_DIRECTION);
widget_class->realize = gimp_navigation_preview_realize;
widget_class->unrealize = gimp_navigation_preview_unrealize;
widget_class->size_allocate = gimp_navigation_preview_size_allocate;
widget_class->expose_event = gimp_navigation_preview_expose;
widget_class->button_press_event = gimp_navigation_preview_button_press;
widget_class->button_release_event = gimp_navigation_preview_button_release;
widget_class->scroll_event = gimp_navigation_preview_scroll;
widget_class->motion_notify_event = gimp_navigation_preview_motion_notify;
widget_class->key_press_event = gimp_navigation_preview_key_press;
}
static void
gimp_navigation_preview_init (GimpNavigationPreview *preview)
{
GTK_WIDGET_SET_FLAGS (preview, GTK_CAN_FOCUS);
gtk_widget_add_events (GTK_WIDGET (preview), (GDK_POINTER_MOTION_MASK |
GDK_KEY_PRESS_MASK));
preview->x = 0.0;
preview->y = 0.0;
preview->width = 0.0;
preview->height = 0.0;
preview->p_x = 0;
preview->p_y = 0;
preview->p_width = 0;
preview->p_height = 0;
preview->motion_offset_x = 0;
preview->motion_offset_y = 0;
preview->has_grab = FALSE;
preview->gc = NULL;
}
static void
gimp_navigation_preview_realize (GtkWidget *widget)
{
GimpNavigationPreview *nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
if (GTK_WIDGET_CLASS (parent_class)->realize)
GTK_WIDGET_CLASS (parent_class)->realize (widget);
nav_preview->gc = gdk_gc_new (widget->window);
gdk_gc_set_function (nav_preview->gc, GDK_INVERT);
gdk_gc_set_line_attributes (nav_preview->gc,
BORDER_PEN_WIDTH,
GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_ROUND);
}
static void
gimp_navigation_preview_unrealize (GtkWidget *widget)
{
GimpNavigationPreview *nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
if (nav_preview->gc)
{
g_object_unref (nav_preview->gc);
nav_preview->gc = NULL;
}
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
static void
gimp_navigation_preview_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (GIMP_VIEW (widget)->renderer->viewable)
gimp_navigation_preview_transform (GIMP_NAVIGATION_PREVIEW (widget));
}
static gboolean
gimp_navigation_preview_expose (GtkWidget *widget,
GdkEventExpose *eevent)
{
if (GTK_WIDGET_DRAWABLE (widget))
{
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, eevent);
gimp_navigation_preview_draw_marker (GIMP_NAVIGATION_PREVIEW (widget),
&eevent->area);
}
return TRUE;
}
static void
gimp_navigation_preview_move_to (GimpNavigationPreview *nav_preview,
gint tx,
gint ty)
{
GimpView *view;
GimpImage *gimage;
gdouble ratiox, ratioy;
gdouble x, y;
view = GIMP_VIEW (nav_preview);
if (! view->renderer->viewable)
return;
tx = CLAMP (tx, 0, view->renderer->width - nav_preview->p_width);
ty = CLAMP (ty, 0, view->renderer->height - nav_preview->p_height);
gimage = GIMP_IMAGE (view->renderer->viewable);
/* transform to image coordinates */
if (view->renderer->width != nav_preview->p_width)
ratiox = ((gimage->width - nav_preview->width + 1.0) /
(view->renderer->width - nav_preview->p_width));
else
ratiox = 1.0;
if (view->renderer->height != nav_preview->p_height)
ratioy = ((gimage->height - nav_preview->height + 1.0) /
(view->renderer->height - nav_preview->p_height));
else
ratioy = 1.0;
x = tx * ratiox;
y = ty * ratioy;
g_signal_emit (view, preview_signals[MARKER_CHANGED], 0, x, y);
}
void
gimp_navigation_preview_grab_pointer (GimpNavigationPreview *nav_preview)
{
GtkWidget *widget;
GdkDisplay *display;
GdkCursor *cursor;
GdkWindow *window;
widget = GTK_WIDGET (nav_preview);
nav_preview->has_grab = TRUE;
gtk_grab_add (widget);
display = gtk_widget_get_display (widget);
cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
window = GIMP_VIEW (nav_preview)->event_window;
gdk_pointer_grab (window, TRUE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK |
GDK_EXTENSION_EVENTS_ALL,
window, cursor, GDK_CURRENT_TIME);
gdk_cursor_unref (cursor);
}
static gboolean
gimp_navigation_preview_button_press (GtkWidget *widget,
GdkEventButton *bevent)
{
GimpNavigationPreview *nav_preview;
gint tx, ty;
GdkDisplay *display;
nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
tx = bevent->x;
ty = bevent->y;
switch (bevent->button)
{
case 1:
if (! (tx > nav_preview->p_x &&
tx < (nav_preview->p_x + nav_preview->p_width) &&
ty > nav_preview->p_y &&
ty < (nav_preview->p_y + nav_preview->p_height)))
{
GdkCursor *cursor;
nav_preview->motion_offset_x = nav_preview->p_width / 2;
nav_preview->motion_offset_y = nav_preview->p_height / 2;
tx -= nav_preview->motion_offset_x;
ty -= nav_preview->motion_offset_y;
gimp_navigation_preview_move_to (nav_preview, tx, ty);
display = gtk_widget_get_display (widget);
cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
gdk_window_set_cursor (GIMP_VIEW (widget)->event_window, cursor);
gdk_cursor_unref (cursor);
}
else
{
nav_preview->motion_offset_x = tx - nav_preview->p_x;
nav_preview->motion_offset_y = ty - nav_preview->p_y;
}
gimp_navigation_preview_grab_pointer (nav_preview);
break;
default:
break;
}
return TRUE;
}
static gboolean
gimp_navigation_preview_button_release (GtkWidget *widget,
GdkEventButton *bevent)
{
GimpNavigationPreview *nav_preview;
nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
switch (bevent->button)
{
case 1:
nav_preview->has_grab = FALSE;
gtk_grab_remove (widget);
gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
GDK_CURRENT_TIME);
break;
default:
break;
}
return TRUE;
}
static gboolean
gimp_navigation_preview_scroll (GtkWidget *widget,
GdkEventScroll *sevent)
{
GimpNavigationPreview *nav_preview;
nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
if (sevent->state & GDK_SHIFT_MASK)
{
if (sevent->direction == GDK_SCROLL_UP)
{
g_signal_emit (widget, preview_signals[ZOOM], 0, GIMP_ZOOM_IN);
}
else
{
g_signal_emit (widget, preview_signals[ZOOM], 0, GIMP_ZOOM_OUT);
}
}
else
{
GdkScrollDirection direction;
if (sevent->state & GDK_CONTROL_MASK)
{
if (sevent->direction == GDK_SCROLL_UP)
direction = GDK_SCROLL_LEFT;
else
direction = GDK_SCROLL_RIGHT;
}
else
{
direction = sevent->direction;
}
g_signal_emit (widget, preview_signals[SCROLL], 0, direction);
}
return TRUE;
}
static gboolean
gimp_navigation_preview_motion_notify (GtkWidget *widget,
GdkEventMotion *mevent)
{
GimpNavigationPreview *nav_preview;
GimpView *view;
gint tx, ty;
GdkModifierType mask;
nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
view = GIMP_VIEW (widget);
if (! nav_preview->has_grab)
{
GdkCursor *cursor;
GdkDisplay *display;
display = gtk_widget_get_display (widget);
if (nav_preview->p_x == 0 &&
nav_preview->p_y == 0 &&
nav_preview->p_width == view->renderer->width &&
nav_preview->p_height == view->renderer->height)
{
gdk_window_set_cursor (view->event_window, NULL);
return FALSE;
}
else if (mevent->x >= nav_preview->p_x &&
mevent->y >= nav_preview->p_y &&
mevent->x < nav_preview->p_x + nav_preview->p_width &&
mevent->y < nav_preview->p_y + nav_preview->p_height)
{
cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
}
else
{
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
}
gdk_window_set_cursor (view->event_window, cursor);
gdk_cursor_unref (cursor);
return FALSE;
}
gdk_window_get_pointer (view->event_window, &tx, &ty, &mask);
tx -= nav_preview->motion_offset_x;
ty -= nav_preview->motion_offset_y;
gimp_navigation_preview_move_to (nav_preview, tx, ty);
return TRUE;
}
static gboolean
gimp_navigation_preview_key_press (GtkWidget *widget,
GdkEventKey *kevent)
{
GimpNavigationPreview *nav_preview;
gint scroll_x = 0;
gint scroll_y = 0;
nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
switch (kevent->keyval)
{
case GDK_Up:
scroll_y = -1;
break;
case GDK_Left:
scroll_x = -1;
break;
case GDK_Right:
scroll_x = 1;
break;
case GDK_Down:
scroll_y = 1;
break;
default:
break;