callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement GimpViewRenderer::draw and draw the overlays with Cairo.

Browse Source 
2007-11-04  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpviewrendererbrush.c: implement
	GimpViewRenderer::draw and draw the overlays with Cairo.

	* app/widgets/gimpviewrenderer.[ch]
	* app/widgets/gimpviewrenderervectors.c: minor cleanups.


svn path=/trunk/; revision=24058
This commit is contained in:
Sven Neumann
2007-11-04 20:30:38 +00:00
committed by Sven Neumann
parent 7218ee5d25
commit f6994c34f5
5 changed files with 85 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-11-04 Sven Neumann <sven@gimp.org>
* app/widgets/gimpviewrendererbrush.c: implement
GimpViewRenderer::draw and draw the overlays with Cairo.
* app/widgets/gimpviewrenderer.[ch]
* app/widgets/gimpviewrenderervectors.c: minor cleanups.
2007-11-04 Sven Neumann <sven@gimp.org> 2007-11-04 Sven Neumann <sven@gimp.org>
* app/widgets/gimpviewrenderer.[ch]: replaced the RGB buffer with * app/widgets/gimpviewrenderer.[ch]: replaced the RGB buffer with

10
app/widgets/gimpviewrenderer.c
View File

@ -680,7 +680,7 @@ static void
gimp_view_renderer_real_draw (GimpViewRenderer *renderer, gimp_view_renderer_real_draw (GimpViewRenderer *renderer,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *draw_area) const GdkRectangle *area)
{ {
if (renderer->needs_render) if (renderer->needs_render)
GIMP_VIEW_RENDERER_GET_CLASS (renderer)->render (renderer, widget); GIMP_VIEW_RENDERER_GET_CLASS (renderer)->render (renderer, widget);
@ -701,8 +701,8 @@ gimp_view_renderer_real_draw (GimpViewRenderer *renderer,
cairo_paint (cr); cairo_paint (cr);
} }
x = draw_area->x + (draw_area->width - width) / 2; x = area->x + (area->width - width) / 2;
y = draw_area->y + (draw_area->height - height) / 2; y = area->y + (area->height - height) / 2;
gdk_cairo_set_source_pixbuf (cr, renderer->pixbuf, x, y); gdk_cairo_set_source_pixbuf (cr, renderer->pixbuf, x, y);
cairo_rectangle (cr, x, y, width, height); cairo_rectangle (cr, x, y, width, height);
@ -714,8 +714,8 @@ gimp_view_renderer_real_draw (GimpViewRenderer *renderer,
gint height = renderer->height; gint height = renderer->height;
gint x, y; gint x, y;
x = draw_area->x + (draw_area->width - width) / 2; x = area->x + (area->width - width) / 2;
y = draw_area->y + (draw_area->height - height) / 2; y = area->y + (area->height - height) / 2;
cairo_set_source_surface (cr, renderer->surface, x, y); cairo_set_source_surface (cr, renderer->surface, x, y);
cairo_rectangle (cr, x, y, width, height); cairo_rectangle (cr, x, y, width, height);

2
app/widgets/gimpviewrenderer.h
View File

@ -87,7 +87,7 @@ struct _GimpViewRendererClass
void (* draw) (GimpViewRenderer *renderer, void (* draw) (GimpViewRenderer *renderer,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *draw_area); const GdkRectangle *area);
void (* render) (GimpViewRenderer *renderer, void (* render) (GimpViewRenderer *renderer,
GtkWidget *widget); GtkWidget *widget);
}; };

229
app/widgets/gimpviewrendererbrush.c
View File

@ -33,11 +33,15 @@
#include "gimpviewrendererbrush.h" #include "gimpviewrendererbrush.h"
static void gimp_view_renderer_brush_finalize (GObject *object); static void gimp_view_renderer_brush_finalize (GObject *object);
static void gimp_view_renderer_brush_render (GimpViewRenderer *renderer, static void gimp_view_renderer_brush_render (GimpViewRenderer *renderer,
GtkWidget *widget); GtkWidget *widget);
static void gimp_view_renderer_brush_draw (GimpViewRenderer *renderer,
GtkWidget *widget,
cairo_t *cr,
const GdkRectangle *area);
static gboolean gimp_view_renderer_brush_render_timeout (gpointer data); static gboolean gimp_view_renderer_brush_render_timeout (gpointer data);
G_DEFINE_TYPE (GimpViewRendererBrush, gimp_view_renderer_brush, G_DEFINE_TYPE (GimpViewRendererBrush, gimp_view_renderer_brush,
@ -55,6 +59,7 @@ gimp_view_renderer_brush_class_init (GimpViewRendererBrushClass *klass)
object_class->finalize = gimp_view_renderer_brush_finalize; object_class->finalize = gimp_view_renderer_brush_finalize;
renderer_class->render = gimp_view_renderer_brush_render; renderer_class->render = gimp_view_renderer_brush_render;
renderer_class->draw = gimp_view_renderer_brush_draw;
} }
static void static void
@ -84,8 +89,6 @@ gimp_view_renderer_brush_render (GimpViewRenderer *renderer,
{ {
GimpViewRendererBrush *renderbrush = GIMP_VIEW_RENDERER_BRUSH (renderer); GimpViewRendererBrush *renderbrush = GIMP_VIEW_RENDERER_BRUSH (renderer);
TempBuf *temp_buf; TempBuf *temp_buf;
gint brush_width;
gint brush_height;
if (renderbrush->pipe_timeout_id) if (renderbrush->pipe_timeout_id)
{ {
@ -93,8 +96,6 @@ gimp_view_renderer_brush_render (GimpViewRenderer *renderer,
renderbrush->pipe_timeout_id = 0; renderbrush->pipe_timeout_id = 0;
} }
gimp_viewable_get_size (renderer->viewable, &brush_width, &brush_height);
temp_buf = gimp_viewable_get_new_preview (renderer->viewable, temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
renderer->context, renderer->context,
renderer->width, renderer->width,
@ -130,160 +131,6 @@ gimp_view_renderer_brush_render (GimpViewRenderer *renderer,
GIMP_VIEW_BG_WHITE); GIMP_VIEW_BG_WHITE);
temp_buf_free (temp_buf); temp_buf_free (temp_buf);
/* FIXME: port brush indicator drawing to Cairo */
#if 0
#define INDICATOR_WIDTH 7
#define INDICATOR_HEIGHT 7
if (renderer->width >= INDICATOR_WIDTH * 2 &&
renderer->height >= INDICATOR_HEIGHT * 2 &&
(renderer->width < brush_width ||
renderer->height < brush_height ||
GIMP_IS_BRUSH_PIPE (renderer->viewable) ||
GIMP_IS_BRUSH_GENERATED (renderer->viewable)))
{
#define WHT { 255, 255, 255 }
#define BLK { 0, 0, 0 }
#define RED { 255, 127, 127 }
#define BLU { 127, 150, 255 }
static const guchar scale_indicator_bits[7][7][3] =
{
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ WHT, BLK, BLK, BLK, BLK, BLK, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT }
};
static const guchar scale_pipe_indicator_bits[7][7][3] =
{
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, RED },
{ WHT, WHT, WHT, BLK, WHT, RED, RED },
{ WHT, BLK, BLK, BLK, BLK, BLK, RED },
{ WHT, WHT, WHT, BLK, RED, RED, RED },
{ WHT, WHT, RED, BLK, RED, RED, RED },
{ WHT, RED, RED, RED, RED, RED, RED }
};
static const guchar pipe_indicator_bits[7][7][3] =
{
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ WHT, WHT, WHT, WHT, WHT, WHT, RED },
{ WHT, WHT, WHT, WHT, WHT, RED, RED },
{ WHT, WHT, WHT, WHT, RED, RED, RED },
{ WHT, WHT, WHT, RED, RED, RED, RED },
{ WHT, WHT, RED, RED, RED, RED, RED },
{ WHT, RED, RED, RED, RED, RED, RED }
};
static const guchar scale_genbrush_indicator_bits[7][7][3] =
{
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ WHT, WHT, WHT, BLK, WHT, WHT, BLU },
{ WHT, WHT, WHT, BLK, WHT, BLU, BLU },
{ WHT, BLK, BLK, BLK, BLK, BLK, BLU },
{ WHT, WHT, WHT, BLK, WHT, BLU, BLU },
{ WHT, WHT, BLU, BLK, BLU, BLU, BLU },
{ WHT, WHT, BLU, BLU, BLU, BLU, BLU }
};
static const guchar genbrush_indicator_bits[7][7][3] =
{
{ WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ WHT, WHT, WHT, WHT, WHT, WHT, BLU },
{ WHT, WHT, WHT, WHT, WHT, BLU, BLU },
{ WHT, WHT, WHT, WHT, BLU, BLU, BLU },
{ WHT, WHT, WHT, BLU, BLU, BLU, BLU },
{ WHT, WHT, BLU, BLU, BLU, BLU, BLU },
{ WHT, BLU, BLU, BLU, BLU, BLU, BLU }
};
#undef WHT
#undef BLK
#undef RED
#undef BLU
guchar *buf;
guchar *b;
gint x, y;
gint offset_x;
gint offset_y;
gboolean alpha;
gboolean pipe;
gboolean genbrush;
gboolean scale;
offset_x = renderer->width - INDICATOR_WIDTH;
offset_y = renderer->height - INDICATOR_HEIGHT;
buf = renderer->buffer + (offset_y * renderer->rowstride +
offset_x * renderer->bytes);
pipe = GIMP_IS_BRUSH_PIPE (renderer->viewable);
genbrush = GIMP_IS_BRUSH_GENERATED (renderer->viewable);
scale = (renderer->width < brush_width ||
renderer->height < brush_height);
alpha = (renderer->bytes == 4);
for (y = 0; y < INDICATOR_HEIGHT; y++)
{
b = buf;
for (x = 0; x < INDICATOR_WIDTH; x++)
{
if (scale)
{
if (pipe)
{
*b++ = scale_pipe_indicator_bits[y][x][0];
*b++ = scale_pipe_indicator_bits[y][x][1];
*b++ = scale_pipe_indicator_bits[y][x][2];
}
else if (genbrush)
{
*b++ = scale_genbrush_indicator_bits[y][x][0];
*b++ = scale_genbrush_indicator_bits[y][x][1];
*b++ = scale_genbrush_indicator_bits[y][x][2];
}
else
{
*b++ = scale_indicator_bits[y][x][0];
*b++ = scale_indicator_bits[y][x][1];
*b++ = scale_indicator_bits[y][x][2];
}
}
else if (pipe)
{
*b++ = pipe_indicator_bits[y][x][0];
*b++ = pipe_indicator_bits[y][x][1];
*b++ = pipe_indicator_bits[y][x][2];
}
else if (genbrush)
{
*b++ = genbrush_indicator_bits[y][x][0];
*b++ = genbrush_indicator_bits[y][x][1];
*b++ = genbrush_indicator_bits[y][x][2];
}
if (alpha)
*b++ = 255;
}
buf += renderer->rowstride;
}
}
#undef INDICATOR_WIDTH
#undef INDICATOR_HEIGHT
#endif
} }
static gboolean static gboolean
@ -334,3 +181,61 @@ gimp_view_renderer_brush_render_timeout (gpointer data)
return TRUE; return TRUE;
} }
static void
gimp_view_renderer_brush_draw (GimpViewRenderer *renderer,
GtkWidget *widget,
cairo_t *cr,
const GdkRectangle *area)
{
GIMP_VIEW_RENDERER_CLASS (parent_class)->draw (renderer, widget, cr, area);
#define INDICATOR_WIDTH 7
#define INDICATOR_HEIGHT 7
if (renderer->width >= INDICATOR_WIDTH * 2 &&
renderer->height >= INDICATOR_HEIGHT * 2)
{
gboolean pipe = GIMP_IS_BRUSH_PIPE (renderer->viewable);
gboolean generated = GIMP_IS_BRUSH_GENERATED (renderer->viewable);
gint brush_width;
gint brush_height;
if (generated || pipe)
{
cairo_move_to (cr, area->x + area->width, area->y + area->height);
cairo_rel_line_to (cr, - INDICATOR_WIDTH, 0);
cairo_rel_line_to (cr, INDICATOR_WIDTH, - INDICATOR_HEIGHT);
cairo_rel_line_to (cr, 0, INDICATOR_HEIGHT);
if (pipe)
cairo_set_source_rgb (cr, 1.0, 0.5, 0.5);
else
cairo_set_source_rgb (cr, 0.5, 0.6, 1.0);
cairo_fill (cr);
}
gimp_viewable_get_size (renderer->viewable, &brush_width, &brush_height);
if (renderer->width < brush_width || renderer->height < brush_height)
{
cairo_move_to (cr,
area->x + area->width - INDICATOR_WIDTH + 1,
area->y + area->height - INDICATOR_HEIGHT / 2.0);
cairo_rel_line_to (cr, INDICATOR_WIDTH - 2, 0);
cairo_move_to (cr,
area->x + area->width - INDICATOR_WIDTH / 2.0,
area->y + area->height - INDICATOR_HEIGHT + 1);
cairo_rel_line_to (cr, 0, INDICATOR_WIDTH - 2);
cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
cairo_set_line_width (cr, 1);
cairo_stroke (cr);
}
}
#undef INDICATOR_WIDTH
#undef INDICATOR_HEIGHT
}

8
app/widgets/gimpviewrenderervectors.c
View File

@ -41,7 +41,7 @@
static void gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer, static void gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *draw_area); const GdkRectangle *area);
G_DEFINE_TYPE (GimpViewRendererVectors, gimp_view_renderer_vectors, G_DEFINE_TYPE (GimpViewRendererVectors, gimp_view_renderer_vectors,
@ -67,7 +67,7 @@ static void
gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer, gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer,
GtkWidget *widget, GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const GdkRectangle *draw_area) const GdkRectangle *area)
{ {
GimpVectors *vectors = GIMP_VECTORS (renderer->viewable); GimpVectors *vectors = GIMP_VECTORS (renderer->viewable);
GimpStroke *stroke; GimpStroke *stroke;
@ -77,8 +77,8 @@ gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer,
gdk_cairo_set_source_color (cr, &widget->style->white); gdk_cairo_set_source_color (cr, &widget->style->white);
x = draw_area->x + (draw_area->width - renderer->width) / 2; x = area->x + (area->width - renderer->width) / 2;
y = draw_area->y + (draw_area->height - renderer->height) / 2; y = area->y + (area->height - renderer->height) / 2;
cairo_rectangle (cr, x, y, renderer->width, renderer->height); cairo_rectangle (cr, x, y, renderer->width, renderer->height);
cairo_fill (cr); cairo_fill (cr);