Commit 859e9c41 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

gdk_pixbuf_new_from_stream -> _from_inline

2001-10-13  Michael Natterer  <mitch@gimp.org>

	* RELEASE-TO-CVS.patch: gdk_pixbuf_new_from_stream -> _from_inline

	* app/display/Makefile.am
	* app/display/gimpdisplay-foreach.[ch]: new files for functions
	operating on all displays (will go away as soon as the display
	behaves like a proper view which doesn't need to be updated
	explicitly).

	* app/display/gimpdisplay-callbacks.c
	* app/display/gimpdisplay-scale.[ch]
	* app/display/gimpdisplay-scroll.[ch]
	* app/display/gimpdisplay.[ch]: "scale" and "scroll" namespace
	cleanup, moved bounds_checking() to gimpdisplay-scroll.[ch], lots
	of unfinished, intermediate stuff.

	* app/display/gimpdisplayshell.[ch]: added some GObject framework
	for the GimpDisplayShell object (not used yet).

	* app/app_procs.c
	* app/docindex.c
	* app/image_map.c
	* app/nav_window.c
	* app/path.c
	* app/qmask.c
	* app/undo.c
	* app/gui/channels-commands.c
	* app/gui/convert-dialog.c
	* app/gui/edit-commands.c
	* app/gui/file-commands.c
	* app/gui/gui.c
	* app/gui/image-commands.c
	* app/gui/layer-select.c
	* app/gui/layers-commands.c
	* app/gui/offset-dialog.c
	* app/gui/paths-dialog.c
	* app/gui/preferences-dialog.c
	* app/gui/select-commands.c
	* app/gui/view-commands.c
	* app/tools/gimpairbrushtool.c
	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpblendtool.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimpeditselectiontool.c
	* app/tools/gimpfreeselecttool.c
	* app/tools/gimpfuzzyselecttool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpinktool.c
	* app/tools/gimpiscissorstool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmeasuretool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimppainttool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimprectselecttool.c
	* app/tools/gimptexttool.c
	* app/tools/gimpthresholdtool.c
	* app/tools/gimptransformtool.c
	* app/widgets/gimpbufferview.c
	* app/widgets/gimpchannellistview.c
	* app/widgets/gimpcomponentlistitem.c
	* app/widgets/gimpdrawablelistitem.c
	* app/widgets/gimpdrawablelistview.c
	* app/widgets/gimplayerlistitem.c
	* app/widgets/gimplayerlistview.c
	* app/widgets/gimplistitem.c
	* tools/pdbgen/pdb/display.pdb
	* app/pdb/display_cmds.c: changed accordingly (mostly including
	"gimpdisplay-foreach.h" instead of "gimpdisplay.h")
parent 0186fb2d
2001-10-13 Michael Natterer <mitch@gimp.org>
* RELEASE-TO-CVS.patch: gdk_pixbuf_new_from_stream -> _from_inline
* app/display/Makefile.am
* app/display/gimpdisplay-foreach.[ch]: new files for functions
operating on all displays (will go away as soon as the display
behaves like a proper view which doesn't need to be updated
explicitly).
* app/display/gimpdisplay-callbacks.c
* app/display/gimpdisplay-scale.[ch]
* app/display/gimpdisplay-scroll.[ch]
* app/display/gimpdisplay.[ch]: "scale" and "scroll" namespace
cleanup, moved bounds_checking() to gimpdisplay-scroll.[ch], lots
of unfinished, intermediate stuff.
* app/display/gimpdisplayshell.[ch]: added some GObject framework
for the GimpDisplayShell object (not used yet).
* app/app_procs.c
* app/docindex.c
* app/image_map.c
* app/nav_window.c
* app/path.c
* app/qmask.c
* app/undo.c
* app/gui/channels-commands.c
* app/gui/convert-dialog.c
* app/gui/edit-commands.c
* app/gui/file-commands.c
* app/gui/gui.c
* app/gui/image-commands.c
* app/gui/layer-select.c
* app/gui/layers-commands.c
* app/gui/offset-dialog.c
* app/gui/paths-dialog.c
* app/gui/preferences-dialog.c
* app/gui/select-commands.c
* app/gui/view-commands.c
* app/tools/gimpairbrushtool.c
* app/tools/gimpbezierselecttool.c
* app/tools/gimpblendtool.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcroptool.c
* app/tools/gimpcurvestool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpfuzzyselecttool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpinktool.c
* app/tools/gimpiscissorstool.c
* app/tools/gimplevelstool.c
* app/tools/gimpmagnifytool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpmovetool.c
* app/tools/gimppainttool.c
* app/tools/gimpposterizetool.c
* app/tools/gimprectselecttool.c
* app/tools/gimptexttool.c
* app/tools/gimpthresholdtool.c
* app/tools/gimptransformtool.c
* app/widgets/gimpbufferview.c
* app/widgets/gimpchannellistview.c
* app/widgets/gimpcomponentlistitem.c
* app/widgets/gimpdrawablelistitem.c
* app/widgets/gimpdrawablelistview.c
* app/widgets/gimplayerlistitem.c
* app/widgets/gimplayerlistview.c
* app/widgets/gimplistitem.c
* tools/pdbgen/pdb/display.pdb
* app/pdb/display_cmds.c: changed accordingly (mostly including
"gimpdisplay-foreach.h" instead of "gimpdisplay.h")
2001-10-10 DindinX <dindinx@wanadoo.fr>
* app/display/gimpdisplay-callbacks.c: fixed a buglet. Key-release
......
......@@ -4,7 +4,7 @@ RCS file: /cvs/gnome/gimp/libgimpbase/gimpparasiteio.c,v
retrieving revision 1.9
diff -u -r1.9 gimpparasiteio.c
--- libgimpbase/gimpparasiteio.c 2001/08/01 00:35:48 1.9
+++ libgimpbase/gimpparasiteio.c 2001/10/02 17:32:26
+++ libgimpbase/gimpparasiteio.c 2001/10/13 12:48:21
@@ -161,8 +161,8 @@
for (i = 0; i < params->dim; i++)
......@@ -16,13 +16,29 @@ diff -u -r1.9 gimpparasiteio.c
}
str = s->str;
Index: libgimpwidgets/gimpstock.c
===================================================================
RCS file: /cvs/gnome/gimp/libgimpwidgets/gimpstock.c,v
retrieving revision 1.3
diff -u -r1.3 gimpstock.c
--- libgimpwidgets/gimpstock.c 2001/08/05 16:07:01 1.3
+++ libgimpwidgets/gimpstock.c 2001/10/13 12:48:21
@@ -48,7 +48,7 @@
gtk_icon_source_set_size (source, size);
gtk_icon_source_set_size_wildcarded (source, FALSE);
- pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL);
+ pixbuf = gdk_pixbuf_new_from_inline (-1, inline_data, FALSE, NULL);
g_assert (pixbuf);
Index: plug-ins/ifscompose/ifscompose_storage.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/ifscompose/ifscompose_storage.c,v
retrieving revision 1.8
diff -u -r1.8 ifscompose_storage.c
--- plug-ins/ifscompose/ifscompose_storage.c 2001/08/01 00:35:57 1.8
+++ plug-ins/ifscompose/ifscompose_storage.c 2001/10/02 17:32:26
+++ plug-ins/ifscompose/ifscompose_storage.c 2001/10/13 12:48:21
@@ -27,6 +27,7 @@
#include "ifscompose.h"
......
......@@ -23,7 +23,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......@@ -31,7 +31,7 @@
#include "core/gimpimage-mask.h"
#include "core/gimplist.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpwidgets-utils.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "tools/tools-types.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpbuffer.h"
......@@ -34,6 +34,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "tools/tool_manager.h"
......
......@@ -22,12 +22,13 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "display/display-types.h"
#include "gui-types.h"
#include "core/gimpimage.h"
#include "core/gimpobject.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplay-ops.h"
#include "file-commands.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
......@@ -34,6 +34,7 @@
#include "pdb/procedural_db.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "convert-dialog.h"
#include "offset-dialog.h"
......
......@@ -37,7 +37,7 @@
#include "core/gimplayermask.h"
#include "core/gimplist.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpwidgets-utils.h"
......
......@@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......@@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolorpanel.h"
......
......@@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......@@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolorpanel.h"
......
......@@ -29,6 +29,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "libgimp/gimpintl.h"
......
......@@ -27,6 +27,7 @@
#include "core/gimpimage.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplay-ops.h"
#include "display/gimpdisplay-scale.h"
#include "display/gimpdisplay-selection.h"
......@@ -51,7 +52,7 @@ view_zoomin_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
change_scale (gdisp, GIMP_ZOOM_IN);
gimp_display_scale (gdisp, GIMP_ZOOM_IN);
}
void
......@@ -61,7 +62,7 @@ view_zoomout_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
change_scale (gdisp, GIMP_ZOOM_OUT);
gimp_display_scale (gdisp, GIMP_ZOOM_OUT);
}
void
......@@ -72,7 +73,7 @@ view_zoom_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
change_scale (gdisp, action);
gimp_display_scale (gdisp, action);
}
void
......@@ -242,5 +243,5 @@ view_shrink_wrap_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
shrink_wrap_display (gdisp);
gimp_display_scale_shrink_wrap (gdisp);
}
......@@ -33,7 +33,6 @@
#include "libgimpbase/gimpbase.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "base/base.h"
......@@ -46,7 +45,7 @@
#include "xcf/xcf.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "tools/tool_manager.h"
......
......@@ -34,6 +34,7 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "gimpcolorbalancetool.h"
#include "gimpcolorbalancetool-transfer.h"
......
......@@ -40,6 +40,7 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "gimpcurvestool.h"
#include "tool_manager.h"
......
......@@ -35,6 +35,7 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "gimphuesaturationtool.h"
#include "tool_manager.h"
......
......@@ -37,6 +37,7 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "gimpthresholdtool.h"
#include "tool_manager.h"
......
......@@ -49,6 +49,7 @@
#include "gui/info-dialog.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "tool_manager.h"
#include "tool_options.h"
......
......@@ -46,6 +46,7 @@
#include "widgets/gimpdnd.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "app_procs.h"
#include "errors.h"
......
......@@ -49,6 +49,7 @@
#include "gui/info-dialog.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "tool_manager.h"
#include "tool_options.h"
......
......@@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......@@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolorpanel.h"
......
......@@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......@@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "widgets/gimpcolorpanel.h"
......
......@@ -45,6 +45,7 @@
#include "core/gimpparasitelist.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "tools/gimpbycolorselecttool.h"
#include "tools/gimptool.h"
......
......@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "core/core-types.h"
#include "display/display-types.h"
#include "base/pixel-region.h"
#include "base/tile-manager.h"
......@@ -32,6 +32,7 @@
#include "core/gimpimage.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "image_map.h"
......
......@@ -109,11 +109,6 @@ static void gdisplay_delete (GimpDisplay *gdisp);
static GSList * gdisplay_free_area_list (GSList *list);
static GSList * gdisplay_process_area_list (GSList *list,
GimpArea *ga1);
static void gdisplay_add_update_area (GimpDisplay *gdisp,
gint x,
gint y,
gint w,
gint h);
static void gdisplay_add_display_area (GimpDisplay *gdisp,
gint x,
gint y,
......@@ -852,7 +847,7 @@ gdisplay_flush_displays_only (GimpDisplay *gdisp)
}
static void
void
gdisplay_flush_whenever (GimpDisplay *gdisp,
gboolean now)
{
......@@ -931,19 +926,20 @@ gdisplay_flush_now (GimpDisplay *gdisp)
void
gdisplays_finish_draw (void)
{
GSList *list = display_list;
GSList *list;
GimpDisplay *gdisp;
while (list)
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->idle_render.active)
{
gtk_idle_remove (gdisp->idle_render.idleid);
while (idlerender_callback(gdisp));
g_source_remove (gdisp->idle_render.idleid);
gdisp->idle_render.idleid = 0;
while (idlerender_callback (gdisp));
}
list = g_slist_next (list);
}
}
......@@ -1113,22 +1109,15 @@ gdisplay_update_icon_scheduler (GimpImage *gimage,
gdisp = (GimpDisplay *) data;
if (gdisp == gdisplays_check_valid (gdisp, gimage))
gdisp->icon_needs_update = 1;
if (!gdisp->icon_timeout_id)
{
gdisp->icon_needs_update = 1;
if (!gdisp->icon_timeout_id)
{
gdisp->icon_timeout_id = g_timeout_add (7500,
gdisplay_update_icon_timer,
gdisp);
if (!gdisp->icon_idle_id)
gdisp->icon_idle_id = g_idle_add (gdisplay_update_icon_invoker,
gdisp->icon_timeout_id = g_timeout_add (7500,
gdisplay_update_icon_timer,
gdisp);
}
}
else
{
g_printerr ("gdisplay_update_icon_scheduler called for invalid gdisplay\n");
if (!gdisp->icon_idle_id)
gdisp->icon_idle_id = g_idle_add (gdisplay_update_icon_invoker,
gdisp);
}
}
......@@ -1567,7 +1556,7 @@ gdisplay_set_dot_for_dot (GimpDisplay *gdisp,
gdisp->dot_for_dot = dot_for_dot;
gdisplay_resize_cursor_label (gdisp);
resize_display (gdisp, gimprc.allow_resize_windows, TRUE);
gimp_display_scale_resize (gdisp, gimprc.allow_resize_windows, TRUE);
}
}
......@@ -1645,7 +1634,7 @@ gdisplay_remove_and_delete (GimpDisplay *gdisp)
}
static void
void
gdisplay_add_update_area (GimpDisplay *gdisp,
gint x,
gint y,
......@@ -2425,6 +2414,8 @@ gdisplay_active (void)
event = gtk_get_current_event ();
if (event != NULL)
{
g_warning ("gdisplay_active(): deleging current event");
gdk_event_free (event);
}
......@@ -2471,310 +2462,6 @@ gdisplay_update_title (GimpDisplay *gdisp)
gtk_statusbar_push (GTK_STATUSBAR (gdisp->statusbar), context_id, title);
}
void
gdisplays_update_title (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
gdisplay_update_title (gdisp);
}
}
void
gdisplays_resize_cursor_label (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
gdisplay_resize_cursor_label (gdisp);
}
}
void
gdisplays_setup_scale (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
setup_scale (gdisp);
}
}
void
gdisplays_update_area (GimpImage *gimage,
gint x,
gint y,
gint w,
gint h)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
gdisplay_add_update_area (gdisp, x, y, w, h);
}
}
void
gdisplays_expose_guides (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
GList *guide_list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
{
for (guide_list = gdisp->gimage->guides;
guide_list;
guide_list = g_list_next (guide_list))
{
gdisplay_expose_guide (gdisp, guide_list->data);
}
}
}
}
void
gdisplays_expose_guide (GimpImage *gimage,
GimpGuide *guide)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
gdisplay_expose_guide (gdisp, guide);
}
}
void
gdisplays_update_full (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
gdisplay_add_update_area (gdisp, 0, 0,
gdisp->gimage->width,
gdisp->gimage->height);
}
}
void
gdisplays_shrink_wrap (GimpImage *gimage)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->gimage == gimage)
shrink_wrap_display (gdisp);
}
}
void
gdisplays_expose_full (void)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
gdisplay_expose_full (gdisp);
}
}
void
gdisplays_nav_preview_resized (void)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{
gdisp = (GimpDisplay *) list->data;
if (gdisp->window_nav_dialog)
nav_dialog_preview_resized (gdisp->window_nav_dialog);
if (gdisp->nav_popup)
{
nav_dialog_free (NULL, gdisp->nav_popup);
gdisp->nav_popup = NULL;
}
}
}
void
gdisplays_selection_visibility (GimpImage *gimage,
GimpSelectionControl control)
{
GimpDisplay *gdisp;
GSList *list;
/* traverse the linked list of displays, handling each one */
for (list = display_list; list; list = g_slist_next (list))
{