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

app/color_select.c app/colormaps.[ch] removed unused global variables 

2000-04-26  Michael Natterer  <mitch@gimp.org>

	* app/color_select.c
	* app/colormaps.[ch]
	* app/context_manager.c: removed unused global variables
	[foreground|background]_pixel and [old|new]_color_pixel.

	Initialize the colormap and visual stuff with GdkRGB instead of
	GtkPreview functions (which are deprecated).

	* app/[62 files]: removed #include's (started with colormaps.h and
	couldn't stop). Also ordered them consistently and did some small
	unrelated cleanups.
	Removed variuos <stdlib.h> et.al. but checked the files carefully
	before doing so. If I was too radical and you get warnings on your
	platform, please flame me or just put them back :)
This commit is contained in:
Michael Natterer 2000-04-27 17:27:28 +00:00 committed by Michael Natterer
parent f0f4569b16
commit c73b233f8a
205 changed files with 1138 additions and 1334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2000-04-26 Michael Natterer <mitch@gimp.org>
* app/color_select.c
* app/colormaps.[ch]
* app/context_manager.c: removed unused global variables
[foreground|background]_pixel and [old|new]_color_pixel.
Initialize the colormap and visual stuff with GdkRGB instead of
GtkPreview functions (which are deprecated).
* app/[62 files]: removed #include's (started with colormaps.h and
couldn't stop). Also ordered them consistently and did some small
unrelated cleanups.
Removed variuos <stdlib.h> et.al. but checked the files carefully
before doing so. If I was too radical and you get warnings on your
platform, please flame me or just put them back :)
2000-04-27 Sven Neumann <sven@gimp.org> 2000-04-27 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/imap_object.c: on request of plug-in author * plug-ins/imagemap/imap_object.c: on request of plug-in author

5
app/actions/help-commands.c
View File

@ -15,11 +15,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include "appenv.h" #include "appenv.h"
#include "about_dialog.h" #include "about_dialog.h"
#include "app_procs.h" #include "app_procs.h"
#include "brush_select.h" #include "brush_select.h"
#include "colormaps.h"
#include "colormap_dialog.i.h" #include "colormap_dialog.i.h"
#include "color_area.h" #include "color_area.h"
#include "commands.h" #include "commands.h"
@ -56,8 +57,6 @@
#include "tools.h" #include "tools.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

16
app/actions/plug-in-commands.c
View File

@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -68,10 +67,6 @@
#define _P_NOWAIT P_NOWAIT #define _P_NOWAIT P_NOWAIT
#endif #endif
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
#ifdef HAVE_IPC_H #ifdef HAVE_IPC_H
#include <sys/ipc.h> #include <sys/ipc.h>
#endif #endif
@ -80,27 +75,28 @@
#include <sys/shm.h> #include <sys/shm.h>
#endif #endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h" #include "app_procs.h"
#include "appenv.h" #include "appenv.h"
#include "brush_select.h" /* Need for closing dialogs */ #include "brush_select.h" /* Need for closing dialogs */
#include "drawable.h" #include "drawable.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h" #include "general.h"
#include "gimage.h" #include "gimage.h"
#include "gimprc.h" #include "gimprc.h"
#include "gradient_select.h" #include "gradient_select.h"
#include "interface.h"
#include "menus.h" #include "menus.h"
#include "pattern_select.h" /* Needed for closing pattern dialogs */ #include "pattern_select.h" /* Needed for closing pattern dialogs */
#include "plug_in.h" #include "plug_in.h"
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

5
app/airbrush.c
View File

@ -15,12 +15,11 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include "appenv.h" #include "appenv.h"
#include "airbrush.h" #include "airbrush.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpbrushpipe.h" #include "gimpbrushpipe.h"
#include "gradient.h" #include "gradient.h"
@ -32,9 +31,9 @@
#include "selection.h" #include "selection.h"
#include "tools.h" #include "tools.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
/* The maximum amount of pressure that can be exerted */ /* The maximum amount of pressure that can be exerted */
#define MAX_PRESSURE 0.075 #define MAX_PRESSURE 0.075

9
app/base/curves.c
View File

@ -15,8 +15,11 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <stdio.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -25,11 +28,11 @@
#include "curves.h" #include "curves.h"
#include "gimplut.h" #include "gimplut.h"
#include "config.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define GRAPH 0x1 #define GRAPH 0x1
#define XRANGE_TOP 0x2 #define XRANGE_TOP 0x2
#define XRANGE_BOTTOM 0x4 #define XRANGE_BOTTOM 0x4

11
app/base/hue-saturation.c
View File

@ -15,24 +15,21 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include <math.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "drawable.h" #include "drawable.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
#include "hue_saturation.h" #include "hue_saturation.h"
#include "interface.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define HUE_PARTITION_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK #define HUE_PARTITION_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK
#define SLIDER_WIDTH 200 #define SLIDER_WIDTH 200

95
app/base/temp-buf.c
View File

@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <glib.h> #include <glib.h>
@ -37,26 +36,26 @@
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimprc.h" #include "gimprc.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "temp_buf.h" #include "temp_buf.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
static unsigned char * temp_buf_allocate (unsigned int);
static void temp_buf_to_color (TempBuf *, TempBuf *); static guchar * temp_buf_allocate (guint);
static void temp_buf_to_gray (TempBuf *, TempBuf *); static void temp_buf_to_color (TempBuf *, TempBuf *);
static void temp_buf_to_gray (TempBuf *, TempBuf *);
/* Memory management */ /* Memory management */
static unsigned char * static guchar *
temp_buf_allocate (unsigned int size) temp_buf_allocate (guint size)
{ {
unsigned char *data; guchar *data;
data = (unsigned char *) g_malloc (size); data = g_new (guchar, size);
return data; return data;
} }
@ -68,8 +67,8 @@ static void
temp_buf_to_color (TempBuf *src_buf, temp_buf_to_color (TempBuf *src_buf,
TempBuf *dest_buf) TempBuf *dest_buf)
{ {
unsigned char *src; guchar *src;
unsigned char *dest; guchar *dest;
long num_bytes; long num_bytes;
src = temp_buf_data (src_buf); src = temp_buf_data (src_buf);
@ -79,7 +78,7 @@ temp_buf_to_color (TempBuf *src_buf,
while (num_bytes--) while (num_bytes--)
{ {
unsigned char tmpch; guchar tmpch;
*dest++ = *src++; /* alpha channel */ *dest++ = *src++; /* alpha channel */
*dest++ = tmpch = *src++; *dest++ = tmpch = *src++;
*dest++ = tmpch; *dest++ = tmpch;
@ -92,8 +91,8 @@ static void
temp_buf_to_gray (TempBuf *src_buf, temp_buf_to_gray (TempBuf *src_buf,
TempBuf *dest_buf) TempBuf *dest_buf)
{ {
unsigned char *src; guchar *src;
unsigned char *dest; guchar *dest;
long num_bytes; long num_bytes;
float pix; float pix;
@ -108,25 +107,25 @@ temp_buf_to_gray (TempBuf *src_buf,
pix = INTENSITY (*src++, *src++, *src++); pix = INTENSITY (*src++, *src++, *src++);
*dest++ = (unsigned char) pix; *dest++ = (guchar) pix;
} }
} }
TempBuf * TempBuf *
temp_buf_new (int width, temp_buf_new (gint width,
int height, gint height,
int bytes, gint bytes,
int x, gint x,
int y, gint y,
unsigned char *col) guchar *col)
{ {
long i; long i;
int j; int j;
unsigned char * data; guchar *data;
TempBuf * temp; TempBuf *temp;
temp = (TempBuf *) g_malloc (sizeof (TempBuf)); temp = g_new (TempBuf, 1);
temp->width = width; temp->width = width;
temp->height = height; temp->height = height;
@ -157,12 +156,12 @@ temp_buf_new (int width,
else else
{ {
/* No, we cannot */ /* No, we cannot */
unsigned char * dptr; guchar * dptr;
/* Fill the first row */ /* Fill the first row */
dptr = data; dptr = data;
for (i = width - 1; i >= 0; --i) for (i = width - 1; i >= 0; --i)
{ {
unsigned char * init; guchar * init;
j = bytes; j = bytes;
init = col; init = col;
while (j--) while (j--)
@ -226,13 +225,13 @@ temp_buf_copy (TempBuf *src,
TempBuf * TempBuf *
temp_buf_resize (TempBuf *buf, temp_buf_resize (TempBuf *buf,
int bytes, gint bytes,
int x, gint x,
int y, gint y,
int w, gint w,
int h) gint h)
{ {
int size; gint size;
/* calculate the requested size */ /* calculate the requested size */
size = w * h * bytes; size = w * h * bytes;
@ -266,16 +265,16 @@ temp_buf_resize (TempBuf *buf,
TempBuf * TempBuf *
temp_buf_copy_area (TempBuf *src, temp_buf_copy_area (TempBuf *src,
TempBuf *dest, TempBuf *dest,
int x, gint x,
int y, gint y,
int w, gint w,
int h, gint h,
int border) gint border)
{ {
TempBuf * new; TempBuf * new;
PixelRegion srcR, destR; PixelRegion srcR, destR;
unsigned char empty[MAX_CHANNELS] = { 0, 0, 0, 0 }; guchar empty[MAX_CHANNELS] = { 0, 0, 0, 0 };
int x1, y1, x2, y2; gint x1, y1, x2, y2;
if (!src) if (!src)
{ {
@ -339,7 +338,7 @@ temp_buf_free (TempBuf *temp_buf)
} }
unsigned char * guchar *
temp_buf_data (TempBuf *temp_buf) temp_buf_data (TempBuf *temp_buf)
{ {
if (temp_buf->swapped) if (temp_buf->swapped)
@ -355,10 +354,10 @@ temp_buf_data (TempBuf *temp_buf)
MaskBuf * MaskBuf *
mask_buf_new (int width, mask_buf_new (gint width,
int height) gint height)
{ {
static unsigned char empty = 0; static guchar empty = 0;
return (temp_buf_new (width, height, 1, 0, 0, &empty)); return (temp_buf_new (width, height, 1, 0, 0, &empty));
} }
@ -371,7 +370,7 @@ mask_buf_free (MaskBuf *mask)
} }
unsigned char * guchar *
mask_buf_data (MaskBuf *mask_buf) mask_buf_data (MaskBuf *mask_buf)
{ {
if (mask_buf->swapped) if (mask_buf->swapped)
@ -409,13 +408,13 @@ mask_buf_data (MaskBuf *mask_buf)
/* a static counter for generating unique filenames */ /* a static counter for generating unique filenames */
static int swap_index = 0; static gint swap_index = 0;
/* a static pointer which keeps track of the last request for a swapped buffer */ /* a static pointer which keeps track of the last request for a swapped buffer */
static TempBuf * cached_in_memory = NULL; static TempBuf * cached_in_memory = NULL;
static char * static gchar *
generate_unique_filename (void) generate_unique_filename (void)
{ {
pid_t pid; pid_t pid;
@ -429,9 +428,9 @@ void
temp_buf_swap (TempBuf *buf) temp_buf_swap (TempBuf *buf)
{ {
TempBuf * swap; TempBuf * swap;
char * filename; gchar * filename;
struct stat stat_buf; struct stat stat_buf;
int err; gint err;
FILE * fp; FILE * fp;
if (!buf || buf->swapped) if (!buf || buf->swapped)

50
app/base/temp-buf.h
View File

@ -18,48 +18,48 @@
#ifndef __TEMP_BUF_H__ #ifndef __TEMP_BUF_H__
#define __TEMP_BUF_H__ #define __TEMP_BUF_H__
typedef struct _TempBuf TempBuf;
typedef struct _TempBuf MaskBuf;
typedef struct _temp_buf TempBuf; struct _TempBuf
typedef struct _temp_buf MaskBuf;
struct _temp_buf
{ {
int bytes; /* The necessary info */ gint bytes; /* The necessary info */
int width; gint width;
int height; gint height;
int x, y; /* origin of data source */ gint x, y; /* origin of data source */
int swapped; /* flag indicating whether buf is cached to disk */ gboolean swapped; /* flag indicating whether buf is cached to disk */
char * filename; /* filename of cached information */ gchar *filename; /* filename of cached information */
unsigned char * data; /* The data buffer */ guchar *data; /* The data buffer */
}; };
/* The temp buffer functions */ /* The temp buffer functions */
TempBuf * temp_buf_new (int, int, int, int, int, unsigned char *); TempBuf * temp_buf_new (gint, gint, gint, gint, gint, guchar *);
TempBuf * temp_buf_copy (TempBuf *, TempBuf *); TempBuf * temp_buf_copy (TempBuf *, TempBuf *);
TempBuf * temp_buf_resize (TempBuf *, int, int, int, int, int); TempBuf * temp_buf_resize (TempBuf *, gint, gint, gint, gint, gint);
TempBuf * temp_buf_copy_area (TempBuf *, TempBuf *, int, int, int, int, int); TempBuf * temp_buf_copy_area (TempBuf *, TempBuf *,
void temp_buf_free (TempBuf *); gint, gint, gint, gint, gint);
unsigned char * temp_buf_data (TempBuf *); void temp_buf_free (TempBuf *);
guchar * temp_buf_data (TempBuf *);
/* The mask buffer functions */ /* The mask buffer functions */
MaskBuf * mask_buf_new (int, int); MaskBuf * mask_buf_new (gint, gint);
void mask_buf_free (MaskBuf *); void mask_buf_free (MaskBuf *);
unsigned char * mask_buf_data (MaskBuf *); guchar * mask_buf_data (MaskBuf *);
/* The disk caching functions */ /* The disk caching functions */
void temp_buf_swap (TempBuf *); void temp_buf_swap (TempBuf *);
void temp_buf_unswap (TempBuf *); void temp_buf_unswap (TempBuf *);
void temp_buf_swap_free (TempBuf *); void temp_buf_swap_free (TempBuf *);
/* Called by app_procs:exit to free up the cached undo buffer */ /* Called by app_procs:exit() to free up the cached undo buffer */
void swapping_free (void); void swapping_free (void);
#endif /* __TEMP_BUF_H__ */ #endif /* __TEMP_BUF_H__ */

6
app/base/threshold.c
View File

@ -15,17 +15,17 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "general.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "threshold.h" #include "threshold.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define HISTOGRAM_WIDTH 256 #define HISTOGRAM_WIDTH 256
#define HISTOGRAM_HEIGHT 150 #define HISTOGRAM_HEIGHT 150

4
app/bezier_select.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "rect_select.h" #include "rect_select.h"
#include "interface.h"
#include "bezier_select.h" #include "bezier_select.h"
#include "bezier_selectP.h" #include "bezier_selectP.h"
#include "paths_dialogP.h" #include "paths_dialogP.h"
#include "selection_options.h" #include "selection_options.h"
#include "undo.h" #include "undo.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
/* Bezier extensions made by Raphael FRANCOIS (fraph@ibm.net) /* Bezier extensions made by Raphael FRANCOIS (fraph@ibm.net)
BEZIER_EXTENDS VER 1.0 BEZIER_EXTENDS VER 1.0

4
app/blend.c
View File

@ -32,7 +32,6 @@
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimpui.h" #include "gimpui.h"
#include "gradient.h" #include "gradient.h"
#include "interface.h"
#include "paint_options.h" #include "paint_options.h"
#include "selection.h" #include "selection.h"
#include "tools.h" #include "tools.h"
@ -41,9 +40,10 @@
#include "tile.h" #include "tile.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
/* target size */ /* target size */
#define TARGET_HEIGHT 15 #define TARGET_HEIGHT 15

4
app/bucket_fill.c
View File

@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -28,14 +28,12 @@
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "paint_options.h" #include "paint_options.h"
#include "selection.h" #include "selection.h"
#include "tools.h" #include "tools.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
/* the bucket fill structures */ /* the bucket fill structures */

4
app/by_color_select.c
View File

@ -15,12 +15,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "boundary.h" #include "boundary.h"
#include "by_color_select.h" #include "by_color_select.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "draw_core.h" #include "draw_core.h"
@ -34,7 +35,6 @@
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define PREVIEW_WIDTH 256 #define PREVIEW_WIDTH 256

9
app/channel.c
View File

@ -23,7 +23,6 @@
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "layer.h" #include "layer.h"
@ -34,15 +33,17 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile.h" #include "tile.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

10
app/channel_ops.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;

6
app/channels_dialog.c
View File

@ -21,10 +21,8 @@
#include "appenv.h" #include "appenv.h"
#include "channels_dialog.h" #include "channels_dialog.h"
#include "colormaps.h"
#include "color_panel.h" #include "color_panel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
#include "gimage_mask.h" #include "gimage_mask.h"
@ -38,6 +36,8 @@
#include "paint_funcs.h" #include "paint_funcs.h"
#include "undo.h" #include "undo.h"
#include "channel_pvt.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "pixmaps/eye.xbm" #include "pixmaps/eye.xbm"
@ -49,8 +49,6 @@
#include "pixmaps/delete.xpm" #include "pixmaps/delete.xpm"
#include "pixmaps/toselection.xpm" #include "pixmaps/toselection.xpm"
#include "channel_pvt.h"
#define COMPONENT_BASE_ID 0x10000000 #define COMPONENT_BASE_ID 0x10000000
typedef struct _ChannelsDialog ChannelsDialog; typedef struct _ChannelsDialog ChannelsDialog;

2
app/clone.c
View File

@ -22,11 +22,9 @@
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "paint_core.h" #include "paint_core.h"
#include "paint_options.h" #include "paint_options.h"

3
app/color_panel.c
View File

@ -15,14 +15,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <math.h>
#include <stdlib.h>
#include "appenv.h" #include "appenv.h"
#include "color_panel.h" #include "color_panel.h"
#include "color_notebook.h" #include "color_notebook.h"
#include "colormaps.h" #include "colormaps.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#define EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \ #define EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | \ GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK GDK_LEAVE_NOTIFY_MASK

6
app/color_select.c
View File

@ -17,14 +17,12 @@
*/ */
#include "config.h" #include "config.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "color_select.h" #include "color_select.h"
#include "colormaps.h" #include "colormaps.h"
#include "errors.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h" #include "gimpui.h"
@ -32,8 +30,10 @@
#include "color_area.h" /* for color_area_draw_rect */ #include "color_area.h" /* for color_area_draw_rect */
#include "libgimp/color_selector.h" #include "libgimp/color_selector.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define XY_DEF_WIDTH 240 #define XY_DEF_WIDTH 240
#define XY_DEF_HEIGHT 240 #define XY_DEF_HEIGHT 240
#define Z_DEF_WIDTH 15 #define Z_DEF_WIDTH 15
@ -879,7 +879,6 @@ color_select_update_colors (ColorSelect *csp,
if (which) if (which)
{ {
window = csp->orig_color->window; window = csp->orig_color->window;
color.pixel = old_color_pixel;
red = csp->orig_values[0]; red = csp->orig_values[0];
green = csp->orig_values[1]; green = csp->orig_values[1];
blue = csp->orig_values[2]; blue = csp->orig_values[2];
@ -887,7 +886,6 @@ color_select_update_colors (ColorSelect *csp,
else else
{ {
window = csp->new_color->window; window = csp->new_color->window;
color.pixel = new_color_pixel;
red = csp->values[COLOR_SELECT_RED]; red = csp->values[COLOR_SELECT_RED];
green = csp->values[COLOR_SELECT_GREEN]; green = csp->values[COLOR_SELECT_GREEN];
blue = csp->values[COLOR_SELECT_BLUE]; blue = csp->values[COLOR_SELECT_BLUE];

11
app/colormap_dialog.i.c
View File

@ -1,21 +1,24 @@
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h>
#include "gdk/gdkkeysyms.h" #include <gdk/gdkkeysyms.h>
#include "color_notebook.h" #include "color_notebook.h"
#include "image_render.h" #include "image_render.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "colormaps.h" #include "colormaps.h"
#include "color_area.h" #include "color_area.h"
#include "general.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimpui.h" #include "gimpui.h"
#include "config.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
/* Add these features: /* Add these features:
* *
* load/save colormaps * load/save colormaps

23
app/colormaps.c
View File

@ -31,12 +31,6 @@ gulong g_color_pixel;
gulong g_normal_guide_pixel; gulong g_normal_guide_pixel;
gulong g_active_guide_pixel; gulong g_active_guide_pixel;
gulong foreground_pixel;
gulong background_pixel;
gulong old_color_pixel;
gulong new_color_pixel;
gulong marching_ants_pixels[8]; gulong marching_ants_pixels[8];
static void static void
@ -51,11 +45,6 @@ set_app_colors (void)
g_normal_guide_pixel = get_color (0, 127, 255); g_normal_guide_pixel = get_color (0, 127, 255);
g_active_guide_pixel = get_color (255, 0, 0); g_active_guide_pixel = get_color (255, 0, 0);
foreground_pixel = get_color (0, 0, 0);
background_pixel = get_color (255, 255, 255);
old_color_pixel = get_color (0, 0, 0);
new_color_pixel = get_color (255, 255, 255);
} }
gulong gulong
@ -69,15 +58,11 @@ get_color (int red,
void void
get_standard_colormaps (void) get_standard_colormaps (void)
{ {
GtkPreviewInfo *info; g_visual = gdk_rgb_get_visual ();
g_cmap = gdk_rgb_get_cmap ();
gtk_widget_set_default_visual (gtk_preview_get_visual ()); gtk_widget_set_default_visual (g_visual);
gtk_widget_set_default_colormap (gtk_preview_get_cmap ()); gtk_widget_set_default_colormap (g_cmap);
info = gtk_preview_get_info ();
g_visual = info->visual;
g_cmap = info->cmap;
set_app_colors (); set_app_colors ();
} }

10
app/colormaps.h
View File

@ -28,17 +28,11 @@ extern gulong g_black_pixel;
extern gulong g_gray_pixel; extern gulong g_gray_pixel;
extern gulong g_white_pixel; extern gulong g_white_pixel;
extern gulong g_color_pixel; extern gulong g_color_pixel;
/* Pixel values for guides */
extern gulong g_normal_guide_pixel; extern gulong g_normal_guide_pixel;
extern gulong g_active_guide_pixel; extern gulong g_active_guide_pixel;
/* Foreground and Background colors */
extern gulong foreground_pixel;
extern gulong background_pixel;
/* Old and New colors */
extern gulong old_color_pixel;
extern gulong new_color_pixel;
/* Colormap entries reserved for color cycled marching ants--optional */ /* Colormap entries reserved for color cycled marching ants--optional */
extern gulong marching_ants_pixels[8]; extern gulong marching_ants_pixels[8];

5
app/commands.c
View File

@ -15,11 +15,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include "appenv.h" #include "appenv.h"
#include "about_dialog.h" #include "about_dialog.h"
#include "app_procs.h" #include "app_procs.h"
#include "brush_select.h" #include "brush_select.h"
#include "colormaps.h"
#include "colormap_dialog.i.h" #include "colormap_dialog.i.h"
#include "color_area.h" #include "color_area.h"
#include "commands.h" #include "commands.h"
@ -56,8 +57,6 @@
#include "tools.h" #include "tools.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

31
app/context_manager.c
View File

@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "context_manager.h" #include "context_manager.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -107,28 +106,6 @@ context_manager_tool_changed (GimpContext *user_context,
} }
} }
static void
context_manager_foreground_changed (GimpContext *context,
gint r,
gint g,
gint b,
gpointer data)
{
if (no_interface == FALSE)
foreground_pixel = get_color (r, g, b);
}
static void
context_manager_background_changed (GimpContext *context,
gint r,
gint g,
gint b,
gpointer data)
{
if (no_interface == FALSE)
background_pixel = get_color (r, g, b);
}
void void
context_manager_init (void) context_manager_init (void)
{ {
@ -158,14 +135,6 @@ context_manager_init (void)
GTK_SIGNAL_FUNC (context_manager_tool_changed), GTK_SIGNAL_FUNC (context_manager_tool_changed),
NULL); NULL);
/* Update color-related stuff */
gtk_signal_connect (GTK_OBJECT (user_context), "foreground_changed",
GTK_SIGNAL_FUNC (context_manager_foreground_changed),
NULL);
gtk_signal_connect (GTK_OBJECT (user_context), "background_changed",
GTK_SIGNAL_FUNC (context_manager_background_changed),
NULL);
/* Make the user contect the currently active context */ /* Make the user contect the currently active context */
gimp_context_set_current (user_context); gimp_context_set_current (user_context);

4
app/convert.c
View File

@ -97,15 +97,15 @@
#include "fsdither.h" #include "fsdither.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "undo.h" #include "undo.h"
#include "palette.h" #include "palette.h"
#include "palette_select.h" #include "palette_select.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "layer_pvt.h" /* ick. */ #include "layer_pvt.h" /* ick. */
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "tile_manager_pvt.h" /* ick ick ick. */ #include "tile_manager_pvt.h" /* ick ick ick. */

16
app/convolve.c
View File

@ -15,13 +15,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "convolve.h" #include "convolve.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
@ -32,9 +31,9 @@
#include "tools.h" #include "tools.h"
#include "gimage.h" #include "gimage.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define FIELD_COLS 4 #define FIELD_COLS 4
#define MIN_BLUR 64 /* (8/9 original pixel) */ #define MIN_BLUR 64 /* (8/9 original pixel) */
#define MAX_BLUR 0.25 /* (1/33 original pixel) */ #define MAX_BLUR 0.25 /* (1/33 original pixel) */
@ -251,7 +250,7 @@ convolve_modifier_key_func (Tool *tool,
} }
Tool * Tool *
tools_new_convolve () tools_new_convolve (void)
{ {
Tool * tool; Tool * tool;
PaintCore * private; PaintCore * private;
@ -288,9 +287,9 @@ convolve_motion (PaintCore *paint_core,
ConvolveType type, ConvolveType type,
double rate) double rate)
{ {
GImage *gimage; GImage *gimage;
TempBuf * area; TempBuf *area;
unsigned char *temp_data; guchar *temp_data;
PixelRegion srcPR, destPR, tempPR; PixelRegion srcPR, destPR, tempPR;
gdouble scale; gdouble scale;
@ -312,7 +311,8 @@ convolve_motion (PaintCore *paint_core,
return; return;
/* configure the pixel regions correctly */ /* configure the pixel regions correctly */
pixel_region_init (&srcPR, drawable_data (drawable), area->x, area->y, area->width, area->height, FALSE); pixel_region_init (&srcPR, drawable_data (drawable),
area->x, area->y, area->width, area->height, FALSE);
destPR.bytes = area->bytes; destPR.bytes = area->bytes;
destPR.x = 0; destPR.y = 0; destPR.x = 0; destPR.y = 0;

9
app/core/gimpchannel-combine.c
View File

@ -23,7 +23,6 @@
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "layer.h" #include "layer.h"
@ -34,15 +33,17 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile.h" #include "tile.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

9
app/core/gimpchannel.c
View File

@ -23,7 +23,6 @@
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "layer.h" #include "layer.h"
@ -34,15 +33,17 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile.h" #include "tile.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

4
app/core/gimpdrawable-blend.c
View File

@ -32,7 +32,6 @@
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimpui.h" #include "gimpui.h"
#include "gradient.h" #include "gradient.h"
#include "interface.h"
#include "paint_options.h" #include "paint_options.h"
#include "selection.h" #include "selection.h"
#include "tools.h" #include "tools.h"
@ -41,9 +40,10 @@
#include "tile.h" #include "tile.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
/* target size */ /* target size */
#define TARGET_HEIGHT 15 #define TARGET_HEIGHT 15

25
app/core/gimpdrawable-invert.c
View File

@ -15,18 +15,15 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include <math.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "interface.h"
#include "invert.h" #include "invert.h"
#include "gimage.h" #include "gimage.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
@ -35,7 +32,7 @@ image_invert (GimpImage *gimage)
{ {
GimpDrawable *drawable; GimpDrawable *drawable;
Argument *return_vals; Argument *return_vals;
int nreturn_vals; gint nreturn_vals;
drawable = gimage_active_drawable (gimage); drawable = gimage_active_drawable (gimage);
@ -63,19 +60,21 @@ void
invert (GimpDrawable *drawable) invert (GimpDrawable *drawable)
{ {
PixelRegion srcPR, destPR; PixelRegion srcPR, destPR;
int x1, y1, x2, y2; gint x1, y1, x2, y2;
GimpLut *lut; GimpLut *lut;
lut = invert_lut_new(gimp_drawable_bytes(drawable)); lut = invert_lut_new (gimp_drawable_bytes (drawable));
drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2); drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
pixel_region_init (&srcPR, drawable_data (drawable), x1, y1, (x2 - x1), (y2 - y1), FALSE); pixel_region_init (&srcPR, drawable_data (drawable),
pixel_region_init (&destPR, drawable_shadow (drawable), x1, y1, (x2 - x1), (y2 - y1), TRUE); x1, y1, (x2 - x1), (y2 - y1), FALSE);
pixel_region_init (&destPR, drawable_shadow (drawable),
x1, y1, (x2 - x1), (y2 - y1), TRUE);
pixel_regions_process_parallel((p_func)gimp_lut_process, lut, pixel_regions_process_parallel ((p_func)gimp_lut_process, lut,
2, &srcPR, &destPR); 2, &srcPR, &destPR);
gimp_lut_free(lut); gimp_lut_free (lut);
drawable_merge_shadow (drawable, TRUE); drawable_merge_shadow (drawable, TRUE);
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1)); drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));

10
app/core/gimpdrawable-offset.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;

4
app/core/gimpimage-convert.c
View File

@ -97,15 +97,15 @@
#include "fsdither.h" #include "fsdither.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "undo.h" #include "undo.h"
#include "palette.h" #include "palette.h"
#include "palette_select.h" #include "palette_select.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "layer_pvt.h" /* ick. */ #include "layer_pvt.h" /* ick. */
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "tile_manager_pvt.h" /* ick ick ick. */ #include "tile_manager_pvt.h" /* ick ick ick. */

10
app/core/gimpimage-duplicate.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;

16
app/core/gimpimage-guides.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

9
app/core/gimpimage-mask.c
View File

@ -17,26 +17,23 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <string.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimprc.h" #include "gimprc.h"
#include "interface.h"
#include "layer.h" #include "layer.h"
#include "paint_core.h" #include "paint_core.h"
#include "paint_options.h" #include "paint_options.h"
#include "undo.h" #include "undo.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile_manager_pvt.h" #include "tile_manager_pvt.h"
#include "libgimp/gimpintl.h"
/* local variables */ /* local variables */
static int gimage_mask_stroking = FALSE; static int gimage_mask_stroking = FALSE;

16
app/core/gimpimage-merge.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

16
app/core/gimpimage-projection.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

16
app/core/gimpimage-resize.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

16
app/core/gimpimage-scale.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

6
app/core/gimpimage-undo-push.c
View File

@ -15,20 +15,20 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "by_color_select.h" #include "by_color_select.h"
#include "channel.h" #include "channel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gdisplay_ops.h" #include "gdisplay_ops.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpparasite.h"
#include "gimprc.h" #include "gimprc.h"
#include "layer.h" #include "layer.h"
#include "paint_core.h" #include "paint_core.h"
@ -46,8 +46,8 @@
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/parasite.h" #include "libgimp/parasite.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "gimpparasite.h"
/*#define DEBUG*/ /*#define DEBUG*/

16
app/core/gimpimage.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

24
app/core/gimpimagemap.c
View File

@ -15,12 +15,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
#include "gimage_mask.h" #include "gimage_mask.h"
@ -29,6 +25,7 @@
#include "tile_manager_pvt.h" #include "tile_manager_pvt.h"
#define WAITING 0 #define WAITING 0
#define WORKING 1 #define WORKING 1
@ -37,15 +34,15 @@
/* Local structures */ /* Local structures */
typedef struct _ImageMap typedef struct _ImageMap
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpDrawable * drawable; GimpDrawable *drawable;
TileManager * undo_tiles; TileManager *undo_tiles;
ImageMapApplyFunc apply_func; ImageMapApplyFunc apply_func;
void * user_data; gpointer user_data;
PixelRegion srcPR, destPR; PixelRegion srcPR, destPR;
void * pr; void *pr;
int state; gint state;
gint idle; gint idle;
} _ImageMap; } _ImageMap;
@ -357,4 +354,3 @@ image_map_get_color_at (ImageMap image_map,
return NULL; return NULL;
} }
} }

13
app/core/gimplayer-floating-sel.c
View File

@ -15,27 +15,26 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "layer.h" #include "layer.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "interface.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "tile_manager_pvt.h" /* ick. */ #include "tile_manager_pvt.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
void void
floating_sel_attach (Layer *layer, floating_sel_attach (Layer *layer,
GimpDrawable *drawable) GimpDrawable *drawable)

16
app/core/gimplayer.c
View File

@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h> #include "config.h"
#include <string.h> #include <string.h>
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
@ -35,14 +35,16 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "libgimp/parasite.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "tile_manager_pvt.h" #include "tile_manager_pvt.h"
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

16
app/core/gimpprojection-construct.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

3
app/core/gimpprojection.c
View File

@ -50,9 +50,10 @@
#include "bezier_selectP.h" #include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */ #include "layer_pvt.h" /* ick. (not alone either) */
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define OVERHEAD 25 /* in units of pixel area */ #define OVERHEAD 25 /* in units of pixel area */
#define EPSILON 5 #define EPSILON 5

9
app/curves.c
View File

@ -15,8 +15,11 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <stdio.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -25,11 +28,11 @@
#include "curves.h" #include "curves.h"
#include "gimplut.h" #include "gimplut.h"
#include "config.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define GRAPH 0x1 #define GRAPH 0x1
#define XRANGE_TOP 0x2 #define XRANGE_TOP 0x2
#define XRANGE_BOTTOM 0x4 #define XRANGE_BOTTOM 0x4

4
app/devices.c
View File

@ -30,13 +30,13 @@
#include "gimpui.h" #include "gimpui.h"
#include "gradient.h" #include "gradient.h"
#include "gradient_header.h" #include "gradient_header.h"
#include "interface.h"
#include "session.h" #include "session.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#define CELL_SIZE 20 /* The size of the preview cells */ #define CELL_SIZE 20 /* The size of the preview cells */
#define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \ #define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \

5
app/dialogs/info-dialog.c
View File

@ -18,15 +18,16 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "interface.h"
#include "session.h" #include "session.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpsizeentry.h"
/* static functions */ /* static functions */
static void info_field_new (InfoDialog *, InfoFieldType, char *, GtkWidget *, static void info_field_new (InfoDialog *, InfoFieldType, char *, GtkWidget *,

4
app/dialogs/info-window.c
View File

@ -26,13 +26,13 @@
#include "gximage.h" #include "gximage.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "info_window.h" #include "info_window.h"
#include "interface.h"
#include "scroll.h" #include "scroll.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpunit.h" #include "libgimp/gimpunit.h"
#include "libgimp/gimpintl.h"
#define MAX_BUF 256 #define MAX_BUF 256
typedef struct _InfoWinData InfoWinData; typedef struct _InfoWinData InfoWinData;

12
app/dialogs/tips-dialog.c
View File

@ -21,15 +21,17 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include "gtk/gtk.h"
#include "tips_dialog.h" #include "tips_dialog.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimphelp.h" #include "gimpui.h"
#include "interface.h"
#include "wilber.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h"
#include "wilber.h"
#define TIPS_DIR_NAME "tips" #define TIPS_DIR_NAME "tips"

19
app/dialogs/tips-dialog.h
View File

@ -1,8 +1,23 @@
/* 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.
*/
#ifndef __TIPS_DIALOG_H__ #ifndef __TIPS_DIALOG_H__
#define __TIPS_DIALOG_H__ #define __TIPS_DIALOG_H__
void tips_dialog_create (void); void tips_dialog_create (void);
#endif /* __TIPS_DIALOG_H__ */ #endif /* __TIPS_DIALOG_H__ */

7
app/disp_callbacks.c
View File

@ -18,19 +18,18 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gdk/gdkkeysyms.h"
#include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "bucket_fill.h" #include "bucket_fill.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "devices.h" #include "devices.h"
#include "disp_callbacks.h" #include "disp_callbacks.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimprc.h" #include "gimprc.h"
#include "info_window.h" #include "info_window.h"
#include "interface.h"
#include "layer_select.h" #include "layer_select.h"
#include "move.h" #include "move.h"
#include "patterns.h" #include "patterns.h"

7
app/display/gimpdisplay-callbacks.c
View File

@ -18,19 +18,18 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gdk/gdkkeysyms.h"
#include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "bucket_fill.h" #include "bucket_fill.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "devices.h" #include "devices.h"
#include "disp_callbacks.h" #include "disp_callbacks.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimprc.h" #include "gimprc.h"
#include "info_window.h" #include "info_window.h"
#include "interface.h"
#include "layer_select.h" #include "layer_select.h"
#include "move.h" #include "move.h"
#include "patterns.h" #include "patterns.h"

5
app/display/gimpdisplay-ops.c
View File

@ -15,9 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include <gtk/gtkmain.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h" #include "colormaps.h"
@ -31,7 +29,6 @@
#include "scale.h" #include "scale.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
static void gdisplay_close_warning_callback (GtkWidget *widget, static void gdisplay_close_warning_callback (GtkWidget *widget,

3
app/display/gimpdisplay-render.c
View File

@ -17,9 +17,8 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "errors.h"
#include "gimprc.h" #include "gimprc.h"
#include "gximage.h" #include "gximage.h"
#include "image_render.h" #include "image_render.h"

2
app/display/gimpdisplay-selection.c
View File

@ -15,11 +15,9 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h>
#include "appenv.h" #include "appenv.h"
#include "boundary.h" #include "boundary.h"
#include "colormaps.h" #include "colormaps.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gdisplay_ops.h" #include "gdisplay_ops.h"
#include "gimage_mask.h" #include "gimage_mask.h"

3
app/display/gimpdisplay.c
View File

@ -50,9 +50,10 @@
#include "bezier_selectP.h" #include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */ #include "layer_pvt.h" /* ick. (not alone either) */
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define OVERHEAD 25 /* in units of pixel area */ #define OVERHEAD 25 /* in units of pixel area */
#define EPSILON 5 #define EPSILON 5

7
app/display/gimpdisplayshell-callbacks.c
View File

@ -18,19 +18,18 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gdk/gdkkeysyms.h"
#include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "bucket_fill.h" #include "bucket_fill.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "devices.h" #include "devices.h"
#include "disp_callbacks.h" #include "disp_callbacks.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimprc.h" #include "gimprc.h"
#include "info_window.h" #include "info_window.h"
#include "interface.h"
#include "layer_select.h" #include "layer_select.h"
#include "move.h" #include "move.h"
#include "patterns.h" #include "patterns.h"

69
app/display/gimpdisplayshell-layer-select.c
View File

@ -15,18 +15,16 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include "gdk/gdkkeysyms.h"
#include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimprc.h" #include "gimprc.h"
#include "interface.h"
#include "layer_select.h" #include "layer_select.h"
#include "layers_dialogP.h" #include "layers_dialogP.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
@ -34,30 +32,31 @@
typedef struct _LayerSelect LayerSelect; typedef struct _LayerSelect LayerSelect;
struct _LayerSelect { struct _LayerSelect
{
GtkWidget *shell; GtkWidget *shell;
GtkWidget *layer_preview; GtkWidget *layer_preview;
GtkWidget *label; GtkWidget *label;
GdkPixmap *layer_pixmap; GdkPixmap *layer_pixmap;
GtkWidget *preview; GtkWidget *preview;
GImage *gimage; GImage *gimage;
Layer *current_layer; Layer *current_layer;
int dirty; gboolean dirty;
int image_width, image_height; gint image_width, image_height;
double ratio; gdouble ratio;
}; };
/* layer widget function prototypes */ /* layer widget function prototypes */
static void layer_select_advance (LayerSelect *, int); static void layer_select_advance (LayerSelect *, gint);
static void layer_select_forward (LayerSelect *); static void layer_select_forward (LayerSelect *);
static void layer_select_backward (LayerSelect *); static void layer_select_backward (LayerSelect *);
static void layer_select_end (LayerSelect *, guint32); static void layer_select_end (LayerSelect *, guint32);
static void layer_select_set_gimage (LayerSelect *, GImage *); static void layer_select_set_gimage (LayerSelect *, GImage *);
static void layer_select_set_layer (LayerSelect *); static void layer_select_set_layer (LayerSelect *);
static gint layer_select_events (GtkWidget *, GdkEvent *); static gint layer_select_events (GtkWidget *, GdkEvent *);
static gint preview_events (GtkWidget *, GdkEvent *); static gint preview_events (GtkWidget *, GdkEvent *);
static void preview_redraw (LayerSelect *); static void preview_redraw (LayerSelect *);
/* /*
* Local variables * Local variables
@ -72,7 +71,7 @@ LayerSelect *layer_select = NULL;
void void
layer_select_init (GImage *gimage, layer_select_init (GImage *gimage,
int dir, gint dir,
guint32 time) guint32 time)
{ {
GtkWidget *frame1; GtkWidget *frame1;
@ -160,7 +159,7 @@ layer_select_init (GImage *gimage,
} }
void void
layer_select_update_preview_size () layer_select_update_preview_size (void)
{ {
if (layer_select != NULL) if (layer_select != NULL)
{ {
@ -177,14 +176,14 @@ layer_select_update_preview_size ()
static void static void
layer_select_advance (LayerSelect *layer_select, layer_select_advance (LayerSelect *layer_select,
int dir) gint dir)
{ {
int index; gint index;
int length; gint length;
int count; gint count;
GSList *list; GSList *list;
GSList *nth; GSList *nth;
Layer *layer; Layer *layer;
index = 0; index = 0;
@ -260,7 +259,7 @@ static void
layer_select_set_gimage (LayerSelect *layer_select, layer_select_set_gimage (LayerSelect *layer_select,
GImage *gimage) GImage *gimage)
{ {
int image_width, image_height; gint image_width, image_height;
layer_select->gimage = gimage; layer_select->gimage = gimage;
layer_select->current_layer = gimage->active_layer; layer_select->current_layer = gimage->active_layer;
@ -304,7 +303,8 @@ layer_select_set_layer (LayerSelect *layer_select)
return; return;
/* Set the layer label */ /* Set the layer label */
gtk_label_set_text (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer))); gtk_label_set_text (GTK_LABEL (layer_select->label),
drawable_get_name (GIMP_DRAWABLE (layer)));
} }
@ -403,10 +403,10 @@ preview_events (GtkWidget *widget,
static void static void
preview_redraw (LayerSelect *layer_select) preview_redraw (LayerSelect *layer_select)
{ {
Layer * layer; Layer *layer;
TempBuf * preview_buf; TempBuf *preview_buf;
int w, h; gint w, h;
int offx, offy; gint offx, offy;
if (! (layer = (layer_select->current_layer))) if (! (layer = (layer_select->current_layer)))
return; return;
@ -443,7 +443,8 @@ preview_redraw (LayerSelect *layer_select)
gtk_preview_put (GTK_PREVIEW (layer_select->preview), gtk_preview_put (GTK_PREVIEW (layer_select->preview),
layer_select->layer_pixmap, layer_select->layer_pixmap,
layer_select->layer_preview->style->black_gc, layer_select->layer_preview->style->black_gc,
0, 0, 0, 0, layer_select->image_width, layer_select->image_height); 0, 0, 0, 0,
layer_select->image_width, layer_select->image_height);
/* make sure the image has been transfered completely to the pixmap before /* make sure the image has been transfered completely to the pixmap before
* we use it again... * we use it again...

3
app/display/gimpdisplayshell-render.c
View File

@ -17,9 +17,8 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "errors.h"
#include "gimprc.h" #include "gimprc.h"
#include "gximage.h" #include "gximage.h"
#include "image_render.h" #include "image_render.h"

2
app/display/gimpdisplayshell-selection.c
View File

@ -15,11 +15,9 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h>
#include "appenv.h" #include "appenv.h"
#include "boundary.h" #include "boundary.h"
#include "colormaps.h" #include "colormaps.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gdisplay_ops.h" #include "gdisplay_ops.h"
#include "gimage_mask.h" #include "gimage_mask.h"

8
app/display/gimpnavigationeditor.c
View File

@ -19,9 +19,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "gdk/gdkkeysyms.h" #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "info_dialog.h" #include "info_dialog.h"
@ -32,14 +32,14 @@
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h" #include "gimpui.h"
#include "gximage.h" #include "gximage.h"
#include "interface.h"
#include "nav_window.h" #include "nav_window.h"
#include "scroll.h" #include "scroll.h"
#include "scale.h" #include "scale.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpunit.h" #include "libgimp/gimpunit.h"
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm" #include "pixmaps/zoom_out.xpm"

8
app/display/gimpnavigationview.c
View File

@ -19,9 +19,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "gdk/gdkkeysyms.h" #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "info_dialog.h" #include "info_dialog.h"
@ -32,14 +32,14 @@
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h" #include "gimpui.h"
#include "gximage.h" #include "gximage.h"
#include "interface.h"
#include "nav_window.h" #include "nav_window.h"
#include "scroll.h" #include "scroll.h"
#include "scale.h" #include "scale.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpunit.h" #include "libgimp/gimpunit.h"
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm" #include "pixmaps/zoom_out.xpm"

2
app/display/gximage.c
View File

@ -15,12 +15,10 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h" #include "colormaps.h"
#include "gimage.h" #include "gimage.h"
#include "gximage.h" #include "gximage.h"
#include "errors.h"
typedef struct _GXImage GXImage; typedef struct _GXImage GXImage;

53
app/dodgeburn.c
View File

@ -17,14 +17,10 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "dodgeburn.h" #include "dodgeburn.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimplut.h" #include "gimplut.h"
@ -36,9 +32,11 @@
#include "tools.h" #include "tools.h"
#include "gimage.h" #include "gimage.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
/* the dodgeburn structures */ /* the dodgeburn structures */
typedef struct _DodgeBurnOptions DodgeBurnOptions; typedef struct _DodgeBurnOptions DodgeBurnOptions;
@ -279,7 +277,6 @@ dodgeburn_make_luts (PaintCore *paint_core,
gimp_lut_setup_exact (lut, gimp_lut_setup_exact (lut,
lut_func, (void *)&exposure, lut_func, (void *)&exposure,
nchannels); nchannels);
} }
static void static void
@ -330,7 +327,7 @@ dodgeburn_modifier_key_func (Tool *tool,
} }
Tool * Tool *
tools_new_dodgeburn () tools_new_dodgeburn (void)
{ {
Tool * tool; Tool * tool;
PaintCore * private; PaintCore * private;
@ -481,7 +478,7 @@ dodgeburn_non_gui_default (GimpDrawable *drawable,
DodgeBurnMode mode = DODGEBURN_DEFAULT_MODE; DodgeBurnMode mode = DODGEBURN_DEFAULT_MODE;
DodgeBurnOptions *options = dodgeburn_options; DodgeBurnOptions *options = dodgeburn_options;
if(options) if (options)
{ {
exposure = dodgeburn_options->exposure; exposure = dodgeburn_options->exposure;
type = dodgeburn_options->type; type = dodgeburn_options->type;
@ -556,8 +553,8 @@ dodgeburn_highlights_lut_func (void *user_data,
gfloat exposure = *exposure_ptr; gfloat exposure = *exposure_ptr;
gfloat factor = 1.0 + exposure * (.333333); gfloat factor = 1.0 + exposure * (.333333);
if ( (nchannels == 2 && channel == 1) || if ((nchannels == 2 && channel == 1) ||
(nchannels == 4 && channel == 3)) (nchannels == 4 && channel == 3))
return value; return value;
return factor * value; return factor * value;
@ -573,8 +570,8 @@ dodgeburn_midtones_lut_func (void *user_data,
gfloat exposure = *exposure_ptr; gfloat exposure = *exposure_ptr;
gfloat factor; gfloat factor;
if ( (nchannels == 2 && channel == 1) || if ((nchannels == 2 && channel == 1) ||
(nchannels == 4 && channel == 3)) (nchannels == 4 && channel == 3))
return value; return value;
if (exposure < 0) if (exposure < 0)
@ -594,30 +591,24 @@ dodgeburn_shadows_lut_func (void *user_data,
gfloat exposure = *exposure_ptr; gfloat exposure = *exposure_ptr;
gfloat new_value; gfloat new_value;
gfloat factor; gfloat factor;
if ( (nchannels == 2 && channel == 1) || if ( (nchannels == 2 && channel == 1) ||
(nchannels == 4 && channel == 3)) (nchannels == 4 && channel == 3))
return value; return value;
if (exposure >= 0) if (exposure >= 0)
{ {
factor = .333333 * exposure; factor = 0.333333 * exposure;
new_value = factor + value - factor * value; new_value = factor + value - factor * value;
} }
else /* exposure < 0 */ else /* exposure < 0 */
{ {
factor = -.333333 * exposure; factor = -0.333333 * exposure;
if (value < factor) if (value < factor)
new_value = 0; new_value = 0;
else /*factor <= value <=1*/ else /*factor <= value <=1*/
new_value = (value - factor)/(1 - factor); new_value = (value - factor)/(1 - factor);
} }
return new_value; return new_value;
} }

18
app/eraser.c
View File

@ -15,14 +15,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpui.h" #include "gimpui.h"
@ -33,9 +32,9 @@
#include "selection.h" #include "selection.h"
#include "tools.h" #include "tools.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
/* Defaults */ /* Defaults */
#define ERASER_DEFAULT_HARD FALSE #define ERASER_DEFAULT_HARD FALSE
#define ERASER_DEFAULT_INCREMENTAL FALSE #define ERASER_DEFAULT_INCREMENTAL FALSE
@ -159,10 +158,10 @@ eraser_paint_func (PaintCore *paint_core,
{ {
switch (state) switch (state)
{ {
case INIT_PAINT : case INIT_PAINT:
break; break;
case MOTION_PAINT : case MOTION_PAINT:
eraser_motion (paint_core, eraser_motion (paint_core,
drawable, drawable,
eraser_options->paint_options.pressure_options, eraser_options->paint_options.pressure_options,
@ -171,10 +170,10 @@ eraser_paint_func (PaintCore *paint_core,
eraser_options->anti_erase); eraser_options->anti_erase);
break; break;
case FINISH_PAINT : case FINISH_PAINT:
break; break;
default : default:
break; break;
} }
@ -182,7 +181,7 @@ eraser_paint_func (PaintCore *paint_core,
} }
Tool * Tool *
tools_new_eraser () tools_new_eraser (void)
{ {
Tool * tool; Tool * tool;
PaintCore * private; PaintCore * private;
@ -205,8 +204,7 @@ tools_new_eraser ()
void void
tools_free_eraser (tool) tools_free_eraser (Tool *tool)
Tool * tool;
{ {
paint_core_free (tool); paint_core_free (tool);
} }

5
app/fileops.c
View File

@ -44,7 +44,6 @@
#include "cursorutil.h" #include "cursorutil.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage.h" #include "gimage.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
@ -59,9 +58,11 @@
#include "docindex.h" #include "docindex.h"
#include "undo.h" #include "undo.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
typedef struct _OverwriteBox OverwriteBox; typedef struct _OverwriteBox OverwriteBox;
struct _OverwriteBox struct _OverwriteBox

13
app/floating_sel.c
View File

@ -15,27 +15,26 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "layer.h" #include "layer.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "interface.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "tile_manager_pvt.h" /* ick. */ #include "tile_manager_pvt.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
void void
floating_sel_attach (Layer *layer, floating_sel_attach (Layer *layer,
GimpDrawable *drawable) GimpDrawable *drawable)

3
app/gdisplay.c
View File

@ -50,9 +50,10 @@
#include "bezier_selectP.h" #include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */ #include "layer_pvt.h" /* ick. (not alone either) */
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define OVERHEAD 25 /* in units of pixel area */ #define OVERHEAD 25 /* in units of pixel area */
#define EPSILON 5 #define EPSILON 5

5
app/gdisplay_ops.c
View File

@ -15,9 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include <gtk/gtkmain.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h" #include "colormaps.h"
@ -31,7 +29,6 @@
#include "scale.h" #include "scale.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
static void gdisplay_close_warning_callback (GtkWidget *widget, static void gdisplay_close_warning_callback (GtkWidget *widget,

1
app/gimage.c
View File

@ -14,7 +14,6 @@
#include "layer_pvt.h" #include "layer_pvt.h"
#include "channel.h" #include "channel.h"
#include "tools.h" #include "tools.h"
#include "general.h"
#include "appenv.h" #include "appenv.h"
#include "gimpset.h" #include "gimpset.h"
#include "dialog_handler.h" #include "dialog_handler.h"

9
app/gimage_mask.c
View File

@ -17,26 +17,23 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <string.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimprc.h" #include "gimprc.h"
#include "interface.h"
#include "layer.h" #include "layer.h"
#include "paint_core.h" #include "paint_core.h"
#include "paint_options.h" #include "paint_options.h"
#include "undo.h" #include "undo.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile_manager_pvt.h" #include "tile_manager_pvt.h"
#include "libgimp/gimpintl.h"
/* local variables */ /* local variables */
static int gimage_mask_stroking = FALSE; static int gimage_mask_stroking = FALSE;

9
app/gimpchannel.c
View File

@ -23,7 +23,6 @@
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "layer.h" #include "layer.h"
@ -34,15 +33,17 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "tile.h" #include "tile.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

1
app/gimpdnd.c
View File

@ -21,7 +21,6 @@
#include "gimpbrushlist.h" #include "gimpbrushlist.h"
#include "gimprc.h" #include "gimprc.h"
#include "gradient_header.h" #include "gradient_header.h"
#include "interface.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimplimits.h" #include "libgimp/gimplimits.h"

25
app/gimpdrawable-invert.c
View File

@ -15,18 +15,15 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include <string.h>
#include <math.h>
#include "appenv.h" #include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "interface.h"
#include "invert.h" #include "invert.h"
#include "gimage.h" #include "gimage.h"
#include "gimplut.h" #include "gimplut.h"
#include "lut_funcs.h" #include "lut_funcs.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
@ -35,7 +32,7 @@ image_invert (GimpImage *gimage)
{ {
GimpDrawable *drawable; GimpDrawable *drawable;
Argument *return_vals; Argument *return_vals;
int nreturn_vals; gint nreturn_vals;
drawable = gimage_active_drawable (gimage); drawable = gimage_active_drawable (gimage);
@ -63,19 +60,21 @@ void
invert (GimpDrawable *drawable) invert (GimpDrawable *drawable)
{ {
PixelRegion srcPR, destPR; PixelRegion srcPR, destPR;
int x1, y1, x2, y2; gint x1, y1, x2, y2;
GimpLut *lut; GimpLut *lut;
lut = invert_lut_new(gimp_drawable_bytes(drawable)); lut = invert_lut_new (gimp_drawable_bytes (drawable));
drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2); drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
pixel_region_init (&srcPR, drawable_data (drawable), x1, y1, (x2 - x1), (y2 - y1), FALSE); pixel_region_init (&srcPR, drawable_data (drawable),
pixel_region_init (&destPR, drawable_shadow (drawable), x1, y1, (x2 - x1), (y2 - y1), TRUE); x1, y1, (x2 - x1), (y2 - y1), FALSE);
pixel_region_init (&destPR, drawable_shadow (drawable),
x1, y1, (x2 - x1), (y2 - y1), TRUE);
pixel_regions_process_parallel((p_func)gimp_lut_process, lut, pixel_regions_process_parallel ((p_func)gimp_lut_process, lut,
2, &srcPR, &destPR); 2, &srcPR, &destPR);
gimp_lut_free(lut); gimp_lut_free (lut);
drawable_merge_shadow (drawable, TRUE); drawable_merge_shadow (drawable, TRUE);
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1)); drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));

10
app/gimpdrawable-offset.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;

4
app/gimpimage-convert.c
View File

@ -97,15 +97,15 @@
#include "fsdither.h" #include "fsdither.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "undo.h" #include "undo.h"
#include "palette.h" #include "palette.h"
#include "palette_select.h" #include "palette_select.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "layer_pvt.h" /* ick. */ #include "layer_pvt.h" /* ick. */
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "tile_manager_pvt.h" /* ick ick ick. */ #include "tile_manager_pvt.h" /* ick ick ick. */

10
app/gimpimage-duplicate.c
View File

@ -27,16 +27,16 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h" #include "gimpui.h"
#include "interface.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#include "channel_pvt.h" #include "channel_pvt.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;

16
app/gimpimage.c
View File

@ -15,17 +15,18 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include "gimpimageP.h" #include "gimpimageP.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "libgimp/parasite.h"
#include "parasitelist.h" #include "parasitelist.h"
#include "undo.h" #include "undo.h"
#include "gimpsignal.h" #include "gimpsignal.h"
@ -33,16 +34,17 @@
#include "path.h" #include "path.h"
#include "gimprc.h" #include "gimprc.h"
#include "config.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h"
#include "tile_manager.h" #include "tile_manager.h"
#include "tile.h" #include "tile.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "drawable_pvt.h" /* ick ick. */ #include "drawable_pvt.h" /* ick ick. */
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#ifdef DEBUG #ifdef DEBUG
#define TRC(x) printf x #define TRC(x) printf x

16
app/gimplayer.c
View File

@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h> #include "config.h"
#include <string.h> #include <string.h>
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
@ -35,14 +35,16 @@
#include "gimpsignal.h" #include "gimpsignal.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "libgimp/parasite.h"
#include "layer_pvt.h" #include "layer_pvt.h"
#include "tile_manager_pvt.h" #include "tile_manager_pvt.h"
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
enum { enum {
REMOVED, REMOVED,
LAST_SIGNAL LAST_SIGNAL

5
app/gimprc.c
View File

@ -39,7 +39,6 @@
#include "fileops.h" #include "fileops.h"
#include "general.h" #include "general.h"
#include "gimpparasite.h" #include "gimpparasite.h"
#include "gimphelp.h"
#include "gimprc.h" #include "gimprc.h"
#include "menus.h" #include "menus.h"
#include "plug_in.h" #include "plug_in.h"
@ -48,10 +47,12 @@
#include "tools.h" #include "tools.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimputils.h" #include "libgimp/gimputils.h"
#include "libgimp/parasite.h" #include "libgimp/parasite.h"
#include "libgimp/gimpintl.h"
#define ERROR 0 #define ERROR 0
#define DONE 1 #define DONE 1
#define OK 2 #define OK 2

7
app/gradient.c
View File

@ -47,7 +47,6 @@
* *
* - Add a Gradient brush mode (color changes as you move it). * - Add a Gradient brush mode (color changes as you move it).
*/ */
#include "config.h" #include "config.h"
#include <stdio.h> #include <stdio.h>
@ -58,11 +57,9 @@
#endif #endif
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h" #include "errors.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimprc.h" #include "gimprc.h"
@ -73,14 +70,16 @@
#include "gradient_select.h" #include "gradient_select.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h" #include "libgimp/gimplimits.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm" #include "pixmaps/zoom_out.xpm"
/***** Magic numbers *****/ /***** Magic numbers *****/
#define EPSILON 1e-10 #define EPSILON 1e-10

7
app/gradient_editor.c
View File

@ -47,7 +47,6 @@
* *
* - Add a Gradient brush mode (color changes as you move it). * - Add a Gradient brush mode (color changes as you move it).
*/ */
#include "config.h" #include "config.h"
#include <stdio.h> #include <stdio.h>
@ -58,11 +57,9 @@
#endif #endif
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h" #include "errors.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimprc.h" #include "gimprc.h"
@ -73,14 +70,16 @@
#include "gradient_select.h" #include "gradient_select.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h" #include "libgimp/gimplimits.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm" #include "pixmaps/zoom_out.xpm"
/***** Magic numbers *****/ /***** Magic numbers *****/
#define EPSILON 1e-10 #define EPSILON 1e-10

6
app/gui/channels-dialog.c
View File

@ -21,10 +21,8 @@
#include "appenv.h" #include "appenv.h"
#include "channels_dialog.h" #include "channels_dialog.h"
#include "colormaps.h"
#include "color_panel.h" #include "color_panel.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"
#include "gimage_mask.h" #include "gimage_mask.h"
@ -38,6 +36,8 @@
#include "paint_funcs.h" #include "paint_funcs.h"
#include "undo.h" #include "undo.h"
#include "channel_pvt.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "pixmaps/eye.xbm" #include "pixmaps/eye.xbm"
@ -49,8 +49,6 @@
#include "pixmaps/delete.xpm" #include "pixmaps/delete.xpm"
#include "pixmaps/toselection.xpm" #include "pixmaps/toselection.xpm"
#include "channel_pvt.h"
#define COMPONENT_BASE_ID 0x10000000 #define COMPONENT_BASE_ID 0x10000000
typedef struct _ChannelsDialog ChannelsDialog; typedef struct _ChannelsDialog ChannelsDialog;

6
app/gui/color-select.c
View File

@ -17,14 +17,12 @@
*/ */
#include "config.h" #include "config.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "color_select.h" #include "color_select.h"
#include "colormaps.h" #include "colormaps.h"
#include "errors.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h" #include "gimpui.h"
@ -32,8 +30,10 @@
#include "color_area.h" /* for color_area_draw_rect */ #include "color_area.h" /* for color_area_draw_rect */
#include "libgimp/color_selector.h" #include "libgimp/color_selector.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define XY_DEF_WIDTH 240 #define XY_DEF_WIDTH 240
#define XY_DEF_HEIGHT 240 #define XY_DEF_HEIGHT 240
#define Z_DEF_WIDTH 15 #define Z_DEF_WIDTH 15
@ -879,7 +879,6 @@ color_select_update_colors (ColorSelect *csp,
if (which) if (which)
{ {
window = csp->orig_color->window; window = csp->orig_color->window;
color.pixel = old_color_pixel;
red = csp->orig_values[0]; red = csp->orig_values[0];
green = csp->orig_values[1]; green = csp->orig_values[1];
blue = csp->orig_values[2]; blue = csp->orig_values[2];
@ -887,7 +886,6 @@ color_select_update_colors (ColorSelect *csp,
else else
{ {
window = csp->new_color->window; window = csp->new_color->window;
color.pixel = new_color_pixel;
red = csp->values[COLOR_SELECT_RED]; red = csp->values[COLOR_SELECT_RED];
green = csp->values[COLOR_SELECT_GREEN]; green = csp->values[COLOR_SELECT_GREEN];
blue = csp->values[COLOR_SELECT_BLUE]; blue = csp->values[COLOR_SELECT_BLUE];

5
app/gui/commands.c
View File

@ -15,11 +15,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include "appenv.h" #include "appenv.h"
#include "about_dialog.h" #include "about_dialog.h"
#include "app_procs.h" #include "app_procs.h"
#include "brush_select.h" #include "brush_select.h"
#include "colormaps.h"
#include "colormap_dialog.i.h" #include "colormap_dialog.i.h"
#include "color_area.h" #include "color_area.h"
#include "commands.h" #include "commands.h"
@ -56,8 +57,6 @@
#include "tools.h" #include "tools.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

4
app/gui/device-status-dialog.c
View File

@ -30,13 +30,13 @@
#include "gimpui.h" #include "gimpui.h"
#include "gradient.h" #include "gradient.h"
#include "gradient_header.h" #include "gradient_header.h"
#include "interface.h"
#include "session.h" #include "session.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#define CELL_SIZE 20 /* The size of the preview cells */ #define CELL_SIZE 20 /* The size of the preview cells */
#define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \ #define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \

7
app/gui/gradient-editor.c
View File

@ -47,7 +47,6 @@
* *
* - Add a Gradient brush mode (color changes as you move it). * - Add a Gradient brush mode (color changes as you move it).
*/ */
#include "config.h" #include "config.h"
#include <stdio.h> #include <stdio.h>
@ -58,11 +57,9 @@
#endif #endif
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h" #include "errors.h"
#include "general.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimprc.h" #include "gimprc.h"
@ -73,14 +70,16 @@
#include "gradient_select.h" #include "gradient_select.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimplimits.h" #include "libgimp/gimplimits.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpcolorspace.h" #include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm" #include "pixmaps/zoom_out.xpm"
/***** Magic numbers *****/ /***** Magic numbers *****/
#define EPSILON 1e-10 #define EPSILON 1e-10

5
app/gui/help-commands.c
View File

@ -15,11 +15,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include "appenv.h" #include "appenv.h"
#include "about_dialog.h" #include "about_dialog.h"
#include "app_procs.h" #include "app_procs.h"
#include "brush_select.h" #include "brush_select.h"
#include "colormaps.h"
#include "colormap_dialog.i.h" #include "colormap_dialog.i.h"
#include "color_area.h" #include "color_area.h"
#include "commands.h" #include "commands.h"
@ -56,8 +57,6 @@
#include "tools.h" #include "tools.h"
#include "undo.h" #include "undo.h"
#include "config.h"
#include "libgimp/gimpmath.h" #include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

5
app/gui/info-dialog.c
View File

@ -18,15 +18,16 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "interface.h"
#include "session.h" #include "session.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpsizeentry.h"
/* static functions */ /* static functions */
static void info_field_new (InfoDialog *, InfoFieldType, char *, GtkWidget *, static void info_field_new (InfoDialog *, InfoFieldType, char *, GtkWidget *,

4
app/gui/info-window.c
View File

@ -26,13 +26,13 @@
#include "gximage.h" #include "gximage.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "info_window.h" #include "info_window.h"
#include "interface.h"
#include "scroll.h" #include "scroll.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpunit.h" #include "libgimp/gimpunit.h"
#include "libgimp/gimpintl.h"
#define MAX_BUF 256 #define MAX_BUF 256
typedef struct _InfoWinData InfoWinData; typedef struct _InfoWinData InfoWinData;

4
app/gui/input-dialog.c
View File

@ -30,13 +30,13 @@
#include "gimpui.h" #include "gimpui.h"
#include "gradient.h" #include "gradient.h"
#include "gradient_header.h" #include "gradient_header.h"
#include "interface.h"
#include "session.h" #include "session.h"
#include "tools.h" #include "tools.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#define CELL_SIZE 20 /* The size of the preview cells */ #define CELL_SIZE 20 /* The size of the preview cells */
#define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \ #define PREVIEW_EVENT_MASK GDK_BUTTON_PRESS_MASK | \

69
app/gui/layer-select.c
View File

@ -15,18 +15,16 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include "config.h"
#include "gdk/gdkkeysyms.h"
#include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "colormaps.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimprc.h" #include "gimprc.h"
#include "interface.h"
#include "layer_select.h" #include "layer_select.h"
#include "layers_dialogP.h" #include "layers_dialogP.h"
#include "config.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
@ -34,30 +32,31 @@
typedef struct _LayerSelect LayerSelect; typedef struct _LayerSelect LayerSelect;
struct _LayerSelect { struct _LayerSelect
{
GtkWidget *shell; GtkWidget *shell;
GtkWidget *layer_preview; GtkWidget *layer_preview;
GtkWidget *label; GtkWidget *label;
GdkPixmap *layer_pixmap; GdkPixmap *layer_pixmap;
GtkWidget *preview; GtkWidget *preview;
GImage *gimage; GImage *gimage;
Layer *current_layer; Layer *current_layer;
int dirty; gboolean dirty;
int image_width, image_height; gint image_width, image_height;
double ratio; gdouble ratio;
}; };
/* layer widget function prototypes */ /* layer widget function prototypes */
static void layer_select_advance (LayerSelect *, int); static void layer_select_advance (LayerSelect *, gint);
static void layer_select_forward (LayerSelect *); static void layer_select_forward (LayerSelect *);
static void layer_select_backward (LayerSelect *); static void layer_select_backward (LayerSelect *);
static void layer_select_end (LayerSelect *, guint32); static void layer_select_end (LayerSelect *, guint32);
static void layer_select_set_gimage (LayerSelect *, GImage *); static void layer_select_set_gimage (LayerSelect *, GImage *);
static void layer_select_set_layer (LayerSelect *); static void layer_select_set_layer (LayerSelect *);
static gint layer_select_events (GtkWidget *, GdkEvent *); static gint layer_select_events (GtkWidget *, GdkEvent *);
static gint preview_events (GtkWidget *, GdkEvent *); static gint preview_events (GtkWidget *, GdkEvent *);
static void preview_redraw (LayerSelect *); static void preview_redraw (LayerSelect *);
/* /*
* Local variables * Local variables
@ -72,7 +71,7 @@ LayerSelect *layer_select = NULL;
void void
layer_select_init (GImage *gimage, layer_select_init (GImage *gimage,
int dir, gint dir,
guint32 time) guint32 time)
{ {
GtkWidget *frame1; GtkWidget *frame1;
@ -160,7 +159,7 @@ layer_select_init (GImage *gimage,
} }
void void
layer_select_update_preview_size () layer_select_update_preview_size (void)
{ {
if (layer_select != NULL) if (layer_select != NULL)
{ {
@ -177,14 +176,14 @@ layer_select_update_preview_size ()
static void static void
layer_select_advance (LayerSelect *layer_select, layer_select_advance (LayerSelect *layer_select,
int dir) gint dir)
{ {
int index; gint index;
int length; gint length;
int count; gint count;
GSList *list; GSList *list;
GSList *nth; GSList *nth;
Layer *layer; Layer *layer;
index = 0; index = 0;
@ -260,7 +259,7 @@ static void
layer_select_set_gimage (LayerSelect *layer_select, layer_select_set_gimage (LayerSelect *layer_select,
GImage *gimage) GImage *gimage)
{ {
int image_width, image_height; gint image_width, image_height;
layer_select->gimage = gimage; layer_select->gimage = gimage;
layer_select->current_layer = gimage->active_layer; layer_select->current_layer = gimage->active_layer;
@ -304,7 +303,8 @@ layer_select_set_layer (LayerSelect *layer_select)
return; return;
/* Set the layer label */ /* Set the layer label */
gtk_label_set_text (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer))); gtk_label_set_text (GTK_LABEL (layer_select->label),
drawable_get_name (GIMP_DRAWABLE (layer)));
} }
@ -403,10 +403,10 @@ preview_events (GtkWidget *widget,
static void static void
preview_redraw (LayerSelect *layer_select) preview_redraw (LayerSelect *layer_select)
{ {
Layer * layer; Layer *layer;
TempBuf * preview_buf; TempBuf *preview_buf;
int w, h; gint w, h;
int offx, offy; gint offx, offy;
if (! (layer = (layer_select->current_layer))) if (! (layer = (layer_select->current_layer)))
return; return;
@ -443,7 +443,8 @@ preview_redraw (LayerSelect *layer_select)
gtk_preview_put (GTK_PREVIEW (layer_select->preview), gtk_preview_put (GTK_PREVIEW (layer_select->preview),
layer_select->layer_pixmap, layer_select->layer_pixmap,
layer_select->layer_preview->style->black_gc, layer_select->layer_preview->style->black_gc,
0, 0, 0, 0, layer_select->image_width, layer_select->image_height); 0, 0, 0, 0,
layer_select->image_width, layer_select->image_height);
/* make sure the image has been transfered completely to the pixmap before /* make sure the image has been transfered completely to the pixmap before
* we use it again... * we use it again...

1
app/gui/layers-dialog.c
View File

@ -22,7 +22,6 @@
#include "appenv.h" #include "appenv.h"
#include "colormaps.h" #include "colormaps.h"
#include "drawable.h" #include "drawable.h"
#include "errors.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimage.h" #include "gimage.h"

9
app/gui/menus.c
View File

@ -15,13 +15,15 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "channels_dialog.h" #include "channels_dialog.h"
#include "colormaps.h"
#include "commands.h" #include "commands.h"
#include "dialog_handler.h" #include "dialog_handler.h"
#include "fileops.h" #include "fileops.h"
@ -38,10 +40,11 @@
#include "gdisplay.h" #include "gdisplay.h"
#include "docindex.h" #include "docindex.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"
#define MRU_MENU_ENTRY_SIZE (strlen ("/File/MRU00 ") + 1) #define MRU_MENU_ENTRY_SIZE (strlen ("/File/MRU00 ") + 1)
#define MRU_MENU_ACCEL_SIZE sizeof ("<control>0") #define MRU_MENU_ACCEL_SIZE sizeof ("<control>0")

3
app/gui/paths-dialog.c
View File

@ -22,11 +22,10 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "gdk/gdkkeysyms.h" #include <gdk/gdkkeysyms.h>
#include "appenv.h" #include "appenv.h"
#include "draw_core.h" #include "draw_core.h"
#include "colormaps.h"
#include "drawable.h" #include "drawable.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gimage.h" #include "gimage.h"

16
app/gui/plug-in-commands.c
View File

@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -68,10 +67,6 @@
#define _P_NOWAIT P_NOWAIT #define _P_NOWAIT P_NOWAIT
#endif #endif
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
#ifdef HAVE_IPC_H #ifdef HAVE_IPC_H
#include <sys/ipc.h> #include <sys/ipc.h>
#endif #endif
@ -80,27 +75,28 @@
#include <sys/shm.h> #include <sys/shm.h>
#endif #endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h" #include "app_procs.h"
#include "appenv.h" #include "appenv.h"
#include "brush_select.h" /* Need for closing dialogs */ #include "brush_select.h" /* Need for closing dialogs */
#include "drawable.h" #include "drawable.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h" #include "general.h"
#include "gimage.h" #include "gimage.h"
#include "gimprc.h" #include "gimprc.h"
#include "gradient_select.h" #include "gradient_select.h"
#include "interface.h"
#include "menus.h" #include "menus.h"
#include "pattern_select.h" /* Needed for closing pattern dialogs */ #include "pattern_select.h" /* Needed for closing pattern dialogs */
#include "plug_in.h" #include "plug_in.h"
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

16
app/gui/plug-in-menus.c
View File

@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -68,10 +67,6 @@
#define _P_NOWAIT P_NOWAIT #define _P_NOWAIT P_NOWAIT
#endif #endif
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
#ifdef HAVE_IPC_H #ifdef HAVE_IPC_H
#include <sys/ipc.h> #include <sys/ipc.h>
#endif #endif
@ -80,27 +75,28 @@
#include <sys/shm.h> #include <sys/shm.h>
#endif #endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h" #include "app_procs.h"
#include "appenv.h" #include "appenv.h"
#include "brush_select.h" /* Need for closing dialogs */ #include "brush_select.h" /* Need for closing dialogs */
#include "drawable.h" #include "drawable.h"
#include "datafiles.h" #include "datafiles.h"
#include "errors.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "general.h" #include "general.h"
#include "gimage.h" #include "gimage.h"
#include "gimprc.h" #include "gimprc.h"
#include "gradient_select.h" #include "gradient_select.h"
#include "interface.h"
#include "menus.h" #include "menus.h"
#include "pattern_select.h" /* Needed for closing pattern dialogs */ #include "pattern_select.h" /* Needed for closing pattern dialogs */
#include "plug_in.h" #include "plug_in.h"
#include "tile.h" /* ick. */ #include "tile.h" /* ick. */
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

12
app/gui/tips-dialog.c
View File

@ -21,15 +21,17 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include "gtk/gtk.h"
#include "tips_dialog.h" #include "tips_dialog.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimphelp.h" #include "gimpui.h"
#include "interface.h"
#include "wilber.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h"
#include "wilber.h"
#define TIPS_DIR_NAME "tips" #define TIPS_DIR_NAME "tips"

Some files were not shown because too many files have changed in this diff Show More