Added --with-included-loaders option

2001-01-09  Alexander Larsson  <alla@lysator.liu.se>

	* configure.in:
	Added --with-included-loaders option

	* gdk-pixbuf/Makefile.am:
	* gdk-pixbuf/gdk-pixbuf-io.c:
	Add support for including selected gdk-pixbuf loaders only.

	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
	gtk_window_set_has_frame):
	Added inline documentation.

	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
	* docs/reference/gdk/tmpl/windows.sgml:
	Added inline documentation.

ChangeLog

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-0

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-10

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-2

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-4

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-6

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

ChangeLog.pre-2-8

@@ -1,3 +1,20 @@
+2001-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Added --with-included-loaders option
+
+	* gdk-pixbuf/Makefile.am:
+	* gdk-pixbuf/gdk-pixbuf-io.c:
+	Add support for including selected gdk-pixbuf loaders only.
+
+	* gtk/gtkwindow.c (gtk_window_set_frame_dimensions,
+	gtk_window_set_has_frame):
+	Added inline documentation.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_decorations):
+	* docs/reference/gdk/tmpl/windows.sgml:
+	Added inline documentation.
+
 Mon Jan  8 14:42:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_realize_buttons): Skip

configure.in

@@ -896,6 +896,40 @@ AC_SUBST(LIBPNG)
 
 AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
 
+#
+# Allow building some or all gdk-pixbuf loaders included
+#
+AC_MSG_CHECKING(pixbuf loaders to build)
+
+AC_ARG_WITH(included_loaders, [  --with-included-loaders=LOADER1,LOADER2,... Build the specified loaders into gdk-pixbuf (only used if module loading disabled)])
+
+all_loaders="png,bmp,wbmp,gif,ico,jpeg,pnm,ras,tiff,xpm"
+included_loaders=""
+# If no loaders specified, include all
+if test "x$with_included_loaders" = x ; then
+  included_loaders="$all_loaders"
+else
+  included_loaders="$with_included_loaders"
+fi
+
+AC_MSG_RESULT($included_loaders)
+
+INCLUDED_LOADER_OBJ=
+INCLUDED_LOADER_DEFINE=
+
+IFS="${IFS= 	}"; gtk_save_ifs="$IFS"; IFS=","
+for loader in $included_loaders; do
+ if ! echo "$all_loaders" | grep "\(^\|\,\)$loader\(\$\|\,\)" > /dev/null; then
+   AC_MSG_ERROR([the specified loader $loader does not exist])
+ fi
+
+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libpixbufloader-static-$loader.la"
+ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader"
+done
+IFS="$gtk_save_ifs"
+AC_SUBST(INCLUDED_LOADER_OBJ)
+AC_SUBST(INCLUDED_LOADER_DEFINE)
+
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT

docs/reference/gdk/tmpl/windows.sgml

@@ -876,9 +876,9 @@ Windows
 
 </para>
 
-@window: The window to get the decorations from
+@window: 
-@decorations: The window decorations will be written here
+@decorations: 
-@Returns: TRUE if the window has decorations set, FALSE otherwise.
+@Returns: 
 
 
 <!-- ##### ENUM GdkWMDecoration ##### -->

gdk-pixbuf/Makefile.am

@@ -11,10 +11,12 @@ loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
 libpixbufloader_png_la_SOURCES = io-png.c
 libpixbufloader_png_la_LDFLAGS = -avoid-version -module
 libpixbufloader_png_la_LIBADD = $(LIBPNG)
+libpixbufloader_static_png_la_SOURCES = io-png.c
 
 #
 # The JPEG loader
 #
+libpixbufloader_static_jpeg_la_SOURCES = io-jpeg.c
 libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
 libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
 libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
@@ -22,6 +24,7 @@ libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
 #
 # The XPM loader
 #
+libpixbufloader_static_xpm_la_SOURCES = io-xpm.c
 libpixbufloader_xpm_la_SOURCES = io-xpm.c
 libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
 libpixbufloader_xpm_la_LIBADD =
@@ -29,6 +32,7 @@ libpixbufloader_xpm_la_LIBADD =
 #
 # The GIF loader
 #
+libpixbufloader_static_gif_la_SOURCES = io-gif.c
 libpixbufloader_gif_la_SOURCES = io-gif.c
 libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
 libpixbufloader_gif_la_LIBADD =
@@ -36,6 +40,7 @@ libpixbufloader_gif_la_LIBADD =
 #
 # The ICO loader
 #
+libpixbufloader_static_ico_la_SOURCES = io-ico.c
 libpixbufloader_ico_la_SOURCES = io-ico.c
 libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
 libpixbufloader_ico_la_LIBADD =
@@ -43,6 +48,7 @@ libpixbufloader_ico_la_LIBADD =
 #
 # The RAS loader
 #
+libpixbufloader_static_ras_la_SOURCES = io-ras.c
 libpixbufloader_ras_la_SOURCES = io-ras.c
 libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
 libpixbufloader_ras_la_LIBADD =
@@ -50,6 +56,7 @@ libpixbufloader_ras_la_LIBADD =
 #
 # The TIFF loader
 #
+libpixbufloader_static_tiff_la_SOURCES = io-tiff.c
 libpixbufloader_tiff_la_SOURCES = io-tiff.c
 libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
 libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
@@ -57,6 +64,7 @@ libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
 #
 # The PNM loader
 #
+libpixbufloader_static_pnm_la_SOURCES = io-pnm.c
 libpixbufloader_pnm_la_SOURCES = io-pnm.c
 libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
 libpixbufloader_pnm_la_LIBADD =
@@ -64,6 +72,7 @@ libpixbufloader_pnm_la_LIBADD =
 #
 # The BMP loader
 #
+libpixbufloader_static_bmp_la_SOURCES = io-bmp.c
 libpixbufloader_bmp_la_SOURCES = io-bmp.c
 libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
 libpixbufloader_bmp_la_LIBADD =
@@ -71,6 +80,7 @@ libpixbufloader_bmp_la_LIBADD =
 #
 # The WBMP loader
 #
+libpixbufloader_static_wbmp_la_SOURCES = io-wbmp.c
 libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
 libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module
 
@@ -116,22 +126,26 @@ loader_LTLIBRARIES = 	\
 
 
 extra_sources = 
-
+builtin_objs = 
 else
 loader_LTLIBRARIES = 
 
-extra_sources = $(libpixbufloader_png_la_SOURCES) 	\
+noinst_LTLIBRARIES =  	\
-		$(libpixbufloader_jpeg_la_SOURCES) 	\
+	libpixbufloader-static-png.la \
-		$(libpixbufloader_xpm_la_SOURCES) 	\
+	libpixbufloader-static-jpeg.la \
-		$(libpixbufloader_gif_la_SOURCES) 	\
+	libpixbufloader-static-gif.la  \
-		$(libpixbufloader_ico_la_SOURCES) 	\
+	libpixbufloader-static-ico.la  \
-		$(libpixbufloader_ras_la_SOURCES) 	\
+	libpixbufloader-static-ras.la  \
-		$(libpixbufloader_tiff_la_SOURCES) 	\
+	libpixbufloader-static-tiff.la \
-		$(libpixbufloader_pnm_la_SOURCES) 	\
+	libpixbufloader-static-xpm.la  \
-		$(libpixbufloader_bmp_la_SOURCES)	\
+	libpixbufloader-static-pnm.la  \
-		$(libpixbufloader_wbmp_la_SOURCES)
+	libpixbufloader-static-bmp.la  \
+	libpixbufloader-static-wbmp.la
+
+builtin_objs = @INCLUDED_LOADER_OBJ@
+
+static_libs = $(STATIC_LIB_DEPS)
 
-builtin_libraries = 
 endif
 
 noinst_PROGRAMS = test-gdk-pixbuf
@@ -141,6 +155,7 @@ DEPS = libgdk_pixbuf-1.3.la
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
 	-I$(top_srcdir)/gdk-pixbuf \
 	-I$(top_builddir)/gdk-pixbuf \
+	@INCLUDED_LOADER_DEFINE@ \
 	$(GLIB_CFLAGS)
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
 
@@ -169,14 +184,14 @@ libgdk_pixbuf_1_3_la_SOURCES = 	\
 	gdk-pixbuf-data.c	\
 	gdk-pixbuf-io.c		\
 	gdk-pixbuf-scale.c	\
-	gdk-pixbuf-util.c	\
+	gdk-pixbuf-util.c
-	$(extra_sources)
 
 libgdk_pixbuf_1_3_la_LDFLAGS = 				        \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
 	@LIBTOOL_EXPORT_OPTIONS@				\
 	$(GLIB_LIBS) 
-libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la
+libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(static_libs)
+libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
 
 libgdk_pixbufinclude_HEADERS =	\
 	gdk-pixbuf.h		\

gdk-pixbuf/gdk-pixbuf-io.c

@@ -425,7 +425,8 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
                         GError         **error)
 {
 	image_module->module = (void *) 1;
-	
+
+#ifdef INCLUDE_png	
 	if (strcmp (image_module->module_name, "png") == 0){
 		image_module->load           = mname (png,load);
 		image_module->begin_load     = mname (png,begin_load);
@@ -434,7 +435,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
                 image_module->save           = mname (png,save);
 		return TRUE;
 	}
+#endif
 
+#ifdef INCLUDE_bmp	
 	if (strcmp (image_module->module_name, "bmp") == 0){
 		image_module->load           = mname (bmp,load);
 		image_module->begin_load     = mname (bmp,begin_load);
@@ -442,7 +445,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (bmp,stop_load);
 		return TRUE;
 	}
+#endif
 
+#ifdef INCLUDE_wbmp
 	if (strcmp (image_module->module_name, "wbmp") == 0){
 		image_module->load           = mname (wbmp,load);
 		image_module->begin_load     = mname (wbmp,begin_load);
@@ -450,7 +455,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (wbmp,stop_load);
 		return TRUE;
 	}
+#endif
 
+#ifdef INCLUDE_gif
 	if (strcmp (image_module->module_name, "gif") == 0){
 		image_module->load           = mname (gif,load);
 		image_module->begin_load     = mname (gif,begin_load);
@@ -459,7 +466,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->load_animation = mname (gif,load_animation);
 		return TRUE;
 	}
+#endif
 
+#ifdef INCLUDE_ico
 	if (strcmp (image_module->module_name, "ico") == 0){
 		image_module->load           = mname (ico,load);
 		image_module->begin_load     = mname (ico,begin_load);
@@ -467,7 +476,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (ico,stop_load);
 		return TRUE;
 	}
+#endif
 
+#ifdef INCLUDE_jpeg
 	if (strcmp (image_module->module_name, "jpeg") == 0){
 		image_module->load           = mname (jpeg,load);
 		image_module->begin_load     = mname (jpeg,begin_load);
@@ -476,6 +487,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
                 image_module->save           = mname (jpeg,save);
 		return TRUE;
 	}
+#endif
+
+#ifdef INCLUDE_pnm
 	if (strcmp (image_module->module_name, "pnm") == 0){
 		image_module->load           = mname (pnm,load);
 		image_module->begin_load     = mname (pnm,begin_load);
@@ -483,6 +497,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (pnm,stop_load);
 		return TRUE;
 	}
+#endif
+
+#ifdef INCLUDE_ras
 	if (strcmp (image_module->module_name, "ras") == 0){
 		image_module->load           = mname (ras,load);
 		image_module->begin_load     = mname (ras,begin_load);
@@ -490,6 +507,9 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (ras,stop_load);
 		return TRUE;
 	}
+#endif
+
+#ifdef INCLUDE_tiff
 	if (strcmp (image_module->module_name, "tiff") == 0){
 		image_module->load           = mname (tiff,load);
 		image_module->begin_load     = mname (tiff,begin_load);
@@ -497,11 +517,15 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 		image_module->stop_load      = mname (tiff,stop_load);
 		return TRUE;
 	}
+#endif
+
+#ifdef INCLUDE_xpm
 	if (strcmp (image_module->module_name, "xpm") == 0){
 		image_module->load           = mname (xpm,load);
 		image_module->load_xpm_data  = mname (xpm,load_xpm_data);
 		return TRUE;
 	}
+#endif
 
         g_set_error (error,
                      GDK_PIXBUF_ERROR,

gdk/x11/gdkwindow-x11.c

@@ -1941,6 +1941,15 @@ gdk_window_set_decorations (GdkWindow      *window,
   gdk_window_set_mwm_hints (window, &hints);
 }
 
+/**
+ * gdk_window_get_decorations:
+ * @window: The #GdkWindow to get the decorations from
+ * @decorations: The window decorations will be written here
+ * @Returns: TRUE if the window has decorations set, FALSE otherwise.
+ *
+ * Returns the decorations set on the GdkWindow with #gdk_window_set_decorations
+ * 
+ **/
 gboolean
 gdk_window_get_decorations(GdkWindow *window,
 			   GdkWMDecoration *decorations)

gtk/gtkwindow.c

@@ -2589,6 +2589,19 @@ gtk_window_expose (GtkWidget      *widget,
   return TRUE;
 }
 
+/**
+ * gtk_window_set_has_frame:
+ * @window: a #GtkWindow
+ * 
+ * If this function is called on a window before it is realized
+ * or showed it will have a "frame" window around widget-window,
+ * accessible in window->frame. Using the signal frame_event
+ * you can recieve all events targeted at the frame.
+ * 
+ * This function is used by the linux-fb port to implement managed
+ * windows, but it could concievably be used by X-programs that
+ * want to do their own window decorations.
+ **/
 void
 gtk_window_set_has_frame (GtkWindow *window)
 {
@@ -2599,6 +2612,17 @@ gtk_window_set_has_frame (GtkWindow *window)
   window->has_frame = TRUE;
 }
 
+/**
+ * gtk_window_set_frame_dimensions:
+ * @window: a #GtkWindow that has a frame
+ * @left: The width of the left border
+ * @top: The height of the top border
+ * @right: The width of the right border
+ * @bottom: The height of the bottom border
+ *
+ * For windows with frames (see #gtk_window_set_has_frame) this function
+ * can be used to change the size of the frame border.
+ **/
 void
 gtk_window_set_frame_dimensions (GtkWindow *window, 
 				 gint       left,