sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Move the installed includes to a subdir

Browse source 
If mutter is going to be a "real" library, then it should install its
includes so that users can do

    #include <meta/display.h>

rather than

    #include <display.h>

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
This commit is contained in:
Dan Winship 2011-03-05 19:29:12 -05:00
parent bb50f65532
commit c84da3ce1b
99 changed files with 257 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/POTFILES.in
View file

@ -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

113
src/Makefile.am
View file

@ -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-<version>.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) \

4
src/compositor/compositor-private.h
View file

@ -5,8 +5,8 @@
#include <X11/extensions/Xfixes.h>
#include "compositor.h"
#include "display.h"
#include <meta/compositor.h>
#include <meta/display.h>
#include "meta-plugin-manager.h"
#include <clutter/clutter.h>

16
src/compositor/compositor.c
View file

@ -4,19 +4,19 @@
#include <clutter/x11/clutter-x11.h>
#include "screen.h"
#include "errors.h"
#include "window.h"
#include <meta/screen.h>
#include <meta/errors.h>
#include <meta/window.h>
#include "compositor-private.h"
#include "compositor-mutter.h"
#include <meta/compositor-mutter.h>
#include "xprops.h"
#include "prefs.h"
#include "meta-shadow-factory.h"
#include <meta/prefs.h>
#include <meta/meta-shadow-factory.h>
#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 <X11/extensions/shape.h>
#include <X11/extensions/Xcomposite.h>

2
src/compositor/meta-background-actor.c
View file

@ -32,7 +32,7 @@
#include "cogl-utils.h"
#include "compositor-private.h"
#include "errors.h"
#include <meta/errors.h>
#include "meta-background-actor.h"
struct _MetaBackgroundActorClass

2
src/compositor/meta-background-actor.h
View file

@ -25,7 +25,7 @@
#include <clutter/clutter.h>
#include "screen.h"
#include <meta/screen.h>
/**
* MetaBackgroundActor:

2
src/compositor/meta-module.c
View file

@ -21,7 +21,7 @@
* 02111-1307, USA.
*/
#include "meta-plugin.h"
#include <meta/meta-plugin.h>
#include "meta-module.h"
#include <gmodule.h>

8
src/compositor/meta-plugin-manager.c
View file

@ -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 <meta/prefs.h>
#include <meta/errors.h>
#include <meta/workspace.h>
#include "meta-module.h"
#include "../core/window-private.h"
#include "window-private.h"
#include <string.h>
#include <stdlib.h>

6
src/compositor/meta-plugin-manager.h
View file

@ -24,11 +24,11 @@
#ifndef META_PLUGIN_MANAGER_H_
#define META_PLUGIN_MANAGER_H_
#include "types.h"
#include "screen.h"
#include <meta/types.h>
#include <meta/screen.h>
#define META_PLUGIN_FROM_MANAGER_
#include "meta-plugin.h"
#include <meta/meta-plugin.h>
#undef META_PLUGIN_FROM_MANAGER_
#define META_PLUGIN_MINIMIZE (1<<0)

6
src/compositor/meta-plugin.c
View file

@ -21,10 +21,10 @@
* 02111-1307, USA.
*/
#include "meta-plugin.h"
#include <meta/meta-plugin.h>
#include "meta-plugin-manager.h"
#include "screen.h"
#include "display.h"
#include <meta/screen.h>
#include <meta/display.h>
#include <string.h>
#include <X11/Xlib.h>

2
src/compositor/meta-shadow-factory-private.h
View file

@ -28,7 +28,7 @@
#include <cairo.h>
#include <clutter/clutter.h>
#include "meta-window-shape.h"
#include "meta-shadow-factory.h"
#include <meta/meta-shadow-factory.h>
/**
* MetaShadow:

2
src/compositor/meta-window-actor-private.h
View file

@ -6,7 +6,7 @@
#include <config.h>
#include <X11/extensions/Xdamage.h>
#include "compositor-mutter.h"
#include <meta/compositor-mutter.h>
MetaWindowActor *meta_window_actor_new (MetaWindow *window);

6
src/compositor/meta-window-actor.c
View file

@ -13,10 +13,10 @@
#include <clutter/x11/clutter-x11.h>
#include <gdk/gdk.h> /* for gdk_rectangle_union() */
#include "display.h"
#include "errors.h"
#include <meta/display.h>
#include <meta/errors.h>
#include "frame.h"
#include "window.h"
#include <meta/window.h>
#include "xprops.h"
#include "compositor-private.h"

2
src/compositor/meta-window-group.h
View file

@ -5,7 +5,7 @@
#include <clutter/clutter.h>
#include "screen.h"
#include <meta/screen.h>
/**
* MetaWindowGroup:

2
src/compositor/plugins/Makefile.am
View file

@ -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

4
src/compositor/plugins/default.c
View file

@ -21,8 +21,8 @@
* 02111-1307, USA.
*/
#include "meta-plugin.h"
#include "window.h"
#include <meta/meta-plugin.h>
#include <meta/window.h>
#include <libintl.h>
#define _(x) dgettext (GETTEXT_PACKAGE, x)

0
src/include/all-keybindings.h → src/core/all-keybindings.h
View file

2
src/core/bell.c
View file

@ -51,7 +51,7 @@
#include <config.h>
#include "bell.h"
#include "screen-private.h"
#include "prefs.h"
#include <meta/prefs.h>
#ifdef HAVE_LIBCANBERRA
#include <canberra-gtk.h>
#endif

2
src/core/bell.h
View file

@ -36,7 +36,7 @@
#include <X11/XKBlib.h>
#endif
#include "display-private.h"
#include "frame-private.h"
#include "frame.h"
#ifdef HAVE_XKB
/**

4
src/core/boxes-private.h
View file

@ -25,8 +25,8 @@
#define META_BOXES_PRIVATE_H
#include <glib-object.h>
#include "common.h"
#include "boxes.h"
#include <meta/common.h>
#include <meta/boxes.h>
#define BOX_LEFT(box) ((box).x) /* Leftmost pixel of rect */
#define BOX_RIGHT(box) ((box).x + (box).width) /* One pixel past right */

2
src/core/boxes.c
View file

@ -27,7 +27,7 @@
*/
#include "boxes-private.h"
#include "util.h"
#include <meta/util.h>
#include <X11/Xutil.h> /* Just for the definition of the various gravities */
/* It would make sense to use GSlice here, but until we clean up the

2
src/core/constraints.c
View file

@ -28,7 +28,7 @@
#include "constraints.h"
#include "workspace-private.h"
#include "place.h"
#include "prefs.h"
#include <meta/prefs.h>
#include <stdlib.h>
#include <math.h>

4
src/core/constraints.h
View file

@ -25,9 +25,9 @@
#ifndef META_CONSTRAINTS_H
#define META_CONSTRAINTS_H
#include "util.h"
#include <meta/util.h>
#include "window-private.h"
#include "frame-private.h"
#include "frame.h"
typedef enum
{

6
src/core/core.c
View file

@ -25,10 +25,10 @@
#include <config.h>
#include "core.h"
#include "frame-private.h"
#include "frame.h"
#include "workspace-private.h"
#include "prefs.h"
#include "errors.h"
#include <meta/prefs.h>
#include <meta/errors.h>
/* Looks up the MetaWindow representing the frame of the given X window.
* Used as a helper function by a bunch of the functions below.

2
src/include/core.h → src/core/core.h
View file

@ -27,7 +27,7 @@
/* Don't include core headers here */
#include <gdk/gdkx.h>
#include "common.h"
#include <meta/common.h>
typedef enum
{

6
src/core/delete.c
View file

@ -25,10 +25,10 @@
#define _XOPEN_SOURCE /* for kill() */
#include <config.h>
#include "util.h"
#include <meta/util.h>
#include "window-private.h"
#include "errors.h"
#include "workspace.h"
#include <meta/errors.h>
#include <meta/workspace.h>
#include <sys/types.h>
#include <sys/wait.h>

10
src/core/display-private.h
View file

@ -34,11 +34,11 @@
#include <glib.h>
#include <X11/Xlib.h>
#include "eventqueue.h"
#include "common.h"
#include "boxes.h"
#include "display.h"
#include <meta/common.h>
#include <meta/boxes.h>
#include <meta/display.h>
#include "keybindings-private.h"
#include "prefs.h"
#include <meta/prefs.h>
#ifdef HAVE_STARTUP_NOTIFICATION
#include <libsn/sn.h>
@ -99,7 +99,7 @@ struct _MetaDisplay
* class is constructed.
*/
#define item(x) Atom atom_##x;
#include "atomnames.h"
#include <meta/atomnames.h>
#undef item
/* This is the actual window from focus events,

16
src/core/display.c
View file

@ -34,21 +34,21 @@
#include <config.h>
#include "display-private.h"
#include "util.h"
#include "main.h"
#include <meta/util.h>
#include <meta/main.h>
#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 <meta/errors.h>
#include "keybindings-private.h"
#include "prefs.h"
#include <meta/prefs.h>
#include "resizepopup.h"
#include "xprops.h"
#include "workspace-private.h"
#include "bell.h"
#include "compositor.h"
#include <meta/compositor.h>
#include <X11/Xatom.h>
#include <X11/cursorfont.h>
#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 <meta/atomnames.h>
#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 <meta/atomnames.h>
#undef item
}

2
src/core/errors.c
View file

@ -23,7 +23,7 @@
*/
#include <config.h>
#include "errors.h"
#include <meta/errors.h>
#include "display-private.h"
#include <errno.h>
#include <stdlib.h>

4
src/core/frame.c
View file

@ -24,9 +24,9 @@
*/
#include <config.h>
#include "frame-private.h"
#include "frame.h"
#include "bell.h"
#include "errors.h"
#include <meta/errors.h>
#include "keybindings-private.h"
#include <X11/extensions/Xrender.h>

4
src/core/frame-private.h → src/core/frame.h
View file

@ -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,

2
src/core/group-private.h
View file

@ -24,7 +24,7 @@
#ifndef META_GROUP_PRIVATE_H
#define META_GROUP_PRIVATE_H
#include "group.h"
#include <meta/group.h>
struct _MetaGroup
{

2
src/core/group-props.h
View file

@ -24,7 +24,7 @@
#ifndef META_GROUP_PROPS_H
#define META_GROUP_PROPS_H
#include "group.h"
#include <meta/group.h>
#include "window-private.h"
void meta_group_reload_property (MetaGroup *group,

4
src/core/group.c
View file

@ -23,11 +23,11 @@
*/
#include <config.h>
#include "util.h"
#include <meta/util.h>
#include "group-private.h"
#include "group-props.h"
#include "window-private.h"
#include "window.h"
#include <meta/window.h>
static MetaGroup*
meta_group_new (MetaDisplay *display,

2
src/core/iconcache.c
View file

@ -24,7 +24,7 @@
#include <config.h>
#include "iconcache.h"
#include "ui.h"
#include "errors.h"
#include <meta/errors.h>
#include <X11/Xatom.h>

2
src/core/keybindings-private.h
View file

@ -29,7 +29,7 @@
#ifndef META_KEYBINDINGS_PRIVATE_H
#define META_KEYBINDINGS_PRIVATE_H
#include "keybindings.h"
#include <meta/keybindings.h>
void meta_display_init_keys (MetaDisplay *display);
void meta_display_shutdown_keys (MetaDisplay *display);

8
src/core/keybindings.c
View file

@ -29,13 +29,13 @@
#include <config.h>
#include "keybindings-private.h"
#include "workspace-private.h"
#include "errors.h"
#include <meta/errors.h>
#include "edge-resistance.h"
#include "ui.h"
#include "frame-private.h"
#include "frame.h"
#include "place.h"
#include "prefs.h"
#include "util.h"
#include <meta/prefs.h>
#include <meta/util.h>
#include <X11/keysym.h>
#include <string.h>

10
src/core/main.c
View file

@ -45,14 +45,14 @@
#define _SVID_SOURCE /* for putenv() and some signal-related functions */
#include <config.h>
#include "main.h"
#include "util.h"
#include <meta/main.h>
#include <meta/util.h>
#include "display-private.h"
#include "errors.h"
#include <meta/errors.h>
#include "ui.h"
#include "session.h"
#include "prefs.h"
#include "compositor.h"
#include <meta/prefs.h>
#include <meta/compositor.h>
#include <glib-object.h>
#include <gdk/gdkx.h>

6
src/core/mutter.c
View file

@ -23,10 +23,10 @@
#include <stdlib.h>
#include "main.h"
#include "util.h"
#include <meta/main.h>
#include <meta/util.h>
#ifdef HAVE_INTROSPECTION
#include "compositor/meta-plugin-manager.h"
#include "meta-plugin-manager.h"
#endif
#include <glib.h>

4
src/core/place.c
View file

@ -28,8 +28,8 @@
#include "boxes-private.h"
#include "place.h"
#include "workspace.h"
#include "prefs.h"
#include <meta/workspace.h>
#include <meta/prefs.h>
#include <gdk/gdk.h>
#include <math.h>
#include <stdlib.h>

2
src/core/place.h
View file

@ -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,

5
src/core/prefs.c
View file

@ -24,9 +24,10 @@
*/
#include <config.h>
#include "prefs.h"
#include <meta/prefs.h>
#include "ui.h"
#include "util.h"
#include <meta/util.h>
#include "meta-plugin-manager.h"
#ifdef HAVE_GCONF
#include <gconf/gconf-client.h>
#endif

2
src/core/screen-private.h
View file

@ -34,7 +34,7 @@
#define META_SCREEN_PRIVATE_H
#include "display-private.h"
#include "screen.h"
#include <meta/screen.h>
#include <X11/Xutil.h>
#include "stack-tracker.h"
#include "ui.h"

12
src/core/screen.c
View file

@ -28,16 +28,16 @@
#include <config.h>
#include "screen-private.h"
#include "util.h"
#include "errors.h"
#include <meta/util.h>
#include <meta/errors.h>
#include "window-private.h"
#include "frame-private.h"
#include "prefs.h"
#include "frame.h"
#include <meta/prefs.h>
#include "workspace-private.h"
#include "keybindings-private.h"
#include "stack.h"
#include "xprops.h"
#include "compositor.h"
#include <meta/compositor.h>
#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 <meta/atomnames.h>
#undef item
#undef EWMH_ATOMS_ONLY
};

6
src/core/session.c
View file

@ -69,10 +69,10 @@ meta_window_release_saved_state (const MetaWindowSessionInfo *info)
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "main.h"
#include "util.h"
#include <meta/main.h>
#include <meta/util.h>
#include "display-private.h"
#include "workspace.h"
#include <meta/workspace.h>
static void ice_io_error_handler (IceConn connection);

6
src/core/stack-tracker.c
View file

@ -23,12 +23,12 @@
#include <string.h>
#include "frame-private.h"
#include "frame.h"
#include "screen-private.h"
#include "stack-tracker.h"
#include "util.h"
#include <meta/util.h>
#include "compositor.h"
#include <meta/compositor.h>
/* The complexity here comes from resolving two competing factors:
*

2
src/core/stack-tracker.h
View file

@ -36,7 +36,7 @@
#ifndef META_STACK_TRACKER_H
#define META_STACK_TRACKER_H
#include "screen.h"
#include <meta/screen.h>
typedef struct _MetaStackTracker MetaStackTracker;

10
src/core/stack.c
View file

@ -29,11 +29,11 @@
#include <config.h>
#include "stack.h"
#include "window-private.h"
#include "errors.h"
#include "frame-private.h"
#include "group.h"
#include "prefs.h"
#include "workspace.h"
#include <meta/errors.h>
#include "frame.h"
#include <meta/group.h>
#include <meta/prefs.h>
#include <meta/workspace.h>
#include <X11/Xatom.h>

6
src/core/util.c
View file

@ -26,9 +26,9 @@
#define _POSIX_C_SOURCE 200112L /* for fdopen() */
#include <config.h>
#include "common.h"
#include "util.h"
#include "main.h"
#include <meta/common.h>
#include <meta/util.h>
#include <meta/main.h>
#include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */

6
src/core/window-private.h
View file

@ -35,10 +35,10 @@
#define META_WINDOW_PRIVATE_H
#include <config.h>
#include "compositor.h"
#include "window.h"
#include <meta/compositor.h>
#include <meta/window.h>
#include "screen-private.h"
#include "util.h"
#include <meta/util.h>
#include "stack.h"
#include "iconcache.h"
#include <X11/Xutil.h>

6
src/core/window-props.c
View file

@ -40,10 +40,10 @@
#include <config.h>
#include "window-props.h"
#include "errors.h"
#include <meta/errors.h>
#include "xprops.h"
#include "frame-private.h"
#include "group.h"
#include "frame.h"
#include <meta/group.h>
#include <X11/Xatom.h>
#include <unistd.h>
#include <string.h>

10
src/core/window.c
View file

@ -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 <meta/util.h>
#include "frame.h"
#include <meta/errors.h>
#include "workspace-private.h"
#include "stack.h"
#include "keybindings-private.h"
#include "ui.h"
#include "place.h"
#include "session.h"
#include "prefs.h"
#include <meta/prefs.h>
#include "resizepopup.h"
#include "xprops.h"
#include "group.h"
#include <meta/group.h>
#include "window-props.h"
#include "constraints.h"
#include "mutter-enum-types.h"

2
src/core/workspace-private.h
View file

@ -33,7 +33,7 @@
#ifndef META_WORKSPACE_PRIVATE_H
#define META_WORKSPACE_PRIVATE_H
#include "workspace.h"
#include <meta/workspace.h>
#include "window-private.h"
struct _MetaWorkspace

8
src/core/workspace.c
View file

@ -25,13 +25,13 @@
#include <config.h>
#include "screen-private.h"
#include "workspace.h"
#include <meta/workspace.h>
#include "workspace-private.h"
#include "boxes-private.h"
#include "errors.h"
#include "prefs.h"
#include <meta/errors.h>
#include <meta/prefs.h>
#include "compositor.h"
#include <meta/compositor.h>
#include <X11/Xatom.h>
#include <string.h>

4
src/core/xprops.c
View file

@ -82,8 +82,8 @@ from The Open Group.
#include <config.h>
#include "xprops.h"
#include "errors.h"
#include "util.h"
#include <meta/errors.h>
#include <meta/util.h>
#include "async-getprop.h"
#include "ui.h"
#include "mutter-Xatomtype.h"

2
src/include/xprops.h → src/core/xprops.h
View file

@ -26,7 +26,7 @@
#include <config.h>
#include "display.h"
#include <meta/display.h>
#include <X11/Xutil.h>
#ifdef HAVE_XSYNC

31
src/include/frame.h
View file

@ -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 <X11/Xlib.h>
#include "types.h"
Window meta_frame_get_xwindow (MetaFrame *frame);
#endif

2
src/libmutter-wm.pc.in
View file

@ -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}

0
src/include/atomnames.h → src/meta/atomnames.h
View file

2
src/include/boxes.h → src/meta/boxes.h
View file

@ -25,7 +25,7 @@
#define META_BOXES_H
#include <glib-object.h>
#include "common.h"
#include <meta/common.h>
#define META_TYPE_RECTANGLE (meta_rectangle_get_type ())

0
src/include/common.h → src/meta/common.h
View file

6
src/include/compositor-mutter.h → src/meta/compositor-mutter.h
View file

@ -28,9 +28,9 @@
#include <clutter/clutter.h>
#include <X11/Xlib.h>
#include "types.h"
#include "compositor.h"
#include "meta-window-actor.h"
#include <meta/types.h>
#include <meta/compositor.h>
#include <meta/meta-window-actor.h>
/* Public compositor API */
ClutterActor *meta_get_stage_for_screen (MetaScreen *screen);

8
src/include/compositor.h → src/meta/compositor.h
View file

@ -25,10 +25,10 @@
#include <glib.h>
#include <X11/Xlib.h>
#include "types.h"
#include "boxes.h"
#include "window.h"
#include "workspace.h"
#include <meta/types.h>
#include <meta/boxes.h>
#include <meta/window.h>
#include <meta/workspace.h>
/**
* MetaCompEffect:

6
src/include/display.h → src/meta/display.h
View file

@ -25,9 +25,9 @@
#include <glib-object.h>
#include <X11/Xlib.h>
#include "types.h"
#include "prefs.h"
#include "common.h"
#include <meta/types.h>
#include <meta/prefs.h>
#include <meta/common.h>
typedef enum
{

4
src/include/errors.h → src/meta/errors.h
View file

@ -26,8 +26,8 @@
#include <X11/Xlib.h>
#include "util.h"
#include "display.h"
#include <meta/util.h>
#include <meta/display.h>
void meta_error_trap_push (MetaDisplay *display);
void meta_error_trap_pop (MetaDisplay *display);

0
src/ui/gradient.h → src/meta/gradient.h
View file

2
src/include/group.h → src/meta/group.h
View file

@ -26,7 +26,7 @@
#include <X11/Xlib.h>
#include <glib.h>
#include "types.h"
#include <meta/types.h>
/* note, can return NULL */
MetaGroup* meta_window_get_group (MetaWindow *window);

4
src/include/keybindings.h → src/meta/keybindings.h
View file

@ -20,8 +20,8 @@
#ifndef META_KEYBINDINGS_H
#define META_KEYBINDINGS_H
#include "display.h"
#include "common.h"
#include <meta/display.h>
#include <meta/common.h>
/**
* MetaKeyHandlerFunc: (skip)

0
src/include/main.h → src/meta/main.h
View file

6
src/include/meta-plugin.h → src/meta/meta-plugin.h
View file

@ -24,9 +24,9 @@
#ifndef META_PLUGIN_H_
#define META_PLUGIN_H_
#include "types.h"
#include "compositor.h"
#include "compositor-mutter.h"
#include <meta/types.h>
#include <meta/compositor.h>
#include <meta/compositor-mutter.h>
#include <clutter/clutter.h>
#include <X11/extensions/Xfixes.h>

0
src/include/meta-shadow-factory.h → src/meta/meta-shadow-factory.h
View file

2
src/include/meta-window-actor.h → src/meta/meta-window-actor.h
View file

@ -28,7 +28,7 @@
#include <clutter/clutter.h>
#include <X11/Xlib.h>
#include "compositor.h"
#include <meta/compositor.h>
/*
* MetaWindowActor object (ClutterGroup sub-class)

2
src/include/prefs.h → src/meta/prefs.h
View file

@ -26,7 +26,7 @@
#define META_PREFS_H
/* This header is a "common" one between the UI and core side */
#include "common.h"
#include <meta/common.h>
#include <pango/pango-font.h>
typedef enum

3
src/ui/preview-widget.h → src/meta/preview-widget.h
View file

@ -23,7 +23,8 @@
#include <config.h>
#include "theme-private.h"
#include <meta/common.h>
#include <meta/theme.h>
#include <gtk/gtk.h>
#ifndef META_PREVIEW_WIDGET_H

4
src/include/screen.h → src/meta/screen.h
View file

@ -24,8 +24,8 @@
#include <X11/Xlib.h>
#include <glib-object.h>
#include "types.h"
#include "workspace.h"
#include <meta/types.h>
#include <meta/workspace.h>
#define META_TYPE_SCREEN (meta_screen_get_type ())
#define META_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SCREEN, MetaScreen))

0
src/ui/theme.h → src/meta/theme.h
View file

0
src/include/types.h → src/meta/types.h
View file

2
src/include/util.h → src/meta/util.h
View file

@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
#include "common.h"
#include <meta/common.h>
gboolean meta_is_verbose (void);
void meta_set_verbose (gboolean setting);

4
src/include/window.h → src/meta/window.h
View file

@ -25,8 +25,8 @@
#include <glib-object.h>
#include <X11/Xlib.h>
#include "boxes.h"
#include "types.h"
#include <meta/boxes.h>
#include <meta/types.h>
typedef enum
{

6
src/include/workspace.h → src/meta/workspace.h
View file

@ -33,9 +33,9 @@
#ifndef META_WORKSPACE_H
#define META_WORKSPACE_H
#include "types.h"
#include "boxes.h"
#include "screen.h"
#include <meta/types.h>
#include <meta/boxes.h>
#include <meta/screen.h>
#define META_TYPE_WORKSPACE (meta_workspace_get_type ())
#define META_WORKSPACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WORKSPACE, MetaWorkspace))

8
src/ui/frames.c
View file

@ -25,14 +25,14 @@
#include <config.h>
#include <math.h>
#include "boxes.h"
#include <meta/boxes.h>
#include "frames.h"
#include "util.h"
#include <meta/util.h>
#include "core.h"
#include "menu.h"
#include "fixedtip.h"
#include "theme.h"
#include "prefs.h"
#include <meta/theme.h>
#include <meta/prefs.h>
#include "ui.h"
#include <cairo-xlib.h>

2
src/ui/frames.h
View file

@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include "common.h"
#include <meta/common.h>
#include "theme-private.h"
typedef enum

4
src/ui/gradient.c
View file

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. */
#include "gradient.h"
#include "util.h"
#include <meta/gradient.h>
#include <meta/util.h>
#include <string.h>
/* This is all Alfredo's and Dan's usual very nice WindowMaker code,

4
src/ui/menu.c
View file

@ -27,8 +27,8 @@
#include <stdio.h>
#include <string.h>
#include "menu.h"
#include "main.h"
#include "util.h"
#include <meta/main.h>
#include <meta/util.h>
#include "core.h"
#include "metaaccellabel.h"
#include "ui.h"

2
src/ui/metaaccellabel.c
View file

@ -35,7 +35,7 @@
#include "metaaccellabel.h"
#include <gtk/gtk.h>
#include <string.h>
#include "util.h"
#include <meta/util.h>
static void meta_accel_label_destroy (GtkWidget *object);
static void meta_accel_label_finalize (GObject *object);

2
src/ui/metaaccellabel.h
View file

@ -35,7 +35,7 @@
#define __META_ACCEL_LABEL_H__
#include <gtk/gtk.h>
#include "common.h"
#include <meta/common.h>
#ifdef __cplusplus
extern "C" {

3
src/ui/preview-widget.c
View file

@ -26,7 +26,8 @@
#include <math.h>
#include <gtk/gtk.h>
#include "preview-widget.h"
#include <meta/preview-widget.h>
#include "theme-private.h"
static void meta_preview_get_preferred_width (GtkWidget *widget,
gint *minimum,

2
src/ui/resizepopup.c
View file

@ -23,7 +23,7 @@
#include <config.h>
#include "resizepopup.h"
#include "util.h"
#include <meta/util.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>

4
src/include/resizepopup.h → src/ui/resizepopup.h
View file

@ -25,8 +25,8 @@
#define META_RESIZEPOPUP_H
/* Don't include gtk.h or gdk.h here */
#include "boxes.h"
#include "common.h"
#include <meta/boxes.h>
#include <meta/common.h>
#include <X11/Xlib.h>
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>

6
src/ui/tabpopup.c
View file

@ -25,13 +25,13 @@
#include <config.h>
#include "util.h"
#include <meta/util.h>
#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 <gtk/gtk.h>
#include <math.h>

4
src/include/tabpopup.h → src/ui/tabpopup.h
View file

@ -26,8 +26,8 @@
#define META_TABPOPUP_H
/* Don't include gtk.h or gdk.h here */
#include "common.h"
#include "boxes.h"
#include <meta/common.h>
#include <meta/boxes.h>
#include <X11/Xlib.h>
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>

2
src/ui/testgradient.c
View file

@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. */
#include "gradient.h"
#include <meta/gradient.h>
#include <gtk/gtk.h>
typedef void (* RenderGradientFunc) (cairo_t *cr,

2
src/ui/theme-parser.c
View file

@ -23,7 +23,7 @@
#include <config.h>
#include "theme-private.h"
#include "util.h"
#include <meta/util.h>
#include <string.h>
#include <stdlib.h>

8
src/ui/theme-private.h
View file

@ -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 <meta/boxes.h>
#include <meta/gradient.h>
#include <meta/theme.h>
#include <meta/common.h>
#include <gtk/gtk.h>
/**

7
src/ui/theme-viewer.c
View file

@ -22,9 +22,10 @@
*/
#include <config.h>
#include "util.h"
#include "theme.h"
#include "preview-widget.h"
#include <meta/util.h>
#include <meta/theme.h>
#include "theme-private.h"
#include <meta/preview-widget.h>
#include <gtk/gtk.h>
#include <time.h>
#include <stdlib.h>

4
src/ui/theme.c
View file

@ -54,8 +54,8 @@
#include <config.h>
#include "theme-private.h"
#include "util.h"
#include "gradient.h"
#include <meta/util.h>
#include <meta/gradient.h>
#include <gtk/gtk.h>
#include <string.h>
#include <stdlib.h>

2
src/include/tile-preview.h → src/ui/tile-preview.h
View file

@ -23,7 +23,7 @@
#ifndef META_TILE_PREVIEW_H
#define META_TILE_PREVIEW_H
#include "boxes.h"
#include <meta/boxes.h>
typedef struct _MetaTilePreview MetaTilePreview;

4
src/ui/ui.c
View file

@ -23,10 +23,10 @@
*/
#include <config.h>
#include "prefs.h"
#include <meta/prefs.h>
#include "ui.h"
#include "frames.h"
#include "util.h"
#include <meta/util.h>
#include "menu.h"
#include "core.h"
#include "theme-private.h"

2
src/include/ui.h → src/ui/ui.h
View file

@ -25,7 +25,7 @@
#define META_UI_H
/* Don't include gtk.h or gdk.h here */
#include "common.h"
#include <meta/common.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <glib.h>