diff --git a/ChangeLog b/ChangeLog index 7685d84d8..27bb4826f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2007-12-19 Havoc Pennington + + * src/ui, src/core, src/include: sort source files into these + directories according to which part of the WM they are supposed to + be in. In an eventual plan, we should also create + src/compositor/render, src/compositor/fallback and move some of + the compositor stuff into that. + + * autogen.sh: require a newer automake, so we don't have to use + a recursive build + + * src/ui/tabpopup.c: put in a hack to make the build temporarily + work, want to commit the large rearrangement before fixing this + not to include workspace.h or frame.h + + * src/core/iconcache.c (meta_read_icons): temporarily break this + to get the build to work, want to commit the large rearrangement + before fixing this file not to include theme.h + 2007-12-19 Thomas Thurman * configure.in: Post-release bump to 2.21.8. diff --git a/autogen.sh b/autogen.sh index eff8b9645..b6b4cc76f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,7 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="metacity" -REQUIRED_AUTOMAKE_VERSION=1.7 +REQUIRED_AUTOMAKE_VERSION=1.10 (test -f $srcdir/configure.in \ && test -d $srcdir/src) || { diff --git a/configure.in b/configure.in index 576f74089..7c04379a9 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ m4_define([metacity_version], AC_INIT([metacity], [metacity_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity]) -AC_CONFIG_SRCDIR(src/display.c) +AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE diff --git a/src/Makefile.am b/src/Makefile.am index 0f1bb9535..22217f824 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,132 +2,132 @@ lib_LTLIBRARIES = libmetacity-private.la SUBDIRS=wm-tester tools themes -INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 +INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 metacity_SOURCES= \ - async-getprop.c \ - async-getprop.h \ - bell.h \ - bell.c \ - boxes.h \ - boxes.c \ - common.h \ - compositor.c \ - compositor.h \ - constraints.c \ - constraints.h \ - core.c \ - core.h \ - delete.c \ - display.c \ - display.h \ - draw-workspace.c \ - draw-workspace.h \ - edge-resistance.c \ - edge-resistance.h \ - effects.c \ - effects.h \ - errors.c \ - errors.h \ - eventqueue.c \ - eventqueue.h \ - fixedtip.c \ - fixedtip.h \ - frame.c \ - frame.h \ - frames.c \ - frames.h \ - gradient.c \ - gradient.h \ - group.c \ - group.h \ - group-private.h \ - group-props.c \ - group-props.h \ - iconcache.c \ - iconcache.h \ + core/async-getprop.c \ + core/async-getprop.h \ + core/bell.c \ + core/bell.h \ + core/boxes.c \ + include/boxes.h \ + core/compositor.c \ + core/compositor.h \ + core/constraints.c \ + core/constraints.h \ + core/core.c \ + core/delete.c \ + core/display.c \ + core/display.h \ + ui/draw-workspace.c \ + core/draw-workspace.h \ + core/edge-resistance.c \ + core/edge-resistance.h \ + core/effects.c \ + core/effects.h \ + core/errors.c \ + core/errors.h \ + core/eventqueue.c \ + core/eventqueue.h \ + core/frame.c \ + core/frame.h \ + ui/gradient.c \ + ui/gradient.h \ + core/group-private.h \ + core/group-props.c \ + core/group-props.h \ + core/group.c \ + core/group.h \ + core/iconcache.c \ + core/iconcache.h \ + core/keybindings.c \ + core/keybindings.h \ + core/main.c \ + core/main.h \ + core/metacity-Xatomtype.h \ + core/place.c \ + core/place.h \ + core/prefs.c \ + core/prefs.h \ + core/screen.c \ + core/screen.h \ + core/session.c \ + core/session.h \ + core/spring-model.c \ + core/spring-model.h \ + core/stack.c \ + core/stack.h \ + core/util.c \ + include/util.h \ + core/window-props.c \ + core/window-props.h \ + core/window.c \ + core/window.h \ + core/workspace.c \ + core/workspace.h \ + core/xprops.c \ + core/xprops.h \ + include/common.h \ + include/core.h \ + include/ui.h \ inlinepixbufs.h \ - keybindings.c \ - keybindings.h \ - main.c \ - main.h \ - menu.c \ - menu.h \ - metaaccellabel.c \ - metaaccellabel.h \ - metacity-Xatomtype.h \ - place.c \ - place.h \ - prefs.c \ - prefs.h \ - resizepopup.c \ - resizepopup.h \ - screen.c \ - screen.h \ - session.c \ - session.h \ - spring-model.c \ - spring-model.h \ - stack.c \ - stack.h \ - tabpopup.c \ - tabpopup.h \ - theme.c \ - theme.h \ - theme-parser.c \ - theme-parser.h \ - themewidget.c \ - themewidget.h \ - ui.c \ - ui.h \ - util.c \ - util.h \ - window.c \ - window.h \ - window-props.c \ - window-props.h \ - workspace.c \ - workspace.h \ - xprops.c \ - xprops.h + ui/fixedtip.c \ + ui/fixedtip.h \ + ui/frames.c \ + ui/frames.h \ + ui/menu.c \ + ui/menu.h \ + ui/metaaccellabel.c \ + ui/metaaccellabel.h \ + ui/resizepopup.c \ + include/resizepopup.h \ + ui/tabpopup.c \ + include/tabpopup.h \ + ui/theme-parser.c \ + ui/theme-parser.h \ + ui/theme.c \ + ui/theme.h \ + ui/themewidget.c \ + ui/themewidget.h \ + ui/ui.c # by setting libmetacity_private_la_CFLAGS, the files shared with # metacity proper will be compiled with different names. libmetacity_private_la_CFLAGS = -libmetacity_private_la_SOURCES= \ - boxes.c \ - boxes.h \ - gradient.c \ - gradient.h \ - preview-widget.c \ - preview-widget.h \ - theme.c \ - theme.h \ - theme-parser.c \ - theme-parser.h \ - util.c \ - util.h \ - common.h +libmetacity_private_la_SOURCES= \ + core/boxes.c \ + include/boxes.h \ + ui/gradient.c \ + ui/gradient.h \ + core/util.c \ + include/util.h \ + include/common.h \ + ui/preview-widget.c \ + ui/preview-widget.h \ + ui/theme-parser.c \ + ui/theme-parser.h \ + ui/theme.c \ + ui/theme.h libmetacity_private_la_LDFLAGS = -no-undefined libmetacity_private_la_LIBADD = @METACITY_LIBS@ libmetacityincludedir = $(includedir)/metacity-1/metacity-private -libmetacityinclude_HEADERS = \ - boxes.h \ - common.h \ - gradient.h \ - preview-widget.h \ - theme.h \ - theme-parser.h \ - util.h +libmetacityinclude_HEADERS = \ + include/boxes.h \ + ui/gradient.h \ + include/util.h \ + include/common.h \ + ui/preview-widget.h \ + ui/theme-parser.h \ + ui/theme.h metacity_theme_viewer_SOURCES= \ - theme-viewer.c + ui/theme-viewer.c metacity_dialog_SOURCES= \ - metacity-dialog.c + ui/metacity-dialog.c bin_PROGRAMS=metacity metacity-theme-viewer libexec_PROGRAMS=metacity-dialog @@ -137,9 +137,9 @@ metacity_LDADD=@METACITY_LIBS@ $(EFENCE) metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la metacity_dialog_LDADD=@METACITY_LIBS@ -testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c -testgradient_SOURCES=gradient.h gradient.c testgradient.c -testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c +testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c +testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c +testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c noinst_PROGRAMS=testboxes testgradient testasyncgetprop @@ -182,7 +182,7 @@ BUILT_SOURCES = inlinepixbufs.h CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml inlinepixbufs.h: $(IMAGES) - $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h + $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/async-getprop.c b/src/core/async-getprop.c similarity index 100% rename from src/async-getprop.c rename to src/core/async-getprop.c diff --git a/src/async-getprop.h b/src/core/async-getprop.h similarity index 100% rename from src/async-getprop.h rename to src/core/async-getprop.h diff --git a/src/bell.c b/src/core/bell.c similarity index 100% rename from src/bell.c rename to src/core/bell.c diff --git a/src/bell.h b/src/core/bell.h similarity index 100% rename from src/bell.h rename to src/core/bell.h diff --git a/src/boxes.c b/src/core/boxes.c similarity index 100% rename from src/boxes.c rename to src/core/boxes.c diff --git a/src/c-screen.c b/src/core/c-screen.c similarity index 100% rename from src/c-screen.c rename to src/core/c-screen.c diff --git a/src/c-screen.h b/src/core/c-screen.h similarity index 100% rename from src/c-screen.h rename to src/core/c-screen.h diff --git a/src/c-window.c b/src/core/c-window.c similarity index 100% rename from src/c-window.c rename to src/core/c-window.c diff --git a/src/c-window.h b/src/core/c-window.h similarity index 100% rename from src/c-window.h rename to src/core/c-window.h diff --git a/src/compositor.c b/src/core/compositor.c similarity index 100% rename from src/compositor.c rename to src/core/compositor.c diff --git a/src/compositor.h b/src/core/compositor.h similarity index 100% rename from src/compositor.h rename to src/core/compositor.h diff --git a/src/constraints.c b/src/core/constraints.c similarity index 100% rename from src/constraints.c rename to src/core/constraints.c diff --git a/src/constraints.h b/src/core/constraints.h similarity index 100% rename from src/constraints.h rename to src/core/constraints.h diff --git a/src/core.c b/src/core/core.c similarity index 100% rename from src/core.c rename to src/core/core.c diff --git a/src/delete.c b/src/core/delete.c similarity index 100% rename from src/delete.c rename to src/core/delete.c diff --git a/src/display.c b/src/core/display.c similarity index 100% rename from src/display.c rename to src/core/display.c diff --git a/src/display.h b/src/core/display.h similarity index 100% rename from src/display.h rename to src/core/display.h diff --git a/src/edge-resistance.c b/src/core/edge-resistance.c similarity index 100% rename from src/edge-resistance.c rename to src/core/edge-resistance.c diff --git a/src/edge-resistance.h b/src/core/edge-resistance.h similarity index 100% rename from src/edge-resistance.h rename to src/core/edge-resistance.h diff --git a/src/effects.c b/src/core/effects.c similarity index 100% rename from src/effects.c rename to src/core/effects.c diff --git a/src/effects.h b/src/core/effects.h similarity index 100% rename from src/effects.h rename to src/core/effects.h diff --git a/src/errors.c b/src/core/errors.c similarity index 100% rename from src/errors.c rename to src/core/errors.c diff --git a/src/errors.h b/src/core/errors.h similarity index 100% rename from src/errors.h rename to src/core/errors.h diff --git a/src/eventqueue.c b/src/core/eventqueue.c similarity index 100% rename from src/eventqueue.c rename to src/core/eventqueue.c diff --git a/src/eventqueue.h b/src/core/eventqueue.h similarity index 100% rename from src/eventqueue.h rename to src/core/eventqueue.h diff --git a/src/frame.c b/src/core/frame.c similarity index 100% rename from src/frame.c rename to src/core/frame.c diff --git a/src/frame.h b/src/core/frame.h similarity index 100% rename from src/frame.h rename to src/core/frame.h diff --git a/src/group-private.h b/src/core/group-private.h similarity index 100% rename from src/group-private.h rename to src/core/group-private.h diff --git a/src/group-props.c b/src/core/group-props.c similarity index 100% rename from src/group-props.c rename to src/core/group-props.c diff --git a/src/group-props.h b/src/core/group-props.h similarity index 100% rename from src/group-props.h rename to src/core/group-props.h diff --git a/src/group.c b/src/core/group.c similarity index 100% rename from src/group.c rename to src/core/group.c diff --git a/src/group.h b/src/core/group.h similarity index 100% rename from src/group.h rename to src/core/group.h diff --git a/src/iconcache.c b/src/core/iconcache.c similarity index 99% rename from src/iconcache.c rename to src/core/iconcache.c index 939a08959..88eca535c 100644 --- a/src/iconcache.c +++ b/src/core/iconcache.c @@ -25,7 +25,6 @@ #include "iconcache.h" #include "ui.h" #include "errors.h" -#include "theme.h" #include @@ -818,6 +817,8 @@ meta_read_icons (MetaScreen *screen, if (icon_cache->want_fallback && icon_cache->origin < USING_FALLBACK_ICON) { +#if 0 + /* FIXME this code requires GTK and thus does not belong here in core/ */ MetaTheme *theme = meta_theme_get_current (); if (theme->fallback_icon == NULL || theme->fallback_mini_icon == NULL) @@ -840,6 +841,9 @@ meta_read_icons (MetaScreen *screen, *iconp, *mini_iconp); return TRUE; +#else + return FALSE; +#endif } if (!icon_cache->want_fallback && diff --git a/src/iconcache.h b/src/core/iconcache.h similarity index 100% rename from src/iconcache.h rename to src/core/iconcache.h diff --git a/src/keybindings.c b/src/core/keybindings.c similarity index 100% rename from src/keybindings.c rename to src/core/keybindings.c diff --git a/src/keybindings.h b/src/core/keybindings.h similarity index 100% rename from src/keybindings.h rename to src/core/keybindings.h diff --git a/src/main.c b/src/core/main.c similarity index 100% rename from src/main.c rename to src/core/main.c diff --git a/src/metacity-Xatomtype.h b/src/core/metacity-Xatomtype.h similarity index 100% rename from src/metacity-Xatomtype.h rename to src/core/metacity-Xatomtype.h diff --git a/src/place.c b/src/core/place.c similarity index 100% rename from src/place.c rename to src/core/place.c diff --git a/src/place.h b/src/core/place.h similarity index 100% rename from src/place.h rename to src/core/place.h diff --git a/src/prefs.c b/src/core/prefs.c similarity index 100% rename from src/prefs.c rename to src/core/prefs.c diff --git a/src/screen.c b/src/core/screen.c similarity index 100% rename from src/screen.c rename to src/core/screen.c diff --git a/src/screen.h b/src/core/screen.h similarity index 100% rename from src/screen.h rename to src/core/screen.h diff --git a/src/session.c b/src/core/session.c similarity index 100% rename from src/session.c rename to src/core/session.c diff --git a/src/session.h b/src/core/session.h similarity index 100% rename from src/session.h rename to src/core/session.h diff --git a/src/spring-model.c b/src/core/spring-model.c similarity index 100% rename from src/spring-model.c rename to src/core/spring-model.c diff --git a/src/spring-model.h b/src/core/spring-model.h similarity index 100% rename from src/spring-model.h rename to src/core/spring-model.h diff --git a/src/stack.c b/src/core/stack.c similarity index 100% rename from src/stack.c rename to src/core/stack.c diff --git a/src/stack.h b/src/core/stack.h similarity index 100% rename from src/stack.h rename to src/core/stack.h diff --git a/src/testasyncgetprop.c b/src/core/testasyncgetprop.c similarity index 100% rename from src/testasyncgetprop.c rename to src/core/testasyncgetprop.c diff --git a/src/testboxes.c b/src/core/testboxes.c similarity index 100% rename from src/testboxes.c rename to src/core/testboxes.c diff --git a/src/util.c b/src/core/util.c similarity index 100% rename from src/util.c rename to src/core/util.c diff --git a/src/window-props.c b/src/core/window-props.c similarity index 100% rename from src/window-props.c rename to src/core/window-props.c diff --git a/src/window-props.h b/src/core/window-props.h similarity index 100% rename from src/window-props.h rename to src/core/window-props.h diff --git a/src/window.c b/src/core/window.c similarity index 100% rename from src/window.c rename to src/core/window.c diff --git a/src/window.h b/src/core/window.h similarity index 100% rename from src/window.h rename to src/core/window.h diff --git a/src/workspace.c b/src/core/workspace.c similarity index 100% rename from src/workspace.c rename to src/core/workspace.c diff --git a/src/workspace.h b/src/core/workspace.h similarity index 100% rename from src/workspace.h rename to src/core/workspace.h diff --git a/src/xprops.c b/src/core/xprops.c similarity index 100% rename from src/xprops.c rename to src/core/xprops.c diff --git a/src/xprops.h b/src/core/xprops.h similarity index 100% rename from src/xprops.h rename to src/core/xprops.h diff --git a/src/boxes.h b/src/include/boxes.h similarity index 100% rename from src/boxes.h rename to src/include/boxes.h diff --git a/src/common.h b/src/include/common.h similarity index 100% rename from src/common.h rename to src/include/common.h diff --git a/src/core.h b/src/include/core.h similarity index 100% rename from src/core.h rename to src/include/core.h diff --git a/src/main.h b/src/include/main.h similarity index 100% rename from src/main.h rename to src/include/main.h diff --git a/src/prefs.h b/src/include/prefs.h similarity index 100% rename from src/prefs.h rename to src/include/prefs.h diff --git a/src/resizepopup.h b/src/include/resizepopup.h similarity index 100% rename from src/resizepopup.h rename to src/include/resizepopup.h diff --git a/src/tabpopup.h b/src/include/tabpopup.h similarity index 100% rename from src/tabpopup.h rename to src/include/tabpopup.h diff --git a/src/ui.h b/src/include/ui.h similarity index 100% rename from src/ui.h rename to src/include/ui.h diff --git a/src/util.h b/src/include/util.h similarity index 100% rename from src/util.h rename to src/include/util.h diff --git a/src/colors.c b/src/ui/colors.c similarity index 100% rename from src/colors.c rename to src/ui/colors.c diff --git a/src/colors.h b/src/ui/colors.h similarity index 100% rename from src/colors.h rename to src/ui/colors.h diff --git a/src/draw-workspace.c b/src/ui/draw-workspace.c similarity index 100% rename from src/draw-workspace.c rename to src/ui/draw-workspace.c diff --git a/src/draw-workspace.h b/src/ui/draw-workspace.h similarity index 100% rename from src/draw-workspace.h rename to src/ui/draw-workspace.h diff --git a/src/fixedtip.c b/src/ui/fixedtip.c similarity index 100% rename from src/fixedtip.c rename to src/ui/fixedtip.c diff --git a/src/fixedtip.h b/src/ui/fixedtip.h similarity index 100% rename from src/fixedtip.h rename to src/ui/fixedtip.h diff --git a/src/frames.c b/src/ui/frames.c similarity index 99% rename from src/frames.c rename to src/ui/frames.c index e762fea96..ef7e0099a 100644 --- a/src/frames.c +++ b/src/ui/frames.c @@ -33,7 +33,6 @@ #include "fixedtip.h" #include "theme.h" #include "prefs.h" -#include "errors.h" #include "ui.h" #ifdef HAVE_SHAPE diff --git a/src/frames.h b/src/ui/frames.h similarity index 100% rename from src/frames.h rename to src/ui/frames.h diff --git a/src/gradient.c b/src/ui/gradient.c similarity index 100% rename from src/gradient.c rename to src/ui/gradient.c diff --git a/src/gradient.h b/src/ui/gradient.h similarity index 100% rename from src/gradient.h rename to src/ui/gradient.h diff --git a/src/menu.c b/src/ui/menu.c similarity index 100% rename from src/menu.c rename to src/ui/menu.c diff --git a/src/menu.h b/src/ui/menu.h similarity index 100% rename from src/menu.h rename to src/ui/menu.h diff --git a/src/metaaccellabel.c b/src/ui/metaaccellabel.c similarity index 100% rename from src/metaaccellabel.c rename to src/ui/metaaccellabel.c diff --git a/src/metaaccellabel.h b/src/ui/metaaccellabel.h similarity index 100% rename from src/metaaccellabel.h rename to src/ui/metaaccellabel.h diff --git a/src/metacity-dialog.c b/src/ui/metacity-dialog.c similarity index 100% rename from src/metacity-dialog.c rename to src/ui/metacity-dialog.c diff --git a/src/preview-widget.c b/src/ui/preview-widget.c similarity index 100% rename from src/preview-widget.c rename to src/ui/preview-widget.c diff --git a/src/preview-widget.h b/src/ui/preview-widget.h similarity index 100% rename from src/preview-widget.h rename to src/ui/preview-widget.h diff --git a/src/resizepopup.c b/src/ui/resizepopup.c similarity index 100% rename from src/resizepopup.c rename to src/ui/resizepopup.c diff --git a/src/tabpopup.c b/src/ui/tabpopup.c similarity index 99% rename from src/tabpopup.c rename to src/ui/tabpopup.c index 5a04e4499..3d4e863a1 100644 --- a/src/tabpopup.c +++ b/src/ui/tabpopup.c @@ -28,9 +28,11 @@ #include "util.h" #include "core.h" #include "tabpopup.h" -#include "workspace.h" /* FIXME should not be included in this file */ +/* FIXME these two includes are 100% broken ... + */ +#include "../core/workspace.h" +#include "../core/frame.h" #include "draw-workspace.h" -#include "frame.h" #include #include diff --git a/src/testgradient.c b/src/ui/testgradient.c similarity index 100% rename from src/testgradient.c rename to src/ui/testgradient.c diff --git a/src/theme-parser.c b/src/ui/theme-parser.c similarity index 100% rename from src/theme-parser.c rename to src/ui/theme-parser.c diff --git a/src/theme-parser.h b/src/ui/theme-parser.h similarity index 100% rename from src/theme-parser.h rename to src/ui/theme-parser.h diff --git a/src/theme-viewer.c b/src/ui/theme-viewer.c similarity index 100% rename from src/theme-viewer.c rename to src/ui/theme-viewer.c diff --git a/src/theme.c b/src/ui/theme.c similarity index 100% rename from src/theme.c rename to src/ui/theme.c diff --git a/src/theme.h b/src/ui/theme.h similarity index 100% rename from src/theme.h rename to src/ui/theme.h diff --git a/src/themewidget.c b/src/ui/themewidget.c similarity index 100% rename from src/themewidget.c rename to src/ui/themewidget.c diff --git a/src/themewidget.h b/src/ui/themewidget.h similarity index 100% rename from src/themewidget.h rename to src/ui/themewidget.h diff --git a/src/ui.c b/src/ui/ui.c similarity index 99% rename from src/ui.c rename to src/ui/ui.c index 5d35febb7..597d9459e 100644 --- a/src/ui.c +++ b/src/ui/ui.c @@ -30,7 +30,6 @@ #include "menu.h" #include "core.h" #include "theme.h" -#include "iconcache.h" #include "inlinepixbufs.h"