gimpinkoptions-gui.c 20.9 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
/* The GIMP -- an image manipulation program
 * Copyright (C) 1995 Spencer Kimball and Peter Mattis
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

#include "config.h"

#include <gtk/gtk.h>

#include "libgimpwidgets/gimpwidgets.h"

#include "tools-types.h"

27 28
#include "config/gimpconfig-params.h"

29 30 31 32 33 34
#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "core/gimptoolinfo.h"

35 36
#include "widgets/gimppropwidgets.h"

37
#include "gimpinkoptions.h"
38
#include "gimpinktool-blob.h"
39 40 41 42 43
#include "paint_options.h"

#include "libgimp/gimpintl.h"


44 45 46 47
enum
{
  PROP_0,
  PROP_SIZE,
48 49
  PROP_TILT_ANGLE,
  PROP_SIZE_SENSITIVITY,
50 51 52 53 54 55 56 57
  PROP_VEL_SENSITIVITY,
  PROP_TILT_SENSITIVITY,
  PROP_BLOB_TYPE,
  PROP_BLOB_ASPECT,
  PROP_BLOB_ANGLE
};


58 59 60
static void   gimp_ink_options_init       (GimpInkOptions      *options);
static void   gimp_ink_options_class_init (GimpInkOptionsClass *options_class);

61 62 63 64 65 66 67 68
static void   gimp_ink_options_set_property (GObject         *object,
                                             guint            property_id,
                                             const GValue    *value,
                                             GParamSpec      *pspec);
static void   gimp_ink_options_get_property (GObject         *object,
                                             guint            property_id,
                                             GValue          *value,
                                             GParamSpec      *pspec);
69

70 71
static GtkWidget * brush_widget_new         (GimpInkOptions  *options);
static GtkWidget * blob_button_new          (GimpInkBlobType  blob_type);
72

73 74 75 76

static GimpPaintOptionsClass *parent_class = NULL;


77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
GType
gimp_ink_options_get_type (void)
{
  static GType type = 0;

  if (! type)
    {
      static const GTypeInfo info =
      {
        sizeof (GimpInkOptionsClass),
	(GBaseInitFunc) NULL,
	(GBaseFinalizeFunc) NULL,
	(GClassInitFunc) gimp_ink_options_class_init,
	NULL,           /* class_finalize */
	NULL,           /* class_data     */
	sizeof (GimpInkOptions),
	0,              /* n_preallocs    */
	(GInstanceInitFunc) gimp_ink_options_init,
      };

      type = g_type_register_static (GIMP_TYPE_PAINT_OPTIONS,
                                     "GimpInkOptions",
                                     &info, 0);
    }

  return type;
}

static void 
gimp_ink_options_class_init (GimpInkOptionsClass *klass)
{
108
  GObjectClass *object_class;
109

110
  object_class = G_OBJECT_CLASS (klass);
111 112 113 114 115 116

  parent_class = g_type_class_peek_parent (klass);

  object_class->set_property = gimp_ink_options_set_property;
  object_class->get_property = gimp_ink_options_get_property;

117 118 119 120
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SIZE,
                                   "size", NULL,
                                   0.0, 20.0, 4.4,
                                   0);
121 122 123 124 125 126 127
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_TILT_ANGLE,
                                   "tilt-angle", NULL,
                                   -90.0, 90.0, 0.0,
                                   0);

  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SIZE_SENSITIVITY,
                                   "size-sensitivity", NULL,
128 129 130 131 132 133 134 135 136 137
                                   0.0, 1.0, 1.0,
                                   0);
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_VEL_SENSITIVITY,
                                   "vel-sensitivity", NULL,
                                   0.0, 1.0, 0.8,
                                   0);
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_TILT_SENSITIVITY,
                                   "tilt-sensitivity", NULL,
                                   0.0, 1.0, 0.4,
                                   0);
138

139 140 141 142 143 144 145 146 147 148 149 150 151
  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_BLOB_TYPE,
                                 "blob-type", NULL,
                                 GIMP_TYPE_INK_BLOB_TYPE,
                                 GIMP_INK_BLOB_TYPE_ELLIPSE,
                                 0);
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_BLOB_ASPECT,
                                   "blob-aspect", NULL,
                                   1.0, 10.0, 1.0,
                                   0);
  GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_BLOB_ANGLE,
                                   "blob-angle", NULL,
                                   -90.0, 90.0, 0.0,
                                   0);
152 153 154 155 156 157 158
}

static void
gimp_ink_options_init (GimpInkOptions *options)
{
}

159 160 161 162 163 164
static void
gimp_ink_options_set_property (GObject      *object,
                               guint         property_id,
                               const GValue *value,
                               GParamSpec   *pspec)
{
165 166 167 168 169 170 171 172 173
  GimpInkOptions *options;

  options = GIMP_INK_OPTIONS (object);

  switch (property_id)
    {
    case PROP_SIZE:
      options->size = g_value_get_double (value);
      break;
174 175 176 177 178
    case PROP_TILT_ANGLE:
      options->tilt_angle = g_value_get_double (value);
      break;
    case PROP_SIZE_SENSITIVITY:
      options->size_sensitivity = g_value_get_double (value);
179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
      break;
    case PROP_VEL_SENSITIVITY:
      options->vel_sensitivity = g_value_get_double (value);
      break;
    case PROP_TILT_SENSITIVITY:
      options->tilt_sensitivity = g_value_get_double (value);
      break;
    case PROP_BLOB_TYPE:
      options->blob_type = g_value_get_enum (value);
      break;
    case PROP_BLOB_ASPECT:
      options->blob_aspect = g_value_get_double (value);
      break;
    case PROP_BLOB_ANGLE:
      options->blob_angle = g_value_get_double (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
      break;
    }
199 200 201 202 203 204 205 206
}

static void
gimp_ink_options_get_property (GObject    *object,
                               guint       property_id,
                               GValue     *value,
                               GParamSpec *pspec)
{
207 208 209 210 211 212 213 214 215
  GimpInkOptions *options;

  options = GIMP_INK_OPTIONS (object);

  switch (property_id)
    {
    case PROP_SIZE:
      g_value_set_double (value, options->size);
      break;
216 217 218 219 220
    case PROP_TILT_ANGLE:
      g_value_set_double (value, options->tilt_angle);
      break;
    case PROP_SIZE_SENSITIVITY:
      g_value_set_double (value, options->size_sensitivity);
221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
      break;
    case PROP_VEL_SENSITIVITY:
      g_value_set_double (value, options->vel_sensitivity);
      break;
    case PROP_TILT_SENSITIVITY:
      g_value_set_double (value, options->tilt_sensitivity);
      break;
    case PROP_BLOB_TYPE:
      g_value_set_enum (value, options->blob_type);
      break;
    case PROP_BLOB_ASPECT:
      g_value_set_double (value, options->blob_aspect);
      break;
    case PROP_BLOB_ANGLE:
      g_value_set_double (value, options->blob_angle);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
      break;
    }
241 242
}

243
GtkWidget *
244 245
gimp_ink_options_gui (GimpToolOptions *tool_options)
{
246 247 248
  GObject   *config;
  GtkWidget *table;
  GtkWidget *vbox;
249
  GtkWidget *brush_vbox;
250 251 252
  GtkWidget *hbox;
  GtkWidget *frame;
  GtkWidget *brush;
253

254
  config = G_OBJECT (tool_options);
255

256
  vbox = gimp_paint_options_gui (tool_options);
257 258 259 260 261 262 263 264 265 266 267 268 269 270

  /* adjust sliders */
  frame = gtk_frame_new (_("Adjustment"));
  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
  gtk_widget_show (frame);

  table = gtk_table_new (2, 3, FALSE);
  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_container_add (GTK_CONTAINER (frame), table);
  gtk_widget_show (table);

  /*  size slider  */
271 272 273 274 275
  gimp_prop_scale_entry_new (config, "size",
                             GTK_TABLE (table), 0, 0,
                             _("Size:"),
                             1.0, 2.0, 1,
                             FALSE, 0.0, 0.0);
276 277

  /* angle adjust slider */
278 279 280 281 282
  gimp_prop_scale_entry_new (config, "tilt-angle",
                             GTK_TABLE (table), 0, 1,
                             _("Angle:"),
                             1.0, 10.0, 1,
                             FALSE, 0.0, 0.0);
283 284 285 286 287 288 289 290 291 292 293 294 295 296

  /* sens sliders */
  frame = gtk_frame_new (_("Sensitivity"));
  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
  gtk_widget_show (frame);

  table = gtk_table_new (3, 3, FALSE);
  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_container_add (GTK_CONTAINER (frame), table);
  gtk_widget_show (table);

  /* size sens slider */
297
  gimp_prop_scale_entry_new (config, "size-sensitivity",
298 299 300 301
                             GTK_TABLE (table), 0, 0,
                             _("Size:"),
                             0.01, 0.1, 1,
                             FALSE, 0.0, 0.0);
302

303
  /* tilt sens slider */
304 305 306 307 308
  gimp_prop_scale_entry_new (config, "tilt-sensitivity",
                             GTK_TABLE (table), 0, 1,
                             _("Tilt:"),
                             0.01, 0.1, 1,
                             FALSE, 0.0, 0.0);
309 310

  /* velocity sens slider */
311 312 313 314 315
  gimp_prop_scale_entry_new (config, "vel-sensitivity",
                             GTK_TABLE (table), 0, 2,
                             _("Speed:"),
                             0.01, 0.1, 1,
                             FALSE, 0.0, 0.0);
316 317 318

  /*  bottom hbox */
  hbox = gtk_hbox_new (FALSE, 2);
319
  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
320 321 322
  gtk_widget_show (hbox);

  /* Brush type radiobuttons */
323 324
  frame = gimp_prop_enum_radio_frame_new (config, "blob-type",
                                          _("Type"), 0, 0);
325 326 327
  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
  gtk_widget_show (frame);

328
  {
329 330 331
    GList           *children;
    GList           *list;
    GimpInkBlobType  blob_type;
332

333 334
    children =
      gtk_container_get_children (GTK_CONTAINER (GTK_BIN (frame)->child));
335

336
    for (list = children, blob_type = GIMP_INK_BLOB_TYPE_ELLIPSE;
337
         list;
338
         list = g_list_next (list), blob_type++)
339 340
      {
        GtkWidget *radio;
341
        GtkWidget *blob;
342

343
        radio = GTK_WIDGET (list->data);
344

345
        gtk_container_remove (GTK_CONTAINER (radio), GTK_BIN (radio)->child);
346

347
        blob = blob_button_new (blob_type);
348 349 350
        gtk_container_add (GTK_CONTAINER (radio), blob);
        gtk_widget_show (blob);
      }
351

352 353
    g_list_free (children);
  }
354 355 356 357 358 359

  /* Brush shape widget */
  frame = gtk_frame_new (_("Shape"));
  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
  gtk_widget_show (frame);

360 361 362 363
  brush_vbox = gtk_vbox_new (FALSE, 2);
  gtk_container_set_border_width (GTK_CONTAINER (brush_vbox), 2);
  gtk_container_add (GTK_CONTAINER (frame), brush_vbox);
  gtk_widget_show (brush_vbox);
364 365 366

  frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
367
  gtk_box_pack_start (GTK_BOX (brush_vbox), frame, TRUE, TRUE, 0);
368
  gtk_widget_show (frame);
369

370 371 372
  brush = brush_widget_new (GIMP_INK_OPTIONS (tool_options));
  gtk_container_add (GTK_CONTAINER (frame), brush);
  gtk_widget_show (brush);
373 374

  return vbox;
375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418
}


/*  BrushWidget functions  */

typedef struct _BrushWidget BrushWidget;

struct _BrushWidget
{
  GtkWidget      *widget;
  gboolean        state;

  /* EEK */
  GimpInkOptions *ink_options;
};

static void     brush_widget_notify         (GimpInkOptions *options,
                                             GParamSpec     *pspec,
                                             BrushWidget    *brush_widget);
static void     brush_widget_active_rect    (BrushWidget    *brush_widget,
                                             GtkWidget      *widget,
                                             GdkRectangle   *rect);
static void     brush_widget_realize        (GtkWidget      *widget);
static gboolean brush_widget_expose         (GtkWidget      *widget,
                                             GdkEventExpose *event,
                                             BrushWidget    *brush_widget);
static gboolean brush_widget_button_press   (GtkWidget      *widget,
                                             GdkEventButton *event,
                                             BrushWidget    *brush_widget);
static gboolean brush_widget_button_release (GtkWidget      *widget,
                                             GdkEventButton *event,
                                             BrushWidget    *brush_widget);
static gboolean brush_widget_motion_notify  (GtkWidget      *widget,
                                             GdkEventMotion *event,
                                             BrushWidget    *brush_widget);

static void     paint_blob                  (GdkDrawable    *drawable,
                                             GdkGC          *gc,
                                             Blob           *blob);

static GtkWidget *
brush_widget_new (GimpInkOptions *options)
{
  BrushWidget *brush_w;
419 420

  brush_w = g_new (BrushWidget, 1);
421
  brush_w->widget      = gtk_drawing_area_new ();
422 423 424
  brush_w->state       = FALSE;
  brush_w->ink_options = options;

425 426 427 428 429 430 431
  gtk_widget_set_size_request (brush_w->widget, 60, 60);
  gtk_widget_set_events (brush_w->widget,
			 GDK_BUTTON_PRESS_MASK   |
                         GDK_BUTTON_RELEASE_MASK |
			 GDK_POINTER_MOTION_MASK |
                         GDK_EXPOSURE_MASK);

432
  g_signal_connect (options, "notify",
433
                    G_CALLBACK (brush_widget_notify),
434
                    brush_w);
435

436
  g_signal_connect (brush_w->widget, "button_press_event",
437
		    G_CALLBACK (brush_widget_button_press),
438
		    brush_w);
439
  g_signal_connect (brush_w->widget, "button_release_event",
440
		    G_CALLBACK (brush_widget_button_release),
441
		    brush_w);
442
  g_signal_connect (brush_w->widget, "motion_notify_event",
443
		    G_CALLBACK (brush_widget_motion_notify),
444
		    brush_w);
445
  g_signal_connect (brush_w->widget, "expose_event",
446
		    G_CALLBACK (brush_widget_expose), 
447
		    brush_w);
448
  g_signal_connect (brush_w->widget, "realize",
449
		    G_CALLBACK (brush_widget_realize),
450
		    brush_w);
451

452 453 454 455
  g_object_weak_ref (G_OBJECT (brush_w->widget),
                     (GWeakNotify) g_free, brush_w);

  return brush_w->widget;
456
}
457

458
static void
459 460 461
brush_widget_notify (GimpInkOptions *options,
                     GParamSpec     *pspec,
                     BrushWidget    *brush_w)
462 463 464 465 466 467 468 469 470 471 472 473
{
  switch (pspec->param_id)
    {
    case PROP_BLOB_TYPE:
    case PROP_BLOB_ASPECT:
    case PROP_BLOB_ANGLE:
      gtk_widget_queue_draw (brush_w->widget);
      break;

    default:
      break;
    }
474 475 476
}

static void
477 478 479
brush_widget_active_rect (BrushWidget  *brush_widget,
			  GtkWidget    *widget,
			  GdkRectangle *rect)
480
{
481 482
  gint x,y;
  gint r;
483

484 485 486 487 488 489 490 491 492
  r = MIN (widget->allocation.width, widget->allocation.height) / 2;

  x = (widget->allocation.width / 2 +
       0.85 * r * brush_widget->ink_options->blob_aspect / 10.0 *
       cos (brush_widget->ink_options->blob_angle));

  y = (widget->allocation.height / 2 +
       0.85 * r * brush_widget->ink_options->blob_aspect / 10.0 *
       sin (brush_widget->ink_options->blob_angle));
493

494 495 496 497
  rect->x      = x - 5;
  rect->y      = y - 5;
  rect->width  = 10;
  rect->height = 10;
498 499 500
}

static void
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545
brush_widget_realize (GtkWidget *widget)
{
  gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
}

static void
brush_widget_draw_brush (BrushWidget *brush_widget,
			 GtkWidget   *widget,
			 gdouble      xc,
			 gdouble      yc,
			 gdouble      radius)
{
  BlobFunc  function = blob_ellipse;
  Blob     *blob;

  switch (brush_widget->ink_options->blob_type)
    {
    case GIMP_INK_BLOB_TYPE_ELLIPSE:
      function = blob_ellipse;
      break;

    case GIMP_INK_BLOB_TYPE_SQUARE:
      function = blob_square;
      break;

    case GIMP_INK_BLOB_TYPE_DIAMOND:
      function = blob_diamond;
      break;
    }

  blob = (* function) (xc, yc,
                       radius * cos (brush_widget->ink_options->blob_angle),
                       radius * sin (brush_widget->ink_options->blob_angle),
                       (- (radius / brush_widget->ink_options->blob_aspect) *
                        sin (brush_widget->ink_options->blob_angle)),
                       ((radius / brush_widget->ink_options->blob_aspect) *
                        cos (brush_widget->ink_options->blob_angle)));
  paint_blob (widget->window, widget->style->fg_gc[widget->state], blob);
  g_free (blob);
}

static gboolean
brush_widget_expose (GtkWidget      *widget,
		     GdkEventExpose *event,
		     BrushWidget    *brush_widget)
546
{
547 548 549 550 551 552 553
  GdkRectangle rect;
  gint         r0;

  r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;

  if (r0 < 2)
    return TRUE;
554

555 556 557 558 559 560 561 562 563 564 565 566 567 568 569
  brush_widget_draw_brush (brush_widget, widget,
			   widget->allocation.width  / 2,
			   widget->allocation.height / 2,
			   0.9 * r0);

  brush_widget_active_rect (brush_widget, widget, &rect);
  gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL],
		      TRUE,	/* filled */
		      rect.x, rect.y, 
		      rect.width, rect.height);
  gtk_paint_shadow (widget->style, widget->window, widget->state,
                    GTK_SHADOW_OUT,
                    NULL, widget, NULL,
                    rect.x, rect.y,
                    rect.width, rect.height);
570

571 572
  return TRUE;
}
573

574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634
static gboolean
brush_widget_button_press (GtkWidget      *widget,
			   GdkEventButton *event,
			   BrushWidget    *brush_widget)
{
  GdkRectangle rect;

  brush_widget_active_rect (brush_widget, widget, &rect);

  if ((event->x >= rect.x) && (event->x-rect.x < rect.width) &&
      (event->y >= rect.y) && (event->y-rect.y < rect.height))
    {
      brush_widget->state = TRUE;

      gtk_grab_add (brush_widget->widget);
    }

  return TRUE;
}

static gboolean
brush_widget_button_release (GtkWidget      *widget,
			     GdkEventButton *event,
			     BrushWidget    *brush_widget)
{
  brush_widget->state = FALSE;

  gtk_grab_remove (brush_widget->widget);

  return TRUE;
}

static gboolean
brush_widget_motion_notify (GtkWidget      *widget,
			    GdkEventMotion *event,
			    BrushWidget    *brush_widget)
{
  if (brush_widget->state)
    {
      gint x;
      gint y;
      gint rsquare;

      x = event->x - widget->allocation.width  / 2;
      y = event->y - widget->allocation.height / 2;

      rsquare = x*x + y*y;

      if (rsquare != 0)
	{
          gint    r0;
          gdouble angle;
          gdouble aspect;

	  r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;

          angle  = atan2 (y, x);
          aspect = 10.0 * sqrt ((gdouble) rsquare / (r0 * r0)) / 0.85;

          aspect = CLAMP (aspect, 1.0, 10.0);

635
          g_object_set (brush_widget->ink_options,
636 637 638 639 640 641 642 643 644 645 646 647 648 649
                        "blob-angle",  angle,
                        "blob-aspect", aspect,
                        NULL);

	  gtk_widget_queue_draw (widget);
	}
    }

  return TRUE;
}


/*  blob button functions  */

650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684
static gboolean   blob_button_expose (GtkWidget      *widget,
                                      GdkEventExpose *event,
                                      BlobFunc        function);

static GtkWidget *
blob_button_new (GimpInkBlobType blob_type)
{
  GtkWidget *blob;
  BlobFunc   function = blob_ellipse;

  switch (blob_type)
    {
    case GIMP_INK_BLOB_TYPE_ELLIPSE:
      function = blob_ellipse;
      break;

    case GIMP_INK_BLOB_TYPE_SQUARE:
      function = blob_square;
      break;

    case GIMP_INK_BLOB_TYPE_DIAMOND:
      function = blob_diamond;
      break;
    }

  blob = gtk_drawing_area_new ();
  gtk_widget_set_size_request (blob, 21, 21);

  g_signal_connect (blob, "expose_event",
                    G_CALLBACK (blob_button_expose),
                    function);

  return blob;
}

685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715
static gboolean
blob_button_expose (GtkWidget      *widget,
                    GdkEventExpose *event,
                    BlobFunc        function)
{
  Blob *blob;

  blob = (* function) (widget->allocation.width  / 2,
                       widget->allocation.height / 2,
                       8, 0, 0, 8);
  paint_blob (widget->window, widget->style->fg_gc[widget->state], blob);
  g_free (blob);

  return TRUE;
}


/*  Draw a blob onto a drawable with the specified graphics context  */

static void
paint_blob (GdkDrawable *drawable,
	    GdkGC       *gc,
	    Blob        *blob)
{
  gint i;

  for (i = 0; i < blob->height; i++)
    if (blob->data[i].left <= blob->data[i].right)
      gdk_draw_line (drawable, gc,
                     blob->data[i].left,      i + blob->y,
                     blob->data[i].right + 1, i + blob->y);
716
}