From c84da3ce1babdf9620179aa8f75a515428169e5b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sat, 5 Mar 2011 19:29:12 -0500 Subject: [PATCH] Move the installed includes to a subdir If mutter is going to be a "real" library, then it should install its includes so that users can do #include rather than #include So rename the includedir accordingly, move src/include to src/meta, and fix up all internal references. There were a handful of header files in src/include that were not installed; this appears to have been part of a plan to keep core/, ui/, and compositor/ from looking at each others' private includes, but that wasn't really working anyway. So move all non-installed headers back into core/ or ui/. https://bugzilla.gnome.org/show_bug.cgi?id=643959 --- po/POTFILES.in | 2 +- src/Makefile.am | 113 ++++++++++--------- src/compositor/compositor-private.h | 4 +- src/compositor/compositor.c | 16 +-- src/compositor/meta-background-actor.c | 2 +- src/compositor/meta-background-actor.h | 2 +- src/compositor/meta-module.c | 2 +- src/compositor/meta-plugin-manager.c | 8 +- src/compositor/meta-plugin-manager.h | 6 +- src/compositor/meta-plugin.c | 6 +- src/compositor/meta-shadow-factory-private.h | 2 +- src/compositor/meta-window-actor-private.h | 2 +- src/compositor/meta-window-actor.c | 6 +- src/compositor/meta-window-group.h | 2 +- src/compositor/plugins/Makefile.am | 2 +- src/compositor/plugins/default.c | 4 +- src/{include => core}/all-keybindings.h | 0 src/core/bell.c | 2 +- src/core/bell.h | 2 +- src/core/boxes-private.h | 4 +- src/core/boxes.c | 2 +- src/core/constraints.c | 2 +- src/core/constraints.h | 4 +- src/core/core.c | 6 +- src/{include => core}/core.h | 2 +- src/core/delete.c | 6 +- src/core/display-private.h | 10 +- src/core/display.c | 16 +-- src/core/errors.c | 2 +- src/core/frame.c | 4 +- src/core/{frame-private.h => frame.h} | 4 +- src/core/group-private.h | 2 +- src/core/group-props.h | 2 +- src/core/group.c | 4 +- src/core/iconcache.c | 2 +- src/core/keybindings-private.h | 2 +- src/core/keybindings.c | 8 +- src/core/main.c | 10 +- src/core/mutter.c | 6 +- src/core/place.c | 4 +- src/core/place.h | 2 +- src/core/prefs.c | 5 +- src/core/screen-private.h | 2 +- src/core/screen.c | 12 +- src/core/session.c | 6 +- src/core/stack-tracker.c | 6 +- src/core/stack-tracker.h | 2 +- src/core/stack.c | 10 +- src/core/util.c | 6 +- src/core/window-private.h | 6 +- src/core/window-props.c | 6 +- src/core/window.c | 10 +- src/core/workspace-private.h | 2 +- src/core/workspace.c | 8 +- src/core/xprops.c | 4 +- src/{include => core}/xprops.h | 2 +- src/include/frame.h | 31 ----- src/libmutter-wm.pc.in | 2 +- src/{include => meta}/atomnames.h | 0 src/{include => meta}/boxes.h | 2 +- src/{include => meta}/common.h | 0 src/{include => meta}/compositor-mutter.h | 6 +- src/{include => meta}/compositor.h | 8 +- src/{include => meta}/display.h | 6 +- src/{include => meta}/errors.h | 4 +- src/{ui => meta}/gradient.h | 0 src/{include => meta}/group.h | 2 +- src/{include => meta}/keybindings.h | 4 +- src/{include => meta}/main.h | 0 src/{include => meta}/meta-plugin.h | 6 +- src/{include => meta}/meta-shadow-factory.h | 0 src/{include => meta}/meta-window-actor.h | 2 +- src/{include => meta}/prefs.h | 2 +- src/{ui => meta}/preview-widget.h | 3 +- src/{include => meta}/screen.h | 4 +- src/{ui => meta}/theme.h | 0 src/{include => meta}/types.h | 0 src/{include => meta}/util.h | 2 +- src/{include => meta}/window.h | 4 +- src/{include => meta}/workspace.h | 6 +- src/ui/frames.c | 8 +- src/ui/frames.h | 2 +- src/ui/gradient.c | 4 +- src/ui/menu.c | 4 +- src/ui/metaaccellabel.c | 2 +- src/ui/metaaccellabel.h | 2 +- src/ui/preview-widget.c | 3 +- src/ui/resizepopup.c | 2 +- src/{include => ui}/resizepopup.h | 4 +- src/ui/tabpopup.c | 6 +- src/{include => ui}/tabpopup.h | 4 +- src/ui/testgradient.c | 2 +- src/ui/theme-parser.c | 2 +- src/ui/theme-private.h | 8 +- src/ui/theme-viewer.c | 7 +- src/ui/theme.c | 4 +- src/{include => ui}/tile-preview.h | 2 +- src/ui/ui.c | 4 +- src/{include => ui}/ui.h | 2 +- 99 files changed, 257 insertions(+), 283 deletions(-) rename src/{include => core}/all-keybindings.h (100%) rename src/{include => core}/core.h (99%) rename src/core/{frame-private.h => frame.h} (95%) rename src/{include => core}/xprops.h (99%) delete mode 100644 src/include/frame.h rename src/{include => meta}/atomnames.h (100%) rename src/{include => meta}/boxes.h (99%) rename src/{include => meta}/common.h (100%) rename src/{include => meta}/compositor-mutter.h (94%) rename src/{include => meta}/compositor.h (98%) rename src/{include => meta}/display.h (98%) rename src/{include => meta}/errors.h (96%) rename src/{ui => meta}/gradient.h (100%) rename src/{include => meta}/group.h (98%) rename src/{include => meta}/keybindings.h (97%) rename src/{include => meta}/main.h (100%) rename src/{include => meta}/meta-plugin.h (99%) rename src/{include => meta}/meta-shadow-factory.h (100%) rename src/{include => meta}/meta-window-actor.h (98%) rename src/{include => meta}/prefs.h (99%) rename src/{ui => meta}/preview-widget.h (98%) rename src/{include => meta}/screen.h (98%) rename src/{ui => meta}/theme.h (100%) rename src/{include => meta}/types.h (100%) rename src/{include => meta}/util.h (99%) rename src/{include => meta}/window.h (99%) rename src/{include => meta}/workspace.h (97%) rename src/{include => ui}/resizepopup.h (97%) rename src/{include => ui}/tabpopup.h (98%) rename src/{include => ui}/tile-preview.h (98%) rename src/{include => ui}/ui.h (99%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4a683d9d8..ee40c1aa8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. +src/core/all-keybindings.h src/core/bell.c src/core/core.c src/core/delete.c @@ -15,7 +16,6 @@ src/core/util.c src/core/window.c src/core/window-props.c src/core/xprops.c -src/include/all-keybindings.h src/mutter.desktop.in src/mutter-wm.desktop.in src/mutter.schemas.in diff --git a/src/Makefile.am b/src/Makefile.am index 3aa38ace4..4e02816bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,9 @@ SUBDIRS=wm-tester tools compositor/plugins INCLUDES= \ $(MUTTER_CFLAGS) \ - -I$(srcdir)/include \ + -I$(srcdir) \ + -I$(srcdir)/core \ + -I$(srcdir)/ui \ -I$(srcdir)/compositor \ -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" \ -DHOST_ALIAS=\"@HOST_ALIAS@\" \ @@ -37,7 +39,7 @@ libmutter_wm_la_SOURCES = \ core/bell.h \ core/boxes.c \ core/boxes-private.h \ - include/boxes.h \ + meta/boxes.h \ compositor/cogl-utils.c \ compositor/cogl-utils.h \ compositor/compositor.c \ @@ -63,11 +65,11 @@ libmutter_wm_la_SOURCES = \ compositor/meta-window-shape.h \ compositor/region-utils.c \ compositor/region-utils.h \ - include/compositor.h \ - include/meta-plugin.h \ - include/meta-shadow-factory.h \ - include/meta-window-actor.h \ - include/compositor-mutter.h \ + meta/compositor.h \ + meta/meta-plugin.h \ + meta/meta-shadow-factory.h \ + meta/meta-window-actor.h \ + meta/compositor-mutter.h \ core/above-tab-keycode.c \ core/constraints.c \ core/constraints.h \ @@ -75,25 +77,24 @@ libmutter_wm_la_SOURCES = \ core/delete.c \ core/display.c \ core/display-private.h \ - include/display.h \ + meta/display.h \ ui/draw-workspace.c \ ui/draw-workspace.h \ core/edge-resistance.c \ core/edge-resistance.h \ core/errors.c \ - include/errors.h \ + meta/errors.h \ core/eventqueue.c \ core/eventqueue.h \ core/frame.c \ - core/frame-private.h \ - include/frame.h \ + core/frame.h \ ui/gradient.c \ - ui/gradient.h \ + meta/gradient.h \ core/group-private.h \ core/group-props.c \ core/group-props.h \ core/group.c \ - include/group.h \ + meta/group.h \ core/iconcache.c \ core/iconcache.h \ core/keybindings.c \ @@ -103,11 +104,11 @@ libmutter_wm_la_SOURCES = \ core/place.c \ core/place.h \ core/prefs.c \ - include/prefs.h \ + meta/prefs.h \ core/screen.c \ core/screen-private.h \ - include/screen.h \ - include/types.h \ + meta/screen.h \ + meta/types.h \ core/session.c \ core/session.h \ core/stack.c \ @@ -115,19 +116,19 @@ libmutter_wm_la_SOURCES = \ core/stack-tracker.c \ core/stack-tracker.h \ core/util.c \ - include/util.h \ + meta/util.h \ core/window-props.c \ core/window-props.h \ core/window.c \ core/window-private.h \ - include/window.h \ + meta/window.h \ core/workspace.c \ core/workspace-private.h \ core/xprops.c \ - include/xprops.h \ - include/common.h \ - include/core.h \ - include/ui.h \ + core/xprops.h \ + meta/common.h \ + core/core.h \ + ui/ui.h \ inlinepixbufs.h \ ui/fixedtip.c \ ui/fixedtip.h \ @@ -138,17 +139,17 @@ libmutter_wm_la_SOURCES = \ ui/metaaccellabel.c \ ui/metaaccellabel.h \ ui/resizepopup.c \ - include/resizepopup.h \ + ui/resizepopup.h \ ui/tabpopup.c \ - include/tabpopup.h \ + ui/tabpopup.h \ ui/tile-preview.c \ - include/tile-preview.h \ + ui/tile-preview.h \ ui/theme-parser.c \ ui/theme.c \ - ui/theme.h \ + meta/theme.h \ ui/theme-private.h \ ui/ui.c \ - include/all-keybindings.h \ + core/all-keybindings.h \ $(mutter_built_sources) libmutter_wm_la_LDFLAGS = -no-undefined @@ -159,17 +160,17 @@ libmutter_wm_la_LIBADD = $(MUTTER_LIBS) libmutter_private_la_CFLAGS = libmutter_private_la_SOURCES= \ core/boxes.c \ - include/boxes.h \ + meta/boxes.h \ ui/gradient.c \ - ui/gradient.h \ + meta/gradient.h \ core/util.c \ - include/util.h \ - include/common.h \ + meta/util.h \ + meta/common.h \ ui/preview-widget.c \ - ui/preview-widget.h \ + meta/preview-widget.h \ ui/theme-parser.c \ ui/theme.c \ - ui/theme.h + meta/theme.h libmutter_private_la_LDFLAGS = -no-undefined libmutter_private_la_LIBADD = $(MUTTER_LIBS) @@ -177,35 +178,35 @@ libmutter_private_la_LIBADD = $(MUTTER_LIBS) # Headers installed for plugins; introspected information will # be extracted into Mutter-.gir libmutterinclude_base_headers = \ - include/boxes.h \ - ui/gradient.h \ - include/main.h \ - include/util.h \ - include/common.h \ - ui/theme.h \ - include/prefs.h \ - include/window.h \ - include/workspace.h \ - include/compositor.h \ - include/compositor-mutter.h \ - include/types.h \ - include/errors.h \ - include/screen.h \ - include/display.h \ - include/group.h \ - include/keybindings.h \ - include/meta-plugin.h \ - include/meta-shadow-factory.h \ - include/meta-window-actor.h + meta/boxes.h \ + meta/common.h \ + meta/compositor-mutter.h \ + meta/compositor.h \ + meta/display.h \ + meta/errors.h \ + meta/gradient.h \ + meta/group.h \ + meta/keybindings.h \ + meta/main.h \ + meta/meta-plugin.h \ + meta/meta-shadow-factory.h \ + meta/meta-window-actor.h \ + meta/prefs.h \ + meta/screen.h \ + meta/theme.h \ + meta/types.h \ + meta/util.h \ + meta/window.h \ + meta/workspace.h # Excluded from scanning for introspection but installed # preview-widget.h: only part of libmutter-private # atomnames.h: macros cause problems for scanning process libmutterinclude_extra_headers = \ - ui/preview-widget.h \ - include/atomnames.h + meta/preview-widget.h \ + meta/atomnames.h -libmutterincludedir = $(includedir)/mutter/mutter-private +libmutterincludedir = $(includedir)/mutter/meta libmutterinclude_HEADERS = \ $(libmutterinclude_base_headers) \ diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h index 03d218ca6..90dc63b82 100644 --- a/src/compositor/compositor-private.h +++ b/src/compositor/compositor-private.h @@ -5,8 +5,8 @@ #include -#include "compositor.h" -#include "display.h" +#include +#include #include "meta-plugin-manager.h" #include diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index c31f62382..4617ed86c 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -4,19 +4,19 @@ #include -#include "screen.h" -#include "errors.h" -#include "window.h" +#include +#include +#include #include "compositor-private.h" -#include "compositor-mutter.h" +#include #include "xprops.h" -#include "prefs.h" -#include "meta-shadow-factory.h" +#include +#include #include "meta-window-actor-private.h" #include "meta-window-group.h" #include "meta-background-actor.h" -#include "../core/window-private.h" /* to check window->hidden */ -#include "../core/display-private.h" /* for meta_display_lookup_x_window() */ +#include "window-private.h" /* to check window->hidden */ +#include "display-private.h" /* for meta_display_lookup_x_window() */ #include #include diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c index 7d980a180..7af8d627d 100644 --- a/src/compositor/meta-background-actor.c +++ b/src/compositor/meta-background-actor.c @@ -32,7 +32,7 @@ #include "cogl-utils.h" #include "compositor-private.h" -#include "errors.h" +#include #include "meta-background-actor.h" struct _MetaBackgroundActorClass diff --git a/src/compositor/meta-background-actor.h b/src/compositor/meta-background-actor.h index 448171aa2..d16a0f9c8 100644 --- a/src/compositor/meta-background-actor.h +++ b/src/compositor/meta-background-actor.h @@ -25,7 +25,7 @@ #include -#include "screen.h" +#include /** * MetaBackgroundActor: diff --git a/src/compositor/meta-module.c b/src/compositor/meta-module.c index 0b7680eae..9c8cb1626 100644 --- a/src/compositor/meta-module.c +++ b/src/compositor/meta-module.c @@ -21,7 +21,7 @@ * 02111-1307, USA. */ -#include "meta-plugin.h" +#include #include "meta-module.h" #include diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c index 1001a01d8..bc4b9c71c 100644 --- a/src/compositor/meta-plugin-manager.c +++ b/src/compositor/meta-plugin-manager.c @@ -24,11 +24,11 @@ #include "config.h" #include "compositor-private.h" #include "meta-plugin-manager.h" -#include "prefs.h" -#include "errors.h" -#include "workspace.h" +#include +#include +#include #include "meta-module.h" -#include "../core/window-private.h" +#include "window-private.h" #include #include diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h index ec09bdd45..59a7d02be 100644 --- a/src/compositor/meta-plugin-manager.h +++ b/src/compositor/meta-plugin-manager.h @@ -24,11 +24,11 @@ #ifndef META_PLUGIN_MANAGER_H_ #define META_PLUGIN_MANAGER_H_ -#include "types.h" -#include "screen.h" +#include +#include #define META_PLUGIN_FROM_MANAGER_ -#include "meta-plugin.h" +#include #undef META_PLUGIN_FROM_MANAGER_ #define META_PLUGIN_MINIMIZE (1<<0) diff --git a/src/compositor/meta-plugin.c b/src/compositor/meta-plugin.c index b8af4423e..055b1b06d 100644 --- a/src/compositor/meta-plugin.c +++ b/src/compositor/meta-plugin.c @@ -21,10 +21,10 @@ * 02111-1307, USA. */ -#include "meta-plugin.h" +#include #include "meta-plugin-manager.h" -#include "screen.h" -#include "display.h" +#include +#include #include #include diff --git a/src/compositor/meta-shadow-factory-private.h b/src/compositor/meta-shadow-factory-private.h index cd1492cc8..3d51cbbc5 100644 --- a/src/compositor/meta-shadow-factory-private.h +++ b/src/compositor/meta-shadow-factory-private.h @@ -28,7 +28,7 @@ #include #include #include "meta-window-shape.h" -#include "meta-shadow-factory.h" +#include /** * MetaShadow: diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h index 23d52f83b..068bfb967 100644 --- a/src/compositor/meta-window-actor-private.h +++ b/src/compositor/meta-window-actor-private.h @@ -6,7 +6,7 @@ #include #include -#include "compositor-mutter.h" +#include MetaWindowActor *meta_window_actor_new (MetaWindow *window); diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index 1d755558a..ddffae3ea 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -13,10 +13,10 @@ #include #include /* for gdk_rectangle_union() */ -#include "display.h" -#include "errors.h" +#include +#include #include "frame.h" -#include "window.h" +#include #include "xprops.h" #include "compositor-private.h" diff --git a/src/compositor/meta-window-group.h b/src/compositor/meta-window-group.h index 4aa3dd01f..0e0dc1873 100644 --- a/src/compositor/meta-window-group.h +++ b/src/compositor/meta-window-group.h @@ -5,7 +5,7 @@ #include -#include "screen.h" +#include /** * MetaWindowGroup: diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am index 0c9d4bda1..ac7d23cd6 100644 --- a/src/compositor/plugins/Makefile.am +++ b/src/compositor/plugins/Makefile.am @@ -1,7 +1,7 @@ pkglibdir=@MUTTER_PLUGIN_DIR@ -INCLUDES=@MUTTER_CFLAGS@ -I $(top_srcdir)/src/include -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\" +INCLUDES=@MUTTER_CFLAGS@ -I $(top_srcdir)/src -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\" default_la_CFLAGS = -fPIC default_la_SOURCES = default.c diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c index 89e2648f2..791715d68 100644 --- a/src/compositor/plugins/default.c +++ b/src/compositor/plugins/default.c @@ -21,8 +21,8 @@ * 02111-1307, USA. */ -#include "meta-plugin.h" -#include "window.h" +#include +#include #include #define _(x) dgettext (GETTEXT_PACKAGE, x) diff --git a/src/include/all-keybindings.h b/src/core/all-keybindings.h similarity index 100% rename from src/include/all-keybindings.h rename to src/core/all-keybindings.h diff --git a/src/core/bell.c b/src/core/bell.c index ef6eb163c..81103a400 100644 --- a/src/core/bell.c +++ b/src/core/bell.c @@ -51,7 +51,7 @@ #include #include "bell.h" #include "screen-private.h" -#include "prefs.h" +#include #ifdef HAVE_LIBCANBERRA #include #endif diff --git a/src/core/bell.h b/src/core/bell.h index 930f3a02f..50f059f04 100644 --- a/src/core/bell.h +++ b/src/core/bell.h @@ -36,7 +36,7 @@ #include #endif #include "display-private.h" -#include "frame-private.h" +#include "frame.h" #ifdef HAVE_XKB /** diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h index a185bf10e..8e402b0dd 100644 --- a/src/core/boxes-private.h +++ b/src/core/boxes-private.h @@ -25,8 +25,8 @@ #define META_BOXES_PRIVATE_H #include -#include "common.h" -#include "boxes.h" +#include +#include #define BOX_LEFT(box) ((box).x) /* Leftmost pixel of rect */ #define BOX_RIGHT(box) ((box).x + (box).width) /* One pixel past right */ diff --git a/src/core/boxes.c b/src/core/boxes.c index 57df28489..8cfd5f565 100644 --- a/src/core/boxes.c +++ b/src/core/boxes.c @@ -27,7 +27,7 @@ */ #include "boxes-private.h" -#include "util.h" +#include #include /* Just for the definition of the various gravities */ /* It would make sense to use GSlice here, but until we clean up the diff --git a/src/core/constraints.c b/src/core/constraints.c index 404028c30..dbdf840f5 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -28,7 +28,7 @@ #include "constraints.h" #include "workspace-private.h" #include "place.h" -#include "prefs.h" +#include #include #include diff --git a/src/core/constraints.h b/src/core/constraints.h index fa3f03911..0e50aa7f6 100644 --- a/src/core/constraints.h +++ b/src/core/constraints.h @@ -25,9 +25,9 @@ #ifndef META_CONSTRAINTS_H #define META_CONSTRAINTS_H -#include "util.h" +#include #include "window-private.h" -#include "frame-private.h" +#include "frame.h" typedef enum { diff --git a/src/core/core.c b/src/core/core.c index 7fee2fc78..54345729c 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -25,10 +25,10 @@ #include #include "core.h" -#include "frame-private.h" +#include "frame.h" #include "workspace-private.h" -#include "prefs.h" -#include "errors.h" +#include +#include /* Looks up the MetaWindow representing the frame of the given X window. * Used as a helper function by a bunch of the functions below. diff --git a/src/include/core.h b/src/core/core.h similarity index 99% rename from src/include/core.h rename to src/core/core.h index 045d9c5f6..a2feb238b 100644 --- a/src/include/core.h +++ b/src/core/core.h @@ -27,7 +27,7 @@ /* Don't include core headers here */ #include -#include "common.h" +#include typedef enum { diff --git a/src/core/delete.c b/src/core/delete.c index 81f6c8c1b..0ae1676da 100644 --- a/src/core/delete.c +++ b/src/core/delete.c @@ -25,10 +25,10 @@ #define _XOPEN_SOURCE /* for kill() */ #include -#include "util.h" +#include #include "window-private.h" -#include "errors.h" -#include "workspace.h" +#include +#include #include #include diff --git a/src/core/display-private.h b/src/core/display-private.h index a233b4d63..cccc04e0f 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -34,11 +34,11 @@ #include #include #include "eventqueue.h" -#include "common.h" -#include "boxes.h" -#include "display.h" +#include +#include +#include #include "keybindings-private.h" -#include "prefs.h" +#include #ifdef HAVE_STARTUP_NOTIFICATION #include @@ -99,7 +99,7 @@ struct _MetaDisplay * class is constructed. */ #define item(x) Atom atom_##x; -#include "atomnames.h" +#include #undef item /* This is the actual window from focus events, diff --git a/src/core/display.c b/src/core/display.c index 5ee3e3a1a..a21838d6b 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -34,21 +34,21 @@ #include #include "display-private.h" -#include "util.h" -#include "main.h" +#include +#include #include "screen-private.h" #include "window-private.h" #include "window-props.h" #include "group-props.h" -#include "frame-private.h" -#include "errors.h" +#include "frame.h" +#include #include "keybindings-private.h" -#include "prefs.h" +#include #include "resizepopup.h" #include "xprops.h" #include "workspace-private.h" #include "bell.h" -#include "compositor.h" +#include #include #include #ifdef HAVE_SOLARIS_XINERAMA @@ -417,7 +417,7 @@ meta_display_open (void) /* A list of all atom names, so that we can intern them in one go. */ char *atom_names[] = { #define item(x) #x, -#include "atomnames.h" +#include #undef item }; Atom atoms[G_N_ELEMENTS(atom_names)]; @@ -490,7 +490,7 @@ meta_display_open (void) { int i = 0; #define item(x) the_display->atom_##x = atoms[i++]; -#include "atomnames.h" +#include #undef item } diff --git a/src/core/errors.c b/src/core/errors.c index f5a95d794..df44cb207 100644 --- a/src/core/errors.c +++ b/src/core/errors.c @@ -23,7 +23,7 @@ */ #include -#include "errors.h" +#include #include "display-private.h" #include #include diff --git a/src/core/frame.c b/src/core/frame.c index 2951aa467..c533f565f 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -24,9 +24,9 @@ */ #include -#include "frame-private.h" +#include "frame.h" #include "bell.h" -#include "errors.h" +#include #include "keybindings-private.h" #include diff --git a/src/core/frame-private.h b/src/core/frame.h similarity index 95% rename from src/core/frame-private.h rename to src/core/frame.h index 89c3d4260..019d6b354 100644 --- a/src/core/frame-private.h +++ b/src/core/frame.h @@ -24,7 +24,6 @@ #ifndef META_FRAME_PRIVATE_H #define META_FRAME_PRIVATE_H -#include "frame.h" #include "window-private.h" typedef struct _MetaFrameGeometry MetaFrameGeometry; @@ -68,7 +67,8 @@ void meta_window_ensure_frame (MetaWindow *window); void meta_window_destroy_frame (MetaWindow *window); void meta_frame_queue_draw (MetaFrame *frame); -MetaFrameFlags meta_frame_get_flags (MetaFrame *frame); +MetaFrameFlags meta_frame_get_flags (MetaFrame *frame); +Window meta_frame_get_xwindow (MetaFrame *frame); /* These should ONLY be called from meta_window_move_resize_internal */ void meta_frame_calc_geometry (MetaFrame *frame, diff --git a/src/core/group-private.h b/src/core/group-private.h index ad4ce39c9..6f56b1b16 100644 --- a/src/core/group-private.h +++ b/src/core/group-private.h @@ -24,7 +24,7 @@ #ifndef META_GROUP_PRIVATE_H #define META_GROUP_PRIVATE_H -#include "group.h" +#include struct _MetaGroup { diff --git a/src/core/group-props.h b/src/core/group-props.h index a663e3a42..a0fb70f6b 100644 --- a/src/core/group-props.h +++ b/src/core/group-props.h @@ -24,7 +24,7 @@ #ifndef META_GROUP_PROPS_H #define META_GROUP_PROPS_H -#include "group.h" +#include #include "window-private.h" void meta_group_reload_property (MetaGroup *group, diff --git a/src/core/group.c b/src/core/group.c index fcf01ac47..f6b839a42 100644 --- a/src/core/group.c +++ b/src/core/group.c @@ -23,11 +23,11 @@ */ #include -#include "util.h" +#include #include "group-private.h" #include "group-props.h" #include "window-private.h" -#include "window.h" +#include static MetaGroup* meta_group_new (MetaDisplay *display, diff --git a/src/core/iconcache.c b/src/core/iconcache.c index 18ec9d969..df9b8dce0 100644 --- a/src/core/iconcache.c +++ b/src/core/iconcache.c @@ -24,7 +24,7 @@ #include #include "iconcache.h" #include "ui.h" -#include "errors.h" +#include #include diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h index 01f6447c4..9571100b4 100644 --- a/src/core/keybindings-private.h +++ b/src/core/keybindings-private.h @@ -29,7 +29,7 @@ #ifndef META_KEYBINDINGS_PRIVATE_H #define META_KEYBINDINGS_PRIVATE_H -#include "keybindings.h" +#include void meta_display_init_keys (MetaDisplay *display); void meta_display_shutdown_keys (MetaDisplay *display); diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 303bec868..f52b1408b 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -29,13 +29,13 @@ #include #include "keybindings-private.h" #include "workspace-private.h" -#include "errors.h" +#include #include "edge-resistance.h" #include "ui.h" -#include "frame-private.h" +#include "frame.h" #include "place.h" -#include "prefs.h" -#include "util.h" +#include +#include #include #include diff --git a/src/core/main.c b/src/core/main.c index 3fb8c4e8c..d0d40eae9 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -45,14 +45,14 @@ #define _SVID_SOURCE /* for putenv() and some signal-related functions */ #include -#include "main.h" -#include "util.h" +#include +#include #include "display-private.h" -#include "errors.h" +#include #include "ui.h" #include "session.h" -#include "prefs.h" -#include "compositor.h" +#include +#include #include #include diff --git a/src/core/mutter.c b/src/core/mutter.c index 64085c2bf..159bbf399 100644 --- a/src/core/mutter.c +++ b/src/core/mutter.c @@ -23,10 +23,10 @@ #include -#include "main.h" -#include "util.h" +#include +#include #ifdef HAVE_INTROSPECTION -#include "compositor/meta-plugin-manager.h" +#include "meta-plugin-manager.h" #endif #include diff --git a/src/core/place.c b/src/core/place.c index 9d7a9f2c1..fa94186bd 100644 --- a/src/core/place.c +++ b/src/core/place.c @@ -28,8 +28,8 @@ #include "boxes-private.h" #include "place.h" -#include "workspace.h" -#include "prefs.h" +#include +#include #include #include #include diff --git a/src/core/place.h b/src/core/place.h index be825b1a5..438ee028e 100644 --- a/src/core/place.h +++ b/src/core/place.h @@ -25,7 +25,7 @@ #define META_PLACE_H #include "window-private.h" -#include "frame-private.h" +#include "frame.h" void meta_window_place (MetaWindow *window, MetaFrameGeometry *fgeom, diff --git a/src/core/prefs.c b/src/core/prefs.c index 25306314b..1d0c1183a 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -24,9 +24,10 @@ */ #include -#include "prefs.h" +#include #include "ui.h" -#include "util.h" +#include +#include "meta-plugin-manager.h" #ifdef HAVE_GCONF #include #endif diff --git a/src/core/screen-private.h b/src/core/screen-private.h index c7373e258..8a2dea725 100644 --- a/src/core/screen-private.h +++ b/src/core/screen-private.h @@ -34,7 +34,7 @@ #define META_SCREEN_PRIVATE_H #include "display-private.h" -#include "screen.h" +#include #include #include "stack-tracker.h" #include "ui.h" diff --git a/src/core/screen.c b/src/core/screen.c index b656c25f0..2f42ac2b8 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -28,16 +28,16 @@ #include #include "screen-private.h" -#include "util.h" -#include "errors.h" +#include +#include #include "window-private.h" -#include "frame-private.h" -#include "prefs.h" +#include "frame.h" +#include #include "workspace-private.h" #include "keybindings-private.h" #include "stack.h" #include "xprops.h" -#include "compositor.h" +#include #include "mutter-marshal.h" #include "mutter-enum-types.h" @@ -277,7 +277,7 @@ set_supported_hint (MetaScreen *screen) Atom atoms[] = { #define EWMH_ATOMS_ONLY #define item(x) screen->display->atom_##x, -#include "atomnames.h" +#include #undef item #undef EWMH_ATOMS_ONLY }; diff --git a/src/core/session.c b/src/core/session.c index ccc570ff8..2ebf1f7a6 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -69,10 +69,10 @@ meta_window_release_saved_state (const MetaWindowSessionInfo *info) #include #include #include -#include "main.h" -#include "util.h" +#include +#include #include "display-private.h" -#include "workspace.h" +#include static void ice_io_error_handler (IceConn connection); diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index 94158079b..585aa6c91 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -23,12 +23,12 @@ #include -#include "frame-private.h" +#include "frame.h" #include "screen-private.h" #include "stack-tracker.h" -#include "util.h" +#include -#include "compositor.h" +#include /* The complexity here comes from resolving two competing factors: * diff --git a/src/core/stack-tracker.h b/src/core/stack-tracker.h index 557c459a0..cb12dcd00 100644 --- a/src/core/stack-tracker.h +++ b/src/core/stack-tracker.h @@ -36,7 +36,7 @@ #ifndef META_STACK_TRACKER_H #define META_STACK_TRACKER_H -#include "screen.h" +#include typedef struct _MetaStackTracker MetaStackTracker; diff --git a/src/core/stack.c b/src/core/stack.c index 1aecc372a..c3917c6d8 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -29,11 +29,11 @@ #include #include "stack.h" #include "window-private.h" -#include "errors.h" -#include "frame-private.h" -#include "group.h" -#include "prefs.h" -#include "workspace.h" +#include +#include "frame.h" +#include +#include +#include #include diff --git a/src/core/util.c b/src/core/util.c index 1aadc2e68..2ea5eb5a9 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -26,9 +26,9 @@ #define _POSIX_C_SOURCE 200112L /* for fdopen() */ #include -#include "common.h" -#include "util.h" -#include "main.h" +#include +#include +#include #include /* For clutter_threads_add_repaint_func() */ diff --git a/src/core/window-private.h b/src/core/window-private.h index 6538db86a..e75f13aa3 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -35,10 +35,10 @@ #define META_WINDOW_PRIVATE_H #include -#include "compositor.h" -#include "window.h" +#include +#include #include "screen-private.h" -#include "util.h" +#include #include "stack.h" #include "iconcache.h" #include diff --git a/src/core/window-props.c b/src/core/window-props.c index ce578ff88..5828eb172 100644 --- a/src/core/window-props.c +++ b/src/core/window-props.c @@ -40,10 +40,10 @@ #include #include "window-props.h" -#include "errors.h" +#include #include "xprops.h" -#include "frame-private.h" -#include "group.h" +#include "frame.h" +#include #include #include #include diff --git a/src/core/window.c b/src/core/window.c index 945920e88..b63352e62 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -28,19 +28,19 @@ #include "window-private.h" #include "boxes-private.h" #include "edge-resistance.h" -#include "util.h" -#include "frame-private.h" -#include "errors.h" +#include +#include "frame.h" +#include #include "workspace-private.h" #include "stack.h" #include "keybindings-private.h" #include "ui.h" #include "place.h" #include "session.h" -#include "prefs.h" +#include #include "resizepopup.h" #include "xprops.h" -#include "group.h" +#include #include "window-props.h" #include "constraints.h" #include "mutter-enum-types.h" diff --git a/src/core/workspace-private.h b/src/core/workspace-private.h index 1a8b9771a..f1391d0c8 100644 --- a/src/core/workspace-private.h +++ b/src/core/workspace-private.h @@ -33,7 +33,7 @@ #ifndef META_WORKSPACE_PRIVATE_H #define META_WORKSPACE_PRIVATE_H -#include "workspace.h" +#include #include "window-private.h" struct _MetaWorkspace diff --git a/src/core/workspace.c b/src/core/workspace.c index 51a3de755..66f9dd0ea 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -25,13 +25,13 @@ #include #include "screen-private.h" -#include "workspace.h" +#include #include "workspace-private.h" #include "boxes-private.h" -#include "errors.h" -#include "prefs.h" +#include +#include -#include "compositor.h" +#include #include #include diff --git a/src/core/xprops.c b/src/core/xprops.c index 306f0f1d5..afff775db 100644 --- a/src/core/xprops.c +++ b/src/core/xprops.c @@ -82,8 +82,8 @@ from The Open Group. #include #include "xprops.h" -#include "errors.h" -#include "util.h" +#include +#include #include "async-getprop.h" #include "ui.h" #include "mutter-Xatomtype.h" diff --git a/src/include/xprops.h b/src/core/xprops.h similarity index 99% rename from src/include/xprops.h rename to src/core/xprops.h index b8d0f07c4..928e46be9 100644 --- a/src/include/xprops.h +++ b/src/core/xprops.h @@ -26,7 +26,7 @@ #include -#include "display.h" +#include #include #ifdef HAVE_XSYNC diff --git a/src/include/frame.h b/src/include/frame.h deleted file mode 100644 index eeb572639..000000000 --- a/src/include/frame.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* - * Copyright (C) 2008 Iain Holmes - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef META_FRAME_H -#define META_FRAME_H - -#include - -#include "types.h" - -Window meta_frame_get_xwindow (MetaFrame *frame); - -#endif diff --git a/src/libmutter-wm.pc.in b/src/libmutter-wm.pc.in index e76d5598f..d3982b5db 100644 --- a/src/libmutter-wm.pc.in +++ b/src/libmutter-wm.pc.in @@ -15,4 +15,4 @@ Description: Mutter window manager library Requires: gtk+-3.0 @CLUTTER_PACKAGE@ x11 Version: @VERSION@ Libs: -L${libdir} -lmutter-wm -Cflags: -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} +Cflags: -I${includedir}/mutter -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} diff --git a/src/include/atomnames.h b/src/meta/atomnames.h similarity index 100% rename from src/include/atomnames.h rename to src/meta/atomnames.h diff --git a/src/include/boxes.h b/src/meta/boxes.h similarity index 99% rename from src/include/boxes.h rename to src/meta/boxes.h index 3fabe2a81..4503c3070 100644 --- a/src/include/boxes.h +++ b/src/meta/boxes.h @@ -25,7 +25,7 @@ #define META_BOXES_H #include -#include "common.h" +#include #define META_TYPE_RECTANGLE (meta_rectangle_get_type ()) diff --git a/src/include/common.h b/src/meta/common.h similarity index 100% rename from src/include/common.h rename to src/meta/common.h diff --git a/src/include/compositor-mutter.h b/src/meta/compositor-mutter.h similarity index 94% rename from src/include/compositor-mutter.h rename to src/meta/compositor-mutter.h index b893106b2..4b7b78479 100644 --- a/src/include/compositor-mutter.h +++ b/src/meta/compositor-mutter.h @@ -28,9 +28,9 @@ #include #include -#include "types.h" -#include "compositor.h" -#include "meta-window-actor.h" +#include +#include +#include /* Public compositor API */ ClutterActor *meta_get_stage_for_screen (MetaScreen *screen); diff --git a/src/include/compositor.h b/src/meta/compositor.h similarity index 98% rename from src/include/compositor.h rename to src/meta/compositor.h index 7edacd08d..c36546b26 100644 --- a/src/include/compositor.h +++ b/src/meta/compositor.h @@ -25,10 +25,10 @@ #include #include -#include "types.h" -#include "boxes.h" -#include "window.h" -#include "workspace.h" +#include +#include +#include +#include /** * MetaCompEffect: diff --git a/src/include/display.h b/src/meta/display.h similarity index 98% rename from src/include/display.h rename to src/meta/display.h index d7b88f858..f4ac20f7a 100644 --- a/src/include/display.h +++ b/src/meta/display.h @@ -25,9 +25,9 @@ #include #include -#include "types.h" -#include "prefs.h" -#include "common.h" +#include +#include +#include typedef enum { diff --git a/src/include/errors.h b/src/meta/errors.h similarity index 96% rename from src/include/errors.h rename to src/meta/errors.h index 6aa57ec8b..6ac141722 100644 --- a/src/include/errors.h +++ b/src/meta/errors.h @@ -26,8 +26,8 @@ #include -#include "util.h" -#include "display.h" +#include +#include void meta_error_trap_push (MetaDisplay *display); void meta_error_trap_pop (MetaDisplay *display); diff --git a/src/ui/gradient.h b/src/meta/gradient.h similarity index 100% rename from src/ui/gradient.h rename to src/meta/gradient.h diff --git a/src/include/group.h b/src/meta/group.h similarity index 98% rename from src/include/group.h rename to src/meta/group.h index 9e20951d5..3f16edd6c 100644 --- a/src/include/group.h +++ b/src/meta/group.h @@ -26,7 +26,7 @@ #include #include -#include "types.h" +#include /* note, can return NULL */ MetaGroup* meta_window_get_group (MetaWindow *window); diff --git a/src/include/keybindings.h b/src/meta/keybindings.h similarity index 97% rename from src/include/keybindings.h rename to src/meta/keybindings.h index 66c1f1739..cf93aed98 100644 --- a/src/include/keybindings.h +++ b/src/meta/keybindings.h @@ -20,8 +20,8 @@ #ifndef META_KEYBINDINGS_H #define META_KEYBINDINGS_H -#include "display.h" -#include "common.h" +#include +#include /** * MetaKeyHandlerFunc: (skip) diff --git a/src/include/main.h b/src/meta/main.h similarity index 100% rename from src/include/main.h rename to src/meta/main.h diff --git a/src/include/meta-plugin.h b/src/meta/meta-plugin.h similarity index 99% rename from src/include/meta-plugin.h rename to src/meta/meta-plugin.h index 80d5312f8..a7f87dcaf 100644 --- a/src/include/meta-plugin.h +++ b/src/meta/meta-plugin.h @@ -24,9 +24,9 @@ #ifndef META_PLUGIN_H_ #define META_PLUGIN_H_ -#include "types.h" -#include "compositor.h" -#include "compositor-mutter.h" +#include +#include +#include #include #include diff --git a/src/include/meta-shadow-factory.h b/src/meta/meta-shadow-factory.h similarity index 100% rename from src/include/meta-shadow-factory.h rename to src/meta/meta-shadow-factory.h diff --git a/src/include/meta-window-actor.h b/src/meta/meta-window-actor.h similarity index 98% rename from src/include/meta-window-actor.h rename to src/meta/meta-window-actor.h index c6894e9f0..d32c0295a 100644 --- a/src/include/meta-window-actor.h +++ b/src/meta/meta-window-actor.h @@ -28,7 +28,7 @@ #include #include -#include "compositor.h" +#include /* * MetaWindowActor object (ClutterGroup sub-class) diff --git a/src/include/prefs.h b/src/meta/prefs.h similarity index 99% rename from src/include/prefs.h rename to src/meta/prefs.h index f01e49b34..672a30516 100644 --- a/src/include/prefs.h +++ b/src/meta/prefs.h @@ -26,7 +26,7 @@ #define META_PREFS_H /* This header is a "common" one between the UI and core side */ -#include "common.h" +#include #include typedef enum diff --git a/src/ui/preview-widget.h b/src/meta/preview-widget.h similarity index 98% rename from src/ui/preview-widget.h rename to src/meta/preview-widget.h index 0faff9816..7da2821cb 100644 --- a/src/ui/preview-widget.h +++ b/src/meta/preview-widget.h @@ -23,7 +23,8 @@ #include -#include "theme-private.h" +#include +#include #include #ifndef META_PREVIEW_WIDGET_H diff --git a/src/include/screen.h b/src/meta/screen.h similarity index 98% rename from src/include/screen.h rename to src/meta/screen.h index 9b5de83dc..ddb29a9e8 100644 --- a/src/include/screen.h +++ b/src/meta/screen.h @@ -24,8 +24,8 @@ #include #include -#include "types.h" -#include "workspace.h" +#include +#include #define META_TYPE_SCREEN (meta_screen_get_type ()) #define META_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SCREEN, MetaScreen)) diff --git a/src/ui/theme.h b/src/meta/theme.h similarity index 100% rename from src/ui/theme.h rename to src/meta/theme.h diff --git a/src/include/types.h b/src/meta/types.h similarity index 100% rename from src/include/types.h rename to src/meta/types.h diff --git a/src/include/util.h b/src/meta/util.h similarity index 99% rename from src/include/util.h rename to src/meta/util.h index f9176f47e..815ced517 100644 --- a/src/include/util.h +++ b/src/meta/util.h @@ -28,7 +28,7 @@ #include #include -#include "common.h" +#include gboolean meta_is_verbose (void); void meta_set_verbose (gboolean setting); diff --git a/src/include/window.h b/src/meta/window.h similarity index 99% rename from src/include/window.h rename to src/meta/window.h index 8819242f5..1eac457b9 100644 --- a/src/include/window.h +++ b/src/meta/window.h @@ -25,8 +25,8 @@ #include #include -#include "boxes.h" -#include "types.h" +#include +#include typedef enum { diff --git a/src/include/workspace.h b/src/meta/workspace.h similarity index 97% rename from src/include/workspace.h rename to src/meta/workspace.h index 21ebf9e11..12fe4bacd 100644 --- a/src/include/workspace.h +++ b/src/meta/workspace.h @@ -33,9 +33,9 @@ #ifndef META_WORKSPACE_H #define META_WORKSPACE_H -#include "types.h" -#include "boxes.h" -#include "screen.h" +#include +#include +#include #define META_TYPE_WORKSPACE (meta_workspace_get_type ()) #define META_WORKSPACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WORKSPACE, MetaWorkspace)) diff --git a/src/ui/frames.c b/src/ui/frames.c index 0c4cb9fef..9c4782ecd 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -25,14 +25,14 @@ #include #include -#include "boxes.h" +#include #include "frames.h" -#include "util.h" +#include #include "core.h" #include "menu.h" #include "fixedtip.h" -#include "theme.h" -#include "prefs.h" +#include +#include #include "ui.h" #include diff --git a/src/ui/frames.h b/src/ui/frames.h index 6ab3a6031..5fdba6366 100644 --- a/src/ui/frames.h +++ b/src/ui/frames.h @@ -26,7 +26,7 @@ #include #include -#include "common.h" +#include #include "theme-private.h" typedef enum diff --git a/src/ui/gradient.c b/src/ui/gradient.c index 9b1c079d7..ef1f06179 100644 --- a/src/ui/gradient.c +++ b/src/ui/gradient.c @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ -#include "gradient.h" -#include "util.h" +#include +#include #include /* This is all Alfredo's and Dan's usual very nice WindowMaker code, diff --git a/src/ui/menu.c b/src/ui/menu.c index 18324cb39..eef421a07 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -27,8 +27,8 @@ #include #include #include "menu.h" -#include "main.h" -#include "util.h" +#include +#include #include "core.h" #include "metaaccellabel.h" #include "ui.h" diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c index 18b659f54..2f9cb621c 100644 --- a/src/ui/metaaccellabel.c +++ b/src/ui/metaaccellabel.c @@ -35,7 +35,7 @@ #include "metaaccellabel.h" #include #include -#include "util.h" +#include static void meta_accel_label_destroy (GtkWidget *object); static void meta_accel_label_finalize (GObject *object); diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h index 0a3b56330..c90c47a90 100644 --- a/src/ui/metaaccellabel.h +++ b/src/ui/metaaccellabel.h @@ -35,7 +35,7 @@ #define __META_ACCEL_LABEL_H__ #include -#include "common.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c index 7f807fc8b..26a106e93 100644 --- a/src/ui/preview-widget.c +++ b/src/ui/preview-widget.c @@ -26,7 +26,8 @@ #include #include -#include "preview-widget.h" +#include +#include "theme-private.h" static void meta_preview_get_preferred_width (GtkWidget *widget, gint *minimum, diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c index c9e69fcb2..133285cb8 100644 --- a/src/ui/resizepopup.c +++ b/src/ui/resizepopup.c @@ -23,7 +23,7 @@ #include #include "resizepopup.h" -#include "util.h" +#include #include #include diff --git a/src/include/resizepopup.h b/src/ui/resizepopup.h similarity index 97% rename from src/include/resizepopup.h rename to src/ui/resizepopup.h index 244678616..0e307dac4 100644 --- a/src/include/resizepopup.h +++ b/src/ui/resizepopup.h @@ -25,8 +25,8 @@ #define META_RESIZEPOPUP_H /* Don't include gtk.h or gdk.h here */ -#include "boxes.h" -#include "common.h" +#include +#include #include #include #include diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c index 2fe8101bb..8c8c23d96 100644 --- a/src/ui/tabpopup.c +++ b/src/ui/tabpopup.c @@ -25,13 +25,13 @@ #include -#include "util.h" +#include #include "core.h" #include "tabpopup.h" /* FIXME these two includes are 100% broken ... */ -#include "../core/workspace-private.h" -#include "../core/frame-private.h" +#include "workspace-private.h" +#include "frame.h" #include "draw-workspace.h" #include #include diff --git a/src/include/tabpopup.h b/src/ui/tabpopup.h similarity index 98% rename from src/include/tabpopup.h rename to src/ui/tabpopup.h index 1c90fc7f7..ee609d9c8 100644 --- a/src/include/tabpopup.h +++ b/src/ui/tabpopup.h @@ -26,8 +26,8 @@ #define META_TABPOPUP_H /* Don't include gtk.h or gdk.h here */ -#include "common.h" -#include "boxes.h" +#include +#include #include #include #include diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c index bf3b4e4b7..29c3acb46 100644 --- a/src/ui/testgradient.c +++ b/src/ui/testgradient.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ -#include "gradient.h" +#include #include typedef void (* RenderGradientFunc) (cairo_t *cr, diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c index 559aafd22..8b1c83b49 100644 --- a/src/ui/theme-parser.c +++ b/src/ui/theme-parser.c @@ -23,7 +23,7 @@ #include #include "theme-private.h" -#include "util.h" +#include #include #include diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h index a9420566c..d4a21664a 100644 --- a/src/ui/theme-private.h +++ b/src/ui/theme-private.h @@ -24,10 +24,10 @@ #ifndef META_THEME_PRIVATE_H #define META_THEME_PRIVATE_H -#include "boxes.h" -#include "gradient.h" -#include "theme.h" -#include "common.h" +#include +#include +#include +#include #include /** diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c index c2addb19c..6aed2d3bd 100644 --- a/src/ui/theme-viewer.c +++ b/src/ui/theme-viewer.c @@ -22,9 +22,10 @@ */ #include -#include "util.h" -#include "theme.h" -#include "preview-widget.h" +#include +#include +#include "theme-private.h" +#include #include #include #include diff --git a/src/ui/theme.c b/src/ui/theme.c index 589d7496d..007738868 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -54,8 +54,8 @@ #include #include "theme-private.h" -#include "util.h" -#include "gradient.h" +#include +#include #include #include #include diff --git a/src/include/tile-preview.h b/src/ui/tile-preview.h similarity index 98% rename from src/include/tile-preview.h rename to src/ui/tile-preview.h index 24b4f0248..740f41f69 100644 --- a/src/include/tile-preview.h +++ b/src/ui/tile-preview.h @@ -23,7 +23,7 @@ #ifndef META_TILE_PREVIEW_H #define META_TILE_PREVIEW_H -#include "boxes.h" +#include typedef struct _MetaTilePreview MetaTilePreview; diff --git a/src/ui/ui.c b/src/ui/ui.c index d115ae368..575f2aefd 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -23,10 +23,10 @@ */ #include -#include "prefs.h" +#include #include "ui.h" #include "frames.h" -#include "util.h" +#include #include "menu.h" #include "core.h" #include "theme-private.h" diff --git a/src/include/ui.h b/src/ui/ui.h similarity index 99% rename from src/include/ui.h rename to src/ui/ui.h index 2914133e9..cc449bd51 100644 --- a/src/include/ui.h +++ b/src/ui/ui.h @@ -25,7 +25,7 @@ #define META_UI_H /* Don't include gtk.h or gdk.h here */ -#include "common.h" +#include #include #include #include