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

Color brushes now appear in the brush selector in color. Scaling is

Browse Source 
* app/brush_select.c: Color brushes now appear in the brush
selector in color.  Scaling is disabled for color brushes because
I can't figure out how to do it just now.  Still need to fix the
toolbox to do this too.

--klm
This commit is contained in:
Kelly Martin
1999-08-13 15:20:35 +00:00
parent 39f037eca8
commit f369da0a95
5 changed files with 185 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
1999-08-13 Kelly Martin <kelly@poverty.bloomington.in.us>
* app/brush_select.c: Color brushes now appear in the brush
selector in color. Scaling is disabled for color brushes because
I can't figure out how to do it just now. Still need to fix the
toolbox to do this too.
Thu Aug 12 19:16:58 1999 Adrian Likins <alikins@redhat.com> Thu Aug 12 19:16:58 1999 Adrian Likins <alikins@redhat.com>
* app/pixmapbrush.c: added a fix from Xach "I dont code." * app/pixmapbrush.c: added a fix from Xach "I dont code."

22
app/base/brush-scale.h
View File

@ -24,17 +24,23 @@
#define brush_scale_indicator_width 7 #define brush_scale_indicator_width 7
#define brush_scale_indicator_height 7 #define brush_scale_indicator_height 7
static unsigned char brush_scale_indicator_bits[7][7] = #define WHT {255,255,255}
#define BLK { 0, 0, 0}
static unsigned char brush_scale_indicator_bits[7][7][3] =
{ {
{ 255, 255, 255, 255, 255, 255, 255 }, { WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 0, 0, 0, 0, 0, 255 }, { WHT, BLK, BLK, BLK, BLK, BLK, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 255, 255, 255, 255 } { WHT, WHT, WHT, WHT, WHT, WHT, WHT }
}; };
#undef WHT
#undef BLK
/* functions */ /* functions */
MaskBuf * brush_scale_mask (MaskBuf *, int, int); MaskBuf * brush_scale_mask (MaskBuf *, int, int);

22
app/brush_scale.h
View File

@ -24,17 +24,23 @@
#define brush_scale_indicator_width 7 #define brush_scale_indicator_width 7
#define brush_scale_indicator_height 7 #define brush_scale_indicator_height 7
static unsigned char brush_scale_indicator_bits[7][7] = #define WHT {255,255,255}
#define BLK { 0, 0, 0}
static unsigned char brush_scale_indicator_bits[7][7][3] =
{ {
{ 255, 255, 255, 255, 255, 255, 255 }, { WHT, WHT, WHT, WHT, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 0, 0, 0, 0, 0, 255 }, { WHT, BLK, BLK, BLK, BLK, BLK, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 0, 255, 255, 255 }, { WHT, WHT, WHT, BLK, WHT, WHT, WHT },
{ 255, 255, 255, 255, 255, 255, 255 } { WHT, WHT, WHT, WHT, WHT, WHT, WHT }
}; };
#undef WHT
#undef BLK
/* functions */ /* functions */
MaskBuf * brush_scale_mask (MaskBuf *, int, int); MaskBuf * brush_scale_mask (MaskBuf *, int, int);

117
app/brush_select.c
View File

@ -20,6 +20,7 @@
#include "appenv.h" #include "appenv.h"
#include "actionarea.h" #include "actionarea.h"
#include "brush_scale.h" #include "brush_scale.h"
#include "gimpbrushpixmap.h"
#include "gimpbrushlist.h" #include "gimpbrushlist.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimplist.h" #include "gimplist.h"
@ -213,7 +214,7 @@ brush_select_new (gchar *title,
bsp->cell_width = MIN_CELL_SIZE; bsp->cell_width = MIN_CELL_SIZE;
bsp->cell_height = MIN_CELL_SIZE; bsp->cell_height = MIN_CELL_SIZE;
bsp->preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); bsp->preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (bsp->preview), gtk_preview_size (GTK_PREVIEW (bsp->preview),
MAX_WIN_WIDTH (bsp), MAX_WIN_HEIGHT (bsp)); MAX_WIN_WIDTH (bsp), MAX_WIN_HEIGHT (bsp));
gtk_widget_set_usize (bsp->preview, gtk_widget_set_usize (bsp->preview,
@ -707,7 +708,7 @@ brush_popup_timeout (gpointer data)
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_container_add (GTK_CONTAINER (bsp->brush_popup), frame); gtk_container_add (GTK_CONTAINER (bsp->brush_popup), frame);
gtk_widget_show (frame); gtk_widget_show (frame);
bsp->brush_preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); bsp->brush_preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_container_add (GTK_CONTAINER (frame), bsp->brush_preview); gtk_container_add (GTK_CONTAINER (frame), bsp->brush_preview);
gtk_widget_show (bsp->brush_preview); gtk_widget_show (bsp->brush_preview);
} }
@ -732,22 +733,36 @@ brush_popup_timeout (gpointer data)
gtk_widget_popup (bsp->brush_popup, x, y); gtk_widget_popup (bsp->brush_popup, x, y);
/* Draw the brush */ /* Draw the brush */
buf = g_new (gchar, brush->mask->width); if (GIMP_IS_BRUSH_PIXMAP (brush))
src = (gchar *) temp_buf_data (brush->mask);
for (y = 0; y < brush->mask->height; y++)
{ {
/* Invert the mask for display. We're doing this because GimpBrushPixmap *pixmapbrush = GIMP_BRUSH_PIXMAP(brush);
* a value of 255 in the mask means it is full intensity. src = (gchar *) temp_buf_data (pixmapbrush->pixmap_mask);
* However, it makes more sense for full intensity to show for (y = 0; y < brush->mask->height; y++)
* up as black in this brush preview window... {
*/ gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)src,
for (x = 0; x < brush->mask->width; x++) 0, y, brush->mask->width);
buf[x] = 255 - src[x]; src += brush->mask->width * 3;
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)buf, }
0, y, brush->mask->width); }
src += brush->mask->width; else
{
buf = g_new (gchar, 3*brush->mask->width);
src = (gchar *) temp_buf_data (brush->mask);
for (y = 0; y < brush->mask->height; y++)
{
/* Invert the mask for display. We're doing this because
* a value of 255 in the mask means it is full intensity.
* However, it makes more sense for full intensity to show
* up as black in this brush preview window...
*/
for (x = 0; x < brush->mask->width; x++)
buf[3*x] = buf[3*x+1] = buf[3*x+2] = 255 - src[x];
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)buf,
0, y, brush->mask->width);
src += brush->mask->width;
}
g_free (buf);
} }
g_free (buf);
/* Draw the brush preview */ /* Draw the brush preview */
gtk_widget_draw (bsp->brush_preview, NULL); gtk_widget_draw (bsp->brush_preview, NULL);
@ -802,12 +817,11 @@ display_brush (BrushSelectP bsp,
int ystart; int ystart;
int i, j; int i, j;
buf = (unsigned char *) g_malloc (sizeof (char) * bsp->cell_width);
brush_buf = brush->mask; brush_buf = brush->mask;
if (brush_buf->width > bsp->cell_width || if (!GIMP_IS_BRUSH_PIXMAP(brush) && /* can't scale color brushes yet */
brush_buf->height > bsp->cell_height) (brush_buf->width > bsp->cell_width ||
brush_buf->height > bsp->cell_height))
{ {
double ratio_x = (double)brush_buf->width / bsp->cell_width; double ratio_x = (double)brush_buf->width / bsp->cell_width;
double ratio_y = (double)brush_buf->height / bsp->cell_height; double ratio_y = (double)brush_buf->height / bsp->cell_height;
@ -837,25 +851,44 @@ display_brush (BrushSelectP bsp,
yend = BOUNDS (offset_y + height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + height, 0, bsp->preview->allocation.height);
/* Get the pointer into the brush mask data */ /* Get the pointer into the brush mask data */
src = mask_buf_data (brush_buf) + (ystart - offset_y) * brush_buf->width; if (GIMP_IS_BRUSH_PIXMAP (brush))
for (i = ystart; i < yend; i++)
{ {
/* Invert the mask for display. We're doing this because GimpBrushPixmap *pixmapbrush = GIMP_BRUSH_PIXMAP(brush);
* a value of 255 in the mask means it is full intensity. src = (gchar *) temp_buf_data (pixmapbrush->pixmap_mask) + (ystart - offset_y) * brush->mask->width * 3;
* However, it makes more sense for full intensity to show for (i = ystart; i < yend; i++)
* up as black in this brush preview window... {
*/ gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), src,
s = src; offset_x, i, width);
b = buf; src += brush->mask->width * 3;
for (j = 0; j < width; j++) }
*b++ = 255 - *s++; }
else
gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), buf, offset_x, i, width); {
buf = (unsigned char *) g_malloc (3 * sizeof (char) * bsp->cell_width);
src += brush_buf->width; src = mask_buf_data (brush_buf) + (ystart - offset_y) * brush_buf->width;
for (i = ystart; i < yend; i++)
{
/* Invert the mask for display. We're doing this because
* a value of 255 in the mask means it is full intensity.
* However, it makes more sense for full intensity to show
* up as black in this brush preview window...
*/
s = src;
b = buf;
for (j = 0; j < width; j++)
{
int k = 255 - *s++;
*b++ = k;
*b++ = k;
*b++ = k;
}
gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), buf,
offset_x, i, width);
src += brush_buf->width;
}
g_free (buf);
} }
g_free (buf);
if (scale) if (scale)
{ {
@ -884,10 +917,10 @@ display_setup (BrushSelectP bsp)
int i; int i;
buf = buf =
(unsigned char *) g_malloc (sizeof (char) * bsp->preview->allocation.width); (unsigned char *) g_malloc (sizeof (char) * 3 *bsp->preview->allocation.width);
/* Set the buffer to white */ /* Set the buffer to white */
memset (buf, 255, bsp->preview->allocation.width); memset (buf, 255, bsp->preview->allocation.width*3);
/* Set the image buffer to white */ /* Set the image buffer to white */
for (i = 0; i < bsp->preview->allocation.height; i++) for (i = 0; i < bsp->preview->allocation.height; i++)
@ -941,7 +974,7 @@ brush_select_show_selected (BrushSelectP bsp,
int offset_x, offset_y; int offset_x, offset_y;
int i; int i;
buf = (unsigned char *) g_malloc (sizeof (char) * bsp->cell_width); buf = (unsigned char *) g_malloc (sizeof (char) * 3 * bsp->cell_width);
if (bsp->old_col != col || bsp->old_row != row) if (bsp->old_col != col || bsp->old_row != row)
{ {
@ -953,7 +986,7 @@ brush_select_show_selected (BrushSelectP bsp,
yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height);
/* set the buf to white */ /* set the buf to white */
memset (buf, 255, bsp->cell_width); memset (buf, 255, 3*bsp->cell_width);
for (i = ystart; i < yend; i++) for (i = ystart; i < yend; i++)
{ {
@ -987,7 +1020,7 @@ brush_select_show_selected (BrushSelectP bsp,
yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height);
/* set the buf to black */ /* set the buf to black */
memset (buf, 0, bsp->cell_width); memset (buf, 0, bsp->cell_width * 3);
for (i = ystart; i < yend; i++) for (i = ystart; i < yend; i++)
{ {

117
app/gui/brush-select.c
View File

@ -20,6 +20,7 @@
#include "appenv.h" #include "appenv.h"
#include "actionarea.h" #include "actionarea.h"
#include "brush_scale.h" #include "brush_scale.h"
#include "gimpbrushpixmap.h"
#include "gimpbrushlist.h" #include "gimpbrushlist.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimplist.h" #include "gimplist.h"
@ -213,7 +214,7 @@ brush_select_new (gchar *title,
bsp->cell_width = MIN_CELL_SIZE; bsp->cell_width = MIN_CELL_SIZE;
bsp->cell_height = MIN_CELL_SIZE; bsp->cell_height = MIN_CELL_SIZE;
bsp->preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); bsp->preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (bsp->preview), gtk_preview_size (GTK_PREVIEW (bsp->preview),
MAX_WIN_WIDTH (bsp), MAX_WIN_HEIGHT (bsp)); MAX_WIN_WIDTH (bsp), MAX_WIN_HEIGHT (bsp));
gtk_widget_set_usize (bsp->preview, gtk_widget_set_usize (bsp->preview,
@ -707,7 +708,7 @@ brush_popup_timeout (gpointer data)
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_container_add (GTK_CONTAINER (bsp->brush_popup), frame); gtk_container_add (GTK_CONTAINER (bsp->brush_popup), frame);
gtk_widget_show (frame); gtk_widget_show (frame);
bsp->brush_preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); bsp->brush_preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_container_add (GTK_CONTAINER (frame), bsp->brush_preview); gtk_container_add (GTK_CONTAINER (frame), bsp->brush_preview);
gtk_widget_show (bsp->brush_preview); gtk_widget_show (bsp->brush_preview);
} }
@ -732,22 +733,36 @@ brush_popup_timeout (gpointer data)
gtk_widget_popup (bsp->brush_popup, x, y); gtk_widget_popup (bsp->brush_popup, x, y);
/* Draw the brush */ /* Draw the brush */
buf = g_new (gchar, brush->mask->width); if (GIMP_IS_BRUSH_PIXMAP (brush))
src = (gchar *) temp_buf_data (brush->mask);
for (y = 0; y < brush->mask->height; y++)
{ {
/* Invert the mask for display. We're doing this because GimpBrushPixmap *pixmapbrush = GIMP_BRUSH_PIXMAP(brush);
* a value of 255 in the mask means it is full intensity. src = (gchar *) temp_buf_data (pixmapbrush->pixmap_mask);
* However, it makes more sense for full intensity to show for (y = 0; y < brush->mask->height; y++)
* up as black in this brush preview window... {
*/ gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)src,
for (x = 0; x < brush->mask->width; x++) 0, y, brush->mask->width);
buf[x] = 255 - src[x]; src += brush->mask->width * 3;
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)buf, }
0, y, brush->mask->width); }
src += brush->mask->width; else
{
buf = g_new (gchar, 3*brush->mask->width);
src = (gchar *) temp_buf_data (brush->mask);
for (y = 0; y < brush->mask->height; y++)
{
/* Invert the mask for display. We're doing this because
* a value of 255 in the mask means it is full intensity.
* However, it makes more sense for full intensity to show
* up as black in this brush preview window...
*/
for (x = 0; x < brush->mask->width; x++)
buf[3*x] = buf[3*x+1] = buf[3*x+2] = 255 - src[x];
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)buf,
0, y, brush->mask->width);
src += brush->mask->width;
}
g_free (buf);
} }
g_free (buf);
/* Draw the brush preview */ /* Draw the brush preview */
gtk_widget_draw (bsp->brush_preview, NULL); gtk_widget_draw (bsp->brush_preview, NULL);
@ -802,12 +817,11 @@ display_brush (BrushSelectP bsp,
int ystart; int ystart;
int i, j; int i, j;
buf = (unsigned char *) g_malloc (sizeof (char) * bsp->cell_width);
brush_buf = brush->mask; brush_buf = brush->mask;
if (brush_buf->width > bsp->cell_width || if (!GIMP_IS_BRUSH_PIXMAP(brush) && /* can't scale color brushes yet */
brush_buf->height > bsp->cell_height) (brush_buf->width > bsp->cell_width ||
brush_buf->height > bsp->cell_height))
{ {
double ratio_x = (double)brush_buf->width / bsp->cell_width; double ratio_x = (double)brush_buf->width / bsp->cell_width;
double ratio_y = (double)brush_buf->height / bsp->cell_height; double ratio_y = (double)brush_buf->height / bsp->cell_height;
@ -837,25 +851,44 @@ display_brush (BrushSelectP bsp,
yend = BOUNDS (offset_y + height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + height, 0, bsp->preview->allocation.height);
/* Get the pointer into the brush mask data */ /* Get the pointer into the brush mask data */
src = mask_buf_data (brush_buf) + (ystart - offset_y) * brush_buf->width; if (GIMP_IS_BRUSH_PIXMAP (brush))
for (i = ystart; i < yend; i++)
{ {
/* Invert the mask for display. We're doing this because GimpBrushPixmap *pixmapbrush = GIMP_BRUSH_PIXMAP(brush);
* a value of 255 in the mask means it is full intensity. src = (gchar *) temp_buf_data (pixmapbrush->pixmap_mask) + (ystart - offset_y) * brush->mask->width * 3;
* However, it makes more sense for full intensity to show for (i = ystart; i < yend; i++)
* up as black in this brush preview window... {
*/ gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), src,
s = src; offset_x, i, width);
b = buf; src += brush->mask->width * 3;
for (j = 0; j < width; j++) }
*b++ = 255 - *s++; }
else
gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), buf, offset_x, i, width); {
buf = (unsigned char *) g_malloc (3 * sizeof (char) * bsp->cell_width);
src += brush_buf->width; src = mask_buf_data (brush_buf) + (ystart - offset_y) * brush_buf->width;
for (i = ystart; i < yend; i++)
{
/* Invert the mask for display. We're doing this because
* a value of 255 in the mask means it is full intensity.
* However, it makes more sense for full intensity to show
* up as black in this brush preview window...
*/
s = src;
b = buf;
for (j = 0; j < width; j++)
{
int k = 255 - *s++;
*b++ = k;
*b++ = k;
*b++ = k;
}
gtk_preview_draw_row (GTK_PREVIEW (bsp->preview), buf,
offset_x, i, width);
src += brush_buf->width;
}
g_free (buf);
} }
g_free (buf);
if (scale) if (scale)
{ {
@ -884,10 +917,10 @@ display_setup (BrushSelectP bsp)
int i; int i;
buf = buf =
(unsigned char *) g_malloc (sizeof (char) * bsp->preview->allocation.width); (unsigned char *) g_malloc (sizeof (char) * 3 *bsp->preview->allocation.width);
/* Set the buffer to white */ /* Set the buffer to white */
memset (buf, 255, bsp->preview->allocation.width); memset (buf, 255, bsp->preview->allocation.width*3);
/* Set the image buffer to white */ /* Set the image buffer to white */
for (i = 0; i < bsp->preview->allocation.height; i++) for (i = 0; i < bsp->preview->allocation.height; i++)
@ -941,7 +974,7 @@ brush_select_show_selected (BrushSelectP bsp,
int offset_x, offset_y; int offset_x, offset_y;
int i; int i;
buf = (unsigned char *) g_malloc (sizeof (char) * bsp->cell_width); buf = (unsigned char *) g_malloc (sizeof (char) * 3 * bsp->cell_width);
if (bsp->old_col != col || bsp->old_row != row) if (bsp->old_col != col || bsp->old_row != row)
{ {
@ -953,7 +986,7 @@ brush_select_show_selected (BrushSelectP bsp,
yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height);
/* set the buf to white */ /* set the buf to white */
memset (buf, 255, bsp->cell_width); memset (buf, 255, 3*bsp->cell_width);
for (i = ystart; i < yend; i++) for (i = ystart; i < yend; i++)
{ {
@ -987,7 +1020,7 @@ brush_select_show_selected (BrushSelectP bsp,
yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height); yend = BOUNDS (offset_y + bsp->cell_height, 0, bsp->preview->allocation.height);
/* set the buf to black */ /* set the buf to black */
memset (buf, 0, bsp->cell_width); memset (buf, 0, bsp->cell_width * 3);
for (i = ystart; i < yend; i++) for (i = ystart; i < yend; i++)
{ {