[mutter] Comprehensively rename to Mutter
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Subject: [mutter] Comprehensively rename to Mutter
- Date: Tue, 16 Jun 2009 14:23:22 -0400 (EDT)
commit 51a646796896312b1bdfdb2ddf46379e3fccced7
Author: Jon Nettleton <jon nettleton gmail com>
Date: Wed Jun 10 12:29:20 2009 +0200
Comprehensively rename to Mutter
Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.
The overall version was brought up to 2.27 to match current gnome.
Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system. Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap. These files will eventually end up in an external
gnome-wm-data module.
Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.
Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set. This allows
gnome-control-center to continue using libmetacity.so for
configuration. This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.
README | 84 +--
autogen.sh | 2 +-
configure.in | 136 ++--
doc/Makefile.am | 4 +-
doc/compositor-control.txt | 2 +-
doc/creating_themes/C/creating-metacity-themes.xml | 286 ------
doc/creating_themes/Makefile.am | 24 -
doc/man/Makefile.am | 4 +-
doc/man/{metacity-message.1 => mutter-message.1} | 14 +-
...tacity-theme-viewer.1 => mutter-theme-viewer.1} | 20 +-
...metacity-window-demo.1 => mutter-window-demo.1} | 10 +-
doc/man/{metacity.1 => mutter.1} | 18 +-
doc/metacity-theme.dtd | 273 ------
metacity.doap | 710 --------------
src/50-metacity-desktop-key.xml.in | 20 -
src/50-metacity-key.xml.in | 269 ------
src/Makefile.am | 94 +--
src/compositor/mutter/mutter-module.c | 2 +-
src/compositor/mutter/plugins/Makefile.am | 4 +-
src/core/bell.c | 11 +-
src/core/bell.h | 4 +-
src/core/constraints.c | 2 +-
src/core/constraints.h | 2 +-
src/core/core.c | 2 +-
src/core/delete.c | 9 +-
src/core/display-private.h | 2 +-
src/core/display.c | 30 +-
src/core/effects.c | 2 +-
src/core/errors.c | 2 +-
src/core/eventqueue.c | 2 +-
src/core/eventqueue.h | 2 +-
src/core/frame-private.h | 2 +-
src/core/frame.c | 2 +-
src/core/group-private.h | 2 +-
src/core/group.c | 2 +-
src/core/iconcache.c | 2 +-
src/core/iconcache.h | 2 +-
src/core/keybindings.c | 4 +-
src/core/main.c | 72 +-
.../{metacity-Xatomtype.h => mutter-Xatomtype.h} | 2 +-
src/core/place.c | 2 +-
src/core/place.h | 2 +-
src/core/prefs.c | 19 +-
src/core/schema-bindings.c | 195 ----
src/core/screen-private.h | 2 +-
src/core/screen.c | 12 +-
src/core/session.c | 52 +-
src/core/testasyncgetprop.c | 2 +-
src/core/testboxes.c | 2 +-
src/core/util.c | 10 +-
src/core/window-private.h | 2 +-
src/core/window.c | 22 +-
src/core/workspace.c | 2 +-
src/core/xprops.c | 4 +-
src/include/all-keybindings.h | 2 +-
src/include/atomnames.h | 14 +-
src/include/common.h | 53 +-
src/include/core.h | 2 +-
src/include/display.h | 2 +-
src/include/errors.h | 2 +-
src/include/group.h | 2 +-
src/include/main.h | 2 +-
src/include/mutter-plugin.h | 12 +-
src/include/prefs.h | 2 +-
src/include/resizepopup.h | 2 +-
src/include/tabpopup.h | 2 +-
src/include/ui.h | 5 +-
src/include/util.h | 2 +-
src/include/xprops.h | 2 +-
...acity-private.pc.in => libmutter-private.pc.in} | 8 +-
src/metacity-plugins.pc.in | 17 -
src/metacity.schemas.in.in | 639 -------------
src/mutter-plugins.pc.in | 17 +
...metacity-wm.desktop.in => mutter-wm.desktop.in} | 8 +-
src/{metacity.desktop.in => mutter.desktop.in} | 8 +-
src/mutter.schemas.in | 56 ++
src/{run-metacity.sh => run-mutter.sh} | 10 +-
src/themes/.cvsignore | 2 -
src/themes/AgingGorilla/README | 7 -
src/themes/AgingGorilla/active-button.png | Bin 844 -> 0 bytes
src/themes/AgingGorilla/active-close-button.png | Bin 896 -> 0 bytes
src/themes/AgingGorilla/active-close-menu-icon.png | Bin 258 -> 0 bytes
src/themes/AgingGorilla/active-maximize-button.png | Bin 886 -> 0 bytes
.../AgingGorilla/active-maximize-menu-icon.png | Bin 284 -> 0 bytes
src/themes/AgingGorilla/active-menu-button.png | Bin 873 -> 0 bytes
src/themes/AgingGorilla/active-minimize-button.png | Bin 914 -> 0 bytes
.../AgingGorilla/active-minimize-menu-icon.png | Bin 332 -> 0 bytes
src/themes/AgingGorilla/gorilla.xcf.bz2 | Bin 11040 -> 0 bytes
src/themes/AgingGorilla/inactive-close-button.png | Bin 919 -> 0 bytes
.../AgingGorilla/inactive-maximize-button.png | Bin 903 -> 0 bytes
src/themes/AgingGorilla/inactive-menu-button.png | Bin 900 -> 0 bytes
.../AgingGorilla/inactive-minimize-button.png | Bin 927 -> 0 bytes
src/themes/AgingGorilla/metacity-theme-1.xml | 291 ------
src/themes/Atlanta/metacity-theme-1.xml | 350 -------
src/themes/Bright/metacity-theme-1.xml | 376 --------
src/themes/Bright/metacity-theme-2.xml | 546 -----------
src/themes/Crux/active-above-button.png | Bin 197 -> 0 bytes
src/themes/Crux/active-border-top-left-border.png | Bin 147 -> 0 bytes
src/themes/Crux/active-border-top-right-border.png | Bin 147 -> 0 bytes
src/themes/Crux/active-bottom-left-border.png | Bin 154 -> 0 bytes
src/themes/Crux/active-bottom-left-corner.png | Bin 166 -> 0 bytes
src/themes/Crux/active-bottom-mid-left-border.png | Bin 171 -> 0 bytes
src/themes/Crux/active-bottom-mid-right-border.png | Bin 276 -> 0 bytes
src/themes/Crux/active-bottom-right-border.png | Bin 154 -> 0 bytes
src/themes/Crux/active-bottom-right-corner.png | Bin 171 -> 0 bytes
src/themes/Crux/active-button-prelight.png | Bin 385 -> 0 bytes
src/themes/Crux/active-button-pressed.png | Bin 391 -> 0 bytes
src/themes/Crux/active-button.png | Bin 396 -> 0 bytes
src/themes/Crux/active-close-button.png | Bin 341 -> 0 bytes
src/themes/Crux/active-left-border.png | Bin 138 -> 0 bytes
src/themes/Crux/active-left-top-border-shaded.png | Bin 160 -> 0 bytes
src/themes/Crux/active-left-top-border.png | Bin 224 -> 0 bytes
src/themes/Crux/active-maximize-button.png | Bin 184 -> 0 bytes
src/themes/Crux/active-menu-button-prelight.png | Bin 455 -> 0 bytes
src/themes/Crux/active-menu-button-pressed.png | Bin 424 -> 0 bytes
src/themes/Crux/active-menu-button.png | Bin 436 -> 0 bytes
src/themes/Crux/active-minimize-button.png | Bin 257 -> 0 bytes
src/themes/Crux/active-restore-button.png | Bin 171 -> 0 bytes
src/themes/Crux/active-right-border.png | Bin 136 -> 0 bytes
src/themes/Crux/active-right-top-border-shaded.png | Bin 274 -> 0 bytes
src/themes/Crux/active-right-top-border.png | Bin 282 -> 0 bytes
src/themes/Crux/active-shade-button.png | Bin 296 -> 0 bytes
src/themes/Crux/active-stick-button.png | Bin 249 -> 0 bytes
src/themes/Crux/active-top-center-left.png | Bin 238 -> 0 bytes
src/themes/Crux/active-top-center-mid-left.png | Bin 902 -> 0 bytes
src/themes/Crux/active-top-center-mid-right.png | Bin 1083 -> 0 bytes
src/themes/Crux/active-top-center-right.png | Bin 312 -> 0 bytes
src/themes/Crux/active-top-left-border.png | Bin 168 -> 0 bytes
src/themes/Crux/active-top-left-corner.png | Bin 162 -> 0 bytes
src/themes/Crux/active-top-mid-left-border.png | Bin 210 -> 0 bytes
src/themes/Crux/active-top-mid-right-border.png | Bin 276 -> 0 bytes
src/themes/Crux/active-top-right-border.png | Bin 170 -> 0 bytes
src/themes/Crux/active-top-right-corner.png | Bin 171 -> 0 bytes
src/themes/Crux/active-unabove-button.png | Bin 205 -> 0 bytes
src/themes/Crux/active-unshade-button.png | Bin 261 -> 0 bytes
src/themes/Crux/active-unstick-button.png | Bin 248 -> 0 bytes
src/themes/Crux/inactive-above-button.png | Bin 205 -> 0 bytes
.../Crux/inactive-border-top-left-border.png | Bin 153 -> 0 bytes
.../Crux/inactive-border-top-right-border.png | Bin 154 -> 0 bytes
src/themes/Crux/inactive-bottom-left-border.png | Bin 158 -> 0 bytes
src/themes/Crux/inactive-bottom-left-corner.png | Bin 176 -> 0 bytes
src/themes/Crux/inactive-bottom-mid-border.png | Bin 254 -> 0 bytes
src/themes/Crux/inactive-bottom-right-border.png | Bin 148 -> 0 bytes
src/themes/Crux/inactive-bottom-right-corner.png | Bin 188 -> 0 bytes
src/themes/Crux/inactive-button-prelight.png | Bin 357 -> 0 bytes
src/themes/Crux/inactive-button-pressed.png | Bin 379 -> 0 bytes
src/themes/Crux/inactive-button.png | Bin 390 -> 0 bytes
src/themes/Crux/inactive-close-button.png | Bin 211 -> 0 bytes
src/themes/Crux/inactive-left-border.png | Bin 137 -> 0 bytes
.../Crux/inactive-left-top-border-shaded.png | Bin 212 -> 0 bytes
src/themes/Crux/inactive-left-top-border.png | Bin 264 -> 0 bytes
src/themes/Crux/inactive-maximize-button.png | Bin 264 -> 0 bytes
src/themes/Crux/inactive-menu-button-prelight.png | Bin 410 -> 0 bytes
src/themes/Crux/inactive-menu-button-pressed.png | Bin 375 -> 0 bytes
src/themes/Crux/inactive-menu-button.png | Bin 374 -> 0 bytes
src/themes/Crux/inactive-minimize-button.png | Bin 255 -> 0 bytes
src/themes/Crux/inactive-restore-button.png | Bin 249 -> 0 bytes
src/themes/Crux/inactive-right-border.png | Bin 140 -> 0 bytes
.../Crux/inactive-right-top-border-shaded.png | Bin 267 -> 0 bytes
src/themes/Crux/inactive-right-top-border.png | Bin 262 -> 0 bytes
src/themes/Crux/inactive-shade-button.png | Bin 213 -> 0 bytes
src/themes/Crux/inactive-stick-button.png | Bin 200 -> 0 bytes
src/themes/Crux/inactive-top-center-left.png | Bin 232 -> 0 bytes
src/themes/Crux/inactive-top-center-mid.png | Bin 981 -> 0 bytes
src/themes/Crux/inactive-top-center-right.png | Bin 238 -> 0 bytes
src/themes/Crux/inactive-top-left-border.png | Bin 157 -> 0 bytes
src/themes/Crux/inactive-top-left-corner.png | Bin 163 -> 0 bytes
src/themes/Crux/inactive-top-mid-border.png | Bin 252 -> 0 bytes
src/themes/Crux/inactive-top-right-border.png | Bin 159 -> 0 bytes
src/themes/Crux/inactive-top-right-corner.png | Bin 176 -> 0 bytes
src/themes/Crux/inactive-unabove-button.png | Bin 212 -> 0 bytes
src/themes/Crux/inactive-unshade-button.png | Bin 204 -> 0 bytes
src/themes/Crux/inactive-unstick-button.png | Bin 190 -> 0 bytes
src/themes/Crux/metacity-theme-1.xml | 579 ------------
src/themes/Crux/metacity-theme-2.xml | 832 ----------------
src/themes/Esco/metacity-theme-1.xml | 990 --------------------
src/themes/Gorilla/README | 7 -
src/themes/Gorilla/active-button.png | Bin 844 -> 0 bytes
src/themes/Gorilla/active-close-button.png | Bin 896 -> 0 bytes
src/themes/Gorilla/active-close-menu-icon.png | Bin 258 -> 0 bytes
src/themes/Gorilla/active-maximize-button.png | Bin 886 -> 0 bytes
src/themes/Gorilla/active-maximize-menu-icon.png | Bin 284 -> 0 bytes
src/themes/Gorilla/active-menu-button.png | Bin 873 -> 0 bytes
src/themes/Gorilla/active-minimize-button.png | Bin 914 -> 0 bytes
src/themes/Gorilla/active-minimize-menu-icon.png | Bin 332 -> 0 bytes
src/themes/Gorilla/gorilla.xcf.bz2 | Bin 11040 -> 0 bytes
src/themes/Gorilla/inactive-close-button.png | Bin 919 -> 0 bytes
src/themes/Gorilla/inactive-maximize-button.png | Bin 903 -> 0 bytes
src/themes/Gorilla/inactive-menu-button.png | Bin 900 -> 0 bytes
src/themes/Gorilla/inactive-minimize-button.png | Bin 927 -> 0 bytes
src/themes/Gorilla/metacity-theme-1.xml | 260 -----
src/themes/Makefile.am | 50 -
src/themes/Metabox/metacity-theme-1.xml | 479 ----------
src/themes/Simple/close.png | Bin 333 -> 0 bytes
src/themes/Simple/maximize.png | Bin 291 -> 0 bytes
src/themes/Simple/maximized.png | Bin 340 -> 0 bytes
src/themes/Simple/metacity-theme-1.xml | 346 -------
src/themes/Simple/minimize.png | Bin 199 -> 0 bytes
src/tools/Makefile.am | 36 +-
.../{metacity-grayscale.c => mutter-grayscale.c} | 0
src/tools/{metacity-mag.c => mutter-mag.c} | 0
src/tools/{metacity-message.c => mutter-message.c} | 14 +-
...metacity-window-demo.c => mutter-window-demo.c} | 4 +-
...city-window-demo.png => mutter-window-demo.png} | Bin 3453 -> 3453 bytes
src/ui/draw-workspace.c | 2 +-
src/ui/fixedtip.c | 2 +-
src/ui/fixedtip.h | 2 +-
src/ui/gradient.h | 2 +-
src/ui/menu.c | 2 +-
src/ui/menu.h | 2 +-
src/ui/tabpopup.c | 2 +-
src/ui/testgradient.c | 2 +-
src/ui/theme-parser.c | 4 +-
src/ui/theme-viewer.c | 4 +-
src/ui/ui.c | 2 +-
src/wm-tester/Makefile.am | 12 +-
test/{metacity-test => mutter-test} | 16 +-
test/tokentest/Makefile | 2 +-
218 files changed, 536 insertions(+), 8022 deletions(-)
---
diff --git a/README b/README
index 2b82e5c..66af52b 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
2.15.x, 2.17.x.
-COMPILING METACITY
+COMPILING MUTTER
===
You need GTK+ 2.2. For startup notification to work you need
@@ -20,6 +20,7 @@ libstartup-notification at
http://www.freedesktop.org/software/startup-notification/ or on the
GNOME ftp site. You also need GConf 1.2 (unless building a funky
extra-small embedded metacity with --disable-gconf, see below).
+You need Clutter 0.9.3. You need gobject-introspection 0.6.3.
REPORTING BUGS AND SUBMITTING PATCHES
===
@@ -36,47 +37,11 @@ Feel free to send patches too; Metacity is relatively small and
simple, so if you find a bug or want to add a feature it should be
pretty easy. Send me mail, or put the patch in bugzilla.
-See the HACKING file for some notes on hacking Metacity.
+See the HACKING file for some notes on hacking Mutter.
-SHRINKING METACITY
+MUTTER FEATURES
===
-Not that metacity is huge, but a substantial amount of code is in
-preferences handling, in static strings that aren't essential, and in
-the theme engine.
-
-You can strip about 70K from the metacity binary by compiling with
-options such as:
-
- --disable-gconf
- --disable-sm
- --disable-verbose
- --disable-startup-notification
-
-However the result is no good for desktop use, all prefs have to be
-hardcoded in the binary, for example. If you wanted to make a really
-small metacity, here's some additional stuff you might consider
-implementing:
-
- - add --disable-themes, which would replace theme.c and theme-parser.c
- with a hardcoded implementation of the interface in theme.h,
- should save about 80K. This should be fairly easy.
-
- - add --disable-gtk, which would implement the interface in ui.h
- without using GTK. This one is easier than you think because the
- main part of the window manager doesn't use GTK directly, but is
- still fairly hard to do. You would probably have to give up some
- of the features, such as window menus, as menus are pretty complex
- to implement well. So time may be better spent adding a GTK
- configure script feature to build GTK with only a small core set of
- functionality.
-
-METACITY FEATURES
-===
-
- - Boring window manager for the adult in you. Many window managers
- are like Marshmallow Froot Loops; Metacity is like Cheerios.
-
- Uses GTK+ 2.0 for drawing window frames. This means colors, fonts,
etc. come from GTK+ theme.
@@ -132,8 +97,6 @@ METACITY FEATURES
Also try the GNOME keyboard shortcuts control panel, or
gconf-editor.
- See metacity.schemas for all available bindings.
-
- Window keybindings:
Alt-space window menu
@@ -185,13 +148,13 @@ METACITY FEATURES
- Session management:
- Metacity connects to the session manager and will set itself up to
+ Mutter connects to the session manager and will set itself up to
be respawned. It theoretically restores sizes/positions/workspace
for session-aware applications.
- - Metacity implements much of the EWMH window manager specification
+ - Mutter implements much of the EWMH window manager specification
from freedesktop.org, as well as the older ICCCM. Please refer to
- the COMPLIANCE file for information on metacity compliance with
+ the COMPLIANCE file for information on mutter compliance with
these standards.
- Uses Pango to render text, so has cool i18n capabilities.
@@ -210,7 +173,7 @@ METACITY FEATURES
- handles the window manager selection from the ICCCM. Will exit if
another WM claims it, and can claim it from another WM if you pass
the --replace argument. So if you're running another
- ICCCM-compliant WM, you can run "metacity --replace" to replace it
+ ICCCM-compliant WM, you can run "mutter --replace" to replace it
with Metacity.
- does basic colormap handling
@@ -220,7 +183,7 @@ METACITY FEATURES
HOW TO ADD EXTERNAL FEATURES
===
-You can write a metacity "plugin" such as a pager, window list, icon
+You can write a mutter "plugin" such as a pager, window list, icon
box, task menu, or even things like "window matching" using the
Extended Window Manager Hints. See http://www.freedesktop.org for the
EWMH specification. An easy-to-use library called "libwnck" is
@@ -228,10 +191,10 @@ available that uses the EWMH and is specifically designed for writing
WM accessories.
You might be interested in existing accessories such as "Devil's Pie"
-by Ross Burton, which add features to Metacity (or other
+by Ross Burton, which add features to Mutter (or other
EWMH-compliant WMs).
-METACITY BUGS, NON-FEATURES, AND CAVEATS
+MUTTER BUGS, NON-FEATURES, AND CAVEATS
===
See bugzilla: http://bugzilla.gnome.org/query.cgi
@@ -270,26 +233,15 @@ A: If it makes sense to turn on unconditionally, or is genuinely a
http://pobox.com/~hp/free-software-ui.html
http://pobox.com/~hp/features.html
-Q: Will Metacity be part of GNOME?
-
-A: It is officially part of GNOME as of GNOME 2.2. Prior to that,
- it was unofficially shipped as the default GNOME WM by several
- OS vendors.
-
-Q: Is Metacity a Red Hat project?
+Q: Will Mutter be part of GNOME?
-A: Metacity's original creation was in no way funded, endorsed, or
- encouraged by Red Hat, Inc. - I'm guessing Red Hat would not
- consider "insufficient number of window managers for Linux" an
- urgent problem. Just a wild guess though.
+A: It is not officially part of GNOME as of GNOME 2.27. We are
+ hoping to have mutter officially included as of GNOME 2.28.
- Now that metacity is the default WM however, Red Hat supports some
- bugfixing and other work.
-
-Q: Why does Metacity remember the workspace/position of some apps
+Q: Why does Mutter remember the workspace/position of some apps
but not others across logout/login?
-A: Metacity only stores sizes/positions for apps that are session
+A: Mutter only stores sizes/positions for apps that are session
managed. As far as I can determine, there is no way to attempt to
remember workspace/position for non-session-aware apps without
causing a lot of weird effects.
@@ -304,7 +256,7 @@ A: Metacity only stores sizes/positions for apps that are session
place. And in fact I see a lot of bugs like this in window managers
that try to handle non-session-aware apps.
- However, for session-aware apps, Metacity can tell that the
+ However, for session-aware apps, Mutter can tell that the
application instance is from the session and thus restore it
reliably, assuming the app properly restores the windows it had
open on session save.
@@ -456,7 +408,7 @@ A: There are quite a few, though many opportunities remain. Sometimes
- and much more.
-Q: I think metacity sucks.
+Q: I think mutter sucks.
A: Feel free to use any WM you like. The reason metacity follows the
ICCCM and EWMH specifications is that it makes metacity a modular,
diff --git a/autogen.sh b/autogen.sh
index 1159af2..c9396c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="metacity"
+PKG_NAME="mutter"
REQUIRED_AUTOMAKE_VERSION=1.10
(test -f $srcdir/configure.in \
diff --git a/configure.in b/configure.in
index f4393fe..215a380 100644
--- a/configure.in
+++ b/configure.in
@@ -1,19 +1,18 @@
AC_PREREQ(2.50)
-m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [27])
+m4_define([mutter_major_version], [2])
+m4_define([mutter_minor_version], [27])
# Fibonacci sequence for micro version numbering:
# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [0])
-m4_define([mutter_version],[0.7])
+m4_define([mutter_micro_version], [0])
-m4_define([metacity_version],
- [metacity_major_version.metacity_minor_version.metacity_micro_version~mutter_version])
+m4_define([mutter_version],
+ [mutter_major_version.mutter_minor_version.mutter_micro_version])
-m4_define([metacity_clutter_plugin_api_version], [2])
+m4_define([mutter_plugin_api_version], [2])
-AC_INIT([metacity], [metacity_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
+AC_INIT([mutter], [mutter_version],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
AC_CONFIG_SRCDIR(src/core/display.c)
AC_CONFIG_HEADERS(config.h)
@@ -21,22 +20,22 @@ AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
-METACITY_MAJOR_VERSION=metacity_major_version
-METACITY_MINOR_VERSION=metacity_minor_version
-METACITY_MICRO_VERSION=metacity_micro_version
-METACITY_CLUTTER_PLUGIN_API_VERSION=metacity_clutter_plugin_api_version
-AC_SUBST(METACITY_MAJOR_VERSION)
-AC_SUBST(METACITY_MINOR_VERSION)
-AC_SUBST(METACITY_MICRO_VERSION)
-AC_SUBST(METACITY_CLUTTER_PLUGIN_API_VERSION)
+MUTTER_MAJOR_VERSION=mutter_major_version
+MUTTER_MINOR_VERSION=mutter_minor_version
+MUTTER_MICRO_VERSION=mutter_micro_version
+MUTTER_PLUGIN_API_VERSION=mutter_plugin_api_version
+AC_SUBST(MUTTER_MAJOR_VERSION)
+AC_SUBST(MUTTER_MINOR_VERSION)
+AC_SUBST(MUTTER_MICRO_VERSION)
+AC_SUBST(MUTTER_PLUGIN_API_VERSION)
-MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins/clutter"
+MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins"
AC_SUBST(MUTTER_PLUGIN_DIR)
# Honor aclocal flags
AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
-GETTEXT_PACKAGE=metacity
+GETTEXT_PACKAGE=mutter
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
@@ -123,7 +122,7 @@ if test "x$GCC" = "xyes"; then
fi
changequote([,])dnl
-METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
+MUTTER_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
AC_ARG_ENABLE(gconf,
AC_HELP_STRING([--disable-gconf],
@@ -132,12 +131,12 @@ AC_ARG_ENABLE(gconf,
if test x$enable_gconf = xyes; then
AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
- METACITY_PC_MODULES="$METACITY_PC_MODULES gconf-2.0 >= 1.2.0"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
fi
AC_ARG_ENABLE(verbose-mode,
AC_HELP_STRING([--disable-verbose-mode],
- [disable metacity's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
+ [disable mutter's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
enable_verbose_mode=yes)
if test x$enable_verbose_mode = xyes; then
@@ -146,42 +145,42 @@ fi
AC_ARG_ENABLE(sm,
AC_HELP_STRING([--disable-sm],
- [disable metacity's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
+ [disable mutter's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
enable_sm=auto)
AC_ARG_ENABLE(startup-notification,
AC_HELP_STRING([--disable-startup-notification],
- [disable metacity's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
+ [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
enable_startup_notification=auto)
AC_ARG_ENABLE(compositor,
AC_HELP_STRING([--disable-compositor],
- [disable metacity's compositing manager]),,
+ [disable mutter's compositing manager]),,
enable_compositor=auto)
-AC_ARG_WITH(clutter,
- AC_HELP_STRING([--with-clutter],
- [Use clutter for compositing]),,
+AC_ARG_ENABLE(clutter,
+ AC_HELP_STRING([--without-clutter],
+ [disable the use of clutter for compositing]),,
with_clutter=auto)
-AC_ARG_WITH(introspection,
- AC_HELP_STRING([--with-introspection],
- [Use GObject introspection]),,
+AC_ARG_ENABLE(introspection,
+ AC_HELP_STRING([--without-introspection],
+ [disable the use of GObject introspection]),,
with_introspection=auto)
AC_ARG_ENABLE(xsync,
AC_HELP_STRING([--disable-xsync],
- [disable metacity's use of the XSync extension]),,
+ [disable mutter's use of the XSync extension]),,
enable_xsync=auto)
AC_ARG_ENABLE(render,
AC_HELP_STRING([--disable-render],
- [disable metacity's use of the RENDER extension]),,
+ [disable mutter's use of the RENDER extension]),,
enable_render=auto)
AC_ARG_ENABLE(shape,
AC_HELP_STRING([--disable-shape],
- [disable metacity's use of the shaped window extension]),,
+ [disable mutter's use of the shaped window extension]),,
enable_shape=auto)
## try definining HAVE_BACKTRACE
@@ -193,8 +192,8 @@ AM_GLIB_GNU_GETTEXT
# GOptionEntry requires glib-2.6.0
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
# gtk_window_set_icon_name requires gtk2+-2.60
-PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
echo "pangoxft found"
@@ -226,7 +225,7 @@ fi
if test x$have_startup_notification = xyes; then
echo "Building with libstartup-notification"
- METACITY_PC_MODULES="$METACITY_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
else
echo "Building without libstartup-notification"
@@ -249,9 +248,10 @@ fi
if test x$with_clutter = xyes; then
have_xcomposite=yes
have_clutter=yes
- echo "CompositeExt support and Clutter forced on"
elif test x$with_clutter = xauto; then
- have_clutter=no
+ echo "Building clutter compositing manager by default now."
+ have_xcomposite=yes
+ have_clutter=yes
else
have_clutter=no
fi
@@ -268,7 +268,7 @@ if test x$have_xcomposite = xyes; then
fi
if test x$have_xcomposite = xyes; then
- METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
echo "Building with compositing manager"
@@ -300,7 +300,7 @@ if test x$have_xcomposite = xno; then
if test x$have_xrender = xyes; then
echo "Building with Render"
- METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES xrender >= $XRENDER_VERSION"
fi
fi ## have_composite
@@ -311,17 +311,17 @@ fi
CLUTTER_PACKAGE=clutter-0.9
AC_SUBST(CLUTTER_PACKAGE)
if test x$have_clutter = xyes; then
- METACITY_PC_MODULES="$METACITY_PC_MODULES $CLUTTER_PACKAGE "
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
dnl Check for the clutter-glx-texture-pixmap header
- metacity_save_cppflags="$CPPFLAGS"
+ mutter_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
[have_glx_texture_pixmap=yes],
[have_glx_texture_pixmap=no])
- CPPFLAGS="$metacity_save_cppflags"
+ CPPFLAGS="$mutter_save_cppflags"
if test x$have_glx_texture_pixmap = xyes; then
AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
@@ -332,7 +332,7 @@ fi
if test x$with_introspection != xno; then
PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0, have_introspection=yes, have_introspection=no)
if test x$have_introspection=xyes; then
- METACITY_PC_MODULES="$METACITY_PC_MODULES gobject-introspection-1.0"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
AC_SUBST(G_IR_SCANNER)
@@ -358,23 +358,23 @@ if $PKG_CONFIG xcursor; then
if test x$have_xcursor = xyes; then
echo "Building with Xcursor"
- METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
fi
-PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
+PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
AC_PATH_XTRA
ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
# Check for Xinerama extension (Solaris impl or Xfree impl)
-metacity_save_cppflags="$CPPFLAGS"
+mutter_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_ARG_ENABLE(xinerama,
AC_HELP_STRING([--disable-xinerama],
- [disable metacity's use of the Xinerama extension]),
+ [disable mutter's use of the Xinerama extension]),
try_xinerama=$enable_xinerama,try_xinerama=yes)
use_solaris_xinerama=no
@@ -420,7 +420,7 @@ if test "${try_xinerama}" != no; then
esac
fi
-CPPFLAGS="$metacity_save_cppflags"
+CPPFLAGS="$mutter_save_cppflags"
SHAPE_LIBS=
found_shape=no
@@ -491,21 +491,21 @@ if test "x$found_xsync" = "xyes"; then
AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
fi
-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
-METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
found_sm=no
-case "$METACITY_LIBS" in
+case "$MUTTER_LIBS" in
*-lSM*)
found_sm=yes
;;
*)
AC_CHECK_LIB(SM, SmcSaveYourselfDone,
[AC_CHECK_HEADERS(X11/SM/SMlib.h,
- METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=yes)],
- , $METACITY_LIBS)
+ MUTTER_LIBS="-lSM -lICE $MUTTER_LIBS" found_sm=yes)],
+ , $MUTTER_LIBS)
;;
esac
@@ -572,14 +572,12 @@ GNOME_DOC_INIT([0.8.0])
AC_CONFIG_FILES([
Makefile
doc/Makefile
-doc/creating_themes/Makefile
doc/man/Makefile
src/Makefile
src/wm-tester/Makefile
-src/libmetacity-private.pc
-src/metacity-plugins.pc
+src/libmutter-private.pc
+src/mutter-plugins.pc
src/tools/Makefile
-src/themes/Makefile
src/compositor/mutter/plugins/Makefile
po/Makefile.in
])
@@ -596,14 +594,14 @@ fi
if test x$enable_verbose_mode = xno; then
echo "*** WARNING WARNING WARNING WARNING WARNING"
echo "*** Building without verbose mode"
- echo "*** This means there's no way to debug metacity problems."
- echo "*** Please build normal desktop versions of metacity"
+ echo "*** This means there's no way to debug mutter problems."
+ echo "*** Please build normal desktop versions of mutter"
echo "*** with verbose mode enabled so users can use it when they report bugs."
fi
dnl ==========================================================================
echo "
-metacity-$VERSION:
+mutter-$VERSION:
prefix: ${prefix}
source code location: ${srcdir}
@@ -624,12 +622,12 @@ metacity-$VERSION:
Clutter: ${have_clutter}
"
-METACITY_MINOR_VERSION=metacity_minor_version
-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
- stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
- echo "This is the UNSTABLE branch of metacity"
+MUTTER_MINOR_VERSION=mutter_minor_version
+if test $(( $(echo $MUTTER_MINOR_VERSION) %2)) == "1"; then
+ stable_version=$(( ($MUTTER_MINOR_VERSION / 2) * 2))
+ echo "This is the UNSTABLE branch of mutter"
echo -n "Use 2.$stable_version.x for stable "
echo "(gnome-2-$stable_version branch in Subversion)"
else
- echo "This is the stable branch of metacity"
+ echo "This is the stable branch of mutter"
fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09feb1d..f613abd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man creating_themes
+SUBDIRS = man
-EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
+EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
how-to-get-focus-right.txt
diff --git a/doc/compositor-control.txt b/doc/compositor-control.txt
index e2e04bd..1253cc3 100644
--- a/doc/compositor-control.txt
+++ b/doc/compositor-control.txt
@@ -42,5 +42,5 @@ options you can set are:
menus zooming, dialogues being semi-transparent, and so on. Try it
and see whether you like it.
-If you have any problems, ask on metacity-devel-list gnome org, or
+If you have any problems, ask on mutter-devel-list gnome org, or
#gnome-hackers on gimpnet, or come and find me (tthurman at gnome) and ask.
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1277f5b..d2eb64d 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,4 @@
-man_MANS = metacity.1 metacity-theme-viewer.1 \
- metacity-window-demo.1 metacity-message.1
+man_MANS = mutter.1 mutter-theme-viewer.1 \
+ mutter-window-demo.1 mutter-message.1
EXTRA_DIST = $(man_MANS)
diff --git a/doc/man/metacity-message.1 b/doc/man/mutter-message.1
similarity index 87%
rename from doc/man/metacity-message.1
rename to doc/man/mutter-message.1
index 7ee62cd..c301875 100644
--- a/doc/man/metacity-message.1
+++ b/doc/man/mutter-message.1
@@ -12,7 +12,7 @@
.\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
.\" > since I have contributed that for Debian. so GPL is no problem for me.
.\" -----
-.TH METACITY\-MESSAGE 1 "28 August 2002"
+.TH MUTTER\-MESSAGE 1 "28 August 2002"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -26,24 +26,24 @@
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
-METACITY\-MESSAGE \- a command to send a message to Metacity
+MUTTER\-MESSAGE \- a command to send a message to Mutter
.SH SYNOPSIS
-.B METACITY\-MESSAGE
+.B MUTTER\-MESSAGE
[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
.SH DESCRIPTION
This manual page documents briefly the
-.B metacity\-message\fP.
+.B mutter\-message\fP.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
-\fBmetacity\-message\fP send a specified message to \fBmetacity\fP(1).
+\fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
.SH OPTIONS
.TP
.B restart
-Restart \fBmetacity\fP(1) which is running.
+Restart \fBmutter\fP(1) which is running.
.TP
.B reload-theme
Reload a theme which is specified on gconf database.
@@ -54,7 +54,7 @@ Enable all of keybindings which is specified on gconf database.
.B disable-keybindings
Disable all of keybindings which is specified on gconf database.
.SH SEE ALSO
-.BR metacity (1)
+.BR mutter (1)
.SH AUTHOR
This manual page was written by Akira TAGOH <tagoh debian org>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/metacity-theme-viewer.1 b/doc/man/mutter-theme-viewer.1
similarity index 69%
rename from doc/man/metacity-theme-viewer.1
rename to doc/man/mutter-theme-viewer.1
index 72df142..19fc0be 100644
--- a/doc/man/metacity-theme-viewer.1
+++ b/doc/man/mutter-theme-viewer.1
@@ -3,21 +3,21 @@
.\"
.\" Based on template provided by Tom Christiansen <tchrist jhereg perl com>.
.\"
-.TH METACITY-THEME-VIEWER 1 "1 June 2004"
+.TH MUTTER-THEME-VIEWER 1 "1 June 2004"
.SH NAME
-metacity-theme-viewer \- view metacity themes
+mutter-theme-viewer \- view mutter themes
.SH SYNOPSIS
-.B metacity-theme-viewer
+.B mutter-theme-viewer
[
.I THEMENAME
]
.SH DESCRIPTION
.\" Putting a newline after each sentence can generate better output.
-.B metacity-theme-viewer
-allows you to preview any installed Metacity theme.
+.B mutter-theme-viewer
+allows you to preview any installed Mutter theme.
.PP
-When designing a new Metacity theme, you can use
-.B metacity-theme-viewer
+When designing a new Mutter theme, you can use
+.B mutter-theme-viewer
to measure the performance of a window frame option, and to preview
the option.
.SH OPTIONS
@@ -32,12 +32,12 @@ It is case-sensitive.
.I /usr/share/themes
system themes directory
.TP
-.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+.I /usr/share/themes/*/mutter-1/mutter-theme-1.xml
theme specification file
.SH AUTHOR
This manual page was written by Jose M. Moya <josem die upm es>, for
the Debian GNU/Linux system (but may be used by others).
.SH "SEE ALSO"
.\" Always quote multiple words for .SH
-.BR metacity (1),
-.BR metacity-window-demo (1).
+.BR mutter (1),
+.BR mutter-window-demo (1).
diff --git a/doc/man/metacity-window-demo.1 b/doc/man/mutter-window-demo.1
similarity index 81%
rename from doc/man/metacity-window-demo.1
rename to doc/man/mutter-window-demo.1
index b7e4a85..605d048 100644
--- a/doc/man/metacity-window-demo.1
+++ b/doc/man/mutter-window-demo.1
@@ -3,11 +3,11 @@
.\"
.\" Based on template provided by Tom Christiansen <tchrist jhereg perl com>.
.\"
-.TH METACITY-WINDOW-DEMO 1 "1 June 2004"
+.TH MUTTER-WINDOW-DEMO 1 "1 June 2004"
.SH NAME
-metacity-window-demo \- demo of window features
+mutter-window-demo \- demo of window features
.SH SYNOPSIS
-.B metacity-window-demo
+.B mutter-window-demo
.SH DESCRIPTION
.\" Putting a newline after each sentence can generate better output.
This program demonstrates various kinds of windows that window
@@ -21,5 +21,5 @@ the Debian GNU/Linux system (but may be used by others).
.SH "SEE ALSO"
.\" Always quote multiple words for .SH
.BR x-window-manager (1),
-.BR metacity (1),
-.BR metacity-theme-viewer (1).
+.BR mutter (1),
+.BR mutter-theme-viewer (1).
diff --git a/doc/man/metacity.1 b/doc/man/mutter.1
similarity index 63%
rename from doc/man/metacity.1
rename to doc/man/mutter.1
index 3232ade..785d208 100644
--- a/doc/man/metacity.1
+++ b/doc/man/mutter.1
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH METACITY 1 "11 February 2006"
+.TH MUTTER 1 "11 February 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -16,25 +16,25 @@
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
-METACITY \- minimal GTK2 Window Manager
+MUTTER \- Clutter based compositing GTK2 Window Manager
.SH SYNOPSIS
-.B metacity
+.B mutter
[\-\-display=\fIDISPLAY\fP] [\-\-replace] [\-\-sm\-client\-id=\fIID\fP] [\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-version] [\-\-help]
.SH DESCRIPTION
This manual page documents briefly
-.B metacity\fP.
+.B mutter\fP.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
-\fBmetacity\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop. \fBmetacity\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
+\fBmutter\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop. \fBmutter\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
.SH OPTIONS
.TP
.B \-\-display=DISPLAY
Connect to X display \fIDISPLAY\fP.
.TP
.B \-\-replace
-a window manager which is running is replaced by \fBmetacity\fP. Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
+a window manager which is running is replaced by \fBmutter\fP. Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
.TP
.B \-\-sm\-client\-id=ID
Specify a session management \fIID\fP.
@@ -51,10 +51,10 @@ Print the version number.
.B \-?, \-\-help
Show summary of options.
.SH CONFIGURATION
-\fBmetacity\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
.SH SEE ALSO
-.BR metacity-message (1)
+.BR mutter-message (1)
.SH AUTHOR
The original manual page was written by Thom May <thom debian org>. It was updated by Akira TAGOH <tagoh debian org>
for the Debian GNU/Linux system (with permission to use by others), and then updated by Luke Morton and Philip O'Brien
-for inclusion in metacity.
+for inclusion in mutter.
diff --git a/src/Makefile.am b/src/Makefile.am
index 365d096..f95c980 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
-lib_LTLIBRARIES = libmetacity-private.la
+lib_LTLIBRARIES = libmutter-private.la
-SUBDIRS=wm-tester tools themes
+SUBDIRS=wm-tester tools
if WITH_CLUTTER
SUBDIRS += compositor/mutter/plugins
endif
-INCLUDES= METACITY_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -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 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR \"
+INCLUDES= MUTTER_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -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_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR \"
-metacity_SOURCES= \
+mutter_SOURCES= \
core/async-getprop.c \
core/async-getprop.h \
core/alttabhandler.c \
@@ -57,7 +57,7 @@ metacity_SOURCES= \
core/keybindings-private.h \
core/main.c \
include/main.h \
- core/metacity-Xatomtype.h \
+ core/mutter-Xatomtype.h \
core/place.c \
core/place.h \
core/prefs.c \
@@ -107,7 +107,7 @@ metacity_SOURCES= \
include/all-keybindings.h
if WITH_CLUTTER
-metacity_SOURCES += \
+mutter_SOURCES += \
compositor/mutter/compositor-mutter.c \
compositor/mutter/mutter-shaped-texture.c \
compositor/mutter/mutter-shaped-texture.h \
@@ -122,10 +122,10 @@ metacity_SOURCES += \
include/compositor-mutter.h
endif
-# 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= \
+# by setting libmutter_private_la_CFLAGS, the files shared with
+# mutter proper will be compiled with different names.
+libmutter_private_la_CFLAGS =
+libmutter_private_la_SOURCES= \
core/boxes.c \
include/boxes.h \
ui/gradient.c \
@@ -140,12 +140,12 @@ libmetacity_private_la_SOURCES= \
ui/theme.c \
ui/theme.h
-libmetacity_private_la_LDFLAGS = -no-undefined
-libmetacity_private_la_LIBADD = @METACITY_LIBS@
+libmutter_private_la_LDFLAGS = -no-undefined
+libmutter_private_la_LIBADD = @MUTTER_LIBS@
-libmetacityincludedir = $(includedir)/metacity-1/metacity-private
+libmutterincludedir = $(includedir)/mutter/mutter-private
-libmetacityinclude_base_headers = \
+libmutterinclude_base_headers = \
include/alttabhandler.h \
include/boxes.h \
ui/gradient.h \
@@ -167,28 +167,19 @@ libmetacityinclude_base_headers = \
include/mutter-plugin.h
# Excluded from scanning for introspection but installed
-libmetacityinclude_extra_headers = \
+libmutterinclude_extra_headers = \
include/atomnames.h
-libmetacityinclude_HEADERS = \
- $(libmetacityinclude_base_headers) \
- $(libmetacityinclude_extra_headers)
+libmutterinclude_HEADERS = \
+ $(libmutterinclude_base_headers) \
+ $(libmutterinclude_extra_headers)
-metacity_theme_viewer_SOURCES= \
+mutter_theme_viewer_SOURCES= \
ui/theme-viewer.c
-schema_bindings_SOURCES = \
- core/schema-bindings.c \
- metacity.schemas.in.in
+bin_PROGRAMS=mutter mutter-theme-viewer
-schema_bindings_LDADD = @METACITY_LIBS@
-metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
- @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
- ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
-
-bin_PROGRAMS=metacity metacity-theme-viewer
-
-api_version = $(METACITY_MAJOR_VERSION).$(METACITY_MINOR_VERSION)
+api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
if WITH_INTROSPECTION
# These files are in package-private directories, even though they may be used
@@ -200,9 +191,9 @@ gir_DATA = Meta-$(api_version).gir
typelibdir = $(pkglibdir)
typelib_DATA = Meta-$(api_version).typelib
-# We need to strip out the attribute that would point back to libmetacity-introspect
+# We need to strip out the attribute that would point back to libmutter-introspect
# so that libgirepository looks for symbols in the executable instead
-Meta-$(api_version).gir: $(G_IR_SCANNER) metacity $(libmetacityinclude_HEADERS) $(metacity_SOURCES)
+Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES)
$(G_IR_SCANNER) \
--namespace=Meta \
--nsversion=$(api_version) \
@@ -213,9 +204,9 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) metacity $(libmetacityinclude_HEADERS)
--pkg=clutter-0.9 \
--pkg=gtk+-2.0 \
--include=xfixes-4.0 \
- --program=./metacity \
- $(filter %.c,$(metacity_SOURCES)) \
- $(libmetacityinclude_base_headers) \
+ --program=./mutter \
+ $(filter %.c,$(mutter_SOURCES)) \
+ $(libmutterinclude_base_headers) \
$(INCLUDES) \
-o $@
@@ -224,43 +215,39 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
endif
EFENCE=
-metacity_LDADD= METACITY_LIBS@ libmetacity-private.la $(EFENCE)
-metacity_LDFLAGS=-export-dynamic
+mutter_LDADD= MUTTER_LIBS@ libmutter-private.la $(EFENCE)
+mutter_LDFLAGS=-export-dynamic
-metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
+mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
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 schema_bindings
+noinst_PROGRAMS=testboxes testgradient testasyncgetprop
-testboxes_LDADD= @METACITY_LIBS@ libmetacity-private.la
-testgradient_LDADD= @METACITY_LIBS@ libmetacity-private.la
-testasyncgetprop_LDADD= @METACITY_LIBS@ libmetacity-private.la
+testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la
+testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la
+testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la
@INTLTOOL_DESKTOP_RULE@
desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=metacity.desktop.in
+desktopfiles_in_files=mutter.desktop.in
desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
desktopfiles_DATA = $(desktopfiles_files)
wmpropertiesdir=$(datadir)/gnome/wm-properties
-wmproperties_in_files=metacity-wm.desktop.in
+wmproperties_in_files=mutter-wm.desktop.in
wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
wmproperties_DATA = $(wmproperties_files)
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = metacity.schemas.in
+schema_in_files = mutter.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_XML_NOMERGE_RULE@
-xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
-xml_DATA = $(xml_in_files:.xml.in=.xml)
-
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
@@ -276,14 +263,14 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h mutter.desktop mutter-wm.desktop mutter.schemas
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmetacity-private.pc metacity-plugins.pc
+pkgconfig_DATA = libmutter-private.pc mutter-plugins.pc
EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_files) \
@@ -291,7 +278,6 @@ EXTRA_DIST=$(desktopfiles_files) \
$(desktopfiles_in_files) \
$(wmproperties_in_files) \
$(schema_in_files) \
- $(xml_in_files) \
- libmetacity-private.pc.in \
- metacity-plugins.pc.in
+ libmutter-private.pc.in \
+ mutter-plugins.pc.in
diff --git a/src/compositor/mutter/mutter-module.c b/src/compositor/mutter/mutter-module.c
index 30a2d0d..65fc50a 100644
--- a/src/compositor/mutter/mutter-module.c
+++ b/src/compositor/mutter/mutter-module.c
@@ -69,7 +69,7 @@ mutter_module_load (GTypeModule *gmodule)
(gpointer *)®ister_type) &&
info && register_type)
{
- if (info->version_api != METACITY_CLUTTER_PLUGIN_API_VERSION)
+ if (info->version_api != MUTTER_PLUGIN_API_VERSION)
g_warning ("Plugin API mismatch for [%s]", priv->path);
else
{
diff --git a/src/compositor/mutter/plugins/Makefile.am b/src/compositor/mutter/plugins/Makefile.am
index 379b426..3296298 100644
--- a/src/compositor/mutter/plugins/Makefile.am
+++ b/src/compositor/mutter/plugins/Makefile.am
@@ -3,7 +3,7 @@ pkglibdir= MUTTER_PLUGIN_DIR@
if WITH_CLUTTER
-INCLUDES= METACITY_CFLAGS@ -I $(top_srcdir)/src/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 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@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 \"
default_la_CFLAGS = -fPIC
default_la_SOURCES = default.c
@@ -14,7 +14,7 @@ pkglib_LTLIBRARIES = default.la
# post-install hook to remove the .la and .a files we are not interested in
# (There is no way to stop libtool generating static libs locally, and we
-# cannot do this globally because of libmetacity-private.so).
+# cannot do this globally because of libmutter-private.so).
install-exec-hook:
-rm $(DESTDIR)$(pkglibdir)/*.a
-rm $(DESTDIR)$(pkglibdir)/*.la
diff --git a/src/core/bell.c b/src/core/bell.c
index 1b6022c..cb0685b 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity visual bell */
+/* Mutter visual bell */
/*
* Copyright (C) 2002 Sun Microsystems Inc.
@@ -25,7 +25,7 @@
/**
* \file bell.c Ring the bell or flash the screen
*
- * Sometimes, X programs "ring the bell", whatever that means. Metacity lets
+ * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
* the user configure the bell to be audible or visible (aka visual), and
* if it's visual it can be configured to be frame-flash or fullscreen-flash.
* We never get told about audible bells; X handles them just fine by itself.
@@ -210,7 +210,12 @@ bell_flash_window_frame (MetaWindow *window)
g_assert (window->frame != NULL);
window->frame->is_flashing = 1;
meta_frame_queue_draw (window->frame);
- g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 100,
+ /* Since this idle is added after the Clutter clock source, with
+ * the same priority, it will be executed after it as well, so
+ * we are guaranteed to get at least one frame drawn in the
+ * flashed state, no matter how loaded we are.
+ */
+ g_timeout_add_full (META_PRIORITY_REDRAW, 100,
bell_unflash_frame, window->frame, NULL);
}
diff --git a/src/core/bell.h b/src/core/bell.h
index 462d1ed..930f3a0 100644
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -3,7 +3,7 @@
/**
* \file bell.h Ring the bell or flash the screen
*
- * Sometimes, X programs "ring the bell", whatever that means. Metacity lets
+ * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
* the user configure the bell to be audible or visible (aka visual), and
* if it's visual it can be configured to be frame-flash or fullscreen-flash.
* We never get told about audible bells; X handles them just fine by itself.
@@ -54,7 +54,7 @@ void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);
/**
* Turns the bell to audible or visual. This tells X what to do, but
- * not Metacity; you will need to set the "visual bell" pref for that.
+ * not Mutter; you will need to set the "visual bell" pref for that.
*
* If the configure script found we had no XKB, this is a no-op.
*
diff --git a/src/core/constraints.c b/src/core/constraints.c
index d3fd7da..57a6a1d 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity size/position constraints */
+/* Mutter size/position constraints */
/*
* Copyright (C) 2002, 2003 Red Hat, Inc.
diff --git a/src/core/constraints.h b/src/core/constraints.h
index 6ccad00..fa3f039 100644
--- a/src/core/constraints.h
+++ b/src/core/constraints.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity size/position constraints */
+/* Mutter size/position constraints */
/*
* Copyright (C) 2002 Red Hat, Inc.
diff --git a/src/core/core.c b/src/core/core.c
index 852c686..00f40fe 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity interface used by GTK+ UI to talk to core */
+/* Mutter interface used by GTK+ UI to talk to core */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/delete.c b/src/core/delete.c
index 6294423..8cc887a 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window deletion */
+/* Mutter window deletion */
/*
* Copyright (C) 2001, 2002 Havoc Pennington
@@ -71,7 +71,8 @@ sigchld_handler (MetaNexus *nexus, guint arg1, gpointer arg2, gpointer user_data
if (GPOINTER_TO_INT (arg2) == ours->dialog_pid)
{
if (arg1 == 1 /* pressed "force quit" */)
- g_idle_add (delete_window_callback, user_data);
+ g_idle_add_full (G_PRIORITY_DEFAULT,
+ delete_window_callback, user_data, NULL);
ours->dialog_pid = -1; /* forget it anyway */
}
@@ -249,7 +250,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
GSList *tmp;
/* Activate transient for window that belongs to
- * metacity-dialog
+ * mutter-dialog
*/
windows = meta_display_list_windows (window->display);
@@ -260,7 +261,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
if (w->xtransient_for == window->xwindow &&
w->res_class &&
- g_ascii_strcasecmp (w->res_class, "metacity-dialog") == 0)
+ g_ascii_strcasecmp (w->res_class, "mutter-dialog") == 0)
{
meta_window_activate (w, timestamp);
break;
diff --git a/src/core/display-private.h b/src/core/display-private.h
index 2f75063..8aeb12f 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X display handler */
+/* Mutter X display handler */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/display.c b/src/core/display.c
index 5920047..309ff23 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X display handler */
+/* Mutter X display handler */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -403,7 +403,7 @@ meta_display_open (void)
#endif
/* FIXME copy the checks from GDK probably */
- the_display->static_gravity_works = g_getenv ("METACITY_USE_STATIC_GRAVITY") != NULL;
+ the_display->static_gravity_works = g_getenv ("MUTTER_USE_STATIC_GRAVITY") != NULL;
meta_bell_init (the_display);
@@ -681,11 +681,11 @@ meta_display_open (void)
meta_prop_set_utf8_string_hint (the_display,
the_display->leader_window,
the_display->atom__NET_WM_NAME,
- "Metacity");
+ "Mutter");
meta_prop_set_utf8_string_hint (the_display,
the_display->leader_window,
- the_display->atom__METACITY_VERSION,
+ the_display->atom__MUTTER_VERSION,
VERSION);
data[0] = the_display->leader_window;
@@ -1434,7 +1434,7 @@ handle_net_restack_window (MetaDisplay* display,
/**
* This is the most important function in the whole program. It is the heart,
- * it is the nexus, it is the Grand Central Station of Metacity's world.
+ * it is the nexus, it is the Grand Central Station of Mutter's world.
* When we create a MetaDisplay, we ask GDK to pass *all* events for *all*
* windows to this function. So every time anything happens that we might
* want to know about, this function gets called. You see why it gets a bit
@@ -1663,7 +1663,7 @@ event_callback (XEvent *event,
gboolean unmodified;
grab_mask = display->window_grab_modifiers;
- if (g_getenv ("METACITY_DEBUG_BUTTON_GRABS"))
+ if (g_getenv ("MUTTER_DEBUG_BUTTON_GRABS"))
grab_mask |= ControlMask;
/* Two possible sources of an unmodified event; one is a
@@ -2235,7 +2235,7 @@ event_callback (XEvent *event,
* sentinel_counter variable declaration in display.h
*/
if (event->xproperty.atom ==
- display->atom__METACITY_SENTINEL)
+ display->atom__MUTTER_SENTINEL)
{
meta_display_decrement_focus_sentinel (display);
}
@@ -2346,13 +2346,13 @@ event_callback (XEvent *event,
}
}
else if (event->xclient.message_type ==
- display->atom__METACITY_RESTART_MESSAGE)
+ display->atom__MUTTER_RESTART_MESSAGE)
{
meta_verbose ("Received restart request\n");
meta_restart ();
}
else if (event->xclient.message_type ==
- display->atom__METACITY_RELOAD_THEME_MESSAGE)
+ display->atom__MUTTER_RELOAD_THEME_MESSAGE)
{
meta_verbose ("Received reload theme request\n");
meta_ui_set_current_theme (meta_prefs_get_theme (),
@@ -2360,14 +2360,14 @@ event_callback (XEvent *event,
meta_display_retheme_all ();
}
else if (event->xclient.message_type ==
- display->atom__METACITY_SET_KEYBINDINGS_MESSAGE)
+ display->atom__MUTTER_SET_KEYBINDINGS_MESSAGE)
{
meta_verbose ("Received set keybindings request = %d\n",
(int) event->xclient.data.l[0]);
meta_set_keybindings_disabled (!event->xclient.data.l[0]);
}
else if (event->xclient.message_type ==
- display->atom__METACITY_TOGGLE_VERBOSE)
+ display->atom__MUTTER_TOGGLE_VERBOSE)
{
meta_verbose ("Received toggle verbose message\n");
meta_set_verbose (!meta_is_verbose ());
@@ -3756,7 +3756,7 @@ meta_display_grab_window_buttons (MetaDisplay *display,
if (display->window_grab_modifiers != 0)
{
- gboolean debug = g_getenv ("METACITY_DEBUG_BUTTON_GRABS") != NULL;
+ gboolean debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
int i;
for (i = 1; i < 4; i++)
{
@@ -3798,7 +3798,7 @@ meta_display_ungrab_window_buttons (MetaDisplay *display,
if (display->window_grab_modifiers == 0)
return;
- debug = g_getenv ("METACITY_DEBUG_BUTTON_GRABS") != NULL;
+ debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
i = 1;
while (i < 4)
{
@@ -3995,7 +3995,7 @@ static gboolean is_syncing = FALSE;
*
* \bug This is *only* called by meta_display_open, but by that time
* we have already turned syncing on or off on startup, and we don't
- * have any way to do so while Metacity is running, so it's rather
+ * have any way to do so while Mutter is running, so it's rather
* pointless.
*/
gboolean
@@ -4971,7 +4971,7 @@ meta_display_increment_focus_sentinel (MetaDisplay *display)
XChangeProperty (display->xdisplay,
((MetaScreen*) display->screens->data)->xroot,
- display->atom__METACITY_SENTINEL,
+ display->atom__MUTTER_SENTINEL,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
diff --git a/src/core/effects.c b/src/core/effects.c
index be36979..1965e6e 100644
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -442,7 +442,7 @@ draw_box_animation (MetaScreen *screen,
g_return_if_fail (seconds_duration > 0.0);
- if (g_getenv ("METACITY_DEBUG_EFFECTS"))
+ if (g_getenv ("MUTTER_DEBUG_EFFECTS"))
seconds_duration *= 10; /* slow things down */
/* Create the animation context */
diff --git a/src/core/errors.c b/src/core/errors.c
index 8de4608..385bb17 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X error handling */
+/* Mutter X error handling */
/*
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
diff --git a/src/core/eventqueue.c b/src/core/eventqueue.c
index 4ce3e46..6143152 100644
--- a/src/core/eventqueue.c
+++ b/src/core/eventqueue.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X event source for main loop */
+/* Mutter X event source for main loop */
/*
* Copyright (C) 2001 Havoc Pennington (based on GDK code (C) Owen
diff --git a/src/core/eventqueue.h b/src/core/eventqueue.h
index cd115bd..0eb6799 100644
--- a/src/core/eventqueue.h
+++ b/src/core/eventqueue.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X event source for main loop */
+/* Mutter X event source for main loop */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/frame-private.h b/src/core/frame-private.h
index cba9b52..89c3d42 100644
--- a/src/core/frame-private.h
+++ b/src/core/frame-private.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X window decorations */
+/* Mutter X window decorations */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/frame.c b/src/core/frame.c
index 48696ff..373382a 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X window decorations */
+/* Mutter X window decorations */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/group-private.h b/src/core/group-private.h
index 25b05c7..ad4ce39 100644
--- a/src/core/group-private.h
+++ b/src/core/group-private.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window group private header */
+/* Mutter window group private header */
/*
* Copyright (C) 2002 Red Hat Inc.
diff --git a/src/core/group.c b/src/core/group.c
index 0c4a820..8088f67 100644
--- a/src/core/group.c
+++ b/src/core/group.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window groups */
+/* Mutter window groups */
/*
* Copyright (C) 2002 Red Hat Inc.
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 7fa2184..b3ec718 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window icons */
+/* Mutter window icons */
/*
* Copyright (C) 2002 Havoc Pennington
diff --git a/src/core/iconcache.h b/src/core/iconcache.h
index ac3e40c..22a241b 100644
--- a/src/core/iconcache.h
+++ b/src/core/iconcache.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window icons */
+/* Mutter window icons */
/*
* Copyright (C) 2002 Havoc Pennington
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 27fe298..fd7e9c1 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity Keybindings */
+/* Mutter Keybindings */
/*
* Copyright (C) 2001 Havoc Pennington
* Copyright (C) 2002 Red Hat Inc.
@@ -2396,7 +2396,7 @@ error_on_command (int command_index,
command_index, command, message);
/*
- metacity-dialog said:
+ mutter-dialog said:
FIXME offer to change the value of the command's gconf key
*/
diff --git a/src/core/main.c b/src/core/main.c
index 52e3279..b815709 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity main() */
+/* Mutter main() */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -26,14 +26,14 @@
* \file
* Program startup.
* Functions which parse the command-line arguments, create the display,
- * kick everything off and then close down Metacity when it's time to go.
+ * kick everything off and then close down Mutter when it's time to go.
*/
/**
* \mainpage
- * Metacity - a boring window manager for the adult in you
+ * Mutter - a boring window manager for the adult in you
*
- * Many window managers are like Marshmallow Froot Loops; Metacity
+ * Many window managers are like Marshmallow Froot Loops; Mutter
* is like Cheerios.
*
* The best way to get a handle on how the whole system fits together
@@ -85,13 +85,13 @@
static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;
/**
- * Handle on the main loop, so that we have an easy way of shutting Metacity
+ * Handle on the main loop, so that we have an easy way of shutting Mutter
* down.
*/
static GMainLoop *meta_main_loop = NULL;
/**
- * If set, Metacity will spawn an identical copy of itself immediately
+ * If set, Mutter will spawn an identical copy of itself immediately
* before quitting.
*/
static gboolean meta_restart_after_quit = FALSE;
@@ -100,7 +100,7 @@ static void prefs_changed_callback (MetaPreference pref,
gpointer data);
/**
- * Prints log messages. If Metacity was compiled with backtrace support,
+ * Prints log messages. If Mutter was compiled with backtrace support,
* also prints a backtrace (see meta_print_backtrace()).
*
* \param log_domain the domain the error occurred in (we ignore this)
@@ -120,13 +120,13 @@ log_handler (const gchar *log_domain,
}
/**
- * Prints the version notice. This is shown when Metacity is called
+ * Prints the version notice. This is shown when Mutter is called
* with the --version switch.
*/
static void
version (void)
{
- g_print (_("metacity %s\n"
+ g_print (_("mutter %s\n"
"Copyright (C) 2001-2008 Havoc Pennington, Red Hat, Inc., and others\n"
"This is free software; see the source for copying conditions.\n"
"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
@@ -136,7 +136,7 @@ version (void)
/**
* Prints a list of which configure script options were used to
- * build this copy of Metacity. This is actually always called
+ * build this copy of Mutter. This is actually always called
* on startup, but it's all no-op unless we're in verbose mode
* (see meta_set_verbose).
*/
@@ -189,7 +189,7 @@ meta_print_compilation_info (void)
* Prints the version number, the current timestamp (not the
* build date), the locale, the character encoding, and a list
* of configure script options that were used to build this
- * copy of Metacity. This is actually always called
+ * copy of Mutter. This is actually always called
* on startup, but it's all no-op unless we're in verbose mode
* (see meta_set_verbose).
*/
@@ -204,7 +204,7 @@ meta_print_self_identity (void)
g_date_clear (&d, 1);
g_date_set_time_t (&d, time (NULL));
g_date_strftime (buf, sizeof (buf), "%x", &d);
- meta_verbose ("Metacity version %s running on %s\n",
+ meta_verbose ("Mutter version %s running on %s\n",
VERSION, buf);
/* Locale and encoding. */
@@ -217,7 +217,7 @@ meta_print_self_identity (void)
}
/**
- * The set of possible options that can be set on Metacity's
+ * The set of possible options that can be set on Mutter's
* command line. This type exists so that meta_parse_options() can
* write to an instance of it.
*/
@@ -246,14 +246,14 @@ typedef struct
/**
* Parses argc and argv and returns the
- * arguments that Metacity understands in meta_args.
+ * arguments that Mutter understands in meta_args.
*
* The strange call signature has to be written like it is so
* that g_option_context_parse() gets a chance to modify argc and
* argv.
*
- * \param argc Pointer to the number of arguments Metacity was given
- * \param argv Pointer to the array of arguments Metacity was given
+ * \param argc Pointer to the number of arguments Mutter was given
+ * \param argv Pointer to the array of arguments Mutter was given
* \param meta_args The result of parsing the arguments.
**/
static GOptionContext *
@@ -272,7 +272,7 @@ meta_parse_options (int *argc, char ***argv,
{
"replace", 0, 0, G_OPTION_ARG_NONE,
&my_args.replace_wm,
- N_("Replace the running window manager with Metacity"),
+ N_("Replace the running window manager with Mutter"),
NULL
},
{
@@ -343,7 +343,7 @@ meta_parse_options (int *argc, char ***argv,
GError *error = NULL;
ctx = g_option_context_new (NULL);
- g_option_context_add_main_entries (ctx, options, "metacity");
+ g_option_context_add_main_entries (ctx, options, "mutter");
#ifdef WITH_CLUTTER
/*
@@ -356,7 +356,7 @@ meta_parse_options (int *argc, char ***argv,
if (!g_option_context_parse (ctx, argc, argv, &error))
{
- g_print ("metacity: %s\n", error->message);
+ g_print ("mutter: %s\n", error->message);
exit(1);
}
@@ -367,7 +367,7 @@ meta_parse_options (int *argc, char ***argv,
#ifdef WITH_CLUTTER
-/* Metacity is responsible for pulling events off the X queue, so Clutter
+/* Mutter is responsible for pulling events off the X queue, so Clutter
* doesn't need (and shouldn't) run its normal event source which polls
* the X fd, but we do have to deal with dispatching events that accumulate
* in the clutter queue. This happens, for example, when clutter generate
@@ -434,9 +434,9 @@ meta_clutter_init (GOptionContext *ctx, int *argc, char ***argv)
#endif
/**
- * Selects which display Metacity should use. It first tries to use
+ * Selects which display Mutter should use. It first tries to use
* display_name as the display. If display_name is NULL then
- * try to use the environment variable METACITY_DISPLAY. If that
+ * try to use the environment variable MUTTER_DISPLAY. If that
* also is NULL, use the default - :0.0
*/
static void
@@ -445,9 +445,9 @@ meta_select_display (gchar *display_name)
gchar *envVar = "";
if (display_name)
envVar = g_strconcat ("DISPLAY=", display_name, NULL);
- else if (g_getenv ("METACITY_DISPLAY"))
+ else if (g_getenv ("MUTTER_DISPLAY"))
envVar = g_strconcat ("DISPLAY=",
- g_getenv ("METACITY_DISPLAY"), NULL);
+ g_getenv ("MUTTER_DISPLAY"), NULL);
/* DO NOT FREE envVar, putenv() sucks */
putenv (envVar);
}
@@ -560,9 +560,9 @@ main (int argc, char **argv)
g_printerr ("Failed to register SIGCHLD handler: %s\n",
g_strerror (errno));
- if (g_getenv ("METACITY_VERBOSE"))
+ if (g_getenv ("MUTTER_VERBOSE"))
meta_set_verbose (TRUE);
- if (g_getenv ("METACITY_DEBUG"))
+ if (g_getenv ("MUTTER_DEBUG"))
meta_set_debugging (TRUE);
if (g_get_home_dir ())
@@ -574,7 +574,7 @@ main (int argc, char **argv)
meta_print_self_identity ();
- bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
@@ -606,7 +606,7 @@ main (int argc, char **argv)
#endif /* WITH_CLUTTER */
#ifdef HAVE_INTROSPECTION
- g_irepository_prepend_search_path (METACITY_PKGLIBDIR);
+ g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
if (meta_args.introspect)
{
GError *error = NULL;
@@ -631,7 +631,7 @@ main (int argc, char **argv)
}
#endif
- meta_set_syncing (meta_args.sync || (g_getenv ("METACITY_SYNC") != NULL));
+ meta_set_syncing (meta_args.sync || (g_getenv ("MUTTER_SYNC") != NULL));
if (meta_args.print_version)
version ();
@@ -674,7 +674,7 @@ main (int argc, char **argv)
#endif
- if (g_getenv ("METACITY_G_FATAL_WARNINGS") != NULL)
+ if (g_getenv ("MUTTER_G_FATAL_WARNINGS") != NULL)
g_log_set_always_fatal (G_LOG_LEVEL_MASK);
meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
@@ -692,7 +692,7 @@ main (int argc, char **argv)
GError *err = NULL;
GDir *themes_dir = NULL;
- if (!(themes_dir = g_dir_open (METACITY_DATADIR"/themes", 0, &err)))
+ if (!(themes_dir = g_dir_open (MUTTER_DATADIR"/themes", 0, &err)))
{
meta_fatal (_("Failed to scan themes directory: %s\n"), err->message);
g_error_free (err);
@@ -711,7 +711,7 @@ main (int argc, char **argv)
if (!meta_ui_have_a_theme ())
meta_fatal (_("Could not find a theme! Be sure %s exists and contains the usual themes.\n"),
- METACITY_DATADIR"/themes");
+ MUTTER_DATADIR"/themes");
/* Connect to SM as late as possible - but before managing display,
* or we might try to manage a window before we have the session
@@ -782,7 +782,7 @@ main (int argc, char **argv)
}
/**
- * Stops Metacity. This tells the event loop to stop processing; it is rather
+ * Stops Mutter. This tells the event loop to stop processing; it is rather
* dangerous to use this rather than meta_restart() because this will leave
* the user with no window manager. We generally do this only if, for example,
* the session manager asks us to; we assume the session manager knows what
@@ -800,10 +800,10 @@ meta_quit (MetaExitCode code)
}
/**
- * Restarts Metacity. In practice, this tells the event loop to stop
+ * Restarts Mutter. In practice, this tells the event loop to stop
* processing, having first set the meta_restart_after_quit flag which
- * tells Metacity to spawn an identical copy of itself before quitting.
- * This happens on receipt of a _METACITY_RESTART_MESSAGE client event.
+ * tells Mutter to spawn an identical copy of itself before quitting.
+ * This happens on receipt of a _MUTTER_RESTART_MESSAGE client event.
*/
void
meta_restart (void)
diff --git a/src/core/metacity-Xatomtype.h b/src/core/mutter-Xatomtype.h
similarity index 98%
rename from src/core/metacity-Xatomtype.h
rename to src/core/mutter-Xatomtype.h
index d14d3ab..2073bc5 100644
--- a/src/core/metacity-Xatomtype.h
+++ b/src/core/mutter-Xatomtype.h
@@ -1,7 +1,7 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/**
- * \file metacity-Xatomtype.h Types for communicating with X about properties
+ * \file mutter-Xatomtype.h Types for communicating with X about properties
*
* This files defines crock C structures for calling XGetWindowProperty and
* XChangeProperty. All fields must be longs as the semantics of property
diff --git a/src/core/place.c b/src/core/place.c
index a2e84a2..280d04b 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window placement */
+/* Mutter window placement */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/place.h b/src/core/place.h
index 10bf4a1..be825b1 100644
--- a/src/core/place.h
+++ b/src/core/place.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window placement */
+/* Mutter window placement */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/prefs.c b/src/core/prefs.c
index bd8a25d..84ba94c 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity preferences */
+/* Mutter preferences */
/*
* Copyright (C) 2001 Havoc Pennington, Copyright (C) 2002 Red Hat Inc.
@@ -57,7 +57,7 @@
#define KEY_TERMINAL_DIR "/desktop/gnome/applications/terminal"
#define KEY_TERMINAL_COMMAND KEY_TERMINAL_DIR "/exec"
-#define KEY_OVERLAY_KEY "/apps/metacity/general/overlay_key"
+#define KEY_OVERLAY_KEY "/apps/mutter/general/overlay_key"
#define KEY_SCREEN_BINDINGS_PREFIX "/apps/metacity/global_keybindings"
#define KEY_WINDOW_BINDINGS_PREFIX "/apps/metacity/window_keybindings"
#define KEY_LIST_BINDINGS_SUFFIX "_list"
@@ -65,11 +65,11 @@
#define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
#ifdef WITH_CLUTTER
-#define KEY_CLUTTER_DISABLED "/apps/metacity/general/clutter_disabled"
-#define KEY_CLUTTER_PLUGINS "/apps/metacity/general/clutter_plugins"
+#define KEY_CLUTTER_DISABLED "/apps/mutter/general/clutter_disabled"
+#define KEY_CLUTTER_PLUGINS "/apps/mutter/general/clutter_plugins"
#endif
-#define KEY_LIVE_HIDDEN_WINDOWS "/apps/metacity/general/live_hidden_windows"
+#define KEY_LIVE_HIDDEN_WINDOWS "/apps/mutter/general/live_hidden_windows"
#define KEY_NO_TAB_POPUP "/apps/metacity/general/no_tab_popup"
@@ -328,7 +328,7 @@ typedef struct
/* FIXMEs: */
/* @@@ Don't use NULL lines at the end; glib can tell you how big it is */
-/* @@@ /apps/metacity/general should be assumed if first char is not / */
+/* @@@ /apps/mutter/general should be assumed if first char is not / */
/* @@@ Will it ever be possible to merge init and update? If not, why not? */
static MetaEnumPreference preferences_enum[] =
@@ -429,13 +429,13 @@ static MetaBoolPreference preferences_bool[] =
FALSE,
},
#ifdef WITH_CLUTTER
- { "/apps/metacity/general/clutter_disabled",
+ { "/apps/mutter/general/clutter_disabled",
META_PREF_CLUTTER_DISABLED,
&clutter_disabled,
FALSE,
},
#endif
- { "/apps/metacity/general/live_hidden_windows",
+ { "/apps/mutter/general/live_hidden_windows",
META_PREF_LIVE_HIDDEN_WINDOWS,
&live_hidden_windows,
FALSE,
@@ -1028,6 +1028,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
/* @@@ again, use glib's ability to tell you the size of the array */
static gchar *gconf_dirs_we_are_interested_in[] = {
"/apps/metacity",
+ "/apps/mutter",
KEY_TERMINAL_DIR,
KEY_GNOME_ACCESSIBILITY,
"/desktop/gnome/peripherals/mouse",
@@ -1243,7 +1244,7 @@ change_notify (GConfClient *client,
#endif
else
{
- meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
+ meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Mutter\n",
key);
}
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 043a51d..81770da 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -1,7 +1,7 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/**
- * \file screen-private.h Screens which Metacity manages
+ * \file screen-private.h Screens which Mutter manages
*
* Managing X screens.
* This file contains methods on this class which are available to
diff --git a/src/core/screen.c b/src/core/screen.c
index 777bd73..0a9c79a 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X screen handler */
+/* Mutter X screen handler */
/*
* Copyright (C) 2001, 2002 Havoc Pennington
@@ -328,7 +328,7 @@ reload_xinerama_infos (MetaScreen *screen)
}
#else
meta_topic (META_DEBUG_XINERAMA,
- "Metacity compiled without XFree86 Xinerama support\n");
+ "Mutter compiled without XFree86 Xinerama support\n");
#endif /* HAVE_XFREE_XINERAMA */
#ifdef HAVE_SOLARIS_XINERAMA
@@ -387,7 +387,7 @@ reload_xinerama_infos (MetaScreen *screen)
}
#else
meta_topic (META_DEBUG_XINERAMA,
- "Metacity compiled without Solaris Xinerama support\n");
+ "Mutter compiled without Solaris Xinerama support\n");
#endif /* HAVE_SOLARIS_XINERAMA */
@@ -396,7 +396,7 @@ reload_xinerama_infos (MetaScreen *screen)
*/
if (screen->n_xinerama_infos == 0)
{
- if (g_getenv ("METACITY_DEBUG_XINERAMA"))
+ if (g_getenv ("MUTTER_DEBUG_XINERAMA"))
{
meta_topic (META_DEBUG_XINERAMA,
"Pretending a single monitor has two Xinerama screens\n");
@@ -1204,7 +1204,7 @@ set_desktop_viewport_hint (MetaScreen *screen)
return;
/*
- * Metacity does not implement viewports, so this is a fixed 0,0
+ * Mutter does not implement viewports, so this is a fixed 0,0
*/
data[0] = 0;
data[1] = 0;
@@ -2115,7 +2115,7 @@ meta_screen_queue_workarea_recalc (MetaScreen *screen)
meta_topic (META_DEBUG_WORKAREA,
"Adding work area hint idle function\n");
screen->work_area_idle =
- g_idle_add_full (META_PRIORITY_WORK_AREA_HINT,
+ g_idle_add_full (META_PRIORITY_BEFORE_REDRAW,
(GSourceFunc) set_work_area_idle_func,
screen,
NULL);
diff --git a/src/core/session.c b/src/core/session.c
index da2c59a..8eb110c 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity Session Management */
+/* Mutter Session Management */
/*
* Copyright (C) 2001 Havoc Pennington (some code in here from
@@ -309,8 +309,8 @@ meta_session_init (const char *previous_client_id,
prop1.type = SmARRAY8;
prop1.num_vals = 1;
prop1.vals = &prop1val;
- prop1val.value = "metacity";
- prop1val.length = strlen ("metacity");
+ prop1val.value = "mutter";
+ prop1val.length = strlen ("mutter");
/* twm sets getuid() for this, but the SM spec plainly
* says pw_name, twm is on crack
@@ -596,7 +596,7 @@ set_clone_restart_commands (void)
g_return_if_fail (client_id);
i = 0;
- restartv[i] = "metacity";
+ restartv[i] = "mutter";
++i;
restartv[i] = "--sm-client-id";
++i;
@@ -617,7 +617,7 @@ set_clone_restart_commands (void)
/* Clone (no client ID) */
i = 0;
- clonev[i] = "metacity";
+ clonev[i] = "mutter";
++i;
clonev[i] = NULL;
@@ -818,7 +818,7 @@ decode_text_from_utf8 (const char *text)
static void
save_state (void)
{
- char *metacity_dir;
+ char *mutter_dir;
char *session_dir;
FILE *outfile;
GSList *windows;
@@ -837,19 +837,19 @@ save_state (void)
* we probably already have full_save_path figured out and therefore
* can just use the directory name from that.
*/
- metacity_dir = g_strconcat (g_get_user_config_dir (),
- G_DIR_SEPARATOR_S "metacity",
+ mutter_dir = g_strconcat (g_get_user_config_dir (),
+ G_DIR_SEPARATOR_S "mutter",
NULL);
- session_dir = g_strconcat (metacity_dir,
+ session_dir = g_strconcat (mutter_dir,
G_DIR_SEPARATOR_S "sessions",
NULL);
- if (mkdir (metacity_dir, 0700) < 0 &&
+ if (mkdir (mutter_dir, 0700) < 0 &&
errno != EEXIST)
{
meta_warning (_("Could not create directory '%s': %s\n"),
- metacity_dir, g_strerror (errno));
+ mutter_dir, g_strerror (errno));
}
if (mkdir (session_dir, 0700) < 0 &&
@@ -871,14 +871,14 @@ save_state (void)
}
/* The file format is:
- * <metacity_session id="foo">
+ * <mutter_session id="foo">
* <window id="bar" class="XTerm" name="xterm" title="/foo/bar" role="blah" type="normal" stacking="5">
* <workspace index="2"/>
* <workspace index="4"/>
* <sticky/> <minimized/> <maximized/>
* <geometry x="100" y="100" width="200" height="200" gravity="northwest"/>
* </window>
- * </metacity_session>
+ * </mutter_session>
*
* Note that attributes on <window> are the match info we use to
* see if the saved state applies to a restored window, and
@@ -886,7 +886,7 @@ save_state (void)
*
*/
- fprintf (outfile, "<metacity_session id=\"%s\">\n",
+ fprintf (outfile, "<mutter_session id=\"%s\">\n",
client_id);
windows = meta_display_list_windows (meta_get_display ());
@@ -998,7 +998,7 @@ save_state (void)
g_slist_free (windows);
- fputs ("</metacity_session>\n", outfile);
+ fputs ("</mutter_session>\n", outfile);
out:
if (outfile)
@@ -1016,7 +1016,7 @@ save_state (void)
}
}
- g_free (metacity_dir);
+ g_free (mutter_dir);
g_free (session_dir);
}
@@ -1055,7 +1055,7 @@ static void text_handler (GMarkupParseContext *context,
gpointer user_data,
GError **error);
-static GMarkupParser metacity_session_parser = {
+static GMarkupParser mutter_session_parser = {
start_element_handler,
end_element_handler,
text_handler,
@@ -1076,7 +1076,7 @@ load_state (const char *previous_save_file)
char *session_file;
session_file = g_strconcat (g_get_user_config_dir (),
- G_DIR_SEPARATOR_S "metacity"
+ G_DIR_SEPARATOR_S "mutter"
G_DIR_SEPARATOR_S "sessions" G_DIR_SEPARATOR_S,
previous_save_file,
NULL);
@@ -1089,9 +1089,9 @@ load_state (const char *previous_save_file)
{
char *canonical_session_file = session_file;
- /* Maybe they were doing it the old way, with ~/.metacity */
+ /* Maybe they were doing it the old way, with ~/.mutter */
session_file = g_strconcat (g_get_home_dir (),
- G_DIR_SEPARATOR_S ".metacity"
+ G_DIR_SEPARATOR_S ".mutter"
G_DIR_SEPARATOR_S "sessions"
G_DIR_SEPARATOR_S,
previous_save_file,
@@ -1122,7 +1122,7 @@ load_state (const char *previous_save_file)
parse_data.info = NULL;
parse_data.previous_id = NULL;
- context = g_markup_parse_context_new (&metacity_session_parser,
+ context = g_markup_parse_context_new (&mutter_session_parser,
0, &parse_data, NULL);
error = NULL;
@@ -1173,7 +1173,7 @@ start_element_handler (GMarkupParseContext *context,
pd = user_data;
- if (strcmp (element_name, "metacity_session") == 0)
+ if (strcmp (element_name, "mutter_session") == 0)
{
/* Get previous ID */
int i;
@@ -1192,7 +1192,7 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("<metacity_session> attribute seen but we already have the session ID"));
+ _("<mutter_session> attribute seen but we already have the session ID"));
return;
}
@@ -1206,7 +1206,7 @@ start_element_handler (GMarkupParseContext *context,
G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <%s> element"),
- name, "metacity_session");
+ name, "mutter_session");
return;
}
@@ -1530,7 +1530,7 @@ get_possible_matches (MetaWindow *window)
retval = NULL;
- ignore_client_id = g_getenv ("METACITY_DEBUG_SM") != NULL;
+ ignore_client_id = g_getenv ("MUTTER_DEBUG_SM") != NULL;
tmp = window_info_list;
while (tmp != NULL)
@@ -1715,7 +1715,7 @@ regenerate_save_file (void)
if (client_id)
full_save_path = g_strconcat (g_get_user_config_dir (),
- G_DIR_SEPARATOR_S "metacity"
+ G_DIR_SEPARATOR_S "mutter"
G_DIR_SEPARATOR_S "sessions" G_DIR_SEPARATOR_S,
client_id,
".ms",
diff --git a/src/core/testasyncgetprop.c b/src/core/testasyncgetprop.c
index 0318268..782d0b1 100644
--- a/src/core/testasyncgetprop.c
+++ b/src/core/testasyncgetprop.c
@@ -276,7 +276,7 @@ main (int argc, char **argv)
return 1;
}
- if (getenv ("METACITY_SYNC") != NULL)
+ if (getenv ("MUTTER_SYNC") != NULL)
XSynchronize (xdisplay, True);
XSetErrorHandler (x_error_handler);
diff --git a/src/core/testboxes.c b/src/core/testboxes.c
index 91ac2f8..93f430c 100644
--- a/src/core/testboxes.c
+++ b/src/core/testboxes.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity box operation testing program */
+/* Mutter box operation testing program */
/*
* Copyright (C) 2005 Elijah Newren
diff --git a/src/core/util.c b/src/core/util.c
index 299cd79..aca85f3 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity utilities */
+/* Mutter utilities */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -81,14 +81,14 @@ static FILE* logfile = NULL;
static void
ensure_logfile (void)
{
- if (logfile == NULL && g_getenv ("METACITY_USE_LOGFILE"))
+ if (logfile == NULL && g_getenv ("MUTTER_USE_LOGFILE"))
{
char *filename = NULL;
char *tmpl;
int fd;
GError *err;
- tmpl = g_strdup_printf ("metacity-%d-debug-log-XXXXXX",
+ tmpl = g_strdup_printf ("mutter-%d-debug-log-XXXXXX",
(int) getpid ());
err = NULL;
@@ -135,7 +135,7 @@ meta_set_verbose (gboolean setting)
{
#ifndef WITH_VERBOSE_MODE
if (setting)
- meta_fatal (_("Metacity was compiled without support for verbose mode\n"));
+ meta_fatal (_("Mutter was compiled without support for verbose mode\n"));
#else
if (setting)
ensure_logfile ();
@@ -567,7 +567,7 @@ meta_show_dialog (const char *type,
argvl[i++] = screen_number_text;
argvl[i++] = "--title";
/* Translators: This is the title used on dialog boxes */
- argvl[i++] = _("Metacity");
+ argvl[i++] = _("Mutter");
argvl[i++] = "--text";
argvl[i++] = message;
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 587ea24..69a33f9 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -1,7 +1,7 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/**
- * \file window-private.h Windows which Metacity manages
+ * \file window-private.h Windows which Mutter manages
*
* Managing X windows.
* This file contains methods on this class which are available to
diff --git a/src/core/window.c b/src/core/window.c
index 74f8e95..363bcc9 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X managed windows */
+/* Mutter X managed windows */
/*
* Copyright (C) 2001 Havoc Pennington, Anders Carlsson
@@ -1419,7 +1419,7 @@ set_wm_state (MetaWindow *window,
meta_verbose ("Setting wm state %s on %s\n",
wm_state_to_string (state), window->desc);
- /* Metacity doesn't use icon windows, so data[1] should be None
+ /* Mutter doesn't use icon windows, so data[1] should be None
* according to the ICCCM 2.0 Section 4.1.3.1.
*/
data[0] = state;
@@ -1987,9 +1987,9 @@ meta_window_queue (MetaWindow *window, guint queuebits)
const gint window_queue_idle_priority[NUMBER_OF_QUEUES] =
{
- G_PRIORITY_DEFAULT_IDLE, /* CALC_SHOWING */
- META_PRIORITY_RESIZE, /* MOVE_RESIZE */
- G_PRIORITY_DEFAULT_IDLE /* UPDATE_ICON */
+ META_PRIORITY_BEFORE_REDRAW, /* CALC_SHOWING */
+ META_PRIORITY_RESIZE, /* MOVE_RESIZE */
+ META_PRIORITY_BEFORE_REDRAW /* UPDATE_ICON */
};
const GSourceFunc window_queue_idle_handler[NUMBER_OF_QUEUES] =
@@ -3332,7 +3332,7 @@ window_activate (MetaWindow *window,
}
/* This function exists since most of the functionality in window_activate
- * is useful for Metacity, but Metacity shouldn't need to specify a client
+ * is useful for Mutter, but Mutter shouldn't need to specify a client
* type for itself. ;-)
*/
void
@@ -3863,10 +3863,10 @@ meta_window_move_resize_internal (MetaWindow *window,
need_configure_notify = TRUE;
/* MapRequest events with a PPosition or UPosition hint with a frame
- * are moved by metacity without resizing; send a configure notify
+ * are moved by mutter without resizing; send a configure notify
* in such cases. See #322840. (Note that window->constructing is
* only true iff this call is due to a MapRequest, and when
- * PPosition/UPosition hints aren't set, metacity seems to send a
+ * PPosition/UPosition hints aren't set, mutter seems to send a
* ConfigureNotify anyway due to the above code.)
*/
if (window->constructing && window->frame &&
@@ -5707,7 +5707,7 @@ meta_window_notify_focus (MetaWindow *window,
*
* My suggestion is to change it so that we clearly separate
* actual keyboard focus tracking using the xterm algorithm,
- * and metacity's "pretend" focus window, and go through all
+ * and mutter's "pretend" focus window, and go through all
* the code and decide which one should be used in each place;
* a hard bit is deciding on a policy for that.
*
@@ -6577,8 +6577,8 @@ set_allowed_actions_hint (MetaWindow *window)
data[i] = window->display->atom__NET_WM_ACTION_SHADE;
++i;
}
- /* sticky according to EWMH is different from metacity's sticky;
- * metacity doesn't support EWMH sticky
+ /* sticky according to EWMH is different from mutter's sticky;
+ * mutter doesn't support EWMH sticky
*/
if (window->has_maximize_func)
{
diff --git a/src/core/workspace.c b/src/core/workspace.c
index ca8acf0..8e7c19a 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity Workspaces */
+/* Mutter Workspaces */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/core/xprops.c b/src/core/xprops.c
index a39c7b4..1eeedb5 100644
--- a/src/core/xprops.c
+++ b/src/core/xprops.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X property convenience routines */
+/* Mutter X property convenience routines */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -86,7 +86,7 @@ from The Open Group.
#include "util.h"
#include "async-getprop.h"
#include "ui.h"
-#include "metacity-Xatomtype.h"
+#include "mutter-Xatomtype.h"
#include <X11/Xatom.h>
#include <string.h>
#include "window-private.h"
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index a3e824c..408b94a 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -200,7 +200,7 @@ keybind (toggle_recording, handle_toggle_recording, 0, 0, "<Control><Shift><Alt>
/* Yes, the param is offset by one. Historical reasons. (Maybe worth fixing
* at some point.) The description is NULL here because the stanza is
- * irregularly shaped in metacity.schemas.in. This will probably be fixed
+ * irregularly shaped in mutter.schemas.in. This will probably be fixed
* as well.
*/
keybind (run_command_1, handle_run_command, 0, 0, NULL, NULL)
diff --git a/src/include/atomnames.h b/src/include/atomnames.h
index 00d5e22..38ece97 100644
--- a/src/include/atomnames.h
+++ b/src/include/atomnames.h
@@ -26,7 +26,7 @@
/**
* \file atomnames.h A list of atom names.
*
- * This is a list of the names of all the X atoms that Metacity uses.
+ * This is a list of the names of all the X atoms that Mutter uses.
* Each is wrapped in a macro "item()" which is undefined here; the
* idea is that when you need to make a big list of all the X atoms,
* you can define item(), include this file, and then undefine it
@@ -54,15 +54,15 @@ item(WM_WINDOW_ROLE)
item(UTF8_STRING)
item(WM_ICON_SIZE)
item(_KWM_WIN_ICON)
-item(_METACITY_RESTART_MESSAGE)
-item(_METACITY_RELOAD_THEME_MESSAGE)
-item(_METACITY_SET_KEYBINDINGS_MESSAGE)
-item(_METACITY_TOGGLE_VERBOSE)
+item(_MUTTER_RESTART_MESSAGE)
+item(_MUTTER_RELOAD_THEME_MESSAGE)
+item(_MUTTER_SET_KEYBINDINGS_MESSAGE)
+item(_MUTTER_TOGGLE_VERBOSE)
item(_GNOME_PANEL_ACTION)
item(_GNOME_PANEL_ACTION_MAIN_MENU)
item(_GNOME_PANEL_ACTION_RUN_DIALOG)
-item(_METACITY_SENTINEL)
-item(_METACITY_VERSION)
+item(_MUTTER_SENTINEL)
+item(_MUTTER_VERSION)
item(WM_CLIENT_MACHINE)
item(MANAGER)
item(TARGETS)
diff --git a/src/include/common.h b/src/include/common.h
index 77fc9c5..87a91ee 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity common types shared by core.h and ui.h */
+/* Mutter common types shared by core.h and ui.h */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -287,8 +287,57 @@ struct _MetaButtonLayout
#define META_DEFAULT_ICON_NAME "window"
+/* Main loop priorities determine when activity in the GLib
+ * will take precendence over the others. Priorities are sometimes
+ * used to enforce ordering: give A a higher priority than B if
+ * A must occur before B. But that poses a problem since then
+ * if A occurs frequently enough, B will never occur.
+ *
+ * Anything we want to occur more or less immediately should
+ * have a priority of G_PRIORITY_DEFAULT. When we want to
+ * coelesce multiple things together, the appropriate place to
+ * do it is usually META_PRIORITY_BEFORE_REDRAW.
+ *
+ * (FIXME: Use a Clutter paint() function instead, to prevent
+ * starving the repaints)
+ *
+ * If something has a priority lower than the redraw priority
+ * (such as a default priority idle), then it may be arbitrarily
+ * delayed. This happens if the screen is updating rapidly: we
+ * are spending all our time either redrawing or waiting for a
+ * vblank-synced buffer swap. (When X is improved to allow
+ * clutter to do the buffer-swap asychronously, this will get
+ * better.)
+ */
+
+/* G_PRIORITY_DEFAULT:
+ * events
+ * many timeouts
+ */
+
+/* GTK_PRIORITY_RESIZE: (G_PRIORITY_HIGH_IDLE + 10) */
+#define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
+/* GTK_PRIORITY_REDRAW: (G_PRIORITY_HIGH_IDLE + 20) */
+
+#define META_PRIORITY_BEFORE_REDRAW (G_PRIORITY_HIGH_IDLE + 40)
+/* calc-showing idle
+ * update-icon idle
+ */
+
+/* CLUTTER_PRIORITY_REDRAW: (G_PRIORITY_HIGH_IDLE + 50) */
+#define META_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 50)
+
+/* ==== Anything below here can be starved arbitrarily ==== */
+
+/* G_PRIORITY_DEFAULT_IDLE:
+ * Mutter plugin unloading
+ * GConf notify idle
+ */
+
+/* Chosen to be below the GConf notify idle */
#define META_PRIORITY_PREFS_NOTIFY (G_PRIORITY_DEFAULT_IDLE + 10)
-#define META_PRIORITY_WORK_AREA_HINT (G_PRIORITY_DEFAULT_IDLE + 15)
+
+/************************************************************/
#define POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \
diff --git a/src/include/core.h b/src/include/core.h
index 0c518e7..54abbfc 100644
--- a/src/include/core.h
+++ b/src/include/core.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity interface used by GTK+ UI to talk to core */
+/* Mutter interface used by GTK+ UI to talk to core */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/display.h b/src/include/display.h
index 472c66b..a4eaa5a 100644
--- a/src/include/display.h
+++ b/src/include/display.h
@@ -113,7 +113,7 @@ void meta_display_end_grab_op (MetaDisplay *display,
guint32 timestamp);
/* meta_display_set_input_focus_window is like XSetInputFocus, except
* that (a) it can't detect timestamps later than the current time,
- * since Metacity isn't part of the XServer, and thus gives erroneous
+ * since Mutter isn't part of the XServer, and thus gives erroneous
* behavior in this circumstance (so don't do it), (b) it uses
* display->last_focus_time since we don't have access to the true
* Xserver one, (c) it makes use of display->user_time since checking
diff --git a/src/include/errors.h b/src/include/errors.h
index 8278948..035a60a 100644
--- a/src/include/errors.h
+++ b/src/include/errors.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X error handling */
+/* Mutter X error handling */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/group.h b/src/include/group.h
index 45f03b0..9e20951 100644
--- a/src/include/group.h
+++ b/src/include/group.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window groups */
+/* Mutter window groups */
/*
* Copyright (C) 2002 Red Hat Inc.
diff --git a/src/include/main.h b/src/include/main.h
index 62106e1..043f9d7 100644
--- a/src/include/main.h
+++ b/src/include/main.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity main */
+/* Mutter main */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/mutter-plugin.h b/src/include/mutter-plugin.h
index 5f84adb..12f5bdc 100644
--- a/src/include/mutter-plugin.h
+++ b/src/include/mutter-plugin.h
@@ -108,7 +108,7 @@ struct _MutterPluginClass
MutterWindow *actor,
gulong events);
- /* General XEvent filter. This is fired *before* metacity itself handles
+ /* General XEvent filter. This is fired *before* mutter itself handles
* an event. Return TRUE to block any further processing.
*/
gboolean (*xevent_filter) (MutterPlugin *plugin,
@@ -137,7 +137,7 @@ const MutterPluginInfo * mutter_plugin_get_info (MutterPlugin *plugin);
struct _MutterPluginVersion
{
/*
- * Version information; the first three numbers match the Metacity version
+ * Version information; the first three numbers match the Mutter version
* with which the plugin was compiled (see clutter-plugins/simple.c for sample
* code).
*/
@@ -159,10 +159,10 @@ struct _MutterPluginVersion
#define MUTTER_PLUGIN_DECLARE(ObjectName, object_name) \
G_MODULE_EXPORT MutterPluginVersion mutter_plugin_version = \
{ \
- METACITY_MAJOR_VERSION, \
- METACITY_MINOR_VERSION, \
- METACITY_MICRO_VERSION, \
- METACITY_CLUTTER_PLUGIN_API_VERSION \
+ MUTTER_MAJOR_VERSION, \
+ MUTTER_MINOR_VERSION, \
+ MUTTER_MICRO_VERSION, \
+ MUTTER_PLUGIN_API_VERSION \
}; \
\
static GType g_define_type_id = 0; \
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 2731700..284e54c 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity preferences */
+/* Mutter preferences */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/resizepopup.h b/src/include/resizepopup.h
index a861ff3..2446786 100644
--- a/src/include/resizepopup.h
+++ b/src/include/resizepopup.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity resizing-terminal-window feedback */
+/* Mutter resizing-terminal-window feedback */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/tabpopup.h b/src/include/tabpopup.h
index c210a19..1c90fc7 100644
--- a/src/include/tabpopup.h
+++ b/src/include/tabpopup.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity tab popup window */
+/* Mutter tab popup window */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/ui.h b/src/include/ui.h
index a4d7fea..bcfbd9f 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity interface for talking to GTK+ UI module */
+/* Mutter interface for talking to GTK+ UI module */
/*
* Copyright (C) 2001 Havoc Pennington
@@ -31,9 +31,6 @@
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-/* This is between GTK_PRIORITY_RESIZE (+10) and GTK_PRIORITY_REDRAW (+20) */
-#define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
-
typedef struct _MetaUI MetaUI;
typedef struct _MetaImageWindow MetaImageWindow;
diff --git a/src/include/util.h b/src/include/util.h
index 24b5a69..a2ac232 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity utilities */
+/* Mutter utilities */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/include/xprops.h b/src/include/xprops.h
index f5ecb6a..b8d0f07 100644
--- a/src/include/xprops.h
+++ b/src/include/xprops.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity X property convenience routines */
+/* Mutter X property convenience routines */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/libmetacity-private.pc.in b/src/libmutter-private.pc.in
similarity index 52%
rename from src/libmetacity-private.pc.in
rename to src/libmutter-private.pc.in
index 3f034b6..97706f8 100644
--- a/src/libmetacity-private.pc.in
+++ b/src/libmutter-private.pc.in
@@ -4,9 +4,9 @@ libdir= libdir@
includedir= includedir@
libgnome_serverdir= libexecdir@
-Name: libmetacity-private
-Description: Metacity internals shared
+Name: libmutter-private
+Description: Mutter internals shared
Requires: gtk+-2.0
Version: @VERSION@
-Libs: -L${libdir} -lmetacity-private
-Cflags: -I${includedir}/metacity-1
+Libs: -L${libdir} -lmutter-private
+Cflags: -I${includedir}/mutter
diff --git a/src/mutter-plugins.pc.in b/src/mutter-plugins.pc.in
new file mode 100644
index 0000000..5d42232
--- /dev/null
+++ b/src/mutter-plugins.pc.in
@@ -0,0 +1,17 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+plugindir= MUTTER_PLUGIN_DIR@
+libgnome_serverdir= libexecdir@
+mutter_major_version= MUTTER_MAJOR_VERSION@
+mutter_minor_version= MUTTER_MINOR_VERSION@
+mutter_micro_version= MUTTER_MICRO_VERSION@
+mutter_plugin_api_version= MUTTER_PLUGIN_API_VERSION@
+
+Name: mutter-plugins
+Description: Dev parameters for mutter plugins
+Requires: @CLUTTER_PACKAGE@
+Version: @VERSION@
+Libs: @CLUTTER_LIBS@
+Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -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} -DMUTTER_PLUGIN_DIR=\"${plugindir}\"
diff --git a/src/metacity-wm.desktop.in b/src/mutter-wm.desktop.in
similarity index 82%
rename from src/metacity-wm.desktop.in
rename to src/mutter-wm.desktop.in
index 91b8124..1a52d95 100644
--- a/src/metacity-wm.desktop.in
+++ b/src/mutter-wm.desktop.in
@@ -1,16 +1,16 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-_Name=Metacity
-Exec=metacity
+_Name=Mutter
+Exec=mutter
# name of loadable control center module
X-GNOME-WMSettingsModule=metacity
# name we put on the WM spec check window
-X-GNOME-WMName=Metacity
+X-GNOME-WMName=Mutter
# back compat only
X-GnomeWMSettingsLibrary=metacity
X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=metacity
+X-GNOME-Bugzilla-Product=mutter
X-GNOME-Bugzilla-Component=general
X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager
diff --git a/src/metacity.desktop.in b/src/mutter.desktop.in
similarity index 82%
rename from src/metacity.desktop.in
rename to src/mutter.desktop.in
index e6b5d47..119b347 100644
--- a/src/metacity.desktop.in
+++ b/src/mutter.desktop.in
@@ -1,17 +1,17 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-_Name=Metacity
-Exec=metacity
+_Name=Mutter
+Exec=mutter
NoDisplay=true
# name of loadable control center module
X-GNOME-WMSettingsModule=metacity
# name we put on the WM spec check window
-X-GNOME-WMName=Metacity
+X-GNOME-WMName=Mutter
# back compat only
X-GnomeWMSettingsLibrary=metacity
X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=metacity
+X-GNOME-Bugzilla-Product=mutter
X-GNOME-Bugzilla-Component=general
X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager
diff --git a/src/mutter.schemas.in b/src/mutter.schemas.in
new file mode 100644
index 0000000..207a7fa
--- /dev/null
+++ b/src/mutter.schemas.in
@@ -0,0 +1,56 @@
+<gconfschemafile>
+ <schemalist>
+
+ <!-- General preferences -->
+
+ <schema>
+ <key>/schemas/apps/mutter/general/overlay_key</key>
+ <applyto>/apps/metacity/general/overlay_key</applyto>
+ <owner>metacity</owner>
+ <type>string</type>
+ <default><Super_L></default>
+ <locale name="C">
+ <short>Modifier to use for extended window management operations</short>
+ <long>
+ This key will initiate the "overlay", which is a combination window
+ overview and application launching system. The default is intended
+ to be the "Windows key" on PC hardware.
+
+ It's expected that this binding either the default or set to
+ the empty string.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/mutter/general/clutter_plugins</key>
+ <applyto>/apps/mutter/general/clutter_plugins</applyto>
+ <owner>mutter</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[default]</default>
+ <locale name="C">
+ <short>Clutter Plugins</short>
+ <long>
+ Plugins to load for the Clutter-based compositing manager.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/mutter/general/live_hidden_windows</key>
+ <applyto>/apps/mutter/general/live_hidden_windows</applyto>
+ <owner>mutter</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Live Hidden Windows</short>
+ <long>
+ Determines whether hidden windows (i.e., minimized windows and
+ windows on other workspaces than the current one) should be kept
+ alive.
+ </long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
diff --git a/src/run-metacity.sh b/src/run-mutter.sh
similarity index 88%
rename from src/run-metacity.sh
rename to src/run-mutter.sh
index e0d9265..b64834f 100755
--- a/src/run-metacity.sh
+++ b/src/run-mutter.sh
@@ -8,8 +8,8 @@ if test -z "$CLIENT_DISPLAY"; then
CLIENT_DISPLAY=:8
fi
-if test -z "$METACITY_DISPLAY"; then
- export METACITY_DISPLAY=$CLIENT_DISPLAY
+if test -z "$MUTTER_DISPLAY"; then
+ export MUTTER_DISPLAY=$CLIENT_DISPLAY
fi
if test -z "$SCREENS"; then
@@ -41,7 +41,7 @@ if test -n "$ICON_TEST"; then
fi
if test -n "$DEMO_TEST"; then
- TEST_CLIENT='./tools/metacity-window-demo'
+ TEST_CLIENT='./tools/mutter-window-demo'
fi
if test -n "$XINERAMA"; then
@@ -68,7 +68,7 @@ if test -z "$ONLY_WM"; then
killall -9 xscope
echo "Launching xscope"
DISPLAY= $XSCOPE_DIR/xscope -o1 -i28 > xscoped-replies.txt &
- export METACITY_DISPLAY=localhost:28
+ export MUTTER_DISPLAY=localhost:28
sleep 1
fi
@@ -105,5 +105,5 @@ if test -z "$ONLY_WM"; then
fi
if test -z "$ONLY_SETUP"; then
- METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 METACITY_DEBUG_BUTTON_GRABS=1 exec $DEBUG ./metacity $OPTIONS
+ MUTTER_VERBOSE=1 MUTTER_USE_LOGFILE=1 MUTTER_DEBUG_BUTTON_GRABS=1 exec $DEBUG ./mutter $OPTIONS
fi
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index fe02c2c..e9c93ab 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,33 +1,33 @@
@INTLTOOL_DESKTOP_RULE@
icondir=$(pkgdatadir)/icons
-icon_DATA=metacity-window-demo.png
+icon_DATA=mutter-window-demo.png
-INCLUDES= METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
- -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
- -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+INCLUDES= MUTTER_WINDOW_DEMO_CFLAGS@ @MUTTER_MESSAGE_CFLAGS@ \
+ -DMUTTER_ICON_DIR=\"$(pkgdatadir)/icons\" \
+ -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-metacity_message_SOURCES= \
- metacity-message.c
+mutter_message_SOURCES= \
+ mutter-message.c
-metacity_window_demo_SOURCES= \
- metacity-window-demo.c
+mutter_window_demo_SOURCES= \
+ mutter-window-demo.c
-metacity_mag_SOURCES= \
- metacity-mag.c
+mutter_mag_SOURCES= \
+ mutter-mag.c
-metacity_grayscale_SOURCES= \
- metacity-grayscale.c
+mutter_grayscale_SOURCES= \
+ mutter-grayscale.c
-bin_PROGRAMS=metacity-message metacity-window-demo
+bin_PROGRAMS=mutter-message mutter-window-demo
## cheesy hacks I use, don't really have any business existing. ;-)
-noinst_PROGRAMS=metacity-mag metacity-grayscale
+noinst_PROGRAMS=mutter-mag mutter-grayscale
-metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
-metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
-metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
-metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
+mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
+mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
EXTRA_DIST=$(icon_DATA)
diff --git a/src/tools/metacity-grayscale.c b/src/tools/mutter-grayscale.c
similarity index 100%
rename from src/tools/metacity-grayscale.c
rename to src/tools/mutter-grayscale.c
diff --git a/src/tools/metacity-mag.c b/src/tools/mutter-mag.c
similarity index 100%
rename from src/tools/metacity-mag.c
rename to src/tools/mutter-mag.c
diff --git a/src/tools/metacity-message.c b/src/tools/mutter-message.c
similarity index 89%
rename from src/tools/metacity-message.c
rename to src/tools/mutter-message.c
index 0df8991..22977e7 100644
--- a/src/tools/metacity-message.c
+++ b/src/tools/mutter-message.c
@@ -1,4 +1,4 @@
-/* Metacity send-magic-messages app */
+/* Mutter send-magic-messages app */
/*
* Copyright (C) 2002 Havoc Pennington
@@ -41,7 +41,7 @@ send_restart (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
- "_METACITY_RESTART_MESSAGE",
+ "_MUTTER_RESTART_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@@ -69,7 +69,7 @@ send_reload_theme (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
- "_METACITY_RELOAD_THEME_MESSAGE",
+ "_MUTTER_RELOAD_THEME_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@@ -97,7 +97,7 @@ send_set_keybindings (gboolean enabled)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
- "_METACITY_SET_KEYBINDINGS_MESSAGE",
+ "_MUTTER_SET_KEYBINDINGS_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = enabled;
@@ -126,7 +126,7 @@ send_toggle_verbose (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
- "_METACITY_TOGGLE_VERBOSE",
+ "_MUTTER_TOGGLE_VERBOSE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@@ -148,7 +148,7 @@ static void
usage (void)
{
g_printerr (_("Usage: %s\n"),
- "metacity-message (restart|reload-theme|enable-keybindings|disable-keybindings|toggle-verbose)");
+ "mutter-message (restart|reload-theme|enable-keybindings|disable-keybindings|toggle-verbose)");
exit (1);
}
@@ -173,7 +173,7 @@ main (int argc, char **argv)
else if (strcmp (argv[1], "toggle-verbose") == 0)
{
#ifndef WITH_VERBOSE_MODE
- g_printerr (_("Metacity was compiled without support for verbose mode\n"));
+ g_printerr (_("Mutter was compiled without support for verbose mode\n"));
return 1;
#else
send_toggle_verbose ();
diff --git a/src/tools/metacity-window-demo.c b/src/tools/mutter-window-demo.c
similarity index 99%
rename from src/tools/metacity-window-demo.c
rename to src/tools/mutter-window-demo.c
index 0685b1f..85f0a68 100644
--- a/src/tools/metacity-window-demo.c
+++ b/src/tools/mutter-window-demo.c
@@ -1,4 +1,4 @@
-/* Metacity window types/properties demo app */
+/* Mutter window types/properties demo app */
/*
* Copyright (C) 2002 Havoc Pennington
@@ -202,7 +202,7 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
err = NULL;
- pixbuf = gdk_pixbuf_new_from_file (METACITY_ICON_DIR"/metacity-window-demo.png",
+ pixbuf = gdk_pixbuf_new_from_file (MUTTER_ICON_DIR"/mutter-window-demo.png",
&err);
if (pixbuf)
{
diff --git a/src/tools/metacity-window-demo.png b/src/tools/mutter-window-demo.png
similarity index 100%
rename from src/tools/metacity-window-demo.png
rename to src/tools/mutter-window-demo.png
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index f7c98b6..8ed7b46 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -3,7 +3,7 @@
/* Draw a workspace */
/* This file should not be modified to depend on other files in
- * libwnck or metacity, since it's used in both of them
+ * libwnck or mutter, since it's used in both of them
*/
/*
diff --git a/src/ui/fixedtip.c b/src/ui/fixedtip.c
index b4c5203..4e8b76b 100644
--- a/src/ui/fixedtip.c
+++ b/src/ui/fixedtip.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity fixed tooltip routine */
+/* Mutter fixed tooltip routine */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/ui/fixedtip.h b/src/ui/fixedtip.h
index c196389..a6f2093 100644
--- a/src/ui/fixedtip.h
+++ b/src/ui/fixedtip.h
@@ -20,7 +20,7 @@
*/
/**
- * \file fixedtip.h Metacity fixed tooltip routine
+ * \file fixedtip.h Mutter fixed tooltip routine
*
* Sometimes we want to display a small floating rectangle with helpful
* text near the pointer. For example, if the user holds the mouse over
diff --git a/src/ui/gradient.h b/src/ui/gradient.h
index 16b3985..c8e7049 100644
--- a/src/ui/gradient.h
+++ b/src/ui/gradient.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity gradient rendering */
+/* Mutter gradient rendering */
/*
* Copyright (C) 2001 Havoc Pennington, 99% copied from wrlib in
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 8319897..36e89c6 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window menu */
+/* Mutter window menu */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/ui/menu.h b/src/ui/menu.h
index 39bb7fa..c6e8dde 100644
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity window menu */
+/* Mutter window menu */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index b4cf8c3..44cb386 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity popup window thing showing windows you can tab to */
+/* Mutter popup window thing showing windows you can tab to */
/*
* Copyright (C) 2001 Havoc Pennington
diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c
index 28de317..d89d826 100644
--- a/src/ui/testgradient.c
+++ b/src/ui/testgradient.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity gradient test program */
+/* Mutter gradient test program */
/*
* Copyright (C) 2002 Havoc Pennington
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 98dc166..9674f3a 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -3990,10 +3990,10 @@ meta_theme_load (const char *theme_name,
}
}
- /* Look for themes in METACITY_DATADIR */
+ /* Look for themes in MUTTER_DATADIR */
if (text == NULL)
{
- theme_dir = g_build_filename (METACITY_DATADIR,
+ theme_dir = g_build_filename (MUTTER_DATADIR,
"themes",
theme_name,
THEME_SUBDIR,
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 5787ad4..e35b880 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -770,7 +770,7 @@ main (int argc, char **argv)
GtkWidget *notebook;
int i;
- bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
textdomain(GETTEXT_PACKAGE);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
@@ -781,7 +781,7 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
- if (g_getenv ("METACITY_DEBUG") != NULL)
+ if (g_getenv ("MUTTER_DEBUG") != NULL)
{
meta_set_debugging (TRUE);
meta_set_verbose (TRUE);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index cf6cd91..f24fb24 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Metacity interface for talking to GTK+ UI module */
+/* Mutter interface for talking to GTK+ UI module */
/*
* Copyright (C) 2002 Havoc Pennington
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index e0c3048..d1ab761 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES= METACITY_CFLAGS@
+INCLUDES= MUTTER_CFLAGS@
wm_tester_SOURCES= \
main.c
@@ -18,8 +18,8 @@ test_size_hints_SOURCES= \
noinst_PROGRAMS=wm-tester test-gravity test-resizing focus-window test-size-hints
-wm_tester_LDADD= @METACITY_LIBS@
-test_gravity_LDADD= @METACITY_LIBS@
-test_resizing_LDADD= @METACITY_LIBS@
-test_size_hints_LDADD= @METACITY_LIBS@
-focus_window_LDADD= @METACITY_LIBS@
\ No newline at end of file
+wm_tester_LDADD= @MUTTER_LIBS@
+test_gravity_LDADD= @MUTTER_LIBS@
+test_resizing_LDADD= @MUTTER_LIBS@
+test_size_hints_LDADD= @MUTTER_LIBS@
+focus_window_LDADD= @MUTTER_LIBS@
diff --git a/test/metacity-test b/test/mutter-test
similarity index 95%
rename from test/metacity-test
rename to test/mutter-test
index de46d66..3f22b67 100644
--- a/test/metacity-test
+++ b/test/mutter-test
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# metacity-test.py -- testing for Metacity
+# mutter-test.py -- testing for Mutter
#
# Copyright (C) 2008 Thomas Thurman
#
@@ -49,7 +49,7 @@ class Test(object):
tests_by_name = {}
tests_by_bug_number = {}
-pristine_copy = '/usr/local/src/metacity'
+pristine_copy = '/usr/local/src/mutter'
working_directory = pristine_copy
homepath = os.getcwd ()
@@ -121,7 +121,7 @@ class BuildTest(Test):
return name
def run_build(self, **params):
- """Generalised routine to attempt to build Metacity.
+ """Generalised routine to attempt to build Mutter.
Parameters are:
action = (string) -- run "make (string)" rather than "make"
@@ -171,20 +171,20 @@ class BuildTest(Test):
if not run('make', 'env %s make %s' % (' '.join(flags), command)):
raise TestFailure('Build failed; can\'t really go on from here.')
- binary = 'src/metacity' # or 'metacity/src/metacity' sometimes. hmm....
+ binary = 'src/mutter' # or 'mutter/src/mutter' sometimes. hmm....
if not os.path.lexists(binary):
raise TestFailure('Binary was not built.')
output = commands.getoutput("env LANG=C %s --version" % binary)
- if not output.startswith('metacity '):
+ if not output.startswith('mutter '):
raise TestFailure('Built program fails to identify itself: ['+output+']')
# Should also test what it says about its flags
# (and make it show its flags)
- if not run ('recopy', 'cp %s %s/metacity-%s' % (binary, homepath, self.executable_name())):
+ if not run ('recopy', 'cp %s %s/mutter-%s' % (binary, homepath, self.executable_name())):
raise TestFailure('Couldn\'t copy binary somewhere safe')
# Should clear up build if it's temp directory
@@ -230,12 +230,12 @@ for (name, klass) in inspect.getmembers(sys.modules['__main__']):
# And back in the ordinary world...
def show_help():
- print ' --- metacity-test --- a test system for metacity.'
+ print ' --- mutter-test --- a test system for mutter.'
print 'There are three kinds of test: unit, regression, or build.'
print 'Only build tests are currently implemented.'
print
print 'Syntax:'
- print ' metacity-test <switches> <test names>'
+ print ' mutter-test <switches> <test names>'
print 'where <switches> can be:'
print ' -h Show this help and exit'
print ' -l List all known tests and exit'
diff --git a/test/tokentest/Makefile b/test/tokentest/Makefile
index 88b3c5f..010fd60 100644
--- a/test/tokentest/Makefile
+++ b/test/tokentest/Makefile
@@ -4,4 +4,4 @@ default:
@echo "Try 'make tp' or 'make glib'"
tp: tokentest.c
- gcc `pkg-config --cflags --libs glib-2.0 gdk-2.0 atk` -DMETACITY_DATADIR=\"/usr/share/metacity\" -I../.. -I../../src -I../../src/include tokentest.c ../../src/ui/theme.c ../../src/ui/gradient.c -o tp
+ gcc `pkg-config --cflags --libs glib-2.0 gdk-2.0 atk` -DMUTTER_DATADIR=\"/usr/share/mutter\" -I../.. -I../../src -I../../src/include tokentest.c ../../src/ui/theme.c ../../src/ui/gradient.c -o tp
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
