From 9059fd20f47cc29b6a67f383c213f7f71e54ad1a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 14 May 2001 13:39:45 +0000 Subject: [PATCH] README.patch_xinput_airbrush removed because GTK+-2.0 will manage the 2001-05-14 Michael Natterer * README.patch_xinput_airbrush * patch_xinput_airbrush: removed because GTK+-2.0 will manage the number of valuators dynamically. * app/Makefile.am: some more thinking about subdirectories. * app/boundary.c * app/pixel_processor.c * app/pixel_region.c: removed #include's, code cleanup. * libgimpwidgets/Makefile.am: install gimpbutton.h * devel-docs/libgimp/tmpl/gimpadaptivesupersample.sgml * devel-docs/libgimp/tmpl/gimpbilinear.sgml: removed ... * devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml * devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml: ... and added here. * devel-docs/libgimp/libgimp-decl.txt * devel-docs/libgimp/libgimp-sections.txt * devel-docs/libgimp/libgimp.hierarchy * devel-docs/libgimp/tmpl/gimpenums.sgml * devel-docs/libgimpcolor/libgimpcolor-decl.txt * devel-docs/libgimpcolor/libgimpcolor-docs.sgml * devel-docs/libgimpcolor/libgimpcolor-sections.txt * devel-docs/libgimpcolor/libgimpcolor.hierarchy * devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml: regenerated. --- ChangeLog | 30 ++ README.patch_xinput_airbrush | 74 ---- app/Makefile.am | 9 +- app/base/boundary.c | 7 +- app/base/pixel-processor.c | 1 - app/base/pixel-region.c | 79 ++-- app/boundary.c | 7 +- app/pixel_processor.c | 1 - app/pixel_region.c | 79 ++-- devel-docs/libgimp/libgimp-decl.txt | 62 +--- devel-docs/libgimp/libgimp-sections.txt | 18 - devel-docs/libgimp/libgimp.hierarchy | 20 + devel-docs/libgimp/tmpl/gimpenums.sgml | 1 - devel-docs/libgimpcolor/libgimpcolor-decl.txt | 279 ++++++++------ .../libgimpcolor/libgimpcolor-docs.sgml | 4 + .../libgimpcolor/libgimpcolor-sections.txt | 17 + .../libgimpcolor/libgimpcolor.hierarchy | 20 + .../tmpl/gimpadaptivesupersample.sgml | 33 -- .../tmpl/gimpbilinear.sgml | 0 .../libgimpcolor/tmpl/gimpcolortypes.sgml | 33 ++ libgimpwidgets/Makefile.am | 1 + patch_xinput_airbrush | 347 ------------------ 22 files changed, 378 insertions(+), 744 deletions(-) delete mode 100644 README.patch_xinput_airbrush rename devel-docs/{libgimp => libgimpcolor}/tmpl/gimpadaptivesupersample.sgml (61%) rename devel-docs/{libgimp => libgimpcolor}/tmpl/gimpbilinear.sgml (100%) delete mode 100644 patch_xinput_airbrush diff --git a/ChangeLog b/ChangeLog index 0312a7362b..57efa0cbdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2001-05-14 Michael Natterer + + * README.patch_xinput_airbrush + * patch_xinput_airbrush: removed because GTK+-2.0 will manage the + number of valuators dynamically. + + * app/Makefile.am: some more thinking about subdirectories. + + * app/boundary.c + * app/pixel_processor.c + * app/pixel_region.c: removed #include's, code cleanup. + + * libgimpwidgets/Makefile.am: install gimpbutton.h + + * devel-docs/libgimp/tmpl/gimpadaptivesupersample.sgml + * devel-docs/libgimp/tmpl/gimpbilinear.sgml: removed ... + + * devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml + * devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml: ... and added here. + + * devel-docs/libgimp/libgimp-decl.txt + * devel-docs/libgimp/libgimp-sections.txt + * devel-docs/libgimp/libgimp.hierarchy + * devel-docs/libgimp/tmpl/gimpenums.sgml + * devel-docs/libgimpcolor/libgimpcolor-decl.txt + * devel-docs/libgimpcolor/libgimpcolor-docs.sgml + * devel-docs/libgimpcolor/libgimpcolor-sections.txt + * devel-docs/libgimpcolor/libgimpcolor.hierarchy + * devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml: regenerated. + 2001-05-14 Sven Neumann * app/Makefile.am diff --git a/README.patch_xinput_airbrush b/README.patch_xinput_airbrush deleted file mode 100644 index e4c41cd747..0000000000 --- a/README.patch_xinput_airbrush +++ /dev/null @@ -1,74 +0,0 @@ -This patch enables support of the sixth valuator present in the xf86Wacom -driver. The driver with support of six valuators are included in XFree86 -3.3.4 and newer. - -The purpose of this patch is to enable the airbrush wheel on the Wacom Intous -airbrush device. The wheel is used in the upcoming new airbrush tool in Gimp -to regulate the virtual altitude of your airbrush. - -The patch is tested with Gtk+-1.2.4 (not the CVS version) and should apply -without problems. The patch is totally unsupported in both Gtk and GIMP. - -A good advice it to install a the patched version of Gtk+ and Gimp in a special -directory because of the binary incompatible (See notes below). - -Here is how to make it work, - -cd gtk+-1.2.4 -pacth -p0 ../patch_xinput_airbrush -./configure --prefix=/opt/gimp --with-xinput=xfree -make -make install -cd ../gimp -export LD_LIBRARY_PATH=/opt/gimp/lib:$LD_LIBRARY_PATH -export PATH=/opt/gimp/bin:$PATH -./configure --prefix=/opt/gimp --enable-gimpdir=.gimpairbrush -make -make install - -Now make a special gimp startup script that you install in a directory -that is in your path. - -Here is an example - -#!/bin/sh -PREFIX=/opt/gimp -LD_LIBRARY_PATH=$PREFIX/lib:$LD_LIBRARY_PATH -exec $PREFIX/bin/gimp "$@" - -OBSERVE that the patch makes Gtk+ binary and source incompatible, i.e you can't -run your old compiled Gtk+ apps (which includes GNOME apps) with Gtk+ patched -with this patch. - -This is because the gdk_input_window_get_pointer is changed and now has nine -parameters instead of eight. The added parameter is gdouble *wheel see below, - -void gdk_input_window_get_pointer (GdkWindow *window, - guint32 deviceid, - gdouble *x, - gdouble *y, - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, - gdouble *wheel, - GdkModifierType *mask); - -gtkfeatures.h has a new define to enable you to check for the presence of this -patch in your program. You can e.g use it as below - -#ifdef GTK_HAVE_SIX_VALUATORS - -gdk_input_window_get_pointer (event->window, event->deviceid, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - -#else /* !GTK_HAVE_SIX_VALUATORS */ - -gdk_input_window_get_pointer (event->window, event->deviceid, - NULL, NULL, NULL, NULL, NULL, NULL); - -#endif /* GTK_HAVE_SIX_VALUATORS */ - -Happy Gimping - -Olof S Kylander - diff --git a/app/Makefile.am b/app/Makefile.am index 9ebd33a45a..716daae3df 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -45,8 +45,6 @@ gimp_SOURCES = \ ops_buttons.h \ qmask.c \ qmask.h \ - resize.c \ - resize.h \ resolution_calibrate.c \ resolution_calibrate.h \ undo_history.c \ @@ -82,6 +80,8 @@ gimp_SOURCES = \ image_map.h \ module_db.c \ module_db.h \ + resize.c \ + resize.h \ user_install.c \ user_install.h \ ## @@ -92,6 +92,8 @@ gimp_SOURCES = \ floating_sel.c \ floating_sel.h \ fsdither.h \ + gimphistogram.c \ + gimphistogram.h \ gimppreviewcache.h \ gimppreviewcache.c \ parasitelist.c \ @@ -105,8 +107,7 @@ gimp_SOURCES = \ boundary.h \ brush_scale.c \ brush_scale.h \ - gimphistogram.c \ - gimphistogram.h \ + gimpcheck.h \ gimplut.c \ gimplut.h \ lut_funcs.c \ diff --git a/app/base/boundary.c b/app/base/boundary.c index b0457a5bb6..e636cfc84a 100644 --- a/app/base/boundary.c +++ b/app/base/boundary.c @@ -24,9 +24,8 @@ #include "apptypes.h" -#include "appenv.h" -#include "errors.h" #include "boundary.h" +#include "errors.h" #include "pixel_region.h" #include "tile.h" #include "tile_manager.h" @@ -211,7 +210,7 @@ find_empty_segs (PixelRegion *maskPR, last = val; } - } + } } *num_empty = l_num_empty; @@ -237,7 +236,7 @@ make_seg (gint x1, max_segs += MAX_SEGS_INC; tmp_segs = (BoundSeg *) g_realloc ((void *) tmp_segs, - sizeof (BoundSeg) * max_segs); + sizeof (BoundSeg) * max_segs); if (!tmp_segs) gimp_fatal_error ("make_seg(): Unable to reallocate segments array for mask boundary."); diff --git a/app/base/pixel-processor.c b/app/base/pixel-processor.c index f4dc33e051..8d3cf8a2ce 100644 --- a/app/base/pixel-processor.c +++ b/app/base/pixel-processor.c @@ -33,7 +33,6 @@ #include "pixel_processor.h" #include "pixel_region.h" -#include "gimprc.h" #ifdef ENABLE_MP #include "tile.h" diff --git a/app/base/pixel-region.c b/app/base/pixel-region.c index ec1da2d1ed..4fdd2bc4ae 100644 --- a/app/base/pixel-region.c +++ b/app/base/pixel-region.c @@ -25,18 +25,11 @@ #include "apptypes.h" -#include "gimpprogress.h" -#include "gimprc.h" #include "pixel_region.h" #include "tile_manager.h" #include "tile.h" -/*********************/ -/* Local Variables */ - - - /*********************/ /* Local Functions */ @@ -119,13 +112,13 @@ pixel_region_get_row (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint inc; - gint end; - gint boundary; - gint b; - gint npixels; - gint tilebpp; - + gint inc; + gint end; + gint boundary; + gint b; + gint npixels; + gint tilebpp; + end = x + w; pixel_region_get_async (PR, x, y, end, y); @@ -171,8 +164,8 @@ pixel_region_set_row (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint end; - gint npixels; + gint end; + gint npixels; end = x + w; @@ -208,11 +201,11 @@ pixel_region_get_col (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint tilebpp; - gint inc; - gint end; - gint boundary; - gint b; + gint tilebpp; + gint inc; + gint end; + gint boundary; + gint b; end = y + h; @@ -250,13 +243,13 @@ pixel_region_set_col (PixelRegion *PR, gint h, guchar *data) { - Tile *tile; + Tile *tile; guchar *tile_data; - gint tilebpp; - gint inc; - gint end; - gint boundary; - gint b; + gint tilebpp; + gint inc; + gint end; + gint boundary; + gint b; end = y + h; @@ -298,13 +291,13 @@ gpointer pixel_regions_register (gint num_regions, ...) { - PixelRegion *PR; - PixelRegionHolder *PRH; + PixelRegion *PR; + PixelRegionHolder *PRH; PixelRegionIterator *PRI; - gboolean found; - va_list ap; + gboolean found; + va_list ap; - PRI = (PixelRegionIterator *) g_malloc (sizeof (PixelRegionIterator)); + PRI = g_new (PixelRegionIterator, 1); PRI->pixel_regions = NULL; PRI->process_count = 0; PRI->dirty_tiles = 1; @@ -318,7 +311,7 @@ pixel_regions_register (gint num_regions, while (num_regions --) { PR = va_arg (ap, PixelRegion *); - PRH = (PixelRegionHolder *) g_malloc (sizeof (PixelRegionHolder)); + PRH = g_new (PixelRegionHolder, 1); PRH->PR = PR; if (PR != NULL) @@ -353,8 +346,8 @@ pixel_regions_register (gint num_regions, gpointer pixel_regions_process (gpointer PRI_ptr) { - GSList *list; - PixelRegionHolder *PRH; + GSList *list; + PixelRegionHolder *PRH; PixelRegionIterator *PRI; PRI = (PixelRegionIterator *) PRI_ptr; @@ -399,7 +392,7 @@ pixel_regions_process (gpointer PRI_ptr) void pixel_regions_process_stop (gpointer PRI_ptr) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; PixelRegionIterator *PRI; @@ -446,10 +439,10 @@ pixel_regions_process_stop (gpointer PRI_ptr) static gint get_portion_height (PixelRegionIterator *PRI) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; - gint min_height = G_MAXINT; - gint height; + gint min_height = G_MAXINT; + gint height; /* Find the minimum height to the next vertical tile * (in the case of a tile manager) or to the end of the @@ -488,10 +481,10 @@ get_portion_height (PixelRegionIterator *PRI) static gint get_portion_width (PixelRegionIterator *PRI) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; - gint min_width = G_MAXINT; - gint width; + gint min_width = G_MAXINT; + gint width; /* Find the minimum width to the next vertical tile * (in the case of a tile manager) or to the end of @@ -531,7 +524,7 @@ static gpointer pixel_regions_configure (PixelRegionIterator *PRI) { PixelRegionHolder *PRH; - GSList *list; + GSList *list; /* Determine the portion width and height */ PRI->portion_width = get_portion_width (PRI); diff --git a/app/boundary.c b/app/boundary.c index b0457a5bb6..e636cfc84a 100644 --- a/app/boundary.c +++ b/app/boundary.c @@ -24,9 +24,8 @@ #include "apptypes.h" -#include "appenv.h" -#include "errors.h" #include "boundary.h" +#include "errors.h" #include "pixel_region.h" #include "tile.h" #include "tile_manager.h" @@ -211,7 +210,7 @@ find_empty_segs (PixelRegion *maskPR, last = val; } - } + } } *num_empty = l_num_empty; @@ -237,7 +236,7 @@ make_seg (gint x1, max_segs += MAX_SEGS_INC; tmp_segs = (BoundSeg *) g_realloc ((void *) tmp_segs, - sizeof (BoundSeg) * max_segs); + sizeof (BoundSeg) * max_segs); if (!tmp_segs) gimp_fatal_error ("make_seg(): Unable to reallocate segments array for mask boundary."); diff --git a/app/pixel_processor.c b/app/pixel_processor.c index f4dc33e051..8d3cf8a2ce 100644 --- a/app/pixel_processor.c +++ b/app/pixel_processor.c @@ -33,7 +33,6 @@ #include "pixel_processor.h" #include "pixel_region.h" -#include "gimprc.h" #ifdef ENABLE_MP #include "tile.h" diff --git a/app/pixel_region.c b/app/pixel_region.c index ec1da2d1ed..4fdd2bc4ae 100644 --- a/app/pixel_region.c +++ b/app/pixel_region.c @@ -25,18 +25,11 @@ #include "apptypes.h" -#include "gimpprogress.h" -#include "gimprc.h" #include "pixel_region.h" #include "tile_manager.h" #include "tile.h" -/*********************/ -/* Local Variables */ - - - /*********************/ /* Local Functions */ @@ -119,13 +112,13 @@ pixel_region_get_row (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint inc; - gint end; - gint boundary; - gint b; - gint npixels; - gint tilebpp; - + gint inc; + gint end; + gint boundary; + gint b; + gint npixels; + gint tilebpp; + end = x + w; pixel_region_get_async (PR, x, y, end, y); @@ -171,8 +164,8 @@ pixel_region_set_row (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint end; - gint npixels; + gint end; + gint npixels; end = x + w; @@ -208,11 +201,11 @@ pixel_region_get_col (PixelRegion *PR, { Tile *tile; guchar *tile_data; - gint tilebpp; - gint inc; - gint end; - gint boundary; - gint b; + gint tilebpp; + gint inc; + gint end; + gint boundary; + gint b; end = y + h; @@ -250,13 +243,13 @@ pixel_region_set_col (PixelRegion *PR, gint h, guchar *data) { - Tile *tile; + Tile *tile; guchar *tile_data; - gint tilebpp; - gint inc; - gint end; - gint boundary; - gint b; + gint tilebpp; + gint inc; + gint end; + gint boundary; + gint b; end = y + h; @@ -298,13 +291,13 @@ gpointer pixel_regions_register (gint num_regions, ...) { - PixelRegion *PR; - PixelRegionHolder *PRH; + PixelRegion *PR; + PixelRegionHolder *PRH; PixelRegionIterator *PRI; - gboolean found; - va_list ap; + gboolean found; + va_list ap; - PRI = (PixelRegionIterator *) g_malloc (sizeof (PixelRegionIterator)); + PRI = g_new (PixelRegionIterator, 1); PRI->pixel_regions = NULL; PRI->process_count = 0; PRI->dirty_tiles = 1; @@ -318,7 +311,7 @@ pixel_regions_register (gint num_regions, while (num_regions --) { PR = va_arg (ap, PixelRegion *); - PRH = (PixelRegionHolder *) g_malloc (sizeof (PixelRegionHolder)); + PRH = g_new (PixelRegionHolder, 1); PRH->PR = PR; if (PR != NULL) @@ -353,8 +346,8 @@ pixel_regions_register (gint num_regions, gpointer pixel_regions_process (gpointer PRI_ptr) { - GSList *list; - PixelRegionHolder *PRH; + GSList *list; + PixelRegionHolder *PRH; PixelRegionIterator *PRI; PRI = (PixelRegionIterator *) PRI_ptr; @@ -399,7 +392,7 @@ pixel_regions_process (gpointer PRI_ptr) void pixel_regions_process_stop (gpointer PRI_ptr) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; PixelRegionIterator *PRI; @@ -446,10 +439,10 @@ pixel_regions_process_stop (gpointer PRI_ptr) static gint get_portion_height (PixelRegionIterator *PRI) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; - gint min_height = G_MAXINT; - gint height; + gint min_height = G_MAXINT; + gint height; /* Find the minimum height to the next vertical tile * (in the case of a tile manager) or to the end of the @@ -488,10 +481,10 @@ get_portion_height (PixelRegionIterator *PRI) static gint get_portion_width (PixelRegionIterator *PRI) { - GSList *list; + GSList *list; PixelRegionHolder *PRH; - gint min_width = G_MAXINT; - gint width; + gint min_width = G_MAXINT; + gint width; /* Find the minimum width to the next vertical tile * (in the case of a tile manager) or to the end of @@ -531,7 +524,7 @@ static gpointer pixel_regions_configure (PixelRegionIterator *PRI) { PixelRegionHolder *PRH; - GSList *list; + GSList *list; /* Determine the portion width and height */ PRI->portion_width = get_portion_width (PRI); diff --git a/devel-docs/libgimp/libgimp-decl.txt b/devel-docs/libgimp/libgimp-decl.txt index e8d5ba4632..69083b4099 100644 --- a/devel-docs/libgimp/libgimp-decl.txt +++ b/devel-docs/libgimp/libgimp-decl.txt @@ -966,8 +966,7 @@ typedef enum GIMP_BLUE_CHANNEL, GIMP_GRAY_CHANNEL, GIMP_INDEXED_CHANNEL, - GIMP_ALPHA_CHANNEL, - GIMP_AUXILLARY_CHANNEL + GIMP_ALPHA_CHANNEL } GimpChannelType; @@ -3491,62 +3490,3 @@ GIOChannel *channel,gdouble *data,gint count gboolean GIOChannel *channel,gchar **data,gint count - -GimpRenderFunc -void -gdouble x, - gdouble y, - GimpRGB *color, - gpointer data - - -GimpPutPixelFunc -void -gint x, - gint y, - GimpRGB *color, - gpointer data - - -GimpProgressFunc -void -gint min, - gint max, - gint current, - gpointer data - - -gimp_adaptive_supersample_area -gulong -gint x1,gint y1,gint x2,gint y2,gint max_depth,gdouble threshold,GimpRenderFunc render_func,gpointer render_data,GimpPutPixelFunc put_pixel_func,gpointer put_pixel_data,GimpProgressFunc progress_func,gpointer progress_data - - -gimp_bilinear -gdouble -gdouble x,gdouble y,gdouble *values - - -gimp_bilinear_8 -guchar -gdouble x,gdouble y,guchar *values - - -gimp_bilinear_16 -guint16 -gdouble x,gdouble y,guint16 *values - - -gimp_bilinear_32 -guint32 -gdouble x,gdouble y,guint32 *values - - -gimp_bilinear_rgb -GimpRGB -gdouble x,gdouble y,GimpRGB *values - - -gimp_bilinear_rgba -GimpRGB -gdouble x,gdouble y,GimpRGB *values - diff --git a/devel-docs/libgimp/libgimp-sections.txt b/devel-docs/libgimp/libgimp-sections.txt index c491c4da97..e0904a3c67 100644 --- a/devel-docs/libgimp/libgimp-sections.txt +++ b/devel-docs/libgimp/libgimp-sections.txt @@ -777,21 +777,3 @@ gimp_unit_get_plural gimp_strescape gimp_strcompress - -
-gimpadaptivesupersample -GimpRenderFunc -GimpPutPixelFunc -GimpProgressFunc -gimp_adaptive_supersample_area -
- -
-gimpbilinear -gimp_bilinear -gimp_bilinear_8 -gimp_bilinear_16 -gimp_bilinear_32 -gimp_bilinear_rgb -gimp_bilinear_rgba -
diff --git a/devel-docs/libgimp/libgimp.hierarchy b/devel-docs/libgimp/libgimp.hierarchy index 1674372fc7..45f5911bb6 100644 --- a/devel-docs/libgimp/libgimp.hierarchy +++ b/devel-docs/libgimp/libgimp.hierarchy @@ -1 +1,21 @@ GtkObject + GtkWidget + GtkRange + GtkScrollbar + GtkVScrollbar + GtkHScrollbar + GtkScale + GtkHScale + GtkVScale + GtkContainer + GtkBin + GtkButton + GtkToggleButton + GtkCheckButton + GtkRadioButton + GtkScrolledWindow + GtkPaned + GtkVPaned + GtkHPaned + GtkData + GtkAdjustment diff --git a/devel-docs/libgimp/tmpl/gimpenums.sgml b/devel-docs/libgimp/tmpl/gimpenums.sgml index 410a69d6eb..b063920aa5 100644 --- a/devel-docs/libgimp/tmpl/gimpenums.sgml +++ b/devel-docs/libgimp/tmpl/gimpenums.sgml @@ -86,7 +86,6 @@ Enums and definitions. @GIMP_GRAY_CHANNEL: @GIMP_INDEXED_CHANNEL: @GIMP_ALPHA_CHANNEL: -@GIMP_AUXILLARY_CHANNEL: diff --git a/devel-docs/libgimpcolor/libgimpcolor-decl.txt b/devel-docs/libgimpcolor/libgimpcolor-decl.txt index 926357ec39..97bdba19a3 100644 --- a/devel-docs/libgimpcolor/libgimpcolor-decl.txt +++ b/devel-docs/libgimpcolor/libgimpcolor-decl.txt @@ -1,113 +1,3 @@ - -gimp_rgb_to_hsv -void -const GimpRGB *rgb,GimpHSV *hsv - - -gimp_rgb_to_hsl -void -const GimpRGB *rgb,gdouble *hue,gdouble *saturation,gdouble *lightness - - -gimp_hsv_to_rgb -void -const GimpHSV *hsv,GimpRGB *rgb - - -gimp_hsl_to_rgb -void -gdouble hue,gdouble saturation,gdouble lightness,GimpRGB *rgb - - -gimp_rgb_to_hwb -void -const GimpRGB *rgb,gdouble *hue,gdouble *whiteness,gdouble *blackness - - -gimp_hwb_to_rgb -void -gdouble hue,gdouble whiteness,gdouble blackness,GimpRGB *rgb - - -gimp_rgb_to_hsv_int -void -gint *red ,gint *green ,gint *blue - - -gimp_hsv_to_rgb_int -void -gint *hue ,gint *saturation ,gint *value - - -gimp_rgb_to_hls_int -void -gint *red ,gint *green ,gint *blue - - -gimp_rgb_to_l_int -gint -gint red,gint green,gint blue - - -gimp_hls_to_rgb_int -void -gint *hue ,gint *lightness ,gint *saturation - - -gimp_rgb_to_hsv_double -void -gdouble *red ,gdouble *green ,gdouble *blue - - -gimp_hsv_to_rgb_double -void -gdouble *hue ,gdouble *saturation,gdouble *value - - -gimp_rgb_to_hsv4 -void -guchar *hsv,gdouble *red,gdouble *green,gdouble *blue - - -gimp_hsv_to_rgb4 -void -guchar *rgb,gdouble hue,gdouble saturation,gdouble value - - -GimpRGB - - -GimpRGB -struct GimpRGB -{ - gdouble r, g, b, a; -}; - - -GimpHSV - - -GimpHSV -struct GimpHSV -{ - gdouble h, s, v, a; -}; - - -gimp_hsv_set -void -GimpHSV *hsv,gdouble h,gdouble s,gdouble v - - -gimp_hsv_clamp -void -GimpHSV *hsv - - -gimp_hsva_set -void -GimpHSV *hsva,gdouble h,gdouble s,gdouble v,gdouble a - GimpRGBCompositeMode typedef enum @@ -245,3 +135,172 @@ const GimpRGB *rgba1,const GimpRGB *rgba2 (g) * INTENSITY_GREEN + \ (b) * INTENSITY_BLUE + 0.001) + +gimp_hsv_set +void +GimpHSV *hsv,gdouble h,gdouble s,gdouble v + + +gimp_hsv_clamp +void +GimpHSV *hsv + + +gimp_hsva_set +void +GimpHSV *hsva,gdouble h,gdouble s,gdouble v,gdouble a + + +GimpRGB + + +GimpRGB +struct GimpRGB +{ + gdouble r, g, b, a; +}; + + +GimpHSV + + +GimpHSV +struct GimpHSV +{ + gdouble h, s, v, a; +}; + + +GimpRenderFunc +void +gdouble x, + gdouble y, + GimpRGB *color, + gpointer data + + +GimpPutPixelFunc +void +gint x, + gint y, + GimpRGB *color, + gpointer data + + +GimpProgressFunc +void +gint min, + gint max, + gint current, + gpointer data + + +gimp_rgb_to_hsv +void +const GimpRGB *rgb,GimpHSV *hsv + + +gimp_rgb_to_hsl +void +const GimpRGB *rgb,gdouble *hue,gdouble *saturation,gdouble *lightness + + +gimp_hsv_to_rgb +void +const GimpHSV *hsv,GimpRGB *rgb + + +gimp_hsl_to_rgb +void +gdouble hue,gdouble saturation,gdouble lightness,GimpRGB *rgb + + +gimp_rgb_to_hwb +void +const GimpRGB *rgb,gdouble *hue,gdouble *whiteness,gdouble *blackness + + +gimp_hwb_to_rgb +void +gdouble hue,gdouble whiteness,gdouble blackness,GimpRGB *rgb + + +gimp_rgb_to_hsv_int +void +gint *red ,gint *green ,gint *blue + + +gimp_hsv_to_rgb_int +void +gint *hue ,gint *saturation ,gint *value + + +gimp_rgb_to_hls_int +void +gint *red ,gint *green ,gint *blue + + +gimp_rgb_to_l_int +gint +gint red,gint green,gint blue + + +gimp_hls_to_rgb_int +void +gint *hue ,gint *lightness ,gint *saturation + + +gimp_rgb_to_hsv_double +void +gdouble *red ,gdouble *green ,gdouble *blue + + +gimp_hsv_to_rgb_double +void +gdouble *hue ,gdouble *saturation,gdouble *value + + +gimp_rgb_to_hsv4 +void +guchar *hsv,gdouble *red,gdouble *green,gdouble *blue + + +gimp_hsv_to_rgb4 +void +guchar *rgb,gdouble hue,gdouble saturation,gdouble value + + +gimp_adaptive_supersample_area +gulong +gint x1,gint y1,gint x2,gint y2,gint max_depth,gdouble threshold,GimpRenderFunc render_func,gpointer render_data,GimpPutPixelFunc put_pixel_func,gpointer put_pixel_data,GimpProgressFunc progress_func,gpointer progress_data + + +gimp_bilinear +gdouble +gdouble x,gdouble y,gdouble *values + + +gimp_bilinear_8 +guchar +gdouble x,gdouble y,guchar *values + + +gimp_bilinear_16 +guint16 +gdouble x,gdouble y,guint16 *values + + +gimp_bilinear_32 +guint32 +gdouble x,gdouble y,guint32 *values + + +gimp_bilinear_rgb +GimpRGB +gdouble x,gdouble y,GimpRGB *values + + +gimp_bilinear_rgba +GimpRGB +gdouble x,gdouble y,GimpRGB *values + diff --git a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml index e5358ff8e7..629e85ea8a 100644 --- a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml +++ b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml @@ -3,6 +3,8 @@ + + ]> @@ -15,5 +17,7 @@ &libgimpcolor-gimpcolorspace; &libgimpcolor-gimprgb; &libgimpcolor-gimphsv; + &libgimpcolor-gimpadaptivesupersample; + &libgimpcolor-gimpbilinear; diff --git a/devel-docs/libgimpcolor/libgimpcolor-sections.txt b/devel-docs/libgimpcolor/libgimpcolor-sections.txt index 452d240145..22f584082c 100644 --- a/devel-docs/libgimpcolor/libgimpcolor-sections.txt +++ b/devel-docs/libgimpcolor/libgimpcolor-sections.txt @@ -25,6 +25,9 @@ gimp_hsv_to_rgb4 gimpcolortypes GimpRGB GimpHSV +GimpRenderFunc +GimpPutPixelFunc +GimpProgressFunc
@@ -65,3 +68,17 @@ INTENSITY_BLUE INTENSITY
+
+gimpadaptivesupersample +gimp_adaptive_supersample_area +
+ +
+gimpbilinear +gimp_bilinear +gimp_bilinear_8 +gimp_bilinear_16 +gimp_bilinear_32 +gimp_bilinear_rgb +gimp_bilinear_rgba +
diff --git a/devel-docs/libgimpcolor/libgimpcolor.hierarchy b/devel-docs/libgimpcolor/libgimpcolor.hierarchy index 1674372fc7..45f5911bb6 100644 --- a/devel-docs/libgimpcolor/libgimpcolor.hierarchy +++ b/devel-docs/libgimpcolor/libgimpcolor.hierarchy @@ -1 +1,21 @@ GtkObject + GtkWidget + GtkRange + GtkScrollbar + GtkVScrollbar + GtkHScrollbar + GtkScale + GtkHScale + GtkVScale + GtkContainer + GtkBin + GtkButton + GtkToggleButton + GtkCheckButton + GtkRadioButton + GtkScrolledWindow + GtkPaned + GtkVPaned + GtkHPaned + GtkData + GtkAdjustment diff --git a/devel-docs/libgimp/tmpl/gimpadaptivesupersample.sgml b/devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml similarity index 61% rename from devel-docs/libgimp/tmpl/gimpadaptivesupersample.sgml rename to devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml index f84a357a57..99e8ba1f7e 100644 --- a/devel-docs/libgimp/tmpl/gimpadaptivesupersample.sgml +++ b/devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml @@ -14,39 +14,6 @@ gimpadaptivesupersample - - - - - -@x: -@y: -@color: -@data: - - - - - - - -@x: -@y: -@color: -@data: - - - - - - - -@min: -@max: -@current: -@data: - - diff --git a/devel-docs/libgimp/tmpl/gimpbilinear.sgml b/devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml similarity index 100% rename from devel-docs/libgimp/tmpl/gimpbilinear.sgml rename to devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml diff --git a/devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml b/devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml index 2e6027e82d..f612788d08 100644 --- a/devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml +++ b/devel-docs/libgimpcolor/tmpl/gimpcolortypes.sgml @@ -34,3 +34,36 @@ gimpcolortypes @v: @a: + + + + + +@x: +@y: +@color: +@data: + + + + + + + +@x: +@y: +@color: +@data: + + + + + + + +@min: +@max: +@current: +@data: + + diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 9a9e6f9f3d..e2fc09d0fe 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -58,6 +58,7 @@ libgimpwidgets_1_3_la_SOURCES = \ libgimpwidgetsinclude_HEADERS = \ gimpwidgets.h \ gimpwidgetstypes.h \ + gimpbutton.h \ gimpchainbutton.h \ gimpcolorarea.h \ gimpcolorbutton.h \ diff --git a/patch_xinput_airbrush b/patch_xinput_airbrush deleted file mode 100644 index 62fcde793a..0000000000 --- a/patch_xinput_airbrush +++ /dev/null @@ -1,347 +0,0 @@ ---- gdk/gdk.h Wed Feb 24 11:14:55 1999 -+++ gdk/gdk.h Tue Jul 6 17:45:19 1999 -@@ -840,6 +840,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask); - - GdkTimeCoord *gdk_input_motion_events (GdkWindow *window, ---- gdk/gdkinput.c Wed Feb 24 11:14:55 1999 -+++ gdk/gdkinput.c Tue Jul 6 18:09:49 1999 -@@ -153,6 +153,7 @@ - coords[i].pressure = 0.5; - coords[i].xtilt = 0.0; - coords[i].ytilt = 0.0; -+ coords[i].wheel = 0.5; - } - - XFree (xcoords); -@@ -345,9 +346,10 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask) - { - if (gdk_input_vtable.get_pointer) - gdk_input_vtable.get_pointer (window, deviceid, x, y, pressure, -- xtilt, ytilt, mask); -+ xtilt, ytilt, wheel, mask); - } ---- gdk/gdkinput.h Wed Feb 24 11:14:56 1999 -+++ gdk/gdkinput.h Tue Jul 6 17:57:32 1999 -@@ -56,6 +56,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask); - gint (*grab_pointer) (GdkWindow * window, - gint owner_events, ---- gdk/gdkinputcommon.h Wed Feb 24 11:14:56 1999 -+++ gdk/gdkinputcommon.h Tue Jul 6 18:22:13 1999 -@@ -45,7 +45,8 @@ - gint *axis_data, - gdouble *x, gdouble *y, - gdouble *pressure, -- gdouble *xtilt, gdouble *ytilt); -+ gdouble *xtilt, gdouble *ytilt, -+ gdouble *wheel); - static guint gdk_input_translate_state(guint state, guint device_state); - static gint gdk_input_common_init(gint include_core); - static gint gdk_input_common_other_event (GdkEvent *event, -@@ -65,6 +66,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask); - - #define GDK_MAX_DEVICE_CLASSES 13 -@@ -237,6 +239,8 @@ - gdkdev->info.axes[j++] = GDK_AXIS_XTILT; - if (jnum_axes) - gdkdev->info.axes[j++] = GDK_AXIS_YTILT; -+ if (jnum_axes) -+ gdkdev->info.axes[j++] = GDK_AXIS_WHEEL; - - /* set up reverse lookup on axis use */ - for (j=GDK_AXIS_IGNORE;jaxis_for_use[GDK_AXIS_PRESSURE]; - xtilt_axis = gdkdev->axis_for_use[GDK_AXIS_XTILT]; - ytilt_axis = gdkdev->axis_for_use[GDK_AXIS_YTILT]; -+ wheel_axis = gdkdev->axis_for_use[GDK_AXIS_WHEEL]; - - device_width = gdkdev->axes[x_axis].max_value - - gdkdev->axes[x_axis].min_value; -@@ -568,6 +573,16 @@ - else - *ytilt = 0; - } -+ if (wheel) -+ { -+ if (wheel_axis != -1) -+ *wheel = ((double)axis_data[wheel_axis] -+ - gdkdev->axes[wheel_axis].min_value) -+ / (gdkdev->axes[wheel_axis].max_value -+ - gdkdev->axes[wheel_axis].min_value); -+ else -+ *wheel = 0.5; -+ } - } - - /* combine the state of the core device and the device state -@@ -611,7 +626,8 @@ - &event->button.x,&event->button.y, - &event->button.pressure, - &event->button.xtilt, -- &event->button.ytilt); -+ &event->button.ytilt, -+ &event->button.wheel); - event->button.state = gdk_input_translate_state(xdbe->state,xdbe->device_state); - event->button.button = xdbe->button; - -@@ -694,7 +710,8 @@ - &event->motion.x,&event->motion.y, - &event->motion.pressure, - &event->motion.xtilt, -- &event->motion.ytilt); -+ &event->motion.ytilt, -+ &event->motion.wheel); - - event->motion.type = GDK_MOTION_NOTIFY; - event->motion.window = input_window->window; -@@ -809,7 +826,8 @@ - device_coords[i].data, - &coords[i].x, &coords[i].y, - &coords[i].pressure, -- &coords[i].xtilt, &coords[i].ytilt); -+ &coords[i].xtilt, &coords[i].ytilt, -+ &coords[i].wheel); - } - XFreeDeviceMotionEvents (device_coords); - -@@ -827,6 +845,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask) - { - GdkDevicePrivate *gdkdev; -@@ -846,6 +865,7 @@ - if (pressure) *pressure = 0.5; - if (xtilt) *xtilt = 0; - if (ytilt) *ytilt = 0; -+ if (wheel) *wheel = 0.5; - } - else - { -@@ -868,8 +888,10 @@ - case ValuatorClass: - gdk_input_translate_coordinates (gdkdev, input_window, - ((XValuatorState *)input_class)->valuators, -- x, y, pressure, -- xtilt, ytilt); -+ x, y, -+ pressure, -+ xtilt, ytilt, -+ wheel); - - - break; ---- gdk/gdkinputgxi.h Wed Feb 24 11:14:56 1999 -+++ gdk/gdkinputgxi.h Tue Jul 6 18:03:42 1999 -@@ -64,6 +64,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask); - static gint gdk_input_gxi_grab_pointer (GdkWindow * window, - gint owner_events, -@@ -554,6 +555,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask) - { - GdkDevicePrivate *gdkdev; -@@ -563,10 +565,10 @@ - - if (gdkdev == gdk_input_core_pointer) - gdk_input_common_get_pointer (window, GDK_CORE_POINTER, x, y, -- pressure, xtilt, ytilt, mask); -+ pressure, xtilt, ytilt, wheel, mask); - else - gdk_input_common_get_pointer (window, deviceid, x, y, -- pressure, xtilt, ytilt, mask); -+ pressure, xtilt, ytilt, wheel, mask); - } - - static GdkTimeCoord * ---- gdk/gdkinputnone.h Wed Feb 24 11:14:56 1999 -+++ gdk/gdkinputnone.h Tue Jul 6 18:02:14 1999 -@@ -33,6 +33,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask); - - void -@@ -65,6 +66,7 @@ - gdouble *pressure, - gdouble *xtilt, - gdouble *ytilt, -+ gdouble *wheel, - GdkModifierType *mask) - { - gint x_int, y_int; -@@ -76,6 +78,7 @@ - if (pressure) *pressure = 0.5; - if (xtilt) *xtilt = 0; - if (ytilt) *ytilt = 0; -+ if (wheel) *wheel = 0.5; - } - - #endif /* XINPUT_NONE */ ---- gdk/gdktypes.h Wed Feb 24 11:14:56 1999 -+++ gdk/gdktypes.h Tue Jul 6 18:11:37 1999 -@@ -577,6 +577,7 @@ - GDK_AXIS_PRESSURE, - GDK_AXIS_XTILT, - GDK_AXIS_YTILT, -+ GDK_AXIS_WHEEL, - GDK_AXIS_LAST - } GdkAxisUse; - -@@ -1001,6 +1002,7 @@ - gdouble pressure; - gdouble xtilt; - gdouble ytilt; -+ gdouble wheel; - }; - - /* Structure that holds information about a drag in progress. -@@ -1073,6 +1075,7 @@ - gdouble pressure; - gdouble xtilt; - gdouble ytilt; -+ gdouble wheel; - guint state; - gint16 is_hint; - GdkInputSource source; -@@ -1091,6 +1094,7 @@ - gdouble pressure; - gdouble xtilt; - gdouble ytilt; -+ gdouble wheel; - guint state; - guint button; - GdkInputSource source; ---- gtk/gtkinputdialog.c Wed Feb 24 11:15:09 1999 -+++ gtk/gtkinputdialog.c Tue Jul 6 18:37:59 1999 -@@ -70,10 +70,10 @@ - - - #define AXIS_LIST_WIDTH 160 --#define AXIS_LIST_HEIGHT 175 -+#define AXIS_LIST_HEIGHT 195 - - #define KEYS_LIST_WIDTH 200 --#define KEYS_LIST_HEIGHT 175 -+#define KEYS_LIST_HEIGHT 195 - - /* Forward declarations */ - -@@ -501,7 +501,8 @@ - N_("Y"), - N_("Pressure"), - N_("X Tilt"), -- N_("Y Tilt") -+ N_("Y Tilt"), -+ N_("Wheel") - }; - - int i,j; ---- gtk/testinput.c Wed Feb 24 11:15:18 1999 -+++ gtk/testinput.c Tue Jul 6 19:13:50 1999 -@@ -236,7 +236,7 @@ - { - if (event->is_hint) - gdk_input_window_get_pointer (event->window, event->deviceid, -- NULL, NULL, NULL, NULL, NULL, NULL); -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL); - draw_brush (widget, event->source, event->x, event->y, - event->pressure); - } -@@ -245,7 +245,7 @@ - { - gdk_input_window_get_pointer (event->window, event->deviceid, - &event->x, &event->y, -- NULL, NULL, NULL, NULL); -+ NULL, NULL, NULL, NULL, NULL); - } - - update_cursor (widget, event->x, event->y); ---- gtk/gtkfeatures.h Sat Sep 4 11:13:32 1999 -+++ gtk/gtkfeatures.h Sat Sep 4 11:35:21 1999 -@@ -115,6 +115,13 @@ - */ - #define GTK_HAVE_FEATURES_1_1_14 1-1-14 - -+/* Gtk+ patched to enable the -+ * sixth valuator present in -+ * the new xf86Wacom driver. -+ */ -+ -+#define GTK_HAVE_SIX_VALUATORS 1 -+ - #ifdef __cplusplus - } - #endif /* __cplusplus */ ---- ../../gtk+-1.2.4/gdk/gdkevents.c Mon Aug 23 21:40:31 1999 -+++ gdk/gdkevents.c Sat Sep 4 11:44:28 1999 -@@ -1213,6 +1213,7 @@ - event->button.pressure = 0.5; - event->button.xtilt = 0; - event->button.ytilt = 0; -+ event->button.wheel = 0.5; - event->button.state = (GdkModifierType) xevent->xbutton.state; - event->button.button = xevent->xbutton.button; - event->button.source = GDK_SOURCE_MOUSE; -@@ -1283,6 +1284,7 @@ - event->button.pressure = 0.5; - event->button.xtilt = 0; - event->button.ytilt = 0; -+ event->button.wheel = 0.5; - event->button.state = (GdkModifierType) xevent->xbutton.state; - event->button.button = xevent->xbutton.button; - event->button.source = GDK_SOURCE_MOUSE; -@@ -1317,6 +1319,7 @@ - event->motion.pressure = 0.5; - event->motion.xtilt = 0; - event->motion.ytilt = 0; -+ event->button.wheel = 0.5; - event->motion.state = (GdkModifierType) xevent->xmotion.state; - event->motion.is_hint = xevent->xmotion.is_hint; - event->motion.source = GDK_SOURCE_MOUSE;