dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allocate less temp_bufs by removing the "create_preview" virtual function 

2001-02-07  Michael Natterer  <mitch@gimp.org>

	* app/gimppreview.[ch]: allocate less temp_bufs by removing the
	"create_preview" virtual function and adding a "render" one.

	Implementations have to call the new public function
	gimp_preview_render_and_flush() to render their temp_bufs.
	This way, e.g. the GimpPatternPreview can render the preview
	directly from the pattern's mask.

	* app/gimpdrawablepreview.c
	* app/gimpimagepreview.c
	* app/gimppatternpreview.c: changed accordingly.

	* app/gimpbrushpreview.[ch]: same as above and added BrushPipe
	popup animation.
This commit is contained in:
Michael Natterer 2001-02-07 20:35:18 +00:00 committed by Michael Natterer
parent d1bae8a4ab
commit e0d1187637
29 changed files with 2202 additions and 1482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2001-02-07 Michael Natterer <mitch@gimp.org>
* app/gimppreview.[ch]: allocate less temp_bufs by removing the
"create_preview" virtual function and adding a "render" one.
Implementations have to call the new public function
gimp_preview_render_and_flush() to render their temp_bufs.
This way, e.g. the GimpPatternPreview can render the preview
directly from the pattern's mask.
* app/gimpdrawablepreview.c
* app/gimpimagepreview.c
* app/gimppatternpreview.c: changed accordingly.
* app/gimpbrushpreview.[ch]: same as above and added BrushPipe
popup animation.
2001-02-07 Michael Natterer <mitch@gimp.org>
* app/gimppreview.[ch]

137
app/gimpbrushpreview.c
View File

@ -34,10 +34,13 @@
static void gimp_brush_preview_class_init (GimpBrushPreviewClass *klass);
static void gimp_brush_preview_init (GimpBrushPreview *preview);
static TempBuf * gimp_brush_preview_create_preview (GimpPreview *preview);
static void gimp_brush_preview_destroy (GtkObject *object);
static void gimp_brush_preview_render (GimpPreview *preview);
static GtkWidget * gimp_brush_preview_create_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_needs_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_render_timeout_func (GimpBrushPreview *preview);
static GimpPreviewClass *parent_class = NULL;
@ -78,14 +81,37 @@ gimp_brush_preview_class_init (GimpBrushPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_brush_preview_create_preview;
object_class->destroy = gimp_brush_preview_destroy;
preview_class->render = gimp_brush_preview_render;
preview_class->create_popup = gimp_brush_preview_create_popup;
preview_class->needs_popup = gimp_brush_preview_needs_popup;
}
static void
gimp_brush_preview_init (GimpBrushPreview *preview)
gimp_brush_preview_init (GimpBrushPreview *brush_preview)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
static void
gimp_brush_preview_destroy (GtkObject *object)
{
GimpBrushPreview *brush_preview;
brush_preview = GIMP_BRUSH_PREVIEW (object);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
#define indicator_width 7
@ -95,9 +121,10 @@ gimp_brush_preview_init (GimpBrushPreview *preview)
#define BLK { 0, 0, 0 }
#define RED { 255, 127, 127 }
static TempBuf *
gimp_brush_preview_create_preview (GimpPreview *preview)
static void
gimp_brush_preview_render (GimpPreview *preview)
{
GimpBrushPreview *brush_preview;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
@ -110,6 +137,15 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
gint offset_x;
gint offset_y;
brush_preview = GIMP_BRUSH_PREVIEW (preview);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
}
brush = GIMP_BRUSH (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
@ -118,10 +154,38 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
height = GTK_WIDGET (preview)->requisition.height;
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
width,
height);
if (preview->is_popup)
return temp_buf;
{
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
if (GIMP_IS_BRUSH_PIPE (brush))
{
if (width != brush_width ||
height != brush_height)
{
g_warning ("%s(): non-fullsize pipe popups are not supported yet.",
G_GNUC_FUNCTION);
return;
}
brush_preview->pipe_animation_index = 0;
brush_preview->pipe_timeout_id =
g_timeout_add (300,
(GSourceFunc) gimp_brush_preview_render_timeout_func,
brush_preview);
}
return;
}
buf = temp_buf_data (temp_buf);
@ -213,7 +277,13 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
#undef BLK
#undef RED
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
@ -255,3 +325,54 @@ gimp_brush_preview_needs_popup (GimpPreview *preview)
return FALSE;
}
static gboolean
gimp_brush_preview_render_timeout_func (GimpBrushPreview *brush_preview)
{
GimpPreview *preview;
GimpBrushPipe *brush_pipe;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
gint height;
gint brush_width;
gint brush_height;
preview = GIMP_PREVIEW (brush_preview);
if (! preview->viewable)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
return FALSE;
}
brush_pipe = GIMP_BRUSH_PIPE (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
brush_preview->pipe_animation_index++;
if (brush_preview->pipe_animation_index >= brush_pipe->nbrushes)
brush_preview->pipe_animation_index = 0;
brush = GIMP_BRUSH (brush_pipe->brushes[brush_preview->pipe_animation_index]);
temp_buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (brush),
width,
height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return TRUE;
}

3
app/gimpbrushpreview.h
View File

@ -43,6 +43,9 @@ typedef struct _GimpBrushPreviewClass GimpBrushPreviewClass;
struct _GimpBrushPreview
{
GimpPreview parent_instance;
guint pipe_timeout_id;
gint pipe_animation_index;
};
struct _GimpBrushPreviewClass

6
app/gimpdrawablepreview.c
View File

@ -31,7 +31,7 @@
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_init (GimpDrawablePreview *preview);
static TempBuf * gimp_drawable_preview_create_preview (GimpPreview *preview);
static void gimp_drawable_preview_render (GimpPreview *preview);
static GtkWidget * gimp_drawable_preview_create_popup (GimpPreview *preview);
@ -80,8 +80,8 @@ gimp_drawable_preview_init (GimpDrawablePreview *preview)
{
}
static TempBuf *
gimp_drawable_preview_create_preview (GimpPreview *preview)
static void
gimp_drawable_preview_render (GimpPreview *preview)
{
}

54
app/gimpimagepreview.c
View File

@ -36,7 +36,7 @@
static void gimp_image_preview_class_init (GimpImagePreviewClass *klass);
static void gimp_image_preview_init (GimpImagePreview *preview);
static TempBuf * gimp_image_preview_create_preview (GimpPreview *preview);
static void gimp_image_preview_render (GimpPreview *preview);
static GtkWidget * gimp_image_preview_create_popup (GimpPreview *preview);
static void gimp_image_preview_calc_size (GimpImage *gimage,
gint width,
@ -85,7 +85,7 @@ gimp_image_preview_class_init (GimpImagePreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_image_preview_create_preview;
preview_class->render = gimp_image_preview_render;
preview_class->create_popup = gimp_image_preview_create_popup;
}
@ -94,8 +94,8 @@ gimp_image_preview_init (GimpImagePreview *preview)
{
}
static TempBuf *
gimp_image_preview_create_preview (GimpPreview *preview)
static void
gimp_image_preview_render (GimpPreview *preview)
{
GimpImage *gimage;
gint width;
@ -103,7 +103,7 @@ gimp_image_preview_create_preview (GimpPreview *preview)
gint preview_width;
gint preview_height;
gboolean scaling_up;
TempBuf *return_buf;
TempBuf *render_buf;
gimage = GIMP_IMAGE (preview->viewable);
@ -124,43 +124,59 @@ gimp_image_preview_create_preview (GimpPreview *preview)
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
gimage->width,
gimage->height);
return_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
render_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
temp_buf_free (temp_buf);
}
else
{
return_buf = gimp_viewable_get_new_preview (preview->viewable,
render_buf = gimp_viewable_get_new_preview (preview->viewable,
preview_width,
preview_height);
}
if (preview_width < width) return_buf->x = (width - preview_width) / 2;
if (preview_height < height) return_buf->y = (height - preview_height) / 2;
if (preview_width < width) render_buf->x = (width - preview_width) / 2;
if (preview_height < height) render_buf->y = (height - preview_height) / 2;
if (return_buf->x || return_buf->y)
if (render_buf->x || render_buf->y)
{
TempBuf *temp_buf;
guchar white[4] = { 255, 255, 255, 255 };
temp_buf = temp_buf_new (width, height,
return_buf->bytes,
render_buf->bytes,
0, 0,
white);
temp_buf_copy_area (return_buf, temp_buf,
temp_buf_copy_area (render_buf, temp_buf,
0, 0,
return_buf->width,
return_buf->height,
return_buf->x,
return_buf->y);
render_buf->width,
render_buf->height,
render_buf->x,
render_buf->y);
temp_buf_free (return_buf);
temp_buf_free (render_buf);
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return;
}
return return_buf;
gimp_preview_render_and_flush (preview,
render_buf,
width,
height,
-1);
temp_buf_free (render_buf);
return;
}
static GtkWidget *

54
app/gimppatternpreview.c
View File

@ -33,6 +33,7 @@
static void gimp_pattern_preview_class_init (GimpPatternPreviewClass *klass);
static void gimp_pattern_preview_init (GimpPatternPreview *preview);
static void gimp_pattern_preview_render (GimpPreview *preview);
static GtkWidget * gimp_pattern_preview_create_popup (GimpPreview *preview);
static gboolean gimp_pattern_preview_needs_popup (GimpPreview *preview);
@ -76,6 +77,7 @@ gimp_pattern_preview_class_init (GimpPatternPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->render = gimp_pattern_preview_render;
preview_class->create_popup = gimp_pattern_preview_create_popup;
preview_class->needs_popup = gimp_pattern_preview_needs_popup;
}
@ -85,6 +87,58 @@ gimp_pattern_preview_init (GimpPatternPreview *preview)
{
}
static void
gimp_pattern_preview_render (GimpPreview *preview)
{
GimpPattern *pattern;
TempBuf *temp_buf;
gint width;
gint height;
gint pattern_width;
gint pattern_height;
pattern = GIMP_PATTERN (preview->viewable);
pattern_width = pattern->mask->width;
pattern_height = pattern->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
if (width == pattern_width &&
height == pattern_height)
{
gimp_preview_render_and_flush (preview,
pattern->mask,
width,
height,
-1);
return;
}
else if (width <= pattern_width &&
height <= pattern_height)
{
gimp_preview_render_and_flush (preview,
pattern->mask,
width,
height,
-1);
return;
}
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
gimp_pattern_preview_create_popup (GimpPreview *preview)
{

75
app/gimppreview.c
View File

@ -56,7 +56,7 @@
enum
{
CLICKED,
CREATE_PREVIEW,
RENDER,
CREATE_POPUP,
NEEDS_POPUP,
LAST_SIGNAL
@ -77,8 +77,8 @@ static gint gimp_preview_enter_notify_event (GtkWidget *widget,
static gint gimp_preview_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
static TempBuf * gimp_preview_create_preview (GimpPreview *preview);
static TempBuf * gimp_preview_real_create_preview (GimpPreview *preview);
static void gimp_preview_render (GimpPreview *preview);
static void gimp_preview_real_render (GimpPreview *preview);
static GtkWidget * gimp_preview_create_popup (GimpPreview *preview);
static GtkWidget * gimp_preview_real_create_popup (GimpPreview *preview);
static gboolean gimp_preview_needs_popup (GimpPreview *preview);
@ -142,14 +142,14 @@ gimp_preview_class_init (GimpPreviewClass *klass)
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_PREVIEW] =
gtk_signal_new ("create_preview",
preview_signals[RENDER] =
gtk_signal_new ("render",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GimpPreviewClass,
create_preview),
gimp_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
render),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_POPUP] =
gtk_signal_new ("create_popup",
@ -180,7 +180,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
widget_class->leave_notify_event = gimp_preview_leave_notify_event;
klass->clicked = NULL;
klass->create_preview = gimp_preview_real_create_preview;
klass->render = gimp_preview_real_render;
klass->create_popup = gimp_preview_real_create_popup;
klass->needs_popup = gimp_preview_real_needs_popup;
}
@ -386,24 +386,31 @@ gimp_preview_leave_notify_event (GtkWidget *widget,
return FALSE;
}
static TempBuf *
gimp_preview_create_preview (GimpPreview *preview)
static void
gimp_preview_render (GimpPreview *preview)
{
TempBuf *temp_buf = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_PREVIEW],
&temp_buf);
return temp_buf;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
}
static TempBuf *
gimp_preview_real_create_preview (GimpPreview *preview)
static void
gimp_preview_real_render (GimpPreview *preview)
{
return
TempBuf *temp_buf;
gint width;
gint height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
temp_buf =
gimp_viewable_get_new_preview (preview->viewable,
GTK_WIDGET (preview)->requisition.width,
GTK_WIDGET (preview)->requisition.height);
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
}
static GtkWidget *
@ -564,23 +571,22 @@ gimp_preview_paint (GimpPreview *preview)
static gboolean
gimp_preview_idle_paint (GimpPreview *preview)
{
TempBuf *temp_buf;
gint width;
gint height;
gint channel;
preview->idle_id = 0;
if (! preview->viewable)
return FALSE;
temp_buf = gimp_preview_create_preview (preview);
gimp_preview_render (preview);
width = temp_buf->width;
height = temp_buf->height;
channel = -1;
return FALSE;
}
/* from layers_dialog.c */
void
gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel)
{
guchar *src, *s;
guchar *cb;
@ -782,11 +788,6 @@ gimp_preview_idle_paint (GimpPreview *preview)
gtk_preview_draw_row (GTK_PREVIEW (preview),
render_temp_buf, 0, i, width);
}
}
temp_buf_free (temp_buf);
gtk_widget_queue_draw (GTK_WIDGET (preview));
return FALSE;
}

8
app/gimppreview.h
View File

@ -62,7 +62,7 @@ struct _GimpPreviewClass
GtkPreviewClass parent_class;
void (* clicked) (GimpPreview *preview);
TempBuf * (* create_preview) (GimpPreview *preview);
void (* render) (GimpPreview *preview);
GtkWidget * (* create_popup) (GimpPreview *preview);
gboolean (* needs_popup) (GimpPreview *preview);
};
@ -76,6 +76,12 @@ GtkWidget * gimp_preview_new (GimpViewable *viewable,
gboolean clickable,
gboolean show_popup);
void gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel);
#ifdef __cplusplus
}

137
app/widgets/gimpbrushpreview.c
View File

@ -34,10 +34,13 @@
static void gimp_brush_preview_class_init (GimpBrushPreviewClass *klass);
static void gimp_brush_preview_init (GimpBrushPreview *preview);
static TempBuf * gimp_brush_preview_create_preview (GimpPreview *preview);
static void gimp_brush_preview_destroy (GtkObject *object);
static void gimp_brush_preview_render (GimpPreview *preview);
static GtkWidget * gimp_brush_preview_create_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_needs_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_render_timeout_func (GimpBrushPreview *preview);
static GimpPreviewClass *parent_class = NULL;
@ -78,14 +81,37 @@ gimp_brush_preview_class_init (GimpBrushPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_brush_preview_create_preview;
object_class->destroy = gimp_brush_preview_destroy;
preview_class->render = gimp_brush_preview_render;
preview_class->create_popup = gimp_brush_preview_create_popup;
preview_class->needs_popup = gimp_brush_preview_needs_popup;
}
static void
gimp_brush_preview_init (GimpBrushPreview *preview)
gimp_brush_preview_init (GimpBrushPreview *brush_preview)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
static void
gimp_brush_preview_destroy (GtkObject *object)
{
GimpBrushPreview *brush_preview;
brush_preview = GIMP_BRUSH_PREVIEW (object);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
#define indicator_width 7
@ -95,9 +121,10 @@ gimp_brush_preview_init (GimpBrushPreview *preview)
#define BLK { 0, 0, 0 }
#define RED { 255, 127, 127 }
static TempBuf *
gimp_brush_preview_create_preview (GimpPreview *preview)
static void
gimp_brush_preview_render (GimpPreview *preview)
{
GimpBrushPreview *brush_preview;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
@ -110,6 +137,15 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
gint offset_x;
gint offset_y;
brush_preview = GIMP_BRUSH_PREVIEW (preview);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
}
brush = GIMP_BRUSH (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
@ -118,10 +154,38 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
height = GTK_WIDGET (preview)->requisition.height;
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
width,
height);
if (preview->is_popup)
return temp_buf;
{
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
if (GIMP_IS_BRUSH_PIPE (brush))
{
if (width != brush_width ||
height != brush_height)
{
g_warning ("%s(): non-fullsize pipe popups are not supported yet.",
G_GNUC_FUNCTION);
return;
}
brush_preview->pipe_animation_index = 0;
brush_preview->pipe_timeout_id =
g_timeout_add (300,
(GSourceFunc) gimp_brush_preview_render_timeout_func,
brush_preview);
}
return;
}
buf = temp_buf_data (temp_buf);
@ -213,7 +277,13 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
#undef BLK
#undef RED
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
@ -255,3 +325,54 @@ gimp_brush_preview_needs_popup (GimpPreview *preview)
return FALSE;
}
static gboolean
gimp_brush_preview_render_timeout_func (GimpBrushPreview *brush_preview)
{
GimpPreview *preview;
GimpBrushPipe *brush_pipe;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
gint height;
gint brush_width;
gint brush_height;
preview = GIMP_PREVIEW (brush_preview);
if (! preview->viewable)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
return FALSE;
}
brush_pipe = GIMP_BRUSH_PIPE (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
brush_preview->pipe_animation_index++;
if (brush_preview->pipe_animation_index >= brush_pipe->nbrushes)
brush_preview->pipe_animation_index = 0;
brush = GIMP_BRUSH (brush_pipe->brushes[brush_preview->pipe_animation_index]);
temp_buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (brush),
width,
height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return TRUE;
}

3
app/widgets/gimpbrushpreview.h
View File

@ -43,6 +43,9 @@ typedef struct _GimpBrushPreviewClass GimpBrushPreviewClass;
struct _GimpBrushPreview
{
GimpPreview parent_instance;
guint pipe_timeout_id;
gint pipe_animation_index;
};
struct _GimpBrushPreviewClass

6
app/widgets/gimpdrawablepreview.c
View File

@ -31,7 +31,7 @@
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_init (GimpDrawablePreview *preview);
static TempBuf * gimp_drawable_preview_create_preview (GimpPreview *preview);
static void gimp_drawable_preview_render (GimpPreview *preview);
static GtkWidget * gimp_drawable_preview_create_popup (GimpPreview *preview);
@ -80,8 +80,8 @@ gimp_drawable_preview_init (GimpDrawablePreview *preview)
{
}
static TempBuf *
gimp_drawable_preview_create_preview (GimpPreview *preview)
static void
gimp_drawable_preview_render (GimpPreview *preview)
{
}

54
app/widgets/gimpimagepreview.c
View File

@ -36,7 +36,7 @@
static void gimp_image_preview_class_init (GimpImagePreviewClass *klass);
static void gimp_image_preview_init (GimpImagePreview *preview);
static TempBuf * gimp_image_preview_create_preview (GimpPreview *preview);
static void gimp_image_preview_render (GimpPreview *preview);
static GtkWidget * gimp_image_preview_create_popup (GimpPreview *preview);
static void gimp_image_preview_calc_size (GimpImage *gimage,
gint width,
@ -85,7 +85,7 @@ gimp_image_preview_class_init (GimpImagePreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_image_preview_create_preview;
preview_class->render = gimp_image_preview_render;
preview_class->create_popup = gimp_image_preview_create_popup;
}
@ -94,8 +94,8 @@ gimp_image_preview_init (GimpImagePreview *preview)
{
}
static TempBuf *
gimp_image_preview_create_preview (GimpPreview *preview)
static void
gimp_image_preview_render (GimpPreview *preview)
{
GimpImage *gimage;
gint width;
@ -103,7 +103,7 @@ gimp_image_preview_create_preview (GimpPreview *preview)
gint preview_width;
gint preview_height;
gboolean scaling_up;
TempBuf *return_buf;
TempBuf *render_buf;
gimage = GIMP_IMAGE (preview->viewable);
@ -124,43 +124,59 @@ gimp_image_preview_create_preview (GimpPreview *preview)
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
gimage->width,
gimage->height);
return_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
render_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
temp_buf_free (temp_buf);
}
else
{
return_buf = gimp_viewable_get_new_preview (preview->viewable,
render_buf = gimp_viewable_get_new_preview (preview->viewable,
preview_width,
preview_height);
}
if (preview_width < width) return_buf->x = (width - preview_width) / 2;
if (preview_height < height) return_buf->y = (height - preview_height) / 2;
if (preview_width < width) render_buf->x = (width - preview_width) / 2;
if (preview_height < height) render_buf->y = (height - preview_height) / 2;
if (return_buf->x || return_buf->y)
if (render_buf->x || render_buf->y)
{
TempBuf *temp_buf;
guchar white[4] = { 255, 255, 255, 255 };
temp_buf = temp_buf_new (width, height,
return_buf->bytes,
render_buf->bytes,
0, 0,
white);
temp_buf_copy_area (return_buf, temp_buf,
temp_buf_copy_area (render_buf, temp_buf,
0, 0,
return_buf->width,
return_buf->height,
return_buf->x,
return_buf->y);
render_buf->width,
render_buf->height,
render_buf->x,
render_buf->y);
temp_buf_free (return_buf);
temp_buf_free (render_buf);
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return;
}
return return_buf;
gimp_preview_render_and_flush (preview,
render_buf,
width,
height,
-1);
temp_buf_free (render_buf);
return;
}
static GtkWidget *

54
app/widgets/gimppatternpreview.c
View File

@ -33,6 +33,7 @@
static void gimp_pattern_preview_class_init (GimpPatternPreviewClass *klass);
static void gimp_pattern_preview_init (GimpPatternPreview *preview);
static void gimp_pattern_preview_render (GimpPreview *preview);
static GtkWidget * gimp_pattern_preview_create_popup (GimpPreview *preview);
static gboolean gimp_pattern_preview_needs_popup (GimpPreview *preview);
@ -76,6 +77,7 @@ gimp_pattern_preview_class_init (GimpPatternPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->render = gimp_pattern_preview_render;
preview_class->create_popup = gimp_pattern_preview_create_popup;
preview_class->needs_popup = gimp_pattern_preview_needs_popup;
}
@ -85,6 +87,58 @@ gimp_pattern_preview_init (GimpPatternPreview *preview)
{
}
static void
gimp_pattern_preview_render (GimpPreview *preview)
{
GimpPattern *pattern;
TempBuf *temp_buf;
gint width;
gint height;
gint pattern_width;
gint pattern_height;
pattern = GIMP_PATTERN (preview->viewable);
pattern_width = pattern->mask->width;
pattern_height = pattern->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
if (width == pattern_width &&
height == pattern_height)
{
gimp_preview_render_and_flush (preview,
pattern->mask,
width,
height,
-1);
return;
}
else if (width <= pattern_width &&
height <= pattern_height)
{
gimp_preview_render_and_flush (preview,
pattern->mask,
width,
height,
-1);
return;
}
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
gimp_pattern_preview_create_popup (GimpPreview *preview)
{

75
app/widgets/gimppreview.c
View File

@ -56,7 +56,7 @@
enum
{
CLICKED,
CREATE_PREVIEW,
RENDER,
CREATE_POPUP,
NEEDS_POPUP,
LAST_SIGNAL
@ -77,8 +77,8 @@ static gint gimp_preview_enter_notify_event (GtkWidget *widget,
static gint gimp_preview_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
static TempBuf * gimp_preview_create_preview (GimpPreview *preview);
static TempBuf * gimp_preview_real_create_preview (GimpPreview *preview);
static void gimp_preview_render (GimpPreview *preview);
static void gimp_preview_real_render (GimpPreview *preview);
static GtkWidget * gimp_preview_create_popup (GimpPreview *preview);
static GtkWidget * gimp_preview_real_create_popup (GimpPreview *preview);
static gboolean gimp_preview_needs_popup (GimpPreview *preview);
@ -142,14 +142,14 @@ gimp_preview_class_init (GimpPreviewClass *klass)
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_PREVIEW] =
gtk_signal_new ("create_preview",
preview_signals[RENDER] =
gtk_signal_new ("render",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GimpPreviewClass,
create_preview),
gimp_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
render),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_POPUP] =
gtk_signal_new ("create_popup",
@ -180,7 +180,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
widget_class->leave_notify_event = gimp_preview_leave_notify_event;
klass->clicked = NULL;
klass->create_preview = gimp_preview_real_create_preview;
klass->render = gimp_preview_real_render;
klass->create_popup = gimp_preview_real_create_popup;
klass->needs_popup = gimp_preview_real_needs_popup;
}
@ -386,24 +386,31 @@ gimp_preview_leave_notify_event (GtkWidget *widget,
return FALSE;
}
static TempBuf *
gimp_preview_create_preview (GimpPreview *preview)
static void
gimp_preview_render (GimpPreview *preview)
{
TempBuf *temp_buf = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_PREVIEW],
&temp_buf);
return temp_buf;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
}
static TempBuf *
gimp_preview_real_create_preview (GimpPreview *preview)
static void
gimp_preview_real_render (GimpPreview *preview)
{
return
TempBuf *temp_buf;
gint width;
gint height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
temp_buf =
gimp_viewable_get_new_preview (preview->viewable,
GTK_WIDGET (preview)->requisition.width,
GTK_WIDGET (preview)->requisition.height);
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
}
static GtkWidget *
@ -564,23 +571,22 @@ gimp_preview_paint (GimpPreview *preview)
static gboolean
gimp_preview_idle_paint (GimpPreview *preview)
{
TempBuf *temp_buf;
gint width;
gint height;
gint channel;
preview->idle_id = 0;
if (! preview->viewable)
return FALSE;
temp_buf = gimp_preview_create_preview (preview);
gimp_preview_render (preview);
width = temp_buf->width;
height = temp_buf->height;
channel = -1;
return FALSE;
}
/* from layers_dialog.c */
void
gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel)
{
guchar *src, *s;
guchar *cb;
@ -782,11 +788,6 @@ gimp_preview_idle_paint (GimpPreview *preview)
gtk_preview_draw_row (GTK_PREVIEW (preview),
render_temp_buf, 0, i, width);
}
}
temp_buf_free (temp_buf);
gtk_widget_queue_draw (GTK_WIDGET (preview));
return FALSE;
}

8
app/widgets/gimppreview.h
View File

@ -62,7 +62,7 @@ struct _GimpPreviewClass
GtkPreviewClass parent_class;
void (* clicked) (GimpPreview *preview);
TempBuf * (* create_preview) (GimpPreview *preview);
void (* render) (GimpPreview *preview);
GtkWidget * (* create_popup) (GimpPreview *preview);
gboolean (* needs_popup) (GimpPreview *preview);
};
@ -76,6 +76,12 @@ GtkWidget * gimp_preview_new (GimpViewable *viewable,
gboolean clickable,
gboolean show_popup);
void gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel);
#ifdef __cplusplus
}

75
app/widgets/gimppreviewrenderer.c
View File

@ -56,7 +56,7 @@
enum
{
CLICKED,
CREATE_PREVIEW,
RENDER,
CREATE_POPUP,
NEEDS_POPUP,
LAST_SIGNAL
@ -77,8 +77,8 @@ static gint gimp_preview_enter_notify_event (GtkWidget *widget,
static gint gimp_preview_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
static TempBuf * gimp_preview_create_preview (GimpPreview *preview);
static TempBuf * gimp_preview_real_create_preview (GimpPreview *preview);
static void gimp_preview_render (GimpPreview *preview);
static void gimp_preview_real_render (GimpPreview *preview);
static GtkWidget * gimp_preview_create_popup (GimpPreview *preview);
static GtkWidget * gimp_preview_real_create_popup (GimpPreview *preview);
static gboolean gimp_preview_needs_popup (GimpPreview *preview);
@ -142,14 +142,14 @@ gimp_preview_class_init (GimpPreviewClass *klass)
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_PREVIEW] =
gtk_signal_new ("create_preview",
preview_signals[RENDER] =
gtk_signal_new ("render",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GimpPreviewClass,
create_preview),
gimp_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
render),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_POPUP] =
gtk_signal_new ("create_popup",
@ -180,7 +180,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
widget_class->leave_notify_event = gimp_preview_leave_notify_event;
klass->clicked = NULL;
klass->create_preview = gimp_preview_real_create_preview;
klass->render = gimp_preview_real_render;
klass->create_popup = gimp_preview_real_create_popup;
klass->needs_popup = gimp_preview_real_needs_popup;
}
@ -386,24 +386,31 @@ gimp_preview_leave_notify_event (GtkWidget *widget,
return FALSE;
}
static TempBuf *
gimp_preview_create_preview (GimpPreview *preview)
static void
gimp_preview_render (GimpPreview *preview)
{
TempBuf *temp_buf = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_PREVIEW],
&temp_buf);
return temp_buf;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
}
static TempBuf *
gimp_preview_real_create_preview (GimpPreview *preview)
static void
gimp_preview_real_render (GimpPreview *preview)
{
return
TempBuf *temp_buf;
gint width;
gint height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
temp_buf =
gimp_viewable_get_new_preview (preview->viewable,
GTK_WIDGET (preview)->requisition.width,
GTK_WIDGET (preview)->requisition.height);
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
}
static GtkWidget *
@ -564,23 +571,22 @@ gimp_preview_paint (GimpPreview *preview)
static gboolean
gimp_preview_idle_paint (GimpPreview *preview)
{
TempBuf *temp_buf;
gint width;
gint height;
gint channel;
preview->idle_id = 0;
if (! preview->viewable)
return FALSE;
temp_buf = gimp_preview_create_preview (preview);
gimp_preview_render (preview);
width = temp_buf->width;
height = temp_buf->height;
channel = -1;
return FALSE;
}
/* from layers_dialog.c */
void
gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel)
{
guchar *src, *s;
guchar *cb;
@ -782,11 +788,6 @@ gimp_preview_idle_paint (GimpPreview *preview)
gtk_preview_draw_row (GTK_PREVIEW (preview),
render_temp_buf, 0, i, width);
}
}
temp_buf_free (temp_buf);
gtk_widget_queue_draw (GTK_WIDGET (preview));
return FALSE;
}

8
app/widgets/gimppreviewrenderer.h
View File

@ -62,7 +62,7 @@ struct _GimpPreviewClass
GtkPreviewClass parent_class;
void (* clicked) (GimpPreview *preview);
TempBuf * (* create_preview) (GimpPreview *preview);
void (* render) (GimpPreview *preview);
GtkWidget * (* create_popup) (GimpPreview *preview);
gboolean (* needs_popup) (GimpPreview *preview);
};
@ -76,6 +76,12 @@ GtkWidget * gimp_preview_new (GimpViewable *viewable,
gboolean clickable,
gboolean show_popup);
void gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel);
#ifdef __cplusplus
}

137
app/widgets/gimppreviewrendererbrush.c
View File

@ -34,10 +34,13 @@
static void gimp_brush_preview_class_init (GimpBrushPreviewClass *klass);
static void gimp_brush_preview_init (GimpBrushPreview *preview);
static TempBuf * gimp_brush_preview_create_preview (GimpPreview *preview);
static void gimp_brush_preview_destroy (GtkObject *object);
static void gimp_brush_preview_render (GimpPreview *preview);
static GtkWidget * gimp_brush_preview_create_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_needs_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_render_timeout_func (GimpBrushPreview *preview);
static GimpPreviewClass *parent_class = NULL;
@ -78,14 +81,37 @@ gimp_brush_preview_class_init (GimpBrushPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_brush_preview_create_preview;
object_class->destroy = gimp_brush_preview_destroy;
preview_class->render = gimp_brush_preview_render;
preview_class->create_popup = gimp_brush_preview_create_popup;
preview_class->needs_popup = gimp_brush_preview_needs_popup;
}
static void
gimp_brush_preview_init (GimpBrushPreview *preview)
gimp_brush_preview_init (GimpBrushPreview *brush_preview)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
static void
gimp_brush_preview_destroy (GtkObject *object)
{
GimpBrushPreview *brush_preview;
brush_preview = GIMP_BRUSH_PREVIEW (object);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
#define indicator_width 7
@ -95,9 +121,10 @@ gimp_brush_preview_init (GimpBrushPreview *preview)
#define BLK { 0, 0, 0 }
#define RED { 255, 127, 127 }
static TempBuf *
gimp_brush_preview_create_preview (GimpPreview *preview)
static void
gimp_brush_preview_render (GimpPreview *preview)
{
GimpBrushPreview *brush_preview;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
@ -110,6 +137,15 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
gint offset_x;
gint offset_y;
brush_preview = GIMP_BRUSH_PREVIEW (preview);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
}
brush = GIMP_BRUSH (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
@ -118,10 +154,38 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
height = GTK_WIDGET (preview)->requisition.height;
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
width,
height);
if (preview->is_popup)
return temp_buf;
{
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
if (GIMP_IS_BRUSH_PIPE (brush))
{
if (width != brush_width ||
height != brush_height)
{
g_warning ("%s(): non-fullsize pipe popups are not supported yet.",
G_GNUC_FUNCTION);
return;
}
brush_preview->pipe_animation_index = 0;
brush_preview->pipe_timeout_id =
g_timeout_add (300,
(GSourceFunc) gimp_brush_preview_render_timeout_func,
brush_preview);
}
return;
}
buf = temp_buf_data (temp_buf);
@ -213,7 +277,13 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
#undef BLK
#undef RED
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
@ -255,3 +325,54 @@ gimp_brush_preview_needs_popup (GimpPreview *preview)
return FALSE;
}
static gboolean
gimp_brush_preview_render_timeout_func (GimpBrushPreview *brush_preview)
{
GimpPreview *preview;
GimpBrushPipe *brush_pipe;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
gint height;
gint brush_width;
gint brush_height;
preview = GIMP_PREVIEW (brush_preview);
if (! preview->viewable)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
return FALSE;
}
brush_pipe = GIMP_BRUSH_PIPE (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
brush_preview->pipe_animation_index++;
if (brush_preview->pipe_animation_index >= brush_pipe->nbrushes)
brush_preview->pipe_animation_index = 0;
brush = GIMP_BRUSH (brush_pipe->brushes[brush_preview->pipe_animation_index]);
temp_buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (brush),
width,
height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return TRUE;
}

3
app/widgets/gimppreviewrendererbrush.h
View File

@ -43,6 +43,9 @@ typedef struct _GimpBrushPreviewClass GimpBrushPreviewClass;
struct _GimpBrushPreview
{
GimpPreview parent_instance;
guint pipe_timeout_id;
gint pipe_animation_index;
};
struct _GimpBrushPreviewClass

6
app/widgets/gimppreviewrendererdrawable.c
View File

@ -31,7 +31,7 @@
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_init (GimpDrawablePreview *preview);
static TempBuf * gimp_drawable_preview_create_preview (GimpPreview *preview);
static void gimp_drawable_preview_render (GimpPreview *preview);
static GtkWidget * gimp_drawable_preview_create_popup (GimpPreview *preview);
@ -80,8 +80,8 @@ gimp_drawable_preview_init (GimpDrawablePreview *preview)
{
}
static TempBuf *
gimp_drawable_preview_create_preview (GimpPreview *preview)
static void
gimp_drawable_preview_render (GimpPreview *preview)
{
}

54
app/widgets/gimppreviewrendererimage.c
View File

@ -36,7 +36,7 @@
static void gimp_image_preview_class_init (GimpImagePreviewClass *klass);
static void gimp_image_preview_init (GimpImagePreview *preview);
static TempBuf * gimp_image_preview_create_preview (GimpPreview *preview);
static void gimp_image_preview_render (GimpPreview *preview);
static GtkWidget * gimp_image_preview_create_popup (GimpPreview *preview);
static void gimp_image_preview_calc_size (GimpImage *gimage,
gint width,
@ -85,7 +85,7 @@ gimp_image_preview_class_init (GimpImagePreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_image_preview_create_preview;
preview_class->render = gimp_image_preview_render;
preview_class->create_popup = gimp_image_preview_create_popup;
}
@ -94,8 +94,8 @@ gimp_image_preview_init (GimpImagePreview *preview)
{
}
static TempBuf *
gimp_image_preview_create_preview (GimpPreview *preview)
static void
gimp_image_preview_render (GimpPreview *preview)
{
GimpImage *gimage;
gint width;
@ -103,7 +103,7 @@ gimp_image_preview_create_preview (GimpPreview *preview)
gint preview_width;
gint preview_height;
gboolean scaling_up;
TempBuf *return_buf;
TempBuf *render_buf;
gimage = GIMP_IMAGE (preview->viewable);
@ -124,43 +124,59 @@ gimp_image_preview_create_preview (GimpPreview *preview)
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
gimage->width,
gimage->height);
return_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
render_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
temp_buf_free (temp_buf);
}
else
{
return_buf = gimp_viewable_get_new_preview (preview->viewable,
render_buf = gimp_viewable_get_new_preview (preview->viewable,
preview_width,
preview_height);
}
if (preview_width < width) return_buf->x = (width - preview_width) / 2;
if (preview_height < height) return_buf->y = (height - preview_height) / 2;
if (preview_width < width) render_buf->x = (width - preview_width) / 2;
if (preview_height < height) render_buf->y = (height - preview_height) / 2;
if (return_buf->x || return_buf->y)
if (render_buf->x || render_buf->y)
{
TempBuf *temp_buf;
guchar white[4] = { 255, 255, 255, 255 };
temp_buf = temp_buf_new (width, height,
return_buf->bytes,
render_buf->bytes,
0, 0,
white);
temp_buf_copy_area (return_buf, temp_buf,
temp_buf_copy_area (render_buf, temp_buf,
0, 0,
return_buf->width,
return_buf->height,
return_buf->x,
return_buf->y);
render_buf->width,
render_buf->height,
render_buf->x,
render_buf->y);
temp_buf_free (return_buf);
temp_buf_free (render_buf);
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return;
}
return return_buf;
gimp_preview_render_and_flush (preview,
render_buf,
width,
height,
-1);
temp_buf_free (render_buf);
return;
}
static GtkWidget *

75
app/widgets/gimpview.c
View File

@ -56,7 +56,7 @@
enum
{
CLICKED,
CREATE_PREVIEW,
RENDER,
CREATE_POPUP,
NEEDS_POPUP,
LAST_SIGNAL
@ -77,8 +77,8 @@ static gint gimp_preview_enter_notify_event (GtkWidget *widget,
static gint gimp_preview_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
static TempBuf * gimp_preview_create_preview (GimpPreview *preview);
static TempBuf * gimp_preview_real_create_preview (GimpPreview *preview);
static void gimp_preview_render (GimpPreview *preview);
static void gimp_preview_real_render (GimpPreview *preview);
static GtkWidget * gimp_preview_create_popup (GimpPreview *preview);
static GtkWidget * gimp_preview_real_create_popup (GimpPreview *preview);
static gboolean gimp_preview_needs_popup (GimpPreview *preview);
@ -142,14 +142,14 @@ gimp_preview_class_init (GimpPreviewClass *klass)
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_PREVIEW] =
gtk_signal_new ("create_preview",
preview_signals[RENDER] =
gtk_signal_new ("render",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GimpPreviewClass,
create_preview),
gimp_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
render),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_POPUP] =
gtk_signal_new ("create_popup",
@ -180,7 +180,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
widget_class->leave_notify_event = gimp_preview_leave_notify_event;
klass->clicked = NULL;
klass->create_preview = gimp_preview_real_create_preview;
klass->render = gimp_preview_real_render;
klass->create_popup = gimp_preview_real_create_popup;
klass->needs_popup = gimp_preview_real_needs_popup;
}
@ -386,24 +386,31 @@ gimp_preview_leave_notify_event (GtkWidget *widget,
return FALSE;
}
static TempBuf *
gimp_preview_create_preview (GimpPreview *preview)
static void
gimp_preview_render (GimpPreview *preview)
{
TempBuf *temp_buf = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_PREVIEW],
&temp_buf);
return temp_buf;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
}
static TempBuf *
gimp_preview_real_create_preview (GimpPreview *preview)
static void
gimp_preview_real_render (GimpPreview *preview)
{
return
TempBuf *temp_buf;
gint width;
gint height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
temp_buf =
gimp_viewable_get_new_preview (preview->viewable,
GTK_WIDGET (preview)->requisition.width,
GTK_WIDGET (preview)->requisition.height);
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
}
static GtkWidget *
@ -564,23 +571,22 @@ gimp_preview_paint (GimpPreview *preview)
static gboolean
gimp_preview_idle_paint (GimpPreview *preview)
{
TempBuf *temp_buf;
gint width;
gint height;
gint channel;
preview->idle_id = 0;
if (! preview->viewable)
return FALSE;
temp_buf = gimp_preview_create_preview (preview);
gimp_preview_render (preview);
width = temp_buf->width;
height = temp_buf->height;
channel = -1;
return FALSE;
}
/* from layers_dialog.c */
void
gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel)
{
guchar *src, *s;
guchar *cb;
@ -782,11 +788,6 @@ gimp_preview_idle_paint (GimpPreview *preview)
gtk_preview_draw_row (GTK_PREVIEW (preview),
render_temp_buf, 0, i, width);
}
}
temp_buf_free (temp_buf);
gtk_widget_queue_draw (GTK_WIDGET (preview));
return FALSE;
}

8
app/widgets/gimpview.h
View File

@ -62,7 +62,7 @@ struct _GimpPreviewClass
GtkPreviewClass parent_class;
void (* clicked) (GimpPreview *preview);
TempBuf * (* create_preview) (GimpPreview *preview);
void (* render) (GimpPreview *preview);
GtkWidget * (* create_popup) (GimpPreview *preview);
gboolean (* needs_popup) (GimpPreview *preview);
};
@ -76,6 +76,12 @@ GtkWidget * gimp_preview_new (GimpViewable *viewable,
gboolean clickable,
gboolean show_popup);
void gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel);
#ifdef __cplusplus
}

75
app/widgets/gimpviewrenderer.c
View File

@ -56,7 +56,7 @@
enum
{
CLICKED,
CREATE_PREVIEW,
RENDER,
CREATE_POPUP,
NEEDS_POPUP,
LAST_SIGNAL
@ -77,8 +77,8 @@ static gint gimp_preview_enter_notify_event (GtkWidget *widget,
static gint gimp_preview_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
static TempBuf * gimp_preview_create_preview (GimpPreview *preview);
static TempBuf * gimp_preview_real_create_preview (GimpPreview *preview);
static void gimp_preview_render (GimpPreview *preview);
static void gimp_preview_real_render (GimpPreview *preview);
static GtkWidget * gimp_preview_create_popup (GimpPreview *preview);
static GtkWidget * gimp_preview_real_create_popup (GimpPreview *preview);
static gboolean gimp_preview_needs_popup (GimpPreview *preview);
@ -142,14 +142,14 @@ gimp_preview_class_init (GimpPreviewClass *klass)
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_PREVIEW] =
gtk_signal_new ("create_preview",
preview_signals[RENDER] =
gtk_signal_new ("render",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GimpPreviewClass,
create_preview),
gimp_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
render),
gtk_signal_default_marshaller,
GTK_TYPE_NONE, 0);
preview_signals[CREATE_POPUP] =
gtk_signal_new ("create_popup",
@ -180,7 +180,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
widget_class->leave_notify_event = gimp_preview_leave_notify_event;
klass->clicked = NULL;
klass->create_preview = gimp_preview_real_create_preview;
klass->render = gimp_preview_real_render;
klass->create_popup = gimp_preview_real_create_popup;
klass->needs_popup = gimp_preview_real_needs_popup;
}
@ -386,24 +386,31 @@ gimp_preview_leave_notify_event (GtkWidget *widget,
return FALSE;
}
static TempBuf *
gimp_preview_create_preview (GimpPreview *preview)
static void
gimp_preview_render (GimpPreview *preview)
{
TempBuf *temp_buf = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_PREVIEW],
&temp_buf);
return temp_buf;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
}
static TempBuf *
gimp_preview_real_create_preview (GimpPreview *preview)
static void
gimp_preview_real_render (GimpPreview *preview)
{
return
TempBuf *temp_buf;
gint width;
gint height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
temp_buf =
gimp_viewable_get_new_preview (preview->viewable,
GTK_WIDGET (preview)->requisition.width,
GTK_WIDGET (preview)->requisition.height);
width, height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
}
static GtkWidget *
@ -564,23 +571,22 @@ gimp_preview_paint (GimpPreview *preview)
static gboolean
gimp_preview_idle_paint (GimpPreview *preview)
{
TempBuf *temp_buf;
gint width;
gint height;
gint channel;
preview->idle_id = 0;
if (! preview->viewable)
return FALSE;
temp_buf = gimp_preview_create_preview (preview);
gimp_preview_render (preview);
width = temp_buf->width;
height = temp_buf->height;
channel = -1;
return FALSE;
}
/* from layers_dialog.c */
void
gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel)
{
guchar *src, *s;
guchar *cb;
@ -782,11 +788,6 @@ gimp_preview_idle_paint (GimpPreview *preview)
gtk_preview_draw_row (GTK_PREVIEW (preview),
render_temp_buf, 0, i, width);
}
}
temp_buf_free (temp_buf);
gtk_widget_queue_draw (GTK_WIDGET (preview));
return FALSE;
}

8
app/widgets/gimpviewrenderer.h
View File

@ -62,7 +62,7 @@ struct _GimpPreviewClass
GtkPreviewClass parent_class;
void (* clicked) (GimpPreview *preview);
TempBuf * (* create_preview) (GimpPreview *preview);
void (* render) (GimpPreview *preview);
GtkWidget * (* create_popup) (GimpPreview *preview);
gboolean (* needs_popup) (GimpPreview *preview);
};
@ -76,6 +76,12 @@ GtkWidget * gimp_preview_new (GimpViewable *viewable,
gboolean clickable,
gboolean show_popup);
void gimp_preview_render_and_flush (GimpPreview *preview,
TempBuf *temp_buf,
gint width,
gint height,
gint channel);
#ifdef __cplusplus
}

137
app/widgets/gimpviewrendererbrush.c
View File

@ -34,10 +34,13 @@
static void gimp_brush_preview_class_init (GimpBrushPreviewClass *klass);
static void gimp_brush_preview_init (GimpBrushPreview *preview);
static TempBuf * gimp_brush_preview_create_preview (GimpPreview *preview);
static void gimp_brush_preview_destroy (GtkObject *object);
static void gimp_brush_preview_render (GimpPreview *preview);
static GtkWidget * gimp_brush_preview_create_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_needs_popup (GimpPreview *preview);
static gboolean gimp_brush_preview_render_timeout_func (GimpBrushPreview *preview);
static GimpPreviewClass *parent_class = NULL;
@ -78,14 +81,37 @@ gimp_brush_preview_class_init (GimpBrushPreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_brush_preview_create_preview;
object_class->destroy = gimp_brush_preview_destroy;
preview_class->render = gimp_brush_preview_render;
preview_class->create_popup = gimp_brush_preview_create_popup;
preview_class->needs_popup = gimp_brush_preview_needs_popup;
}
static void
gimp_brush_preview_init (GimpBrushPreview *preview)
gimp_brush_preview_init (GimpBrushPreview *brush_preview)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
static void
gimp_brush_preview_destroy (GtkObject *object)
{
GimpBrushPreview *brush_preview;
brush_preview = GIMP_BRUSH_PREVIEW (object);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
#define indicator_width 7
@ -95,9 +121,10 @@ gimp_brush_preview_init (GimpBrushPreview *preview)
#define BLK { 0, 0, 0 }
#define RED { 255, 127, 127 }
static TempBuf *
gimp_brush_preview_create_preview (GimpPreview *preview)
static void
gimp_brush_preview_render (GimpPreview *preview)
{
GimpBrushPreview *brush_preview;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
@ -110,6 +137,15 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
gint offset_x;
gint offset_y;
brush_preview = GIMP_BRUSH_PREVIEW (preview);
if (brush_preview->pipe_timeout_id)
{
g_source_remove (brush_preview->pipe_timeout_id);
brush_preview->pipe_timeout_id = 0;
}
brush = GIMP_BRUSH (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
@ -118,10 +154,38 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
height = GTK_WIDGET (preview)->requisition.height;
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
width, height);
width,
height);
if (preview->is_popup)
return temp_buf;
{
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
if (GIMP_IS_BRUSH_PIPE (brush))
{
if (width != brush_width ||
height != brush_height)
{
g_warning ("%s(): non-fullsize pipe popups are not supported yet.",
G_GNUC_FUNCTION);
return;
}
brush_preview->pipe_animation_index = 0;
brush_preview->pipe_timeout_id =
g_timeout_add (300,
(GSourceFunc) gimp_brush_preview_render_timeout_func,
brush_preview);
}
return;
}
buf = temp_buf_data (temp_buf);
@ -213,7 +277,13 @@ gimp_brush_preview_create_preview (GimpPreview *preview)
#undef BLK
#undef RED
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
}
static GtkWidget *
@ -255,3 +325,54 @@ gimp_brush_preview_needs_popup (GimpPreview *preview)
return FALSE;
}
static gboolean
gimp_brush_preview_render_timeout_func (GimpBrushPreview *brush_preview)
{
GimpPreview *preview;
GimpBrushPipe *brush_pipe;
GimpBrush *brush;
TempBuf *temp_buf;
gint width;
gint height;
gint brush_width;
gint brush_height;
preview = GIMP_PREVIEW (brush_preview);
if (! preview->viewable)
{
brush_preview->pipe_timeout_id = 0;
brush_preview->pipe_animation_index = 0;
return FALSE;
}
brush_pipe = GIMP_BRUSH_PIPE (preview->viewable);
brush_width = brush->mask->width;
brush_height = brush->mask->height;
width = GTK_WIDGET (preview)->requisition.width;
height = GTK_WIDGET (preview)->requisition.height;
brush_preview->pipe_animation_index++;
if (brush_preview->pipe_animation_index >= brush_pipe->nbrushes)
brush_preview->pipe_animation_index = 0;
brush = GIMP_BRUSH (brush_pipe->brushes[brush_preview->pipe_animation_index]);
temp_buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (brush),
width,
height);
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return TRUE;
}

3
app/widgets/gimpviewrendererbrush.h
View File

@ -43,6 +43,9 @@ typedef struct _GimpBrushPreviewClass GimpBrushPreviewClass;
struct _GimpBrushPreview
{
GimpPreview parent_instance;
guint pipe_timeout_id;
gint pipe_animation_index;
};
struct _GimpBrushPreviewClass

6
app/widgets/gimpviewrendererdrawable.c
View File

@ -31,7 +31,7 @@
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_init (GimpDrawablePreview *preview);
static TempBuf * gimp_drawable_preview_create_preview (GimpPreview *preview);
static void gimp_drawable_preview_render (GimpPreview *preview);
static GtkWidget * gimp_drawable_preview_create_popup (GimpPreview *preview);
@ -80,8 +80,8 @@ gimp_drawable_preview_init (GimpDrawablePreview *preview)
{
}
static TempBuf *
gimp_drawable_preview_create_preview (GimpPreview *preview)
static void
gimp_drawable_preview_render (GimpPreview *preview)
{
}

54
app/widgets/gimpviewrendererimage.c
View File

@ -36,7 +36,7 @@
static void gimp_image_preview_class_init (GimpImagePreviewClass *klass);
static void gimp_image_preview_init (GimpImagePreview *preview);
static TempBuf * gimp_image_preview_create_preview (GimpPreview *preview);
static void gimp_image_preview_render (GimpPreview *preview);
static GtkWidget * gimp_image_preview_create_popup (GimpPreview *preview);
static void gimp_image_preview_calc_size (GimpImage *gimage,
gint width,
@ -85,7 +85,7 @@ gimp_image_preview_class_init (GimpImagePreviewClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_PREVIEW);
preview_class->create_preview = gimp_image_preview_create_preview;
preview_class->render = gimp_image_preview_render;
preview_class->create_popup = gimp_image_preview_create_popup;
}
@ -94,8 +94,8 @@ gimp_image_preview_init (GimpImagePreview *preview)
{
}
static TempBuf *
gimp_image_preview_create_preview (GimpPreview *preview)
static void
gimp_image_preview_render (GimpPreview *preview)
{
GimpImage *gimage;
gint width;
@ -103,7 +103,7 @@ gimp_image_preview_create_preview (GimpPreview *preview)
gint preview_width;
gint preview_height;
gboolean scaling_up;
TempBuf *return_buf;
TempBuf *render_buf;
gimage = GIMP_IMAGE (preview->viewable);
@ -124,43 +124,59 @@ gimp_image_preview_create_preview (GimpPreview *preview)
temp_buf = gimp_viewable_get_new_preview (preview->viewable,
gimage->width,
gimage->height);
return_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
render_buf = temp_buf_scale (temp_buf, preview_width, preview_height);
temp_buf_free (temp_buf);
}
else
{
return_buf = gimp_viewable_get_new_preview (preview->viewable,
render_buf = gimp_viewable_get_new_preview (preview->viewable,
preview_width,
preview_height);
}
if (preview_width < width) return_buf->x = (width - preview_width) / 2;
if (preview_height < height) return_buf->y = (height - preview_height) / 2;
if (preview_width < width) render_buf->x = (width - preview_width) / 2;
if (preview_height < height) render_buf->y = (height - preview_height) / 2;
if (return_buf->x || return_buf->y)
if (render_buf->x || render_buf->y)
{
TempBuf *temp_buf;
guchar white[4] = { 255, 255, 255, 255 };
temp_buf = temp_buf_new (width, height,
return_buf->bytes,
render_buf->bytes,
0, 0,
white);
temp_buf_copy_area (return_buf, temp_buf,
temp_buf_copy_area (render_buf, temp_buf,
0, 0,
return_buf->width,
return_buf->height,
return_buf->x,
return_buf->y);
render_buf->width,
render_buf->height,
render_buf->x,
render_buf->y);
temp_buf_free (return_buf);
temp_buf_free (render_buf);
return temp_buf;
gimp_preview_render_and_flush (preview,
temp_buf,
width,
height,
-1);
temp_buf_free (temp_buf);
return;
}
return return_buf;
gimp_preview_render_and_flush (preview,
render_buf,
width,
height,
-1);
temp_buf_free (render_buf);
return;
}
static GtkWidget *