1998-06-15 06:42:36 +08:00
|
|
|
/* 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.
|
|
|
|
|
*/
|
app/appenv.h New file. Includes <math.h>. Move G_PI, RINT(), ROUND() etc
1999-09-01 Tor Lillqvist <tml@iki.fi>
* app/appenv.h
* libgimp/gimpmath.h: New file. Includes <math.h>. Move G_PI,
RINT(), ROUND() etc from app/appenv.h here, so plug-ins can
use them, too. Remove some commented-out old stuff in appenv.h.
* libgimp/gimp.h: Include gimpmath.h.
* libgimp/gimp.c (gimp_main): Win32: Don't install signal
handlers, we can't do anything useful in the handler ourselves
anyway (it would be nice to print out a backtrace, but that seems
pretty hard to do, even if not impossible). Let Windows inform the
user about the crash. If the plug-in was compiled with MSVC, and
the user also has it, she is offered a chance to start the
debugger automatically anyway.
* app/*several*.c: Include gimpmath.h for G_PI etc. Don't include
<math.h>, as gimpmath.h includes it.
* plug-ins/*/*many*.c: Include config.h. Don't include <math.h>.
Remove all the duplicated definitions of G_PI and rint(). Use
RINT() instead of rint().
* app/app_procs.[ch]: app_exit() takes a gboolean.
* app/batch.c
* app/commands.c
* app/interface.c: Call app_exit() with FALSE or TRUE.
* app/main.c (on_error): Call gimp_fatal_error. (main): Don't
install any signal handler on Win32 here, either.
* app/errors.c (gimp_fatal_error, gimp_terminate): Win32: Format
the message and call MessageBox with it. g_on_error_query doesn't
do anything useful on Win32, and printf'ing a message to stdout or
stderr doesn't do anything, either, in a windowing application.
1999-09-02 04:30:56 +08:00
|
|
|
#include "config.h"
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
#include <stdlib.h>
|
1999-03-07 20:56:03 +08:00
|
|
|
#include <string.h>
|
app/appenv.h New file. Includes <math.h>. Move G_PI, RINT(), ROUND() etc
1999-09-01 Tor Lillqvist <tml@iki.fi>
* app/appenv.h
* libgimp/gimpmath.h: New file. Includes <math.h>. Move G_PI,
RINT(), ROUND() etc from app/appenv.h here, so plug-ins can
use them, too. Remove some commented-out old stuff in appenv.h.
* libgimp/gimp.h: Include gimpmath.h.
* libgimp/gimp.c (gimp_main): Win32: Don't install signal
handlers, we can't do anything useful in the handler ourselves
anyway (it would be nice to print out a backtrace, but that seems
pretty hard to do, even if not impossible). Let Windows inform the
user about the crash. If the plug-in was compiled with MSVC, and
the user also has it, she is offered a chance to start the
debugger automatically anyway.
* app/*several*.c: Include gimpmath.h for G_PI etc. Don't include
<math.h>, as gimpmath.h includes it.
* plug-ins/*/*many*.c: Include config.h. Don't include <math.h>.
Remove all the duplicated definitions of G_PI and rint(). Use
RINT() instead of rint().
* app/app_procs.[ch]: app_exit() takes a gboolean.
* app/batch.c
* app/commands.c
* app/interface.c: Call app_exit() with FALSE or TRUE.
* app/main.c (on_error): Call gimp_fatal_error. (main): Don't
install any signal handler on Win32 here, either.
* app/errors.c (gimp_fatal_error, gimp_terminate): Win32: Format
the message and call MessageBox with it. g_on_error_query doesn't
do anything useful on Win32, and printf'ing a message to stdout or
stderr doesn't do anything, either, in a windowing application.
1999-09-02 04:30:56 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
#include "appenv.h"
|
|
|
|
|
#include "drawable.h"
|
|
|
|
|
#include "draw_core.h"
|
|
|
|
|
#include "gimage_mask.h"
|
1998-07-19 01:39:23 +08:00
|
|
|
#include "gimprc.h"
|
2000-01-14 20:41:00 +08:00
|
|
|
#include "gimpui.h"
|
1998-06-15 06:42:36 +08:00
|
|
|
#include "ink.h"
|
1999-04-22 22:34:00 +08:00
|
|
|
#include "paint_options.h"
|
1998-06-15 06:42:36 +08:00
|
|
|
#include "tools.h"
|
|
|
|
|
#include "undo.h"
|
|
|
|
|
#include "blob.h"
|
1998-08-16 08:34:20 +08:00
|
|
|
#include "gdisplay.h"
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1998-11-23 22:47:09 +08:00
|
|
|
#include "libgimp/gimpintl.h"
|
app/appenv.h New file. Includes <math.h>. Move G_PI, RINT(), ROUND() etc
1999-09-01 Tor Lillqvist <tml@iki.fi>
* app/appenv.h
* libgimp/gimpmath.h: New file. Includes <math.h>. Move G_PI,
RINT(), ROUND() etc from app/appenv.h here, so plug-ins can
use them, too. Remove some commented-out old stuff in appenv.h.
* libgimp/gimp.h: Include gimpmath.h.
* libgimp/gimp.c (gimp_main): Win32: Don't install signal
handlers, we can't do anything useful in the handler ourselves
anyway (it would be nice to print out a backtrace, but that seems
pretty hard to do, even if not impossible). Let Windows inform the
user about the crash. If the plug-in was compiled with MSVC, and
the user also has it, she is offered a chance to start the
debugger automatically anyway.
* app/*several*.c: Include gimpmath.h for G_PI etc. Don't include
<math.h>, as gimpmath.h includes it.
* plug-ins/*/*many*.c: Include config.h. Don't include <math.h>.
Remove all the duplicated definitions of G_PI and rint(). Use
RINT() instead of rint().
* app/app_procs.[ch]: app_exit() takes a gboolean.
* app/batch.c
* app/commands.c
* app/interface.c: Call app_exit() with FALSE or TRUE.
* app/main.c (on_error): Call gimp_fatal_error. (main): Don't
install any signal handler on Win32 here, either.
* app/errors.c (gimp_fatal_error, gimp_terminate): Win32: Format
the message and call MessageBox with it. g_on_error_query doesn't
do anything useful on Win32, and printf'ing a message to stdout or
stderr doesn't do anything, either, in a windowing application.
1999-09-02 04:30:56 +08:00
|
|
|
#include "libgimp/gimpmath.h"
|
1998-11-23 22:47:09 +08:00
|
|
|
|
1998-08-12 01:35:34 +08:00
|
|
|
#include "tile.h" /* ick. */
|
1998-07-08 14:41:58 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
#define SUBSAMPLE 8
|
|
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
#define DIST_SMOOTHER_BUFFER 10
|
|
|
|
|
#define TIME_SMOOTHER_BUFFER 10
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* the Ink structures */
|
|
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
typedef Blob *(*BlobFunc) (gdouble, gdouble, gdouble, gdouble, gdouble, gdouble);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
typedef struct _InkTool InkTool;
|
2000-01-14 20:41:00 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
struct _InkTool
|
|
|
|
|
{
|
2000-01-14 20:41:00 +08:00
|
|
|
DrawCore *core; /* Core select object */
|
1998-06-15 06:42:36 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
Blob *last_blob; /* blob for last cursor position */
|
1998-06-15 06:42:36 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gint x1, y1; /* image space coordinate */
|
|
|
|
|
gint x2, y2; /* image space coords */
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1999-06-22 06:12:07 +08:00
|
|
|
/* circular distance history buffer */
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble dt_buffer[DIST_SMOOTHER_BUFFER];
|
|
|
|
|
gint dt_index;
|
1999-04-10 22:55:17 +08:00
|
|
|
|
1999-06-22 06:12:07 +08:00
|
|
|
/* circular timing history buffer */
|
2000-01-14 20:41:00 +08:00
|
|
|
guint32 ts_buffer[TIME_SMOOTHER_BUFFER];
|
|
|
|
|
gint ts_index;
|
1999-04-10 22:55:17 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble last_time; /* previous time of a motion event */
|
|
|
|
|
gdouble lastx, lasty; /* previous position of a motion event */
|
1999-04-10 22:55:17 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gboolean init_velocity;
|
1998-06-15 06:42:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct _BrushWidget BrushWidget;
|
2000-01-14 20:41:00 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
struct _BrushWidget
|
|
|
|
|
{
|
1999-02-03 12:29:08 +08:00
|
|
|
GtkWidget *widget;
|
1998-06-15 06:42:36 +08:00
|
|
|
gboolean state;
|
|
|
|
|
};
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
typedef struct _InkOptions InkOptions;
|
2000-01-14 20:41:00 +08:00
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
struct _InkOptions
|
|
|
|
|
{
|
1999-04-22 22:34:00 +08:00
|
|
|
PaintOptions paint_options;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble size;
|
|
|
|
|
gdouble size_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
GtkObject *size_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble sensitivity;
|
|
|
|
|
gdouble sensitivity_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
GtkObject *sensitivity_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble vel_sensitivity;
|
|
|
|
|
gdouble vel_sensitivity_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
GtkObject *vel_sensitivity_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble tilt_sensitivity;
|
|
|
|
|
gdouble tilt_sensitivity_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
GtkObject *tilt_sensitivity_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble tilt_angle;
|
|
|
|
|
gdouble tilt_angle_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
GtkObject *tilt_angle_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
1999-04-22 22:34:00 +08:00
|
|
|
BlobFunc function;
|
|
|
|
|
BlobFunc function_d;
|
|
|
|
|
GtkWidget *function_w[3]; /* 3 radio buttons */
|
1999-04-13 01:55:06 +08:00
|
|
|
|
2000-01-14 20:41:00 +08:00
|
|
|
gdouble aspect;
|
|
|
|
|
gdouble aspect_d;
|
|
|
|
|
gdouble angle;
|
|
|
|
|
gdouble angle_d;
|
1999-04-22 22:34:00 +08:00
|
|
|
BrushWidget *brush_w;
|
1999-04-13 01:55:06 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
/* the ink tool options */
|
2000-01-14 20:41:00 +08:00
|
|
|
static InkOptions * ink_options = NULL;
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
|
/* local variables */
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* undo blocks variables */
|
|
|
|
|
static TileManager * undo_tiles = NULL;
|
1998-11-28 06:42:15 +08:00
|
|
|
|
|
|
|
|
/* Tiles used to render the stroke at 1 byte/pp */
|
1998-06-15 06:42:36 +08:00
|
|
|
static TileManager * canvas_tiles = NULL;
|
|
|
|
|
|
1998-11-28 06:42:15 +08:00
|
|
|
/* Flat buffer that is used to used to render the dirty region
|
|
|
|
|
* for composition onto the destination drawable
|
|
|
|
|
*/
|
1998-06-15 06:42:36 +08:00
|
|
|
static TempBuf * canvas_buf = NULL;
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* local function prototypes */
|
1999-04-13 01:55:06 +08:00
|
|
|
|
1999-06-22 06:12:07 +08:00
|
|
|
static void ink_button_press (Tool *, GdkEventButton *, gpointer);
|
|
|
|
|
static void ink_button_release (Tool *, GdkEventButton *, gpointer);
|
|
|
|
|
static void ink_motion (Tool *, GdkEventMotion *, gpointer);
|
|
|
|
|
static void ink_cursor_update (Tool *, GdkEventMotion *, gpointer);
|
|
|
|
|
static void ink_control (Tool *, ToolAction, gpointer);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
static void time_smoother_add (InkTool* ink_tool, guint32 value);
|
|
|
|
|
static gdouble time_smoother_result (InkTool* ink_tool);
|
|
|
|
|
static void time_smoother_init (InkTool* ink_tool, guint32 initval);
|
|
|
|
|
static void dist_smoother_add (InkTool* ink_tool, gdouble value);
|
|
|
|
|
static gdouble dist_smoother_result (InkTool* ink_tool);
|
|
|
|
|
static void dist_smoother_init (InkTool* ink_tool, gdouble initval);
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
static void ink_init (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
double x,
|
|
|
|
|
double y);
|
|
|
|
|
static void ink_finish (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
int tool_id);
|
|
|
|
|
static void ink_cleanup (void);
|
|
|
|
|
|
1999-02-03 12:29:08 +08:00
|
|
|
static void ink_type_update (GtkWidget *radio_button,
|
|
|
|
|
BlobFunc function);
|
|
|
|
|
static GdkPixmap *blob_pixmap (GdkColormap *colormap,
|
|
|
|
|
GdkVisual *visual,
|
|
|
|
|
BlobFunc function);
|
|
|
|
|
static void paint_blob (GdkDrawable *drawable,
|
|
|
|
|
GdkGC *gc,
|
|
|
|
|
Blob *blob);
|
|
|
|
|
|
1999-06-22 06:12:07 +08:00
|
|
|
/* Rendering functions */
|
1998-06-15 06:42:36 +08:00
|
|
|
static void ink_set_paint_area (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
Blob *blob);
|
|
|
|
|
static void ink_paste (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
Blob *blob);
|
|
|
|
|
|
|
|
|
|
static void ink_to_canvas_tiles (InkTool *ink_tool,
|
|
|
|
|
Blob *blob,
|
|
|
|
|
guchar *color);
|
|
|
|
|
|
|
|
|
|
static void ink_set_undo_tiles (GimpDrawable *drawable,
|
|
|
|
|
int x,
|
|
|
|
|
int y,
|
|
|
|
|
int w,
|
|
|
|
|
int h);
|
|
|
|
|
static void ink_set_canvas_tiles(int x,
|
|
|
|
|
int y,
|
|
|
|
|
int w,
|
|
|
|
|
int h);
|
|
|
|
|
|
1999-06-22 06:12:07 +08:00
|
|
|
/* Brush pseudo-widget callbacks */
|
1998-06-15 06:42:36 +08:00
|
|
|
static void brush_widget_active_rect (BrushWidget *brush_widget,
|
|
|
|
|
GtkWidget *w,
|
|
|
|
|
GdkRectangle *rect);
|
|
|
|
|
static void brush_widget_realize (GtkWidget *w);
|
|
|
|
|
static void brush_widget_expose (GtkWidget *w,
|
|
|
|
|
GdkEventExpose *event,
|
|
|
|
|
BrushWidget *brush_widget);
|
|
|
|
|
static void brush_widget_button_press (GtkWidget *w,
|
|
|
|
|
GdkEventButton *event,
|
|
|
|
|
BrushWidget *brush_widget);
|
|
|
|
|
static void brush_widget_button_release (GtkWidget *w,
|
|
|
|
|
GdkEventButton *event,
|
|
|
|
|
BrushWidget *brush_widget);
|
|
|
|
|
static void brush_widget_motion_notify (GtkWidget *w,
|
|
|
|
|
GdkEventMotion *event,
|
|
|
|
|
BrushWidget *brush_widget);
|
|
|
|
|
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
/* functions */
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
static void
|
|
|
|
|
ink_type_update (GtkWidget *radio_button,
|
|
|
|
|
BlobFunc function)
|
|
|
|
|
{
|
|
|
|
|
InkOptions *options = ink_options;
|
|
|
|
|
|
|
|
|
|
if (GTK_TOGGLE_BUTTON (radio_button)->active)
|
|
|
|
|
options->function = function;
|
|
|
|
|
|
|
|
|
|
gtk_widget_queue_draw (options->brush_w->widget);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
static void
|
1999-04-13 01:55:06 +08:00
|
|
|
ink_options_reset (void)
|
1999-04-09 06:25:54 +08:00
|
|
|
{
|
|
|
|
|
InkOptions *options = ink_options;
|
|
|
|
|
|
1999-04-22 22:34:00 +08:00
|
|
|
paint_options_reset ((PaintOptions *) options);
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->size_w),
|
|
|
|
|
options->size_d);
|
|
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->sensitivity_w),
|
|
|
|
|
options->sensitivity_d);
|
|
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->tilt_sensitivity_w),
|
|
|
|
|
options->tilt_sensitivity_d);
|
1999-04-10 22:55:17 +08:00
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->vel_sensitivity_w),
|
|
|
|
|
options->vel_sensitivity_d);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->tilt_angle_w),
|
|
|
|
|
options->tilt_angle_d);
|
1999-04-18 07:18:43 +08:00
|
|
|
gtk_toggle_button_set_active (((options->function_d == blob_ellipse) ?
|
|
|
|
|
GTK_TOGGLE_BUTTON (options->function_w[0]) :
|
|
|
|
|
((options->function_d == blob_square) ?
|
|
|
|
|
GTK_TOGGLE_BUTTON (options->function_w[1]) :
|
|
|
|
|
GTK_TOGGLE_BUTTON (options->function_w[2]))),
|
|
|
|
|
TRUE);
|
1999-04-09 06:25:54 +08:00
|
|
|
options->aspect = options->aspect_d;
|
|
|
|
|
options->angle = options->angle_d;
|
1999-04-13 01:55:06 +08:00
|
|
|
gtk_widget_queue_draw (options->brush_w->widget);
|
1999-04-09 06:25:54 +08:00
|
|
|
}
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
static InkOptions *
|
1999-04-13 01:55:06 +08:00
|
|
|
ink_options_new (void)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
1999-04-09 06:25:54 +08:00
|
|
|
InkOptions *options;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
GtkWidget *table;
|
1998-06-15 06:42:36 +08:00
|
|
|
GtkWidget *vbox;
|
2000-04-16 20:10:24 +08:00
|
|
|
GtkWidget *hbox;
|
|
|
|
|
GtkWidget *hbox2;
|
1999-02-03 12:29:08 +08:00
|
|
|
GtkWidget *radio_button;
|
|
|
|
|
GtkWidget *pixmap_widget;
|
1998-06-15 06:42:36 +08:00
|
|
|
GtkWidget *slider;
|
1999-04-09 06:25:54 +08:00
|
|
|
GtkWidget *frame;
|
1998-06-15 06:42:36 +08:00
|
|
|
GtkWidget *darea;
|
1999-02-03 12:29:08 +08:00
|
|
|
GdkPixmap *pixmap;
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
/* the new ink tool options structure */
|
2000-01-14 20:41:00 +08:00
|
|
|
options = g_new (InkOptions, 1);
|
1999-04-22 22:34:00 +08:00
|
|
|
paint_options_init ((PaintOptions *) options,
|
|
|
|
|
INK,
|
|
|
|
|
ink_options_reset);
|
1999-04-10 22:55:17 +08:00
|
|
|
options->size = options->size_d = 4.4;
|
1999-04-09 06:25:54 +08:00
|
|
|
options->sensitivity = options->sensitivity_d = 1.0;
|
1999-04-10 22:55:17 +08:00
|
|
|
options->vel_sensitivity = options->vel_sensitivity_d = 0.8;
|
|
|
|
|
options->tilt_sensitivity = options->tilt_sensitivity_d = 0.4;
|
1999-04-09 06:25:54 +08:00
|
|
|
options->tilt_angle = options->tilt_angle_d = 0.0;
|
|
|
|
|
options->function = options->function_d = blob_ellipse;
|
|
|
|
|
options->aspect = options->aspect_d = 1.0;
|
|
|
|
|
options->angle = options->angle_d = 0.0;
|
|
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
/* the main vbox */
|
|
|
|
|
vbox = gtk_vbox_new (FALSE, 2);
|
|
|
|
|
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), vbox,
|
|
|
|
|
TRUE, TRUE, 0);
|
|
|
|
|
gtk_widget_show (vbox);
|
|
|
|
|
|
|
|
|
|
/* 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, 2, FALSE);
|
|
|
|
|
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
|
|
|
|
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (frame), table);
|
|
|
|
|
gtk_widget_show (table);
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
|
/* size slider */
|
|
|
|
|
options->size_w =
|
1999-07-21 00:12:56 +08:00
|
|
|
gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0);
|
1999-04-09 06:25:54 +08:00
|
|
|
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w));
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
|
2000-04-16 20:10:24 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
|
|
|
|
|
_("Size:"), 1.0, 1.0,
|
|
|
|
|
slider, 1, FALSE);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (options->size_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1998-06-15 06:42:36 +08:00
|
|
|
&options->size);
|
2000-04-16 20:10:24 +08:00
|
|
|
|
|
|
|
|
/* angle adjust slider */
|
|
|
|
|
options->tilt_angle_w =
|
|
|
|
|
gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0);
|
|
|
|
|
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w));
|
|
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
|
|
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
|
|
|
|
_("Angle:"), 1.0, 1.0,
|
|
|
|
|
slider, 1, FALSE);
|
|
|
|
|
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (options->tilt_angle_w), "value_changed",
|
|
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
|
|
|
|
&options->tilt_angle);
|
|
|
|
|
|
|
|
|
|
/* 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, 2, FALSE);
|
|
|
|
|
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
|
|
|
|
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (frame), table);
|
|
|
|
|
gtk_widget_show (table);
|
|
|
|
|
|
|
|
|
|
/* size sens slider */
|
1999-04-09 06:25:54 +08:00
|
|
|
options->sensitivity_w =
|
|
|
|
|
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
|
|
|
|
|
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
|
2000-04-16 20:10:24 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
|
|
|
|
_("Size:"), 1.0, 1.0,
|
|
|
|
|
slider, 1, FALSE);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1998-06-15 06:42:36 +08:00
|
|
|
&options->sensitivity);
|
1998-11-26 03:21:54 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
/* tilt sens slider */
|
|
|
|
|
options->tilt_sensitivity_w =
|
|
|
|
|
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
|
|
|
|
|
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
|
1998-11-26 03:21:54 +08:00
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
|
2000-04-16 20:10:24 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
|
|
|
|
|
_("Tilt:"), 1.0, 1.0,
|
|
|
|
|
slider, 1, FALSE);
|
1998-11-26 03:21:54 +08:00
|
|
|
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1998-11-26 03:21:54 +08:00
|
|
|
&options->tilt_sensitivity);
|
1999-04-10 22:55:17 +08:00
|
|
|
|
|
|
|
|
/* velocity sens slider */
|
|
|
|
|
options->vel_sensitivity_w =
|
|
|
|
|
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
|
|
|
|
|
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
|
|
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
|
2000-04-16 20:10:24 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
|
|
|
|
|
_("Speed:"), 1.0, 1.0,
|
|
|
|
|
slider, 1, FALSE);
|
1999-04-10 22:55:17 +08:00
|
|
|
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1999-04-10 22:55:17 +08:00
|
|
|
&options->vel_sensitivity);
|
|
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
/* bottom hbox */
|
|
|
|
|
hbox = gtk_hbox_new (FALSE, 2);
|
|
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
|
|
|
|
|
gtk_widget_show (hbox);
|
1998-11-26 15:44:17 +08:00
|
|
|
|
1999-02-03 12:29:08 +08:00
|
|
|
/* Brush type radiobuttons */
|
1999-04-09 06:25:54 +08:00
|
|
|
frame = gtk_frame_new (_("Type"));
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_widget_show (frame);
|
|
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
hbox2 = gtk_hbox_new (FALSE, 0);
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (frame), hbox2);
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
vbox = gtk_vbox_new (FALSE, 2);
|
|
|
|
|
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_widget_show (vbox);
|
|
|
|
|
|
|
|
|
|
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
|
|
|
|
|
gtk_widget_get_visual (vbox),
|
1999-02-03 12:29:08 +08:00
|
|
|
blob_ellipse);
|
|
|
|
|
|
|
|
|
|
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
|
|
|
|
|
gdk_pixmap_unref (pixmap);
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
|
|
|
|
radio_button = gtk_radio_button_new (NULL);
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
|
|
|
|
|
GTK_SIGNAL_FUNC (ink_type_update),
|
|
|
|
|
(gpointer)blob_ellipse);
|
|
|
|
|
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (radio_button), pixmap_widget);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1999-04-18 07:18:43 +08:00
|
|
|
options->function_w[0] = radio_button;
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
|
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
|
|
|
|
|
gtk_widget_get_visual (vbox),
|
1999-02-03 12:29:08 +08:00
|
|
|
blob_square);
|
|
|
|
|
|
|
|
|
|
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
|
|
|
|
|
gdk_pixmap_unref (pixmap);
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
radio_button =
|
|
|
|
|
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
|
1999-02-03 12:29:08 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
|
|
|
|
|
GTK_SIGNAL_FUNC (ink_type_update),
|
|
|
|
|
(gpointer)blob_square);
|
|
|
|
|
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (radio_button), pixmap_widget);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1999-04-18 07:18:43 +08:00
|
|
|
options->function_w[1] = radio_button;
|
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
|
|
|
|
|
gtk_widget_get_visual (vbox),
|
1999-02-03 12:29:08 +08:00
|
|
|
blob_diamond);
|
|
|
|
|
|
|
|
|
|
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
|
|
|
|
|
gdk_pixmap_unref (pixmap);
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
radio_button =
|
|
|
|
|
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
|
1999-02-03 12:29:08 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
|
|
|
|
|
GTK_SIGNAL_FUNC (ink_type_update),
|
|
|
|
|
(gpointer)blob_diamond);
|
|
|
|
|
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (radio_button), pixmap_widget);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
1999-04-18 07:18:43 +08:00
|
|
|
options->function_w[2] = radio_button;
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* Brush shape widget */
|
1999-04-09 06:25:54 +08:00
|
|
|
frame = gtk_frame_new (_("Shape"));
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_widget_show (frame);
|
|
|
|
|
|
|
|
|
|
vbox = gtk_vbox_new (FALSE, 2);
|
|
|
|
|
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
|
|
|
|
gtk_widget_show (vbox);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
|
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
options->brush_w = g_new (BrushWidget, 1);
|
|
|
|
|
options->brush_w->state = FALSE;
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
darea = gtk_drawing_area_new();
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w->widget = darea;
|
1999-04-18 07:18:43 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 60, 60);
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (frame), darea);
|
1999-04-18 07:18:43 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_widget_set_events (darea,
|
|
|
|
|
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
|
|
|
|
|
| GDK_POINTER_MOTION_MASK | GDK_EXPOSURE_MASK);
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (darea), "button_press_event",
|
|
|
|
|
GTK_SIGNAL_FUNC (brush_widget_button_press),
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (darea), "button_release_event",
|
|
|
|
|
GTK_SIGNAL_FUNC (brush_widget_button_release),
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (darea), "motion_notify_event",
|
|
|
|
|
GTK_SIGNAL_FUNC (brush_widget_motion_notify),
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
|
|
|
|
|
GTK_SIGNAL_FUNC (brush_widget_expose),
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w);
|
1998-06-15 06:42:36 +08:00
|
|
|
gtk_signal_connect (GTK_OBJECT (darea), "realize",
|
|
|
|
|
GTK_SIGNAL_FUNC (brush_widget_realize),
|
1999-04-13 01:55:06 +08:00
|
|
|
options->brush_w);
|
1999-04-09 06:25:54 +08:00
|
|
|
|
2000-04-16 20:10:24 +08:00
|
|
|
gtk_widget_show_all (hbox);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
return options;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
|
|
|
|
|
/* the brush widget functions */
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_active_rect (BrushWidget *brush_widget,
|
|
|
|
|
GtkWidget *widget,
|
1998-06-15 06:42:36 +08:00
|
|
|
GdkRectangle *rect)
|
|
|
|
|
{
|
|
|
|
|
int x,y;
|
|
|
|
|
int r;
|
|
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
r = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
x = widget->allocation.width / 2 + 0.85 * r * ink_options->aspect / 10.0 *
|
1998-06-15 06:42:36 +08:00
|
|
|
cos (ink_options->angle);
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
y = widget->allocation.height / 2 + 0.85 * r * ink_options->aspect / 10.0 *
|
1998-06-15 06:42:36 +08:00
|
|
|
sin (ink_options->angle);
|
|
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
rect->x = x - 5;
|
|
|
|
|
rect->y = y - 5;
|
1998-06-15 06:42:36 +08:00
|
|
|
rect->width = 10;
|
|
|
|
|
rect->height = 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_realize (GtkWidget *widget)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_draw_brush (BrushWidget *brush_widget,
|
|
|
|
|
GtkWidget *widget,
|
|
|
|
|
gdouble xc,
|
|
|
|
|
gdouble yc,
|
|
|
|
|
gdouble radius)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
Blob *blob;
|
|
|
|
|
|
|
|
|
|
blob = ink_options->function (xc, yc,
|
|
|
|
|
radius * cos (ink_options->angle),
|
|
|
|
|
radius * sin (ink_options->angle),
|
|
|
|
|
(- (radius / ink_options->aspect) *
|
|
|
|
|
sin (ink_options->angle)),
|
|
|
|
|
((radius / ink_options->aspect) *
|
|
|
|
|
cos (ink_options->angle)));
|
|
|
|
|
|
|
|
|
|
paint_blob (widget->window, widget->style->fg_gc[widget->state], blob);
|
|
|
|
|
g_free (blob);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_expose (GtkWidget *widget,
|
|
|
|
|
GdkEventExpose *event,
|
|
|
|
|
BrushWidget *brush_widget)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
GdkRectangle rect;
|
|
|
|
|
int r0;
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
|
|
|
|
|
r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
if (r0 < 2)
|
|
|
|
|
return;
|
|
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
gdk_window_clear_area (widget->window, 0, 0,
|
|
|
|
|
widget->allocation.width,
|
|
|
|
|
widget->allocation.height);
|
|
|
|
|
brush_widget_draw_brush (brush_widget, widget,
|
|
|
|
|
widget->allocation.width / 2,
|
|
|
|
|
widget->allocation.height / 2,
|
|
|
|
|
0.9 * r0);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_active_rect (brush_widget, widget, &rect);
|
|
|
|
|
gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL],
|
1998-06-15 06:42:36 +08:00
|
|
|
TRUE, /* filled */
|
|
|
|
|
rect.x, rect.y,
|
|
|
|
|
rect.width, rect.height);
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
gtk_draw_shadow (widget->style, widget->window, widget->state, GTK_SHADOW_OUT,
|
1998-06-15 06:42:36 +08:00
|
|
|
rect.x, rect.y,
|
|
|
|
|
rect.width, rect.height);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_button_press (GtkWidget *widget,
|
|
|
|
|
GdkEventButton *event,
|
|
|
|
|
BrushWidget *brush_widget)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
GdkRectangle rect;
|
|
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_active_rect (brush_widget, widget, &rect);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
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;
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
|
1999-07-24 23:37:03 +08:00
|
|
|
gtk_grab_add (brush_widget->widget);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_button_release (GtkWidget *widget,
|
|
|
|
|
GdkEventButton *event,
|
|
|
|
|
BrushWidget *brush_widget)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
brush_widget->state = FALSE;
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
|
1999-07-24 23:37:03 +08:00
|
|
|
gtk_grab_remove (brush_widget->widget);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
brush_widget_motion_notify (GtkWidget *widget,
|
|
|
|
|
GdkEventMotion *event,
|
|
|
|
|
BrushWidget *brush_widget)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
int x;
|
|
|
|
|
int y;
|
|
|
|
|
int r0;
|
|
|
|
|
int rsquare;
|
|
|
|
|
|
|
|
|
|
if (brush_widget->state)
|
|
|
|
|
{
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
x = event->x - widget->allocation.width / 2;
|
|
|
|
|
y = event->y - widget->allocation.height / 2;
|
1998-06-15 06:42:36 +08:00
|
|
|
rsquare = x*x + y*y;
|
|
|
|
|
|
|
|
|
|
if (rsquare != 0)
|
|
|
|
|
{
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
ink_options->angle = atan2 (y, x);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
1998-06-15 06:42:36 +08:00
|
|
|
ink_options->aspect =
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
10.0 * sqrt ((double) rsquare / (r0 * r0)) / 0.85;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
if (ink_options->aspect < 1.0)
|
|
|
|
|
ink_options->aspect = 1.0;
|
|
|
|
|
if (ink_options->aspect > 10.0)
|
|
|
|
|
ink_options->aspect = 10.0;
|
|
|
|
|
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
gtk_widget_draw (widget, NULL);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-02-03 12:29:08 +08:00
|
|
|
/*
|
|
|
|
|
* Return a black-on white pixmap in the given colormap and
|
|
|
|
|
* visual that represents the BlobFunc 'function'
|
|
|
|
|
*/
|
|
|
|
|
static GdkPixmap *
|
|
|
|
|
blob_pixmap (GdkColormap *colormap,
|
|
|
|
|
GdkVisual *visual,
|
|
|
|
|
BlobFunc function)
|
|
|
|
|
{
|
|
|
|
|
GdkPixmap *pixmap;
|
|
|
|
|
GdkGC *black_gc, *white_gc;
|
|
|
|
|
GdkColor tmp_color;
|
|
|
|
|
Blob *blob;
|
|
|
|
|
|
|
|
|
|
pixmap = gdk_pixmap_new (NULL, 22, 21, visual->depth);
|
|
|
|
|
|
|
|
|
|
black_gc = gdk_gc_new (pixmap);
|
|
|
|
|
gdk_color_black (colormap, &tmp_color);
|
|
|
|
|
gdk_gc_set_foreground (black_gc, &tmp_color);
|
|
|
|
|
|
|
|
|
|
white_gc = gdk_gc_new (pixmap);
|
|
|
|
|
gdk_color_white (colormap, &tmp_color);
|
|
|
|
|
gdk_gc_set_foreground (white_gc, &tmp_color);
|
|
|
|
|
|
|
|
|
|
gdk_draw_rectangle (pixmap, white_gc, TRUE, 0, 0, 21, 20);
|
|
|
|
|
gdk_draw_rectangle (pixmap, black_gc, FALSE, 0, 0, 21, 20);
|
|
|
|
|
blob = (*function) (10, 10, 8, 0, 0, 8);
|
|
|
|
|
paint_blob (pixmap, black_gc, blob);
|
1999-11-15 06:50:08 +08:00
|
|
|
g_free (blob);
|
1999-02-03 12:29:08 +08:00
|
|
|
|
|
|
|
|
gdk_gc_unref (white_gc);
|
|
|
|
|
gdk_gc_unref (black_gc);
|
|
|
|
|
|
|
|
|
|
return pixmap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Draw a blob onto a drawable with the specified graphics context
|
|
|
|
|
*/
|
|
|
|
|
static void
|
|
|
|
|
paint_blob (GdkDrawable *drawable, GdkGC *gc,
|
|
|
|
|
Blob *blob)
|
|
|
|
|
{
|
|
|
|
|
int 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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
static Blob *
|
|
|
|
|
ink_pen_ellipse (gdouble x_center, gdouble y_center,
|
1999-04-10 22:55:17 +08:00
|
|
|
gdouble pressure, gdouble xtilt, gdouble ytilt,
|
|
|
|
|
gdouble velocity)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
double size;
|
|
|
|
|
double tsin, tcos;
|
|
|
|
|
double aspect, radmin;
|
|
|
|
|
double x,y;
|
1998-11-26 03:21:54 +08:00
|
|
|
double tscale;
|
1998-11-26 15:44:17 +08:00
|
|
|
double tscale_c;
|
|
|
|
|
double tscale_s;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
/* Adjust the size depending on pressure. */
|
|
|
|
|
|
|
|
|
|
size = ink_options->size * (1.0 + ink_options->sensitivity *
|
|
|
|
|
(2.0 * pressure - 1.0) );
|
|
|
|
|
|
|
|
|
|
/* Adjust the size further depending on pointer velocity
|
|
|
|
|
and velocity-sensitivity. These 'magic constants' are
|
|
|
|
|
'feels natural' tigert-approved. --ADM */
|
|
|
|
|
|
|
|
|
|
if (velocity < 3.0)
|
|
|
|
|
velocity = 3.0;
|
|
|
|
|
|
|
|
|
|
#ifdef VERBOSE
|
|
|
|
|
g_print("%f (%f) -> ", (float)size, (float)velocity);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
size = ink_options->vel_sensitivity *
|
|
|
|
|
((4.5 * size) / (1.0 + ink_options->vel_sensitivity * (2.0*(velocity))))
|
|
|
|
|
+ (1.0 - ink_options->vel_sensitivity) * size;
|
|
|
|
|
|
|
|
|
|
#ifdef VERBOSE
|
|
|
|
|
g_print("%f\n", (float)size);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Clamp resulting size to sane limits */
|
|
|
|
|
|
|
|
|
|
if (size > ink_options->size * (1.0 + ink_options->sensitivity))
|
|
|
|
|
size = ink_options->size * (1.0 + ink_options->sensitivity);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
if (size*SUBSAMPLE < 1.0) size = 1.0/SUBSAMPLE;
|
|
|
|
|
|
|
|
|
|
/* Add brush angle/aspect to tilt vectorially */
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1998-11-26 15:44:17 +08:00
|
|
|
/* I'm not happy with the way the brush widget info is combined with
|
|
|
|
|
tilt info from the brush. My personal feeling is that representing
|
|
|
|
|
both as affine transforms would make the most sense. -RLL */
|
|
|
|
|
|
1998-11-26 03:21:54 +08:00
|
|
|
tscale = ink_options->tilt_sensitivity * 10.0;
|
2000-02-19 02:20:04 +08:00
|
|
|
tscale_c = tscale * cos (gimp_deg_to_rad (ink_options->tilt_angle));
|
|
|
|
|
tscale_s = tscale * sin (gimp_deg_to_rad (ink_options->tilt_angle));
|
1998-11-26 15:44:17 +08:00
|
|
|
x = ink_options->aspect*cos(ink_options->angle) +
|
|
|
|
|
xtilt * tscale_c - ytilt * tscale_s;
|
|
|
|
|
y = ink_options->aspect*sin(ink_options->angle) +
|
|
|
|
|
ytilt * tscale_c + xtilt * tscale_s;
|
|
|
|
|
#ifdef VERBOSE
|
|
|
|
|
g_print ("angle %g aspect %g; %g %g; %g %g\n",
|
|
|
|
|
ink_options->angle, ink_options->aspect, tscale_c, tscale_s, x, y);
|
|
|
|
|
#endif
|
1998-06-15 06:42:36 +08:00
|
|
|
aspect = sqrt(x*x+y*y);
|
|
|
|
|
|
|
|
|
|
if (aspect != 0)
|
|
|
|
|
{
|
|
|
|
|
tcos = x/aspect;
|
|
|
|
|
tsin = y/aspect;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tsin = sin(ink_options->angle);
|
|
|
|
|
tcos = cos(ink_options->angle);
|
|
|
|
|
}
|
1999-04-09 06:25:54 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
if (aspect < 1.0)
|
|
|
|
|
aspect = 1.0;
|
|
|
|
|
else if (aspect > 10.0)
|
|
|
|
|
aspect = 10.0;
|
|
|
|
|
|
|
|
|
|
radmin = SUBSAMPLE * size/aspect;
|
|
|
|
|
if (radmin < 1.0) radmin = 1.0;
|
|
|
|
|
|
1999-02-03 12:29:08 +08:00
|
|
|
return ink_options->function (x_center * SUBSAMPLE, y_center * SUBSAMPLE,
|
|
|
|
|
radmin*aspect*tcos, radmin*aspect*tsin,
|
|
|
|
|
-radmin*tsin, radmin*tcos);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_button_press (Tool *tool,
|
|
|
|
|
GdkEventButton *bevent,
|
|
|
|
|
gpointer gdisp_ptr)
|
|
|
|
|
{
|
|
|
|
|
gdouble x, y;
|
|
|
|
|
GDisplay *gdisp;
|
|
|
|
|
InkTool *ink_tool;
|
|
|
|
|
GimpDrawable *drawable;
|
|
|
|
|
Blob *b;
|
|
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
|
ink_tool = (InkTool *) tool->private;
|
|
|
|
|
|
|
|
|
|
/* Keep the coordinates of the target */
|
|
|
|
|
gdisplay_untransform_coords_f (gdisp, bevent->x, bevent->y,
|
|
|
|
|
&x, &y, TRUE);
|
|
|
|
|
drawable = gimage_active_drawable (gdisp->gimage);
|
|
|
|
|
|
|
|
|
|
ink_init (ink_tool, drawable, x, y);
|
|
|
|
|
|
|
|
|
|
tool->state = ACTIVE;
|
|
|
|
|
tool->gdisp_ptr = gdisp_ptr;
|
|
|
|
|
tool->paused_count = 0;
|
|
|
|
|
|
|
|
|
|
/* pause the current selection and grab the pointer */
|
1998-06-29 08:24:44 +08:00
|
|
|
gdisplays_selection_visibility (gdisp->gimage, SelectionPause);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1998-07-19 01:39:23 +08:00
|
|
|
/* add motion memory if you press mod1 first ^ perfectmouse */
|
|
|
|
|
if (((bevent->state & GDK_MOD1_MASK) != 0) != (perfectmouse != 0))
|
1998-06-15 06:42:36 +08:00
|
|
|
gdk_pointer_grab (gdisp->canvas->window, FALSE,
|
|
|
|
|
GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
|
|
|
|
|
NULL, NULL, bevent->time);
|
|
|
|
|
else
|
|
|
|
|
gdk_pointer_grab (gdisp->canvas->window, FALSE,
|
1998-07-19 01:39:23 +08:00
|
|
|
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK |
|
|
|
|
|
GDK_BUTTON_RELEASE_MASK,
|
1998-06-15 06:42:36 +08:00
|
|
|
NULL, NULL, bevent->time);
|
|
|
|
|
|
|
|
|
|
tool->gdisp_ptr = gdisp_ptr;
|
|
|
|
|
tool->state = ACTIVE;
|
|
|
|
|
|
|
|
|
|
b = ink_pen_ellipse (x, y,
|
1999-04-10 22:55:17 +08:00
|
|
|
bevent->pressure, bevent->xtilt, bevent->ytilt, 10.0);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
ink_paste (ink_tool, drawable, b);
|
|
|
|
|
ink_tool->last_blob = b;
|
|
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
time_smoother_init (ink_tool, bevent->time);
|
|
|
|
|
ink_tool->last_time = bevent->time;
|
|
|
|
|
dist_smoother_init (ink_tool, 0.0);
|
|
|
|
|
ink_tool->init_velocity = TRUE;
|
|
|
|
|
ink_tool->lastx = x;
|
|
|
|
|
ink_tool->lasty = y;
|
|
|
|
|
|
1998-10-05 04:16:17 +08:00
|
|
|
gdisplay_flush_now (gdisp);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_button_release (Tool *tool,
|
|
|
|
|
GdkEventButton *bevent,
|
|
|
|
|
gpointer gdisp_ptr)
|
|
|
|
|
{
|
|
|
|
|
GDisplay * gdisp;
|
|
|
|
|
GImage * gimage;
|
|
|
|
|
InkTool * ink_tool;
|
|
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
|
gimage = gdisp->gimage;
|
|
|
|
|
ink_tool = (InkTool *) tool->private;
|
|
|
|
|
|
|
|
|
|
/* resume the current selection and ungrab the pointer */
|
1998-06-29 08:24:44 +08:00
|
|
|
gdisplays_selection_visibility (gdisp->gimage, SelectionResume);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
gdk_pointer_ungrab (bevent->time);
|
|
|
|
|
gdk_flush ();
|
|
|
|
|
|
|
|
|
|
/* Set tool state to inactive -- no longer painting */
|
|
|
|
|
tool->state = INACTIVE;
|
|
|
|
|
|
1999-07-14 17:44:58 +08:00
|
|
|
/* free the last blob */
|
|
|
|
|
g_free (ink_tool->last_blob);
|
|
|
|
|
ink_tool->last_blob = NULL;
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
ink_finish (ink_tool, gimage_active_drawable (gdisp->gimage), tool->ID);
|
|
|
|
|
gdisplays_flush ();
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dist_smoother_init (InkTool* ink_tool, gdouble initval)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
|
|
ink_tool->dt_index = 0;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<DIST_SMOOTHER_BUFFER; i++)
|
|
|
|
|
{
|
|
|
|
|
ink_tool->dt_buffer[i] = initval;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
|
dist_smoother_result (InkTool* ink_tool)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
gdouble result = 0.0;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<DIST_SMOOTHER_BUFFER; i++)
|
|
|
|
|
{
|
|
|
|
|
result += ink_tool->dt_buffer[i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (result / (gdouble)DIST_SMOOTHER_BUFFER);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dist_smoother_add (InkTool* ink_tool, gdouble value)
|
|
|
|
|
{
|
|
|
|
|
ink_tool->dt_buffer[ink_tool->dt_index] = value;
|
|
|
|
|
|
|
|
|
|
if ((++ink_tool->dt_index) == DIST_SMOOTHER_BUFFER)
|
|
|
|
|
ink_tool->dt_index = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
time_smoother_init (InkTool* ink_tool, guint32 initval)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
|
|
ink_tool->ts_index = 0;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<TIME_SMOOTHER_BUFFER; i++)
|
|
|
|
|
{
|
|
|
|
|
ink_tool->ts_buffer[i] = initval;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
|
time_smoother_result (InkTool* ink_tool)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
guint64 result = 0;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<TIME_SMOOTHER_BUFFER; i++)
|
|
|
|
|
{
|
|
|
|
|
result += ink_tool->ts_buffer[i];
|
|
|
|
|
}
|
|
|
|
|
|
Win32 portability changes:
* config.h.win32, README.win32: Small changes.
* tools/pdbgen/pdb/*.pdb: Include <string.h>.
* app/*_cmds.c: Autogenerated files reflect above changes.
* libgimp/makefile.msc app/makefile.msc: Various updates,
including new object files. Gtk+ directory now should be called
gtk+ (not gtk-plus). Use win32-specific gdk subdir. Glib directory
now should be called just glib.
* libgimp/gimp.def: Updates.
* libgimp/gimpfeatures.h.win32: Made current with
gimpfeatures.h.in.
* libgimp/gimpfileselection.c: Define S_ISDIR and S_ISREG if
necessary.
* tools/pdbgen/pdb/fileops.pdb: Must have a
statement (even an empty one) after a label.
* app/fileops_cmds.c: Autogenerated file reflects above changes.
* app/crop.c: Include <string.h>.
* app/{app_procs,batch,fileops,datafiles,errorconsole,general,
plug_in,temp_buf,tile_swap}.c: Test NATIVE_WIN32, not
_MSC_VER. (NATIVE_WIN32 means we are using the Microsoft C
runtime, even if we might be compiling with gcc.)
* app/fileops.c: Don't include <process.h> here.
* app/fileops.h: Do include <process.h> here.
* app/gimpparasite.c: Include config.h, guard inclusion of
<unistd.h>. (Is the inclusion of unistd.h in source files all over
the place really necessary?)
* app/ink.c: MSC doesn't handle conversion from unsigned __int64
to double, so cast to signed.
* app/lut_funcs.c: Include config.h, and define rint() if necessary.
* app/pixel_processor.c: Include config.h without "..", like in
all the other places. Include <string.h>
* app/text_tool.c: Guard the "POINTS" identifier that clashes with
<windows.h>, sigh.
1999-05-05 05:32:17 +08:00
|
|
|
#ifdef _MSC_VER
|
|
|
|
|
return (gdouble) (gint64) (result / TIME_SMOOTHER_BUFFER);
|
|
|
|
|
#else
|
1999-04-10 22:55:17 +08:00
|
|
|
return (result / TIME_SMOOTHER_BUFFER);
|
Win32 portability changes:
* config.h.win32, README.win32: Small changes.
* tools/pdbgen/pdb/*.pdb: Include <string.h>.
* app/*_cmds.c: Autogenerated files reflect above changes.
* libgimp/makefile.msc app/makefile.msc: Various updates,
including new object files. Gtk+ directory now should be called
gtk+ (not gtk-plus). Use win32-specific gdk subdir. Glib directory
now should be called just glib.
* libgimp/gimp.def: Updates.
* libgimp/gimpfeatures.h.win32: Made current with
gimpfeatures.h.in.
* libgimp/gimpfileselection.c: Define S_ISDIR and S_ISREG if
necessary.
* tools/pdbgen/pdb/fileops.pdb: Must have a
statement (even an empty one) after a label.
* app/fileops_cmds.c: Autogenerated file reflects above changes.
* app/crop.c: Include <string.h>.
* app/{app_procs,batch,fileops,datafiles,errorconsole,general,
plug_in,temp_buf,tile_swap}.c: Test NATIVE_WIN32, not
_MSC_VER. (NATIVE_WIN32 means we are using the Microsoft C
runtime, even if we might be compiling with gcc.)
* app/fileops.c: Don't include <process.h> here.
* app/fileops.h: Do include <process.h> here.
* app/gimpparasite.c: Include config.h, guard inclusion of
<unistd.h>. (Is the inclusion of unistd.h in source files all over
the place really necessary?)
* app/ink.c: MSC doesn't handle conversion from unsigned __int64
to double, so cast to signed.
* app/lut_funcs.c: Include config.h, and define rint() if necessary.
* app/pixel_processor.c: Include config.h without "..", like in
all the other places. Include <string.h>
* app/text_tool.c: Guard the "POINTS" identifier that clashes with
<windows.h>, sigh.
1999-05-05 05:32:17 +08:00
|
|
|
#endif
|
1999-04-10 22:55:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
time_smoother_add (InkTool* ink_tool, guint32 value)
|
|
|
|
|
{
|
|
|
|
|
ink_tool->ts_buffer[ink_tool->ts_index] = value;
|
|
|
|
|
|
|
|
|
|
if ((++ink_tool->ts_index) == TIME_SMOOTHER_BUFFER)
|
|
|
|
|
ink_tool->ts_index = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
static void
|
|
|
|
|
ink_motion (Tool *tool,
|
|
|
|
|
GdkEventMotion *mevent,
|
|
|
|
|
gpointer gdisp_ptr)
|
|
|
|
|
{
|
|
|
|
|
GDisplay *gdisp;
|
|
|
|
|
InkTool *ink_tool;
|
|
|
|
|
GimpDrawable *drawable;
|
|
|
|
|
Blob *b, *blob_union;
|
|
|
|
|
|
|
|
|
|
double x, y;
|
1999-04-10 22:55:17 +08:00
|
|
|
double pressure;
|
|
|
|
|
double velocity;
|
|
|
|
|
double dist;
|
|
|
|
|
gdouble lasttime, thistime;
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
|
ink_tool = (InkTool *) tool->private;
|
|
|
|
|
|
|
|
|
|
gdisplay_untransform_coords_f (gdisp, mevent->x, mevent->y, &x, &y, TRUE);
|
|
|
|
|
drawable = gimage_active_drawable (gdisp->gimage);
|
|
|
|
|
|
1999-04-10 22:55:17 +08:00
|
|
|
lasttime = ink_tool->last_time;
|
|
|
|
|
|
|
|
|
|
time_smoother_add (ink_tool, mevent->time);
|
|
|
|
|
thistime = ink_tool->last_time =
|
|
|
|
|
time_smoother_result(ink_tool);
|
|
|
|
|
|
|
|
|
|
/* The time resolution on X-based GDK motion events is
|
|
|
|
|
bloody awful, hence the use of the smoothing function.
|
|
|
|
|
Sadly this also means that there is always the chance of
|
|
|
|
|
having an indeterminite velocity since this event and
|
|
|
|
|
the previous several may still appear to issue at the same
|
|
|
|
|
instant. -ADM */
|
|
|
|
|
|
|
|
|
|
if (thistime == lasttime)
|
|
|
|
|
thistime = lasttime + 1;
|
|
|
|
|
|
|
|
|
|
if (ink_tool->init_velocity)
|
|
|
|
|
{
|
|
|
|
|
dist_smoother_init (ink_tool, dist = sqrt((ink_tool->lastx-x)*(ink_tool->lastx-x) +
|
|
|
|
|
(ink_tool->lasty-y)*(ink_tool->lasty-y)));
|
|
|
|
|
ink_tool->init_velocity = FALSE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
dist_smoother_add (ink_tool, sqrt((ink_tool->lastx-x)*(ink_tool->lastx-x) +
|
|
|
|
|
(ink_tool->lasty-y)*(ink_tool->lasty-y)));
|
|
|
|
|
dist = dist_smoother_result(ink_tool);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ink_tool->lastx = x;
|
|
|
|
|
ink_tool->lasty = y;
|
|
|
|
|
|
|
|
|
|
pressure = mevent->pressure;
|
|
|
|
|
velocity = 10.0 * sqrt((dist) / (double)(thistime - lasttime));
|
|
|
|
|
|
|
|
|
|
b = ink_pen_ellipse (x, y, pressure, mevent->xtilt, mevent->ytilt, velocity);
|
1998-06-15 06:42:36 +08:00
|
|
|
blob_union = blob_convex_union (ink_tool->last_blob, b);
|
|
|
|
|
g_free (ink_tool->last_blob);
|
|
|
|
|
ink_tool->last_blob = b;
|
|
|
|
|
|
|
|
|
|
ink_paste (ink_tool, drawable, blob_union);
|
|
|
|
|
g_free (blob_union);
|
|
|
|
|
|
1998-10-05 04:16:17 +08:00
|
|
|
gdisplay_flush_now (gdisp);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_cursor_update (Tool *tool,
|
|
|
|
|
GdkEventMotion *mevent,
|
|
|
|
|
gpointer gdisp_ptr)
|
|
|
|
|
{
|
|
|
|
|
GDisplay *gdisp;
|
|
|
|
|
Layer *layer;
|
|
|
|
|
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
|
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
|
|
|
|
|
|
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, FALSE, FALSE);
|
|
|
|
|
if ((layer = gimage_get_active_layer (gdisp->gimage)))
|
|
|
|
|
{
|
|
|
|
|
int off_x, off_y;
|
|
|
|
|
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
|
|
|
|
|
if (x >= off_x && y >= off_y &&
|
|
|
|
|
x < (off_x + drawable_width (GIMP_DRAWABLE(layer))) &&
|
|
|
|
|
y < (off_y + drawable_height (GIMP_DRAWABLE(layer))))
|
|
|
|
|
{
|
|
|
|
|
/* One more test--is there a selected region?
|
|
|
|
|
* if so, is cursor inside?
|
|
|
|
|
*/
|
|
|
|
|
if (gimage_mask_is_empty (gdisp->gimage))
|
|
|
|
|
ctype = GDK_PENCIL;
|
|
|
|
|
else if (gimage_mask_value (gdisp->gimage, x, y))
|
|
|
|
|
ctype = GDK_PENCIL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
gdisplay_install_tool_cursor (gdisp, ctype);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1999-06-22 06:12:07 +08:00
|
|
|
ink_control (Tool *tool,
|
|
|
|
|
ToolAction action,
|
|
|
|
|
gpointer gdisp_ptr)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
InkTool *ink_tool;
|
|
|
|
|
|
|
|
|
|
ink_tool = (InkTool *) tool->private;
|
|
|
|
|
|
|
|
|
|
switch (action)
|
|
|
|
|
{
|
1999-06-22 06:12:07 +08:00
|
|
|
case PAUSE:
|
1998-06-15 06:42:36 +08:00
|
|
|
draw_core_pause (ink_tool->core, tool);
|
|
|
|
|
break;
|
1999-06-22 06:12:07 +08:00
|
|
|
|
|
|
|
|
case RESUME:
|
1998-06-15 06:42:36 +08:00
|
|
|
draw_core_resume (ink_tool->core, tool);
|
|
|
|
|
break;
|
1999-06-22 06:12:07 +08:00
|
|
|
|
|
|
|
|
case HALT:
|
1998-06-15 06:42:36 +08:00
|
|
|
ink_cleanup ();
|
|
|
|
|
break;
|
1999-06-22 06:12:07 +08:00
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_init (InkTool *ink_tool, GimpDrawable *drawable,
|
1999-07-03 01:40:10 +08:00
|
|
|
double x, double y)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
/* free the block structures */
|
|
|
|
|
if (undo_tiles)
|
|
|
|
|
tile_manager_destroy (undo_tiles);
|
|
|
|
|
if (canvas_tiles)
|
|
|
|
|
tile_manager_destroy (canvas_tiles);
|
|
|
|
|
|
|
|
|
|
/* Allocate the undo structure */
|
|
|
|
|
undo_tiles = tile_manager_new (drawable_width (drawable),
|
|
|
|
|
drawable_height (drawable),
|
|
|
|
|
drawable_bytes (drawable));
|
|
|
|
|
|
|
|
|
|
/* Allocate the canvas blocks structure */
|
|
|
|
|
canvas_tiles = tile_manager_new (drawable_width (drawable),
|
|
|
|
|
drawable_height (drawable), 1);
|
|
|
|
|
|
|
|
|
|
/* Get the initial undo extents */
|
|
|
|
|
ink_tool->x1 = ink_tool->x2 = x;
|
|
|
|
|
ink_tool->y1 = ink_tool->y2 = y;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_finish (InkTool *ink_tool, GimpDrawable *drawable, int tool_id)
|
|
|
|
|
{
|
|
|
|
|
/* push an undo */
|
|
|
|
|
drawable_apply_image (drawable, ink_tool->x1, ink_tool->y1,
|
|
|
|
|
ink_tool->x2, ink_tool->y2, undo_tiles, TRUE);
|
|
|
|
|
undo_tiles = NULL;
|
|
|
|
|
|
|
|
|
|
/* invalidate the drawable--have to do it here, because
|
|
|
|
|
* it is not done during the actual painting.
|
|
|
|
|
*/
|
2000-06-04 02:19:22 +08:00
|
|
|
gimp_drawable_invalidate_preview (drawable, TRUE);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_cleanup (void)
|
|
|
|
|
{
|
|
|
|
|
/* CLEANUP */
|
|
|
|
|
/* If the undo tiles exist, nuke them */
|
|
|
|
|
if (undo_tiles)
|
|
|
|
|
{
|
|
|
|
|
tile_manager_destroy (undo_tiles);
|
|
|
|
|
undo_tiles = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the canvas blocks exist, nuke them */
|
|
|
|
|
if (canvas_tiles)
|
|
|
|
|
{
|
|
|
|
|
tile_manager_destroy (canvas_tiles);
|
|
|
|
|
canvas_tiles = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free the temporary buffer if it exist */
|
|
|
|
|
if (canvas_buf)
|
|
|
|
|
temp_buf_free (canvas_buf);
|
|
|
|
|
canvas_buf = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*********************************
|
|
|
|
|
* Rendering functions *
|
|
|
|
|
*********************************/
|
|
|
|
|
|
|
|
|
|
/* Some of this stuff should probably be combined with the
|
|
|
|
|
* code it was copied from in paint_core.c; but I wanted
|
|
|
|
|
* to learn this stuff, so I've kept it simple.
|
|
|
|
|
*
|
|
|
|
|
* The following only supports CONSTANT mode. Incremental
|
|
|
|
|
* would, I think, interact strangely with the way we
|
|
|
|
|
* do things. But it wouldn't be hard to implement at all.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_set_paint_area (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
Blob *blob)
|
|
|
|
|
{
|
|
|
|
|
int x, y, width, height;
|
|
|
|
|
int x1, y1, x2, y2;
|
|
|
|
|
int bytes;
|
|
|
|
|
|
|
|
|
|
blob_bounds (blob, &x, &y, &width, &height);
|
|
|
|
|
|
|
|
|
|
bytes = drawable_has_alpha (drawable) ?
|
|
|
|
|
drawable_bytes (drawable) : drawable_bytes (drawable) + 1;
|
|
|
|
|
|
|
|
|
|
x1 = CLAMP (x/SUBSAMPLE - 1, 0, drawable_width (drawable));
|
|
|
|
|
y1 = CLAMP (y/SUBSAMPLE - 1, 0, drawable_height (drawable));
|
|
|
|
|
x2 = CLAMP ((x + width)/SUBSAMPLE + 2, 0, drawable_width (drawable));
|
|
|
|
|
y2 = CLAMP ((y + height)/SUBSAMPLE + 2, 0, drawable_height (drawable));
|
|
|
|
|
|
|
|
|
|
/* configure the canvas buffer */
|
|
|
|
|
if ((x2 - x1) && (y2 - y1))
|
|
|
|
|
canvas_buf = temp_buf_resize (canvas_buf, bytes, x1, y1,
|
|
|
|
|
(x2 - x1), (y2 - y1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum { ROW_START, ROW_STOP };
|
|
|
|
|
|
|
|
|
|
/* The insertion sort here, for SUBSAMPLE = 8, tends to beat out
|
|
|
|
|
* qsort() by 4x with CFLAGS=-O2, 2x with CFLAGS=-g
|
|
|
|
|
*/
|
|
|
|
|
static void insert_sort (int *data, int n)
|
|
|
|
|
{
|
|
|
|
|
int i, j, k;
|
|
|
|
|
int tmp1, tmp2;
|
|
|
|
|
|
|
|
|
|
for (i=2; i<2*n; i+=2)
|
|
|
|
|
{
|
|
|
|
|
tmp1 = data[i];
|
|
|
|
|
tmp2 = data[i+1];
|
|
|
|
|
j = 0;
|
|
|
|
|
while (data[j] < tmp1)
|
|
|
|
|
j += 2;
|
|
|
|
|
|
|
|
|
|
for (k=i; k>j; k-=2)
|
|
|
|
|
{
|
|
|
|
|
data[k] = data[k-2];
|
|
|
|
|
data[k+1] = data[k-1];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data[j] = tmp1;
|
|
|
|
|
data[j+1] = tmp2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
fill_run (guchar *dest,
|
|
|
|
|
guchar alpha,
|
|
|
|
|
int w)
|
|
|
|
|
{
|
|
|
|
|
if (alpha == 255)
|
|
|
|
|
{
|
|
|
|
|
memset (dest, 255, w);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
while (w--)
|
|
|
|
|
{
|
1998-11-28 06:42:15 +08:00
|
|
|
*dest = MAX(*dest, alpha);
|
1998-06-15 06:42:36 +08:00
|
|
|
dest++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
render_blob_line (Blob *blob, guchar *dest,
|
|
|
|
|
int x, int y, int width)
|
|
|
|
|
{
|
|
|
|
|
int buf[4*SUBSAMPLE];
|
|
|
|
|
int *data = buf;
|
|
|
|
|
int n = 0;
|
|
|
|
|
int i, j;
|
|
|
|
|
int current = 0; /* number of filled rows at this point
|
|
|
|
|
* in the scan line */
|
|
|
|
|
|
|
|
|
|
int last_x;
|
|
|
|
|
|
|
|
|
|
/* Sort start and ends for all lines */
|
|
|
|
|
|
|
|
|
|
j = y * SUBSAMPLE - blob->y;
|
|
|
|
|
for (i=0; i<SUBSAMPLE; i++)
|
|
|
|
|
{
|
|
|
|
|
if (j >= blob->height)
|
|
|
|
|
break;
|
|
|
|
|
if ((j > 0) && (blob->data[j].left <= blob->data[j].right))
|
|
|
|
|
{
|
|
|
|
|
data[2*n] = blob->data[j].left;
|
|
|
|
|
data[2*n+1] = ROW_START;
|
|
|
|
|
data[2*SUBSAMPLE+2*n] = blob->data[j].right;
|
|
|
|
|
data[2*SUBSAMPLE+2*n+1] = ROW_STOP;
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
j++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have less than SUBSAMPLE rows, compress */
|
|
|
|
|
if (n < SUBSAMPLE)
|
|
|
|
|
{
|
|
|
|
|
for (i=0; i<2*n; i++)
|
|
|
|
|
data[2*n+i] = data[2*SUBSAMPLE+i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now count start and end separately */
|
|
|
|
|
n *= 2;
|
|
|
|
|
|
|
|
|
|
insert_sort (data, n);
|
|
|
|
|
|
|
|
|
|
/* Discard portions outside of tile */
|
|
|
|
|
|
|
|
|
|
while ((n > 0) && (data[0] < SUBSAMPLE*x))
|
|
|
|
|
{
|
|
|
|
|
if (data[1] == ROW_START)
|
|
|
|
|
current++;
|
|
|
|
|
else
|
|
|
|
|
current--;
|
|
|
|
|
data += 2;
|
|
|
|
|
n--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width)))
|
|
|
|
|
n--;
|
|
|
|
|
|
|
|
|
|
/* Render the row */
|
|
|
|
|
|
|
|
|
|
last_x = 0;
|
|
|
|
|
for (i=0; i<n;)
|
|
|
|
|
{
|
|
|
|
|
int cur_x = data[2*i] / SUBSAMPLE - x;
|
|
|
|
|
int pixel;
|
|
|
|
|
|
|
|
|
|
/* Fill in portion leading up to this pixel */
|
|
|
|
|
if (current && cur_x != last_x)
|
|
|
|
|
fill_run (dest + last_x, (255*current)/SUBSAMPLE, cur_x - last_x);
|
|
|
|
|
|
|
|
|
|
/* Compute the value for this pixel */
|
|
|
|
|
pixel = current * SUBSAMPLE;
|
|
|
|
|
|
|
|
|
|
while (i<n)
|
|
|
|
|
{
|
|
|
|
|
int tmp_x = data[2*i] / SUBSAMPLE;
|
|
|
|
|
if (tmp_x - x != cur_x)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (data[2*i+1] == ROW_START)
|
|
|
|
|
{
|
|
|
|
|
current++;
|
|
|
|
|
pixel += ((tmp_x + 1) * SUBSAMPLE) - data[2*i];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
current--;
|
|
|
|
|
pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2*i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
1998-11-28 06:42:15 +08:00
|
|
|
dest[cur_x] = MAX(dest[cur_x], (pixel * 255) / (SUBSAMPLE * SUBSAMPLE));
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
last_x = cur_x + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (current != 0)
|
|
|
|
|
fill_run (dest + last_x, (255*current)/SUBSAMPLE, width - last_x);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
render_blob (PixelRegion *dest, Blob *blob)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int h;
|
|
|
|
|
unsigned char * s;
|
|
|
|
|
void * pr;
|
|
|
|
|
|
|
|
|
|
for (pr = pixel_regions_register (1, dest);
|
|
|
|
|
pr != NULL;
|
|
|
|
|
pr = pixel_regions_process (pr))
|
|
|
|
|
{
|
|
|
|
|
h = dest->h;
|
|
|
|
|
s = dest->data;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<h; i++)
|
|
|
|
|
{
|
|
|
|
|
render_blob_line (blob, s,
|
|
|
|
|
dest->x, dest->y + i, dest->w);
|
|
|
|
|
s += dest->rowstride;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ink_paste (InkTool *ink_tool,
|
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
|
Blob *blob)
|
|
|
|
|
{
|
|
|
|
|
GImage *gimage;
|
|
|
|
|
PixelRegion srcPR;
|
|
|
|
|
int offx, offy;
|
|
|
|
|
unsigned char col[MAX_CHANNELS];
|
|
|
|
|
|
|
|
|
|
if (! (gimage = drawable_gimage (drawable)))
|
|
|
|
|
return;
|
1998-08-17 07:54:51 +08:00
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* Get the the buffer */
|
|
|
|
|
ink_set_paint_area (ink_tool, drawable, blob);
|
1998-08-17 07:54:51 +08:00
|
|
|
|
|
|
|
|
/* check to make sure there is actually a canvas to draw on */
|
|
|
|
|
if (!canvas_buf)
|
|
|
|
|
return;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
gimage_get_foreground (gimage, drawable, col);
|
|
|
|
|
|
|
|
|
|
/* set the alpha channel */
|
|
|
|
|
col[canvas_buf->bytes - 1] = OPAQUE_OPACITY;
|
|
|
|
|
|
|
|
|
|
/* color the pixels */
|
|
|
|
|
color_pixels (temp_buf_data (canvas_buf), col,
|
|
|
|
|
canvas_buf->width * canvas_buf->height, canvas_buf->bytes);
|
|
|
|
|
|
|
|
|
|
/* set undo blocks */
|
|
|
|
|
ink_set_undo_tiles (drawable,
|
|
|
|
|
canvas_buf->x, canvas_buf->y,
|
|
|
|
|
canvas_buf->width, canvas_buf->height);
|
|
|
|
|
|
|
|
|
|
/* initialize any invalid canvas tiles */
|
|
|
|
|
ink_set_canvas_tiles (canvas_buf->x, canvas_buf->y,
|
|
|
|
|
canvas_buf->width, canvas_buf->height);
|
|
|
|
|
|
|
|
|
|
ink_to_canvas_tiles (ink_tool, blob, col);
|
|
|
|
|
|
|
|
|
|
/* initialize canvas buf source pixel regions */
|
|
|
|
|
srcPR.bytes = canvas_buf->bytes;
|
|
|
|
|
srcPR.x = 0; srcPR.y = 0;
|
|
|
|
|
srcPR.w = canvas_buf->width;
|
|
|
|
|
srcPR.h = canvas_buf->height;
|
|
|
|
|
srcPR.rowstride = canvas_buf->width * canvas_buf->bytes;
|
|
|
|
|
srcPR.data = temp_buf_data (canvas_buf);
|
|
|
|
|
|
|
|
|
|
/* apply the paint area to the gimage */
|
|
|
|
|
gimage_apply_image (gimage, drawable, &srcPR,
|
|
|
|
|
FALSE,
|
1999-07-06 23:18:25 +08:00
|
|
|
(int) (gimp_context_get_opacity (NULL) * 255),
|
|
|
|
|
gimp_context_get_paint_mode (NULL),
|
1998-06-15 06:42:36 +08:00
|
|
|
undo_tiles, /* specify an alternative src1 */
|
|
|
|
|
canvas_buf->x, canvas_buf->y);
|
|
|
|
|
|
|
|
|
|
/* Update the undo extents */
|
|
|
|
|
ink_tool->x1 = MIN (ink_tool->x1, canvas_buf->x);
|
|
|
|
|
ink_tool->y1 = MIN (ink_tool->y1, canvas_buf->y);
|
|
|
|
|
ink_tool->x2 = MAX (ink_tool->x2, (canvas_buf->x + canvas_buf->width));
|
|
|
|
|
ink_tool->y2 = MAX (ink_tool->y2, (canvas_buf->y + canvas_buf->height));
|
|
|
|
|
|
|
|
|
|
/* Update the gimage--it is important to call gdisplays_update_area
|
|
|
|
|
* instead of drawable_update because we don't want the drawable
|
|
|
|
|
* preview to be constantly invalidated
|
|
|
|
|
*/
|
|
|
|
|
drawable_offsets (drawable, &offx, &offy);
|
1998-06-29 08:24:44 +08:00
|
|
|
gdisplays_update_area (gimage, canvas_buf->x + offx, canvas_buf->y + offy,
|
1998-06-15 06:42:36 +08:00
|
|
|
canvas_buf->width, canvas_buf->height);
|
|
|
|
|
}
|
|
|
|
|
|
1998-11-28 06:42:15 +08:00
|
|
|
/* This routine a) updates the representation of the stroke
|
|
|
|
|
* in the canvas tiles, then renders the dirty bit of it
|
|
|
|
|
* into canvas_buf.
|
|
|
|
|
*/
|
1998-06-15 06:42:36 +08:00
|
|
|
static void
|
|
|
|
|
ink_to_canvas_tiles (InkTool *ink_tool,
|
|
|
|
|
Blob *blob,
|
|
|
|
|
guchar *color)
|
|
|
|
|
{
|
|
|
|
|
PixelRegion srcPR, maskPR;
|
|
|
|
|
|
|
|
|
|
/* draw the blob on the canvas tiles */
|
|
|
|
|
pixel_region_init (&srcPR, canvas_tiles,
|
|
|
|
|
canvas_buf->x, canvas_buf->y,
|
|
|
|
|
canvas_buf->width, canvas_buf->height, TRUE);
|
|
|
|
|
|
|
|
|
|
render_blob (&srcPR, blob);
|
|
|
|
|
|
|
|
|
|
/* combine the canvas tiles and the canvas buf */
|
|
|
|
|
srcPR.bytes = canvas_buf->bytes;
|
|
|
|
|
srcPR.x = 0; srcPR.y = 0;
|
|
|
|
|
srcPR.w = canvas_buf->width;
|
|
|
|
|
srcPR.h = canvas_buf->height;
|
|
|
|
|
srcPR.rowstride = canvas_buf->width * canvas_buf->bytes;
|
|
|
|
|
srcPR.data = temp_buf_data (canvas_buf);
|
|
|
|
|
|
|
|
|
|
pixel_region_init (&maskPR, canvas_tiles,
|
|
|
|
|
canvas_buf->x, canvas_buf->y,
|
|
|
|
|
canvas_buf->width, canvas_buf->height, FALSE);
|
|
|
|
|
|
|
|
|
|
/* apply the canvas tiles to the canvas buf */
|
|
|
|
|
apply_mask_to_region (&srcPR, &maskPR, OPAQUE_OPACITY);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1999-05-01 05:11:27 +08:00
|
|
|
ink_set_undo_tiles (GimpDrawable *drawable,
|
|
|
|
|
int x, int y, int w, int h)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
Tile *src_tile;
|
|
|
|
|
Tile *dest_tile;
|
|
|
|
|
|
|
|
|
|
for (i = y; i < (y + h); i += (TILE_HEIGHT - (i % TILE_HEIGHT)))
|
|
|
|
|
{
|
|
|
|
|
for (j = x; j < (x + w); j += (TILE_WIDTH - (j % TILE_WIDTH)))
|
|
|
|
|
{
|
1998-08-16 03:17:36 +08:00
|
|
|
dest_tile = tile_manager_get_tile (undo_tiles, j, i, FALSE, FALSE);
|
1998-08-12 01:35:34 +08:00
|
|
|
if (tile_is_valid (dest_tile) == FALSE)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
1998-08-16 03:17:36 +08:00
|
|
|
src_tile = tile_manager_get_tile (drawable_data (drawable), j, i, TRUE, FALSE);
|
|
|
|
|
tile_manager_map_tile (undo_tiles, j, i, src_tile);
|
1998-07-10 10:43:12 +08:00
|
|
|
tile_release (src_tile, FALSE);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1999-05-01 05:11:27 +08:00
|
|
|
ink_set_canvas_tiles (int x, int y, int w, int h)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
Tile *tile;
|
|
|
|
|
|
|
|
|
|
for (i = y; i < (y + h); i += (TILE_HEIGHT - (i % TILE_HEIGHT)))
|
|
|
|
|
{
|
|
|
|
|
for (j = x; j < (x + w); j += (TILE_WIDTH - (j % TILE_WIDTH)))
|
|
|
|
|
{
|
1998-08-16 03:17:36 +08:00
|
|
|
tile = tile_manager_get_tile (canvas_tiles, j, i, FALSE, FALSE);
|
1998-08-12 01:35:34 +08:00
|
|
|
if (tile_is_valid (tile) == FALSE)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
1998-08-16 03:17:36 +08:00
|
|
|
tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE);
|
1998-08-12 01:35:34 +08:00
|
|
|
memset (tile_data_pointer (tile, 0, 0),
|
|
|
|
|
0,
|
|
|
|
|
tile_size (tile));
|
1998-07-10 10:43:12 +08:00
|
|
|
tile_release (tile, TRUE);
|
1998-06-15 06:42:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-03 01:40:10 +08:00
|
|
|
/**************************/
|
1998-06-15 06:42:36 +08:00
|
|
|
/* Global ink functions */
|
1999-07-03 01:40:10 +08:00
|
|
|
/**************************/
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ink_no_draw (Tool *tool)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Tool *
|
1999-05-01 05:11:27 +08:00
|
|
|
tools_new_ink (void)
|
1998-06-15 06:42:36 +08:00
|
|
|
{
|
|
|
|
|
Tool * tool;
|
|
|
|
|
InkTool * private;
|
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
/* The tool options */
|
1998-06-15 06:42:36 +08:00
|
|
|
if (! ink_options)
|
1999-04-13 01:55:06 +08:00
|
|
|
{
|
|
|
|
|
ink_options = ink_options_new ();
|
|
|
|
|
tools_register (INK, (ToolOptions *) ink_options);
|
1999-04-18 07:18:43 +08:00
|
|
|
|
|
|
|
|
/* press all default buttons */
|
|
|
|
|
ink_options_reset ();
|
1999-04-13 01:55:06 +08:00
|
|
|
}
|
1998-06-15 06:42:36 +08:00
|
|
|
|
1999-07-03 01:40:10 +08:00
|
|
|
tool = tools_new_tool (INK);
|
|
|
|
|
private = g_new (InkTool, 1);
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
private->core = draw_core_new (ink_no_draw);
|
|
|
|
|
private->last_blob = NULL;
|
|
|
|
|
|
|
|
|
|
tool->private = private;
|
1999-06-26 19:16:47 +08:00
|
|
|
|
1999-07-03 01:40:10 +08:00
|
|
|
tool->button_press_func = ink_button_press;
|
1998-06-15 06:42:36 +08:00
|
|
|
tool->button_release_func = ink_button_release;
|
1999-07-03 01:40:10 +08:00
|
|
|
tool->motion_func = ink_motion;
|
|
|
|
|
tool->cursor_update_func = ink_cursor_update;
|
|
|
|
|
tool->control_func = ink_control;
|
1998-06-15 06:42:36 +08:00
|
|
|
|
|
|
|
|
return tool;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
tools_free_ink (Tool *tool)
|
|
|
|
|
{
|
|
|
|
|
InkTool * ink_tool;
|
|
|
|
|
|
|
|
|
|
ink_tool = (InkTool *) tool->private;
|
|
|
|
|
|
|
|
|
|
/* Make sure the selection core is not visible */
|
|
|
|
|
if (tool->state == ACTIVE && ink_tool->core)
|
|
|
|
|
draw_core_stop (ink_tool->core, tool);
|
|
|
|
|
|
|
|
|
|
/* Free the selection core */
|
|
|
|
|
if (ink_tool->core)
|
|
|
|
|
draw_core_free (ink_tool->core);
|
|
|
|
|
|
1999-07-14 17:44:58 +08:00
|
|
|
/* Free the last blob, if any */
|
1998-07-12 11:59:23 +08:00
|
|
|
if (ink_tool->last_blob)
|
|
|
|
|
g_free (ink_tool->last_blob);
|
|
|
|
|
|
1998-06-15 06:42:36 +08:00
|
|
|
/* Cleanup memory */
|
|
|
|
|
ink_cleanup ();
|
|
|
|
|
|
|
|
|
|
/* Free the paint core */
|
|
|
|
|
g_free (ink_tool);
|
|
|
|
|
}
|