2.23.0 release.

svn path=/trunk/; revision=3602

.cvsignore

@@ -29,3 +29,7 @@ COPYING
 intltool-*
 metacity.spec
 autom4te.cache
+compile
+depcomp
+omf.make
+xmldocs.make

HACKING

@@ -11,6 +11,7 @@ is nonetheless useful.
 
 Overview
   Administrative issues
+  Minimal Building/Testing Environment
   Relevant standards and X properties
   Debugging and testing
     Debugging logs
@@ -34,6 +35,31 @@ Administrative issues
   instructions is that the minor version number of a Metacity release
   should always be a number from the Fibonacci sequence.
 
+Minimal Building/Testing Environment
+  You do not need to _install_ a development version of Metacity to
+  build, run and test it; you can run it from some temporary
+  directory.  Also, you do not need to build all of Gnome in order to
+  build a development version of Metacity -- odds are, you may be able
+  to build metacity from CVS without building any other modules.
+
+  As long as you have gtk+ >= 2.10 and GConf with your distro (gtk+ >=
+  2.6 if you manually revert the change from bug 348633), you should
+  be able to install your distro's development packages
+  (e.g. gtk2-devel, GConf2-devel, startup-notification-devel on
+  Fedora; also, remember to install the gnome-common package which is
+  needed for building cvs versions of Gnome modules like Metacity) as
+  well as the standard development tools (gcc, autoconf, automake,
+  pkg-config, intltool, and libtool) and be ready to build and test
+  Metacity.  Steps to do so:
+
+  $ svn checkout http://svn.gnome.org/svn/metacity/trunk metacity
+  $ cd metacity
+  $ ./autogen.sh --prefix /usr
+  $ make
+  $ ./src/metacity --replace
+
+  Again, note that you do not need to run 'make install'.
+
 Relevant standards and X properties
   There are two documents that describe some basics about how window
   managers should behave: the ICCCM (Inter-Client Communication Conventions
@@ -156,7 +182,7 @@ Debugging information
 
   To run metacity under valgrind, use options typical for any Gnome
   program, such as
-    valgrind --logfile=metacity.log --tool=memcheck --num-callers=48 \
+    valgrind --log-file=metacity.log --tool=memcheck --num-callers=48 \
     --leak-check=yes --leak-resolution=high --show-reachable=yes     \
     ./src/metacity --replace
   where, again, the backslashes mean to join all the stuff on the following
@@ -197,11 +223,30 @@ Debugging information
     of window without launching a full desktop.
 
 Technical gotchas to keep in mind
-  Files that include gdk.h or gtk.h are not supposed to include display.h
-  or window.h or other core files.
+  Files that include gdk.h or gtk.h are not supposed to include
+  display.h or window.h or other core files.  Files in the core
+  (display.[hc], window.[hc]) are not supposed to include gdk.h or
+  gtk.h.  Reasons:
 
-  Files in the core (display.[hc], window.[hc]) are not supposed to include
-  gdk.h or gtk.h.
+    "Basically you don't want GDK most of the time. It adds
+    abstractions that cause problems, because they aren't designed to
+    be used in a WM where we do weird stuff (display grabs, and just
+    being the WM). At best GDK adds inefficiency, at worst it breaks
+    things in weird ways where you have to be a GDK guru to figure
+    them out. Owen also told me that they didn't want to start adding
+    a lot of hacks to GDK to let a WM use it; we both agreed back in
+    the mists of time that metacity would only use it for the "UI"
+    bits as it does.
+
+    Having the split in the source code contains and makes very clear
+    the interface between the WM and GDK/GTK. This keeps people from
+    introducing extra GDK/GTK usage when it isn't needed or
+    appropriate. Also, it speeds up the compilation a bit, though this
+    was perhaps more relevant 5 years ago than it is now.
+
+    There was also a very old worry that the GDK stuff might have to
+    be in a separate process to work right; that turned out to be
+    untrue. Though who knows what issues the CM will introduce."
 
   Remember that strings stored in X properties are not in UTF-8, and they
   have to end up in UTF-8 before we try putting them through Pango.

MAINTAINERS

@@ -0,0 +1,41 @@
+Currently active maintainers
+--------------------------------
+
+Elijah Newren
+Email: newren gmail com
+Userid: newren
+
+  - Usually won't touch the theme bugs (isn't interested) or the
+    compositor (until open source nvidia drivers are up to snuff).
+    Tends to be most interested in libwnck/gtk interactions, focus
+    issues, constraints problems, and raising/stacking, but works on
+    just about anything other than themes and the compositor.
+
+Thomas Thurman
+Email: thomas thurman org uk
+Userid: tthurman
+
+  - Responsible for all theme bugs and the compositor (thank goodness
+    Thomas got involved, eh?).  I'm sure he'll replace this sentence
+    with his interests when he reads it.  ;-)
+
+
+Semi-active maintainers
+--------------------------------
+Havoc Pennington
+Email: hp  redhat com
+Userid: hp
+  - Original author.  Doesn't patch metacity anymore, but is active in
+    answering questions, responding to bugs, providing very helpful
+    suggestions and insight, and even assisting with debugging.
+
+
+Important historical figureheads
+--------------------------------
+Rob Adams (readams  readams net)
+  - Was the main maintainer of metacity for a while; particular areas
+    of focus included xinerama, placement, and an older version of the
+    constraints code.  Still responds to bugs every once in a while.
+
+Søren Sandmann (sandmann  redhat com)
+  - Wrote most of the current compositing manager code + libcm

Makefile.am

@@ -1,7 +1,7 @@
 
 SUBDIRS=src po doc
 
-EXTRA_DIST=HACKING rationales.txt \
+EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
 	intltool-extract.in intltool-merge.in intltool-update.in
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache

README

@@ -6,10 +6,11 @@ on UNIX keyboards.
 The first release of Metacity was version 2.3. Metacity has no need for
 your petty hangups about version numbers.
 
-The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-, 2.10.x,
-2.12.x.
+The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
+2.10.x, 2.12.x, 2.14.x, 2.16.x.
 
-Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x
+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
 ===
@@ -315,8 +316,8 @@ A: Metacity only stores sizes/positions for apps that are session
    archaic than twm - and you should flame them. ;-)
 
    Docs on session management:
-    ftp://ftp.x.org/pub/R6.4/xc/doc/hardcopy/SM/xsmp.PS.gz
-    ftp://ftp.x.org:21/pub/R6.4/xc/doc/hardcopy/SM/SMlib.PS.gz
+    http://www.fifi.org/doc/xspecs/xsmp.txt.gz
+    http://www.fifi.org/doc/xspecs/SMlib.txt.gz
 
    See also the ICCCM section on SM. For GNOME apps, use the
    GnomeClient object. For a simple example of using libSM directly,

autogen.sh

@@ -4,140 +4,18 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=metacity
-TEST_TYPE=-f
-FILE=src/display.c
+PKG_NAME="metacity"
+REQUIRED_AUTOMAKE_VERSION=1.10
 
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-	DIE=1
+(test -f $srcdir/configure.in \
+  && test -d $srcdir/src) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level metacity directory"
+    exit 1
 }
 
-if automake-1.9 --version < /dev/null > /dev/null 2>&1; then
-  AUTOMAKE=automake-1.9
-  ACLOCAL=aclocal-1.9
-elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then
-  AUTOMAKE=automake-1.8
-  ACLOCAL=aclocal-1.8
-elif automake-1.7 --version < /dev/null > /dev/null 2>&1; then
-  AUTOMAKE=automake-1.7
-  ACLOCAL=aclocal-1.7
-else
-        echo
-        echo "You must have automake >= 1.7 installed to compile $PROJECT."
-        echo "Get http://ftp.gnu.org/gnu/automake/automake-1.9.3.tar.bz2"
-        echo "(or a newer version if it is available)"
-        DIE=1
-fi
-
-(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
-    echo "Get http://ftp.gnu.org/gnu/libtool/libtool-1.5.10.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
 }
-
-CONFIGURE=configure.in
-if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" "$CONFIGURE" >/dev/null; then
-  if grep "sed.*POTFILES" "$CONFIGURE" >/dev/null; then
-    GETTEXTIZE=""
-  else
-    if grep "^AM_GLIB_GNU_GETTEXT" "$CONFIGURE" >/dev/null; then
-      GETTEXTIZE="glib-gettextize"
-      GETTEXTIZE_URL="ftp://ftp.gtk.org/pub/gtk/v2.0/glib-2.0.0.tar.gz"
-    else
-      GETTEXTIZE="gettextize"
-      GETTEXTIZE_URL="ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
-    fi
-
-    $GETTEXTIZE --version < /dev/null > /dev/null 2>&1
-    if test $? -ne 0; then
-      echo
-      echo "**Error**: You must have \`$GETTEXTIZE' installed to compile $PKG_NAME."
-      echo "Get $GETTEXTIZE_URL"
-      echo "(or a newer version if it is available)"
-      DIE=1
-    fi
-  fi
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-if test -z "$*"; then
-	echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-topdir=`pwd`
-for coin in .
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    cd $dr
-    if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
-      if grep "sed.*POTFILES" configure.in >/dev/null; then
-	: do nothing -- we still have an old unmodified configure.in
-      else
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running glib-gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy || exit $?
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-    fi
-    if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
-      echo "Running intltoolize..."
-      intltoolize --force --copy --automake || exit $?
-    fi
-    if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-      echo "Running libtoolize..."
-      libtoolize --force --copy || exit $?
-    fi
-
-    echo "Running $ACLOCAL $ACLOCAL_FLAGS ..."
-    $ACLOCAL $ACLOCAL_FLAGS || exit $?
-    echo "Running autoconf ..."
-    autoconf || exit $?
-    if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
-      echo "Running autoheader..."
-      autoheader || exit $?
-    fi
-    echo "Running $AUTOMAKE..."
-    $AUTOMAKE --add-missing --force --gnu || exit $?
-
-    cd $topdir
-  fi
-done
-
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-
-cd "$ORIGDIR"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PROJECT  || exit $?
-else
-  echo Skipping configure process.
-fi
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh

configure.in

@@ -1,11 +1,17 @@
 AC_PREREQ(2.50)
 
+m4_define([metacity_major_version], [2])
+m4_define([metacity_minor_version], [23])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.13.21],
+m4_define([metacity_micro_version], [0])
+
+m4_define([metacity_version],
+          [metacity_major_version.metacity_minor_version.metacity_micro_version])
+AC_INIT([metacity], [metacity_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
-AC_CONFIG_SRCDIR(src/display.c)
+AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 
 AM_INIT_AUTOMAKE
@@ -18,7 +24,7 @@ GETTEXT_PACKAGE=metacity
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 
-AC_PROG_INTLTOOL([0.21])
+IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -101,7 +107,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-METACITY_PC_MODULES='gtk+-2.0 >= 2.2.0 pango >= 1.2.0'
+METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
 
 AC_ARG_ENABLE(gconf,
   AC_HELP_STRING([--disable-gconf],
@@ -114,7 +120,7 @@ if test x$enable_gconf = xyes; then
 fi
 
 AC_ARG_ENABLE(verbose-mode,
-  AC_HELP_STRING([--disable-verbose],
+  AC_HELP_STRING([--disable-verbose-mode],
                  [disable metacity's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
   enable_verbose_mode=yes)
 
@@ -155,7 +161,6 @@ AC_ARG_ENABLE(shape,
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy id is it ja ko ku lt lv mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sl sk sq sr sr@Latn sv ta th tk tr uk vi wa xh zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
@@ -171,6 +176,10 @@ else
    AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
 fi
 
+# Unconditionally use this dir to avoid a circular dep with gnomecc
+GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
+AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
+
 STARTUP_NOTIFICATION_VERSION=0.7
 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
@@ -214,15 +223,15 @@ if test x$enable_compositor = xyes; then
    have_xcomposite=yes
    echo "CompositeExt support forced on"
 elif test x$enable_compositor = xauto; then
-   echo "Not building compositing manager by default now, must enable explicitly to get it. And it doesn't work, so don't bother unless you want to hack on it..."
-   have_xcomposite=no
+   echo "Building compositing manager by default now."
+   have_xcomposite=yes
 else
    have_xcomposite=no
 fi
 
 if test x$have_xcomposite = xyes; then
   echo "Building with CompositeExt"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage cm"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
   AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
 
   ## force on render also
@@ -404,10 +413,10 @@ if test "x$found_xsync" = "xyes"; then
    AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi
 
-METACITY_LIBS="$XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
-METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS"
-METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"
-METACITY_PROPS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_PROPS_LIBS"
+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+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"
 
 found_sm=no
 case "$METACITY_LIBS" in
@@ -417,7 +426,7 @@ case "$METACITY_LIBS" in
  *)
   AC_CHECK_LIB(SM, SmcSaveYourselfDone, 
                [AC_CHECK_HEADERS(X11/SM/SMlib.h,
-                                METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=no)],
+                                METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=yes)],
                , $METACITY_LIBS)
     ;;
 esac
@@ -450,12 +459,6 @@ fi
 
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
-## hack to work with old GTK versions for now 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$METACITY_LIBS $LDFLAGS"
-AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream)
-LDFLAGS=$save_LDFLAGS
-
 if test x$enable_gconf = xyes; then 
    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
    if test x"$GCONFTOOL" = xno; then
@@ -463,8 +466,17 @@ if test x$enable_gconf = xyes; then
    fi
 
    AM_GCONF_SOURCE_2
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
 fi
 
+AC_ARG_ENABLE(debug,
+	[  --enable-debug		enable debugging],,
+	enable_debug=no)
+if test "x$enable_debug" = "xyes"; then
+	CFLAGS="$CFLAGS -g -O -Wall"
+fi
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
@@ -481,11 +493,8 @@ AC_OUTPUT
 
 if test x$enable_gconf = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
-        echo "*** Building without GConf"
-        echo "*** This means there's no way to change prefs except"
-        echo "*** hacking source code, at least for now."
-        echo "*** Also, some prefs may have broken defaults."
-        echo "*** Patches needed for a simple no-gconf config file."
+        echo "*** Building without GConf.  This means there's no"
+        echo "*** way to change prefs except hacking source code."
         echo "*** This is intended for embedded systems etc., not for normal use."
 fi
 
@@ -517,5 +526,13 @@ metacity-$VERSION:
 	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
 "
-echo "This is the UNSTABLE branch of metacity"
-echo "Use 2.12.x for stable (gnome-2-12 branch in CVS)"
+
+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"
+   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"
+fi

doc/compositor-control.txt

@@ -0,0 +1,46 @@
+The compositor is the box of tricks inside the window manager which performs
+special effects on the windows on your screen. Metacity's compositor is
+under development. Your help is requested in finding and fixing bugs. This
+document tells you how to configure Metacity so that you can use compositing.
+
+To turn the compositor on initially, you need to pass --enable-compositor to
+the configure script. This will introduce a dependence on libcm, which you
+can get from <URL:http://ftp.gnome.org/pub/GNOME/sources/libcm/>.
+
+When Metacity is compiled, you will need to turn the compositor on in gconf
+for it to have any effect. You will find the boolean switch at
+
+   /apps/metacity/general/compositing_manager
+
+When that's done, you can set some environment variables before you launch
+Metacity to influence how the compositor works. These will eventually become
+configuration options or gconf options when they grow up. Define them to any
+value to turn them on; leave them undefined to turn them off. Currently the
+options you can set are:
+
+   LIBCM_DIRECT
+
+      If this is set, the compositor will bypass the X server and do all its
+      work directly with the hardware. I know of no reason you would want to
+      do so, but perhaps you do.
+
+   LIBCM_TFP
+
+      If this is set ("tfp mode"), the compositor will feel free to use the
+      texture_from_pixmap extension; if this is not set ("non-tfp mode"), the
+      compositor will use a workaround. Many drivers require non-tfp mode in
+      order to work, and will paint all windows clear blue or clear white
+      without it. Thanks to Travis Watkins for suggesting this switch; he
+      cautions that some games or video players may require tfp mode.
+
+   METACITY_BLING
+
+      This turns on several pretty but non-essential animations (dialogues
+      fracturing and exploding, minimisations doing a shrinkydink effect,
+      and so on). If it is not set, the standard non-GL animations are
+      retained. This affects only window event animations; it doesn't change
+      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
+#gnome-hackers on gimpnet, or come and find me (tthurman at gnome) and ask.

doc/how-to-get-focus-right.txt

@@ -9,7 +9,8 @@ basics are easy:
 Focus method  Behavior
     click     When a user clicks on a window, focus it
    sloppy     When an EnterNotify is received, focus the window
-    mouse     Same as sloppy, but also defocus on LeaveNotify
+    mouse     Same as sloppy, but also defocus when mouse enters DESKTOP
+              window
 
 Note that these choices (along with the choice that clicking on a
 window raises it for the click focus method) introduces the following
@@ -20,8 +21,8 @@ Focus method  Invariant
    sloppy     If the mouse is in a window, then it is focused; if the
               mouse is not in a window, then the most recently used
               window is focused.
-    mouse     If the mouse is in a window, then it is focused; otherwise,
-              the designated "no_focus_window" is focused
+    mouse     If the mouse is in a non-DESKTOP window, then it is focused;
+              otherwise, the designated "no_focus_window" is focused
 
 However, there are a number of cases where the current focus window
 becomes invalid and another should be chosen.  Some examples are when
@@ -34,8 +35,9 @@ Focus method  Behavior
               on top)
    sloppy     Focus the window containing the pointer if there is such
               a window, otherwise focus the most recently used window.
-    mouse     Focus the window containing the pointer if there is one,
-              otherwise focus the designated "no_focus_window".
+    mouse     Focus the non-DESKTOP window containing the pointer if
+              there is one, otherwise focus the designated
+              "no_focus_window".
 
 Note that "most recently used window", as used here, has a slightly
 different connotation than "most recent to have keyboard focus".  This
@@ -62,9 +64,9 @@ cases in which a new window shouldn't be focused:
 
 To handle these cases, Metacity compares timestamps of the event that
 caused the launch and the timestamp of the last interaction with the
-focused window.  (Case 2 is handled by providing a special timestamp
-of 0 for the launch time, which ensures that the window that appears
-doesn't get focus)
+focused window.  (Case 2 is handled by the application providing a
+special timestamp of 0 for the launch time, which ensures that the
+window that appears doesn't get focus)
 
 If the newly launched window isn't focused, some things should be done
 to alert the user that there is a window to work with:
@@ -84,10 +86,10 @@ attempt to handle the INHERENTLY CONFLICTING CONSTRAINTS.  Metacity does
 this by having a mouse_mode boolean used to determine which of the two
 sets of invariants holds.  This mode is set according to which method was
 most recently used to choose a focus window:
-  1) When receiving EnterNotify/LeaveNotify events from mouse movement, set
+  1) When receiving EnterNotify events from mouse movement, set
      mouse_mode to TRUE.
   2) When using keynav to choose a focus window (e.g. alt-tab, alt-esc,
-     move-window-to-workspace keybindings), set mouse_mode to FALSE.
+     alt-f2, move-window-to-workspace keybindings), set mouse_mode to FALSE.
   3) When handling events that don't choose a focus window but rather need
      a focus_window chosen for them (e.g. switch-to-workspace keybindings),
      don't change the mouse_mode and just use the current value.
@@ -123,6 +125,7 @@ To read more about the bugs that inspired these choices:
   - Mousenav vs. Keynav in mouse and sloppy focus modes
     http://bugzilla.gnome.org/show_bug.cgi?id=167545
     http://bugzilla.gnome.org/show_bug.cgi?id=101190
+    http://bugzilla.gnome.org/show_bug.cgi?id=357695
   - Not focusing panels
     http://bugzilla.gnome.org/show_bug.cgi?id=160470
     http://bugzilla.gnome.org/show_bug.cgi?id=120100

doc/man/Makefile.am

@@ -1,3 +1,3 @@
-man_MANS = metacity-theme-viewer.1 metacity-window-demo.1
+man_MANS = metacity.1 metacity-theme-viewer.1 metacity-window-demo.1
 
 EXTRA_DIST = $(man_MANS)

doc/man/metacity.1

@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" 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"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+METACITY \- minimal GTK2 Window Manager
+.SH SYNOPSIS
+.B metacity
+[\-\-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.
+.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.
+.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.
+.TP
+.B \-\-sm\-client\-id=ID
+Specify a session management \fIID\fP.
+.TP
+.B \-\-sm\-disable
+Disable the session management.
+.TP
+.B \-\-sm\-save\-file=FILENAME
+Load a session from \fIFILENAME\fP.
+.TP
+.B \-\-version
+Print the version number.
+.TP
+.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).
+.SH SEE ALSO
+.BR metacity-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.

doc/theme-format.txt

@@ -1,6 +1,91 @@
-Docs on the theme format
+Themes are in a simple XML-subset format. There are multiple versions
+of the theme format, and a given theme can support more than one format.
 
-Themes are in a simple XML-subset format.
+Version 1:     THEMEDIR/metacity-1/metacity-theme-1.xml
+  (original metacity format)
+Version 2:     THEMEDIR/metacity-1/metacity-theme-2.xml
+
+The subdirectory name is "metacity-1" in all versions.
+
+As you might expect, older versions of metacity will not understand
+newer theme formats. However, newer versions will use old themes.
+Metacity will always use the newest theme format it understands that
+the X server supports. Some format versions are only supported if you
+have the right X server features.
+
+Each format *requires* the corresponding filename. If you put version
+2 format features in the metacity-1/metacity-theme-1.xml file, then
+metacity will get angry.
+
+This document has separate sections for each format version. You may
+want to read the document in reverse order, since the base features
+are discussed under version 1.
+
+New Features in Theme Format Version 2
+======================================
+
+The optional attributes rounded_top_left, rounded_top_right,
+rounded_bottom_left and rounded_bottom_right on <frame_geometry>
+should now be the radius of the corner in pixels. You may still use
+the values "false" for 0 and "true" for 5, which means v1 values will
+still work just fine.
+
+<frame_geometry> has a new optional attribute, hide_buttons. If this
+is true, no buttons will be displayed on the titlebar.
+
+Anywhere you can use a positive integer, you can use an integer constant.
+
+As well as constant integers and reals, you may define constant colours,
+thus:
+  <constant name="RevoltingPink" value="#FF00FF"/>
+  <constant name="Background" value="gtk:bg[NORMAL]"/>
+
+<frame_style> has two new optional attributes, background and alpha.
+If you specify alpha, you must specify background. background is a
+colour used for the background of the frame. alpha is the transparency
+as a real between 0.0 and 1.0. If the current X server does not support
+alpha channels, the value is ignored.
+
+The filename attribute of <image> may begin with "theme:". If so, the
+rest of the string is the name of a theme icon. The 64x64 version of the
+icon is used, except for fallback mini_icons, which use the 16x16 version.
+This does not affect ordinary resizing. For example:
+  <button function="close" state="normal">
+    <draw_ops>
+      <include name="active_button"/>
+      <image filename="theme:gnome-logout" x="2" y="2"
+          width="width-4" height="height-4"/>
+      <!-- Note: not "theme:gnome-logout.png" or similar. -->
+    </draw_ops>
+  </button>
+
+<menu_icon>s are parsed but ignored.
+
+Fallback icons can be specified using <fallback>. There are two
+optional arguments, icon and mini_icon. The values of these arguments
+are identical to that of the filename attribute of <image>. Fallback
+icons are used when a window does not supply its own icon. If a fallback
+icon is not specified with <fallback>, Metacity will use a built-in
+icon, as in metacity-theme-1.
+
+The <arc> element, as well as the original start_angle and end_angle
+attributes, may be given from and to attributes. The values of these
+attributes are given in degrees clockwise, with 0 being straight up.
+For example:
+  <arc from="0.0" to="90.0" filled="true" color="#FF00FF"
+      x="0" y="5" width="15" height="15"/>
+
+<frame state="shaded"> may now take an optional resize attribute, with
+the same interpretation as the resize attribute on <frame state="normal">.
+If this attribute is omitted for state="shaded", it defaults to "both".
+(If it is omitted for state="normal", it remains an error.)
+
+In addition to the four <button> functions which are required in
+metacity-theme-1, there are six new functions in metacity-theme-2:
+shade, unshade, above, unabove, stick and unstick.
+      
+Overview of Theme Format Version 1
+==================================
 
 <?xml version="1.0"?>
 <metacity_theme>

po/.cvsignore

@@ -9,3 +9,4 @@ cat-id-tbl.c
 messages
 missing
 stamp-cat-id
+stamp-it

po/LINGUAS

@@ -0,0 +1,82 @@
+# please keep this list sorted alphabetically
+#
+am
+ar
+as
+az
+be
+be@latin
+bg
+bn
+bn_IN
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+hy
+id
+is
+it
+ja
+ka
+kn
+ko
+ku
+lt
+lv
+mg
+mk
+ml
+mn
+mr
+ms
+nb
+ne
+nl
+nn
+oc
+or
+pa
+pl
+pt
+pt_BR
+ro
+ru
+rw
+si
+sk
+sl
+sq
+sr
+sr@Latn
+sv
+ta
+th
+tk
+tr
+uk
+vi
+wa
+xh
+zh_CN
+zh_HK
+zh_TW

po/POTFILES.in

@@ -1,26 +1,29 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/tools/metacity-message.c
-src/delete.c
-src/display.c
-src/errors.c
-src/frames.c
-src/keybindings.c
-src/main.c
-src/menu.c
-src/metaaccellabel.c
-src/metacity-dialog.c
+src/50-metacity-desktop-key.xml.in
+src/50-metacity-key.xml.in
+src/core/core.c
+src/core/delete.c
+src/core/display.c
+src/core/errors.c
+src/core/keybindings.c
+src/core/main.c
+src/core/prefs.c
+src/core/screen.c
+src/core/session.c
+src/core/util.c
+src/core/window-props.c
+src/core/window.c
+src/core/xprops.c
 src/metacity.desktop.in
 src/metacity.schemas.in
-src/prefs.c
-src/resizepopup.c
-src/screen.c
-src/session.c
-src/theme-parser.c
-src/theme-viewer.c
-src/theme.c
-src/util.c
-src/window-props.c
-src/window.c
-src/workspace.c
-src/xprops.c
+src/ui/frames.c
+src/ui/menu.c
+src/ui/metaaccellabel.c
+src/ui/metacity-dialog.c
+src/ui/resizepopup.c
+src/ui/theme-parser.c
+src/ui/theme-viewer.c
+src/ui/theme.c
+src/tools/metacity-message.c
+

rationales.txt

@@ -39,10 +39,22 @@ workspace wrapping:
   http://bugzilla.gnome.org/show_bug.cgi?id=89315
 
 raise windows on click:
+  http://bugzilla.gnome.org/show_bug.cgi?id=326156
   http://bugzilla.gnome.org/show_bug.cgi?id=86108
   http://bugzilla.gnome.org/show_bug.cgi?id=115072
   http://bugzilla.gnome.org/show_bug.cgi?id=115753
 
+Pointer warping:
+  http://bugzilla.gnome.org/show_bug.cgi?id=134353
+  http://bugzilla.gnome.org/show_bug.cgi?id=134352
+  (Think about tasklist & window selector too; this would be a very bad idea)
+
+
+Bugs for easy dupe-finding that seem to be hard to find otherwise:
+===
+Applications opening in wrong workspace:
+  http://bugzilla.gnome.org/show_bug.cgi?id=160687
+
 
 Tracking bugs
 ====
@@ -62,3 +74,6 @@ moving/resizing (constraints): http://bugzilla.gnome.org/show_bug.cgi?id=155458
                 modal dialogs: http://bugzilla.gnome.org/show_bug.cgi?id=164841
      multi-head sans xinerama: http://bugzilla.gnome.org/show_bug.cgi?id=324772
                      xinerama: http://bugzilla.gnome.org/show_bug.cgi?id=324773
+          output-only windows: http://bugzilla.gnome.org/show_bug.cgi?id=340584
+  allowed actions/window-type: http://bugzilla.gnome.org/show_bug.cgi?id=340682
+        EWMH/ICCCM compliance: http://bugzilla.gnome.org/show_bug.cgi?id=340691

src/50-metacity-desktop-key.xml.in

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries _name="Desktop" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_run_dialog" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_main_menu" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_screenshot" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_window_screenshot" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_terminal" />
+
+</KeyListEntries>
+

src/50-metacity-key.xml.in

@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries _name="Window Management" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/activate_window_menu" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_fullscreen" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_maximized" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/unmaximize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_shaded" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/close" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/minimize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/begin_move" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/begin_resize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_on_all_workspaces"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/raise_or_lower" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/raise" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/lower" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize_vertically" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize_horizontally" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_1"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_2"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_3"
+	value="2"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_4"
+	value="3"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_5"
+	value="4"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_6"
+	value="5"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_7"
+	value="6"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_8"
+	value="7"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_9"
+	value="8"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_10"
+	value="9"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_11"
+	value="10"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_12"
+	value="11"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_left"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_right"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_up"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_down"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_windows" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_group" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_panels" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_windows" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_group" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_panels" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/show_desktop" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_1"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_2"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_3"
+	value="2"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_4"
+	value="3"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_5"
+	value="4"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_6"
+	value="5"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_7"
+	value="6"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_8"
+	value="7"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_9"
+	value="8"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_10"
+	value="9"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_11"
+	value="10"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_12"
+	value="11"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_left"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_right"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_up"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_down"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+</KeyListEntries>
+

src/Makefile.am

@@ -2,132 +2,132 @@ lib_LTLIBRARIES = libmetacity-private.la
 
 SUBDIRS=wm-tester tools themes
 
-INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DMETACITY_LIBDIR=\"$(libdir)\" -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
-
-EGGFILES=			\
-	eggaccelerators.c	\
-	eggaccelerators.h
+INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
 
 metacity_SOURCES= 				\
-	async-getprop.c				\
-	async-getprop.h				\
-	bell.h					\
-	bell.c					\
-	boxes.h					\
-	boxes.c					\
-	common.h				\
-	compositor.c				\
-	compositor.h				\
-	constraints.c				\
-	constraints.h				\
-	core.c					\
-	core.h					\
-	delete.c				\
-	display.c				\
-	display.h				\
-	draw-workspace.c			\
-	draw-workspace.h			\
-	edge-resistance.c			\
-	edge-resistance.h			\
-	effects.c				\
-	effects.h				\
-	errors.c				\
-	errors.h				\
-	eventqueue.c				\
-	eventqueue.h				\
-	fixedtip.c				\
-	fixedtip.h				\
-	frame.c					\
-	frame.h					\
-	frames.c				\
-	frames.h				\
-	gradient.c				\
-	gradient.h				\
-	group.c					\
-	group.h					\
-	group-private.h				\
-	group-props.c				\
-	group-props.h				\
-	iconcache.c				\
-	iconcache.h				\
+	core/async-getprop.c			\
+	core/async-getprop.h			\
+	core/bell.c				\
+	core/bell.h				\
+	core/boxes.c				\
+	include/boxes.h				\
+	core/compositor.c			\
+	core/compositor.h			\
+	core/constraints.c			\
+	core/constraints.h			\
+	core/core.c				\
+	core/delete.c				\
+	core/display.c				\
+	core/display.h				\
+	ui/draw-workspace.c			\
+	ui/draw-workspace.h			\
+	core/edge-resistance.c			\
+	core/edge-resistance.h			\
+	core/effects.c				\
+	core/effects.h				\
+	core/errors.c				\
+	core/errors.h				\
+	core/eventqueue.c			\
+	core/eventqueue.h			\
+	core/frame.c				\
+	core/frame.h				\
+	ui/gradient.c				\
+	ui/gradient.h				\
+	core/group-private.h			\
+	core/group-props.c			\
+	core/group-props.h			\
+	core/group.c				\
+	core/group.h				\
+	core/iconcache.c			\
+	core/iconcache.h			\
+	core/keybindings.c			\
+	core/keybindings.h			\
+	core/main.c				\
+	include/main.h				\
+	core/metacity-Xatomtype.h		\
+	core/place.c				\
+	core/place.h				\
+	core/prefs.c				\
+	include/prefs.h				\
+	core/screen.c				\
+	core/screen.h				\
+	core/session.c				\
+	core/session.h				\
+	core/spring-model.c			\
+	core/spring-model.h			\
+	core/stack.c				\
+	core/stack.h				\
+	core/util.c				\
+	include/util.h				\
+	core/window-props.c			\
+	core/window-props.h			\
+	core/window.c				\
+	core/window.h				\
+	core/workspace.c			\
+	core/workspace.h			\
+	core/xprops.c				\
+	core/xprops.h				\
+	include/common.h			\
+	include/core.h				\
+	include/ui.h				\
 	inlinepixbufs.h				\
-	keybindings.c				\
-	keybindings.h				\
-	main.c					\
-	main.h					\
-	menu.c					\
-	menu.h					\
-	metaaccellabel.c			\
-	metaaccellabel.h			\
-	metacity-Xatomtype.h			\
-	place.c					\
-	place.h					\
-	prefs.c					\
-	prefs.h					\
-	resizepopup.c				\
-	resizepopup.h				\
-	screen.c				\
-	screen.h				\
-	session.c				\
-	session.h				\
-	stack.c					\
-	stack.h					\
-	tabpopup.c				\
-	tabpopup.h				\
-	theme.c					\
-	theme.h					\
-	theme-parser.c				\
-	theme-parser.h				\
-	themewidget.c				\
-	themewidget.h				\
-	ui.c					\
-	ui.h					\
-	util.c					\
-	util.h					\
-	window.c				\
-	window.h				\
-	window-props.c				\
-	window-props.h				\
-	workspace.c				\
-	workspace.h				\
-	xprops.c				\
-	xprops.h				\
-	$(EGGFILES)
+	ui/fixedtip.c				\
+	ui/fixedtip.h				\
+	ui/frames.c				\
+	ui/frames.h				\
+	ui/menu.c				\
+	ui/menu.h				\
+	ui/metaaccellabel.c			\
+	ui/metaaccellabel.h			\
+	ui/resizepopup.c			\
+	include/resizepopup.h			\
+	ui/tabpopup.c				\
+	include/tabpopup.h				\
+	ui/theme-parser.c			\
+	ui/theme-parser.h			\
+	ui/theme.c				\
+	ui/theme.h				\
+	ui/themewidget.c			\
+	ui/themewidget.h			\
+	ui/ui.c
 
 # by setting libmetacity_private_la_CFLAGS, the files shared with
 # metacity proper will be compiled with different names.
 libmetacity_private_la_CFLAGS =
-libmetacity_private_la_SOURCES=	\
-	gradient.c		\
-	gradient.h		\
-	preview-widget.c	\
-	preview-widget.h	\
-	theme.c			\
-	theme.h			\
-	theme-parser.c		\
-	theme-parser.h		\
-	util.c			\
-	util.h			\
-	common.h
+libmetacity_private_la_SOURCES=			\
+	core/boxes.c				\
+	include/boxes.h				\
+	ui/gradient.c				\
+	ui/gradient.h				\
+	core/util.c				\
+	include/util.h				\
+	include/common.h			\
+	ui/preview-widget.c			\
+	ui/preview-widget.h			\
+	ui/theme-parser.c			\
+	ui/theme-parser.h			\
+	ui/theme.c				\
+	ui/theme.h
 
 libmetacity_private_la_LDFLAGS = -no-undefined
 libmetacity_private_la_LIBADD  = @METACITY_LIBS@
 
 libmetacityincludedir = $(includedir)/metacity-1/metacity-private
 
-libmetacityinclude_HEADERS =	\
-	common.h		\
-	gradient.h		\
-	preview-widget.h	\
-	theme.h			\
-	theme-parser.h		\
-	util.h
+libmetacityinclude_HEADERS =			\
+	include/boxes.h				\
+	ui/gradient.h				\
+	include/util.h				\
+	include/common.h			\
+	ui/preview-widget.h			\
+	ui/theme-parser.h			\
+	ui/theme.h
 
 metacity_theme_viewer_SOURCES=  \
-	theme-viewer.c
+	ui/theme-viewer.c
 
 metacity_dialog_SOURCES= 	\
-	metacity-dialog.c
+	ui/metacity-dialog.c
 
 bin_PROGRAMS=metacity metacity-theme-viewer
 libexec_PROGRAMS=metacity-dialog
@@ -137,9 +137,9 @@ metacity_LDADD=@METACITY_LIBS@ $(EFENCE)
 metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
 metacity_dialog_LDADD=@METACITY_LIBS@
 
-testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c
-testgradient_SOURCES=gradient.h gradient.c testgradient.c
-testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c
+testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
+testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
+testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c
 
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
@@ -157,6 +157,12 @@ schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = metacity.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
@@ -173,10 +179,10 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
           stock_delete_data $(srcdir)/stock_delete.png
 
 BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
 
 inlinepixbufs.h: $(IMAGES)
-	   $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -184,13 +190,8 @@ pkgconfig_DATA = libmetacity-private.pc
 
 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(IMAGES) $(schema_DATA) 	\
-	update-from-egg.sh		\
 	$(desktopfiles_in_files)	\
 	$(schema_in_files)		\
+	$(xml_in_files)			\
 	libmetacity-private.pc.in
 
-
-EGGDIR=$(srcdir)/../../libegg/libegg
-
-regenerate-built-sources:
-	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh

src/api.c

@@ -1,53 +0,0 @@
-/* Metacity misc. public entry points */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "api.h"
-#include "display.h"
-#include "colors.h"
-
-PangoContext*
-meta_get_pango_context (Screen                     *xscreen,
-                        const PangoFontDescription *desc)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  g_return_val_if_fail (screen != NULL, NULL);
-
-  return meta_screen_get_pango_context (screen,
-                                        desc,
-                                        /* FIXME, from the frame window */
-                                        PANGO_DIRECTION_LTR);
-}
-
-gulong
-meta_get_x_pixel (Screen *xscreen, const PangoColor *color)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  g_return_val_if_fail (screen != NULL, 0);
-  
-  return meta_screen_get_x_pixel (screen, color);
-}
-

src/api.h

@@ -1,62 +0,0 @@
-/* Metacity misc. public entry points */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_API_H
-#define META_API_H
-
-/* don't add any internal headers here; api.h is an installed/public
- * header. Only theme.h is also installed.
- */
-#include <X11/Xlib.h>
-#include <pango/pangox.h>
-
-/* Colors/state stuff matches GTK since we get the info from
- * the GTK UI slave
- */
-typedef struct _MetaUIColors MetaUIColors;
-
-typedef enum
-{
-  META_STATE_NORMAL,
-  META_STATE_ACTIVE,
-  META_STATE_PRELIGHT,
-  META_STATE_SELECTED,
-  META_STATE_INSENSITIVE
-} MetaUIState;
-
-struct _MetaUIColors
-{
-  PangoColor fg[5];
-  PangoColor bg[5];
-  PangoColor light[5];
-  PangoColor dark[5];
-  PangoColor mid[5];
-  PangoColor text[5];
-  PangoColor base[5];
-  PangoColor text_aa[5];
-};
-
-PangoContext*       meta_get_pango_context (Screen                     *xscreen,
-                                            const PangoFontDescription *desc);
-gulong              meta_get_x_pixel       (Screen                     *xscreen,
-                                            const PangoColor           *color);
-
-#endif

src/compositor.c

@@ -1,907 +0,0 @@
-/* 
- * Copyright (C) 2003, 2004 Red Hat, Inc.
- * Copyright (C) 2003 Keith Packard
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include <config.h>
-#include "compositor.h"
-#include "screen.h"
-#include "errors.h"
-#include "window.h"
-#include "frame.h"
-#include "workspace.h"
-
-#include <math.h>
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-#include <cm/node.h>
-#include <cm/drawable-node.h>
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <GL/glx.h>
-
-#include <cm/ws.h>
-#include <cm/wsint.h>
-
-#include <X11/extensions/shape.h>
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/Xrender.h>
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#define FRAME_INTERVAL_MILLISECONDS ((int)(1000.0/40.0))
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-/* Screen specific information */
-typedef struct
-{
-  /* top of stack is first in list */
-  GList *compositor_windows;
-  WsWindow *glw;
-  int idle_id;
-} ScreenInfo;
-
-struct MetaCompositor
-{
-  MetaDisplay *display;
-  
-  Ws *ws;
-  
-  GHashTable *window_hash;
-  
-  guint repair_idle;
-  
-  guint enabled : 1;
-  guint have_composite : 1;
-  guint have_damage : 1;
-  guint have_fixes : 1;
-  guint have_name_window_pixmap : 1;
-  guint debug_updates : 1;
-  
-  GList *ignored_damage;
-};
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-free_window_hash_value (void *v)
-{
-  DrawableNode *drawable_node = v;
-  
-  drawable_node_unref (drawable_node);
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-MetaCompositor*
-meta_compositor_new (MetaDisplay *display)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  MetaCompositor *compositor;
-  
-  compositor = g_new0 (MetaCompositor, 1);
-  
-  compositor->ws = ws_new (NULL);
-  
-  ws_init_test (compositor->ws);
-  ws_set_ignore_grabs (compositor->ws, TRUE);
-  
-  compositor->display = display;
-  
-  compositor->window_hash = g_hash_table_new_full (meta_unsigned_long_hash,
-						   meta_unsigned_long_equal,
-						   NULL,
-						   free_window_hash_value);
-  
-  compositor->enabled = TRUE;
-  
-  return compositor;
-#else /* HAVE_COMPOSITE_EXTENSIONS */
-  return NULL;
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-void
-meta_compositor_set_debug_updates (MetaCompositor *compositor,
-				   gboolean	   debug_updates)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  compositor->debug_updates = !!debug_updates;
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-remove_repair_idle (MetaCompositor *compositor)
-{
-  if (compositor->repair_idle)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR, "Damage idle removed\n");
-      
-      g_source_remove (compositor->repair_idle);
-      compositor->repair_idle = 0;
-    }
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-void
-meta_compositor_unref (MetaCompositor *compositor)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  /* There isn't really a refcount at the moment since
-   * there's no ref()
-   */
-  remove_repair_idle (compositor);
-  
-  if (compositor->window_hash)
-    g_hash_table_destroy (compositor->window_hash);
-  
-  g_free (compositor);
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-draw_windows (MetaScreen *screen,
-	      GList      *list)
-{
-  Node *node;
-  
-  if (!list)
-    return;
-  
-  node = list->data;
-  
-  draw_windows (screen, list->next);
-  node->render (node);
-}
-
-static MetaScreen *
-node_get_screen (Display *dpy,
-		 DrawableNode *node)
-{
-  /* FIXME: we should probably have a reverse mapping
-   * from nodes to screens
-   */
-  
-  Screen *screen = XDefaultScreenOfDisplay (dpy);
-  return meta_screen_for_x_screen (screen);
-}
-
-static void
-handle_restacking (MetaCompositor *compositor,
-		   DrawableNode *node,
-		   DrawableNode *above)
-{
-  GList *window_link, *above_link;
-  MetaScreen *screen;
-  ScreenInfo *scr_info;
-  
-  screen = node_get_screen (compositor->display->xdisplay, node);
-  scr_info = screen->compositor_data;
-  
-  window_link = g_list_find (scr_info->compositor_windows, node);
-  above_link  = g_list_find (scr_info->compositor_windows, above);
-  
-  if (!window_link || !above_link)
-    return;
-  
-  if (window_link == above_link)
-    {
-      /* This can happen if the topmost window is raise above
-       * the GL window
-       */
-      return;
-    }
-  
-  if (window_link->next != above_link)
-    {
-      ScreenInfo *scr_info = screen->compositor_data;
-      
-      scr_info->compositor_windows =
-	g_list_delete_link (scr_info->compositor_windows, window_link);
-      scr_info->compositor_windows =
-	g_list_insert_before (scr_info->compositor_windows, above_link, node);
-    }
-}
-
-static void
-process_configure_notify (MetaCompositor  *compositor,
-                          XConfigureEvent *event)
-{
-  WsWindow *above_window;
-  DrawableNode *node = g_hash_table_lookup (compositor->window_hash,
-					    &event->window);
-  DrawableNode *above_node;
-  MetaScreen *screen;
-  ScreenInfo *scr_info;
-  
-  if (!node)
-    return;
-  
-  screen = node_get_screen (compositor->display->xdisplay, node);
-  scr_info = screen->compositor_data;
-  
-  above_window = ws_window_lookup (node->drawable->ws, event->above);
-  
-  if (above_window == scr_info->glw)
-    {
-      above_node = scr_info->compositor_windows->data;
-    }
-  else
-    {
-      above_node = g_hash_table_lookup (compositor->window_hash,
-					&event->above);
-    }
-  
-  handle_restacking (compositor, node, above_node);
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_expose (MetaCompositor     *compositor,
-                XExposeEvent       *event)
-{
-  /* FIXME: queue repaint */
-}
-
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_map (MetaCompositor     *compositor,
-             XMapEvent          *event)
-{
-  DrawableNode *node;
-  MetaScreen *screen;
-  
-  /* See if window was mapped as child of root */
-  screen = meta_display_screen_for_root (compositor->display,
-					 event->event);
-  
-  if (screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "MapNotify received on non-root 0x%lx for 0x%lx\n",
-		  event->event, event->window);
-      return; /* MapNotify wasn't for a child of the root */
-    }
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &event->window);
-  if (node == NULL)
-    {
-      XWindowAttributes attrs;
-      
-      meta_error_trap_push_with_return (compositor->display);
-      
-      XGetWindowAttributes (compositor->display->xdisplay,
-			    event->window, &attrs);
-      
-      if (meta_error_trap_pop_with_return (compositor->display, TRUE) != Success)
-        {
-	  meta_topic (META_DEBUG_COMPOSITOR, "Failed to get attributes for window 0x%lx\n",
-		      event->window);
-        }
-      else
-	{
-	  meta_compositor_add_window (compositor,
-				      event->window, &attrs);
-        }
-    }
-  else
-    {
-      drawable_node_set_viewable (node, TRUE);
-    }
-  
-  /* We don't actually need to invalidate anything, because we will
-   * get damage events as the server fills the background and the client
-   * draws the window
-   */
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_unmap (MetaCompositor     *compositor,
-               XUnmapEvent        *event)
-{
-  DrawableNode *node;
-  MetaScreen *screen;
-  
-  /* See if window was unmapped as child of root */
-  screen = meta_display_screen_for_root (compositor->display,
-					 event->event);
-  
-  if (screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "UnmapNotify received on non-root 0x%lx for 0x%lx\n",
-		  event->event, event->window);
-      return; /* UnmapNotify wasn't for a child of the root */
-    }
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &event->window);
-  if (node != NULL)
-    {
-      drawable_node_set_viewable (node, FALSE);
-    }
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_create (MetaCompositor     *compositor,
-                XCreateWindowEvent *event)
-{
-  MetaScreen *screen;
-  XWindowAttributes attrs;
-  
-  screen = meta_display_screen_for_root (compositor->display,
-					 event->parent);
-  
-  if (screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "CreateNotify received on non-root 0x%lx for 0x%lx\n",
-		  event->parent, event->window);
-      return;
-    }
-  
-  meta_error_trap_push_with_return (compositor->display);
-  
-  XGetWindowAttributes (compositor->display->xdisplay,
-			event->window, &attrs);
-  
-  if (meta_error_trap_pop_with_return (compositor->display, TRUE) != Success)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR, "Failed to get attributes for window 0x%lx\n",
-		  event->window);
-    }
-  else
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "Create window 0x%lx, adding\n", event->window);
-      
-      meta_compositor_add_window (compositor,
-				  event->window, &attrs);
-    }
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_destroy (MetaCompositor      *compositor,
-                 XDestroyWindowEvent *event)
-{
-  MetaScreen *screen;
-  
-  screen = meta_display_screen_for_root (compositor->display,
-					 event->event);
-  
-  if (screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "DestroyNotify received on non-root 0x%lx for 0x%lx\n",
-		  event->event, event->window);
-      return;
-    }
-  
-  meta_topic (META_DEBUG_COMPOSITOR,
-	      "Destroy window 0x%lx\n", event->window);
-  meta_compositor_remove_window (compositor, event->window);
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-process_reparent (MetaCompositor      *compositor,
-                  XReparentEvent      *event)
-{
-  /* Reparent from one screen to another doesn't happen now, but
-   * it's been suggested as a future extension
-   */
-  MetaScreen *event_screen;
-  MetaScreen *parent_screen;
-  DrawableNode *node;
-  XWindowAttributes attrs;
-  
-  event_screen = meta_display_screen_for_root (compositor->display,
-					       event->event);
-  
-  if (event_screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "ReparentNotify received on non-root 0x%lx for 0x%lx\n",
-		  event->event, event->window);
-      return;
-    }
-  
-  meta_topic (META_DEBUG_COMPOSITOR,
-	      "Reparent window 0x%lx new parent 0x%lx received on 0x%lx\n",
-	      event->window, event->parent, event->event);
-  
-  parent_screen = meta_display_screen_for_root (compositor->display,
-						event->parent);
-  
-  if (parent_screen == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "ReparentNotify 0x%lx to a non-screen or unmanaged screen 0x%lx\n",
-		  event->window, event->parent);
-      meta_compositor_remove_window (compositor, event->window);
-      return;
-    }
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &event->window);
-  
-  meta_error_trap_push_with_return (compositor->display);
-  
-  XGetWindowAttributes (compositor->display->xdisplay,
-			event->window, &attrs);
-  
-  if (meta_error_trap_pop_with_return (compositor->display, TRUE) != Success)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR, "Failed to get attributes for window 0x%lx\n",
-		  event->window);
-    }
-  else
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "Reparent window 0x%lx into screen 0x%lx, adding\n",
-		  event->window, event->parent);
-      meta_compositor_add_window (compositor,
-				  event->window, &attrs);
-    }
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-void
-meta_compositor_process_event (MetaCompositor *compositor,
-                               XEvent         *event,
-                               MetaWindow     *window)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  if (!compositor->enabled)
-    return; /* no extension */
-  
-  /* FIXME support CirculateNotify */
-  
-  if (event->type == ConfigureNotify)
-    {
-      process_configure_notify (compositor,
-				(XConfigureEvent*) event);
-    }
-  else if (event->type == Expose)
-    {
-      process_expose (compositor,
-		      (XExposeEvent*) event);
-    }
-  else if (event->type == UnmapNotify)
-    {
-      process_unmap (compositor,
-		     (XUnmapEvent*) event);
-    }
-  else if (event->type == MapNotify)
-    {
-      process_map (compositor,
-		   (XMapEvent*) event);
-    }
-  else if (event->type == ReparentNotify)
-    {
-      process_reparent (compositor,
-			(XReparentEvent*) event);
-    }
-  else if (event->type == CreateNotify)
-    {
-      process_create (compositor,
-		      (XCreateWindowEvent*) event);
-    }
-  else if (event->type == DestroyNotify)
-    {
-      process_destroy (compositor,
-		       (XDestroyWindowEvent*) event);
-    }
-  
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-static void
-wavy (double time,
-      double in_x, double in_y,
-      double *out_x, double *out_y,
-      gpointer data)
-{
-  static int m;
-  time = time * 5;
-  double dx = 0.0025 * sin (time + 35 * in_y);
-  double dy = 0.0025 * cos (time + 35 * in_x);
-  
-  *out_x = in_x + dx;
-  *out_y = in_y + dy;
-  
-  m++;
-}
-
-static gboolean
-update (gpointer data)
-{
-  MetaScreen *screen = data;
-  ScreenInfo *scr_info = screen->compositor_data;
-  WsWindow *gl_window = scr_info->glw;
-  
-  glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity ();
-  gluOrtho2D (0, 1.0, 0.0, 1.0);
-  
-  ws_window_raise (gl_window);
-  
-  glClearColor (0.0, 0.5, 0.5, 0.0);
-  glClear (GL_COLOR_BUFFER_BIT);
-  
-  glColor4f (1.0, 0.0, 0.0, 1.0);
-  
-  glDisable (GL_TEXTURE_2D);
-  
-  glBegin (GL_QUADS);
-  
-  glVertex2f (0.2, 0.2);
-  glVertex2f (0.2, 0.4);
-  glVertex2f (0.4, 0.4);
-  glVertex2f (0.4, 0.2);
-  
-  glEnd ();
-  
-  glEnable (GL_TEXTURE_2D);
-  draw_windows (screen, scr_info->compositor_windows);
-  
-  /* FIXME: we should probably grab the server around the raise/swap */
-  
-  ws_window_gl_swap_buffers (gl_window);
-  glFinish();
-
-  scr_info->idle_id = 0;
-
-  g_print ("returning FALSE\n");
-  
-  return FALSE;
-}
-
-static void
-do_repaint (DrawableNode *node, gpointer data)
-{
-    MetaScreen *screen = data;
-    ScreenInfo *scr_info = screen->compositor_data;
-
-    g_print ("do repaint\n");
-    
-    if (!scr_info->idle_id)
-	scr_info->idle_id = g_idle_add (update, screen);
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-/* This is called when metacity does its XQueryTree() on startup
- * and when a new window is mapped.
- */
-void
-meta_compositor_add_window (MetaCompositor    *compositor,
-                            Window             xwindow,
-                            XWindowAttributes *attrs)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  DrawableNode *node;
-  MetaScreen *screen;
-  WsDrawable *drawable;
-  ScreenInfo *scr_info;
-  
-  if (!compositor->enabled)
-    return; /* no extension */
-  
-  screen = meta_screen_for_x_screen (attrs->screen);
-  g_assert (screen != NULL);
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &xwindow);
-  
-  if (node != NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "Window 0x%lx already added\n", xwindow);
-      return;
-    }
-  
-  drawable = (WsDrawable *)ws_window_lookup (compositor->ws, xwindow);
-
-  scr_info = screen->compositor_data;
-
-  g_assert (scr_info);
-  
-  if (ws_window_query_input_only ((WsWindow *)drawable) ||
-      drawable == (WsDrawable *)scr_info->glw)
-    {
-      return;
-    }
-  else
-    {
-      node = drawable_node_new (drawable);
-
-      drawable_node_set_damage_func (node, do_repaint, screen);
-      
-#if 0
-      drawable_node_set_deformation_func (node, wavy, NULL);
-#endif
-    }
-  
-  /* FIXME: we should probably just store xid's directly */
-  g_hash_table_insert (compositor->window_hash,
-		       &(node->drawable->xid), node);
-  
-  /* assume cwindow is at the top of the stack as it was either just
-   * created or just reparented to the root window
-   */
-  scr_info->compositor_windows = g_list_prepend (scr_info->compositor_windows,
-						 node);
-  
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-void
-meta_compositor_remove_window (MetaCompositor    *compositor,
-                               Window             xwindow)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  DrawableNode *node;
-  MetaScreen *screen;
-  ScreenInfo *scr_info;
-  
-  if (!compositor->enabled)
-    return; /* no extension */
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &xwindow);
-  
-  if (node == NULL)
-    {
-      meta_topic (META_DEBUG_COMPOSITOR,
-		  "Window 0x%lx already removed\n", xwindow);
-      return;
-    }
-  
-  screen = node_get_screen (compositor->display->xdisplay, node);
-  scr_info = screen->compositor_data;
-  
-  scr_info->compositor_windows = g_list_remove (scr_info->compositor_windows,
-					      node);
-  
-  /* Frees node as side effect */
-  g_hash_table_remove (compositor->window_hash,
-		       &xwindow);
-  
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-void
-meta_compositor_manage_screen (MetaCompositor *compositor,
-                               MetaScreen     *screen)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  ScreenInfo *scr_info = g_new0 (ScreenInfo, 1);
-  
-  WsScreen *ws_screen =
-      ws_screen_get_from_number (compositor->ws, screen->number);
-  WsWindow *root = ws_screen_get_root_window (ws_screen);
-  WsRegion *region;
-  
-  scr_info->glw = ws_window_new_gl (root);
-  scr_info->compositor_windows = NULL;
-  scr_info->idle_id = 0;
-
-  g_print ("setting compositor_data for screen %p to %p\n", screen, scr_info);
-  screen->compositor_data = scr_info;
-  
-  ws_init_composite (compositor->ws);
-  ws_init_damage (compositor->ws);
-  ws_init_fixes (compositor->ws);
-  
-  ws_window_redirect_subwindows (root);
-  ws_window_set_override_redirect (scr_info->glw, TRUE);
-  ws_window_unredirect (scr_info->glw);
-  
-  region = ws_region_new (compositor->ws);
-  ws_window_set_input_shape (scr_info->glw, region);
-  ws_region_unref (region);
-  
-  ws_window_map (scr_info->glw);
-  
-  ws_sync (compositor->ws);
-  
-#endif
-}
-
-void
-meta_compositor_unmanage_screen (MetaCompositor *compositor,
-                                 MetaScreen     *screen)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS  
-  ScreenInfo *scr_info = screen->compositor_data;
-  
-  if (!compositor->enabled)
-    return; /* no extension */
-  
-  while (scr_info->compositor_windows != NULL)
-    {
-      DrawableNode *node = scr_info->compositor_windows->data;
-      
-      meta_compositor_remove_window (compositor, node->drawable->xid);
-    }
-  /* FIXME: free scr_info */
-  
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-}
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS  
-static DrawableNode *
-window_to_node (MetaCompositor *compositor,
-		MetaWindow *window)
-{
-  Window xwindow;
-  DrawableNode *node;
-  
-  if (window->frame)
-    xwindow = window->frame->xwindow;
-  else
-    xwindow = window->xwindow;
-  
-  node = g_hash_table_lookup (compositor->window_hash,
-			      &xwindow);
-  
-  return node;
-}
-
-typedef struct
-{
-  double x;
-  double y;
-  double width;
-  double height;
-} DoubleRect;
-
-typedef struct
-{
-  MetaWindow *window;
-  DrawableNode *node;
-  
-  DoubleRect start;
-  DoubleRect target;
-  
-  double start_time;
-  int idle_id;
-
-  MetaMinimizeFinishedFunc finished_func;
-  gpointer		   finished_data;
-} MiniInfo;
-
-static gdouble
-interpolate (gdouble t, gdouble begin, gdouble end, double power)
-{
-  return (begin + (end - begin) * pow (t, power));
-}
-
-static gboolean
-stop_minimize (gpointer data)
-{
-  MiniInfo *info = data;
-  
-  drawable_node_set_deformation_func (info->node, NULL, NULL);
-  
-  if (info->finished_func)
-    info->finished_func (info->finished_data);
-  
-  g_free (info);
-  
-  return FALSE;
-}
-
-static void
-minimize_deformation (gdouble time,
-		      double in_x,
-		      double in_y,
-		      double *out_x,
-		      double *out_y,
-		      gpointer data)
-{
-#define MINIMIZE_TIME 0.5
-  MiniInfo *info = data;
-  gdouble elapsed;
-  gdouble pos;
-  
-  if (info->start_time == -1)
-    info->start_time = time;
-  
-  elapsed = time - info->start_time;
-  pos = elapsed / MINIMIZE_TIME;
-  
-  *out_x = interpolate (pos, in_x, info->target.x + info->target.width * ((in_x - info->start.x)  / info->start.width), 10 * in_y);
-  *out_y = interpolate (pos, in_y, info->target.y + info->target.height * ((in_y - info->start.y)  / info->start.height), 1.0);
-  
-  if (elapsed > MINIMIZE_TIME)
-    {
-      g_assert (info->node);
-      if (!info->idle_id)
-	info->idle_id = g_idle_add (stop_minimize, info);
-    }
-}
-
-static void
-convert (MetaScreen *screen,
-	 int x, int y, int width, int height,
-	 DoubleRect *rect)
-{
-  rect->x = x / (double)screen->rect.width;
-  rect->y = y / (double)screen->rect.height;
-  rect->width = width / (double)screen->rect.width;
-  rect->height = height / (double)screen->rect.height;
-}
-#endif /* HAVE_COMPOSITE_EXTENSIONS */
-
-void
-meta_compositor_minimize (MetaCompositor           *compositor,
-			  MetaWindow               *window,
-			  int                       x,
-			  int                       y,
-			  int                       width,
-			  int                       height,
-			  MetaMinimizeFinishedFunc  finished,
-			  gpointer                  data)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  MiniInfo *info = g_new (MiniInfo, 1);
-  DrawableNode *node = window_to_node (compositor, window);
-  WsRectangle start;
-  MetaScreen *screen = window->screen;
-  
-  info->node = node;
-  
-  info->idle_id = 0;
-  
-  ws_drawable_query_geometry (node->drawable, &start);
-  
-  convert (screen, start.x, start.y, start.width, start.height,
-	   &info->start);
-  convert (screen, x, y, width, height,
-	   &info->target);
-  
-  info->window = window;
-  
-  info->target.y = 1 - info->target.y;
-  
-  info->start_time = -1;
-
-  info->finished_func = finished;
-  info->finished_data = data;
-  
-  drawable_node_set_deformation_func (node, minimize_deformation, info);
-#endif
-}

src/core.c

@@ -1,895 +0,0 @@
-/* Metacity interface used by GTK+ UI to talk to core */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * Copyright (C) 2003 Rob Adams
- * Copyright (C) 2004-2006 Elijah Newren
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include <config.h>
-#include "core.h"
-#include "frame.h"
-#include "workspace.h"
-#include "prefs.h"
-
-void
-meta_core_get_client_size (Display *xdisplay,
-                           Window   frame_xwindow,
-                           int     *width,
-                           int     *height)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  if (width)
-    *width = window->rect.width;
-  if (height)
-    *height = window->rect.height;
-}
-
-gboolean
-meta_core_titlebar_is_onscreen (Display *xdisplay,
-                                Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  return meta_window_titlebar_is_onscreen (window);  
-}
-
-
-Window
-meta_core_get_client_xwindow (Display *xdisplay,
-                              Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  return window->xwindow;
-}
-
-MetaFrameFlags
-meta_core_get_frame_flags (Display *xdisplay,
-                           Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  return meta_frame_get_flags (window->frame);
-}
-
-MetaFrameType
-meta_core_get_frame_type (Display *xdisplay,
-                          Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  MetaFrameType base_type;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  base_type = META_FRAME_TYPE_LAST;
-  
-  switch (window->type)
-    {
-    case META_WINDOW_NORMAL:
-      base_type = META_FRAME_TYPE_NORMAL;
-      break;
-      
-    case META_WINDOW_DIALOG:
-      base_type = META_FRAME_TYPE_DIALOG;
-      break;
-      
-    case META_WINDOW_MODAL_DIALOG:
-      base_type = META_FRAME_TYPE_MODAL_DIALOG;
-      break;
-      
-    case META_WINDOW_MENU:
-      base_type = META_FRAME_TYPE_MENU;
-      break;
-
-    case META_WINDOW_UTILITY:
-      base_type = META_FRAME_TYPE_UTILITY;
-      break;
-      
-    case META_WINDOW_DESKTOP:
-    case META_WINDOW_DOCK:
-    case META_WINDOW_TOOLBAR:
-    case META_WINDOW_SPLASHSCREEN:
-      /* No frame */
-      base_type = META_FRAME_TYPE_LAST;
-      break;
-    }
-
-  if (base_type == META_FRAME_TYPE_LAST)
-    return META_FRAME_TYPE_LAST; /* can't add border if undecorated */
-  else if (window->border_only)
-    return META_FRAME_TYPE_BORDER; /* override base frame type */
-  else
-    return base_type;
-}
-
-GdkPixbuf*
-meta_core_get_mini_icon (Display *xdisplay,
-                         Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  return window->mini_icon;
-}
-
-GdkPixbuf*
-meta_core_get_icon (Display *xdisplay,
-                    Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  return window->icon;
-}
-
-void
-meta_core_queue_frame_resize (Display *xdisplay,
-                              Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_queue_move_resize (window);
-}
-
-void
-meta_core_user_move (Display *xdisplay,
-                     Window   frame_xwindow,
-                     int      x,
-                     int      y)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  meta_window_move (window, TRUE, x, y);
-}
-
-void
-meta_core_user_resize  (Display *xdisplay,
-                        Window   frame_xwindow,
-                        int      gravity,
-                        int      width,
-                        int      height)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
-  meta_window_resize_with_gravity (window, TRUE, width, height, gravity);
-}
-
-void
-meta_core_user_raise (Display *xdisplay,
-                      Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  meta_window_raise (window);
-}
-
-void
-meta_core_user_lower_and_unfocus (Display *xdisplay,
-                                  Window   frame_xwindow,
-                                  Time     timestamp)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  meta_window_lower (window);
-
-  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
-      meta_prefs_get_raise_on_click ())
-    {
-      /* Move window to the back of the focusing workspace's MRU list.
-       * Do extra sanity checks to avoid possible race conditions.
-       * (Borrowed from window.c.)
-       */
-      if (window->screen->active_workspace &&
-          meta_window_located_on_workspace (window, 
-                                            window->screen->active_workspace))
-        {
-          GList* link;
-          link = g_list_find (window->screen->active_workspace->mru_list, 
-                              window);
-          g_assert (link);
-
-          window->screen->active_workspace->mru_list = 
-            g_list_remove_link (window->screen->active_workspace->mru_list,
-                                link);
-          g_list_free (link);
-
-          window->screen->active_workspace->mru_list = 
-            g_list_append (window->screen->active_workspace->mru_list, 
-                           window);
-        }
-    }
-
-  /* focus the default window, if needed */
-  if (window->has_focus)
-    meta_workspace_focus_default_window (window->screen->active_workspace,
-                                         NULL,
-                                         timestamp);
-}
-
-void
-meta_core_user_focus (Display *xdisplay,
-                      Window   frame_xwindow,
-                      Time     timestamp)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-  
-  meta_window_focus (window, timestamp);
-}
-
-void
-meta_core_get_position (Display *xdisplay,
-                        Window   frame_xwindow,
-                        int     *x,
-                        int     *y)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_get_position (window, x, y);
-}
-
-void
-meta_core_get_size (Display *xdisplay,
-                    Window   frame_xwindow,
-                    int     *width,
-                    int     *height)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  if (width)
-    *width = window->rect.width;
-  if (height)
-    *height = window->rect.height;
-}
-
-
-void
-meta_core_minimize (Display *xdisplay,
-                    Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_minimize (window);
-}
-
-void
-meta_core_maximize (Display *xdisplay,
-                    Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_maximize (window, 
-                        META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
-}
-
-void
-meta_core_toggle_maximize (Display *xdisplay,
-                           Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  if (META_WINDOW_MAXIMIZED (window))
-    meta_window_unmaximize (window, 
-                            META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
-  else
-    meta_window_maximize (window,
-                          META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
-}
-
-void
-meta_core_unmaximize (Display *xdisplay,
-                      Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_unmaximize (window,
-                          META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
-}
-
-void
-meta_core_delete (Display *xdisplay,
-                  Window   frame_xwindow,
-                  guint32  timestamp)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-  
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-     
-  meta_window_delete (window, timestamp);
-}
-
-void
-meta_core_unshade (Display *xdisplay,
-                   Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_unshade (window);
-}
-
-void
-meta_core_shade (Display *xdisplay,
-                 Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_shade (window);
-}
-
-void
-meta_core_unstick (Display *xdisplay,
-                   Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_unstick (window);
-}
-
-void
-meta_core_stick (Display *xdisplay,
-                 Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_stick (window);
-}
-
-void
-meta_core_change_workspace (Display *xdisplay,
-                            Window   frame_xwindow,
-                            int      new_workspace)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_change_workspace (window,
-                                meta_screen_get_workspace_by_index (window->screen,
-                                                                    new_workspace));
-}
-
-int
-meta_core_get_num_workspaces (Screen  *xscreen)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  return meta_screen_get_n_workspaces (screen);
-}
-
-int
-meta_core_get_active_workspace (Screen *xscreen)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  return meta_workspace_index (screen->active_workspace);
-}
-
-int
-meta_core_get_frame_workspace (Display *xdisplay,
-                               Window frame_xwindow)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  return meta_window_get_net_wm_desktop (window);
-}
-
-void
-meta_core_get_frame_extents   (Display        *xdisplay,
-                               Window          frame_xwindow,
-                               int            *x,
-                               int            *y,
-                               int            *width,
-                               int            *height)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  if (x)
-    *x = window->frame->rect.x;
-  if (y)
-    *y = window->frame->rect.y;
-  if (width)
-    *width = window->frame->rect.width;
-  if (height)
-    *height = window->frame->rect.height;
-}
-
-
-void
-meta_core_show_window_menu (Display *xdisplay,
-                            Window   frame_xwindow,
-                            int      root_x,
-                            int      root_y,
-                            int      button,
-                            Time     timestamp)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  if (meta_prefs_get_raise_on_click ())
-    meta_window_raise (window);
-  meta_window_focus (window, timestamp);
-
-  meta_window_show_menu (window, root_x, root_y, button, timestamp);
-}
-
-void
-meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
-                                int                  workspace,
-                                unsigned int        *keysym,
-                                MetaVirtualModifier *modifiers)
-{
-  const char *name;
-
-  name = NULL;
-  
-  switch (menu_op)
-    {
-    case META_MENU_OP_DELETE:
-      name = META_KEYBINDING_CLOSE;
-      break;
-    case META_MENU_OP_MINIMIZE:
-      name = META_KEYBINDING_MINIMIZE;
-      break;
-    case META_MENU_OP_UNMAXIMIZE:
-      name = META_KEYBINDING_UNMAXIMIZE;
-      break;
-    case META_MENU_OP_MAXIMIZE:
-      name = META_KEYBINDING_MAXIMIZE;
-      break;
-    case META_MENU_OP_UNSHADE:
-    case META_MENU_OP_SHADE:
-      name = META_KEYBINDING_TOGGLE_SHADE;
-      break;
-    case META_MENU_OP_UNSTICK:
-    case META_MENU_OP_STICK:
-      name = META_KEYBINDING_TOGGLE_STICKY;
-      break;
-    case META_MENU_OP_ABOVE:
-    case META_MENU_OP_UNABOVE:
-      name = META_KEYBINDING_TOGGLE_ABOVE;
-      break;
-    case META_MENU_OP_WORKSPACES:
-      switch (workspace)
-        {
-        case 1:
-          name = META_KEYBINDING_MOVE_WORKSPACE_1;
-          break;
-        case 2:
-          name = META_KEYBINDING_MOVE_WORKSPACE_2;
-          break;
-        case 3:
-          name = META_KEYBINDING_MOVE_WORKSPACE_3;
-          break; 
-        case 4:
-          name = META_KEYBINDING_MOVE_WORKSPACE_4;
-          break; 
-        case 5:
-          name = META_KEYBINDING_MOVE_WORKSPACE_5;
-          break; 
-        case 6:
-          name = META_KEYBINDING_MOVE_WORKSPACE_6;
-          break; 
-        case 7:
-          name = META_KEYBINDING_MOVE_WORKSPACE_7;
-          break; 
-        case 8:
-          name = META_KEYBINDING_MOVE_WORKSPACE_8;
-          break; 
-        case 9:
-          name = META_KEYBINDING_MOVE_WORKSPACE_9;
-          break; 
-        case 10:
-          name = META_KEYBINDING_MOVE_WORKSPACE_10;
-          break;
-        case 11:
-          name = META_KEYBINDING_MOVE_WORKSPACE_11;
-          break;
-        case 12:
-          name = META_KEYBINDING_MOVE_WORKSPACE_12;
-          break;
-        }
-      break;
-    case META_MENU_OP_MOVE:
-      name = META_KEYBINDING_BEGIN_MOVE;
-      break;
-    case META_MENU_OP_RESIZE:
-      name = META_KEYBINDING_BEGIN_RESIZE;
-      break;
-    case META_MENU_OP_MOVE_LEFT:
-      name = META_KEYBINDING_MOVE_WORKSPACE_LEFT;
-      break;
-    case META_MENU_OP_MOVE_RIGHT:
-      name = META_KEYBINDING_MOVE_WORKSPACE_RIGHT;
-      break;
-    case META_MENU_OP_MOVE_UP:
-      name = META_KEYBINDING_MOVE_WORKSPACE_UP;
-      break;
-    case META_MENU_OP_MOVE_DOWN:
-      name = META_KEYBINDING_MOVE_WORKSPACE_DOWN;
-      break;
-    case META_MENU_OP_RECOVER:
-      /* No keybinding for this one */
-      break;
-    }
-
-  if (name)
-    {
-      meta_prefs_get_window_binding (name, keysym, modifiers);
-    }
-  else
-    {
-      *keysym = 0;
-      *modifiers = 0;
-    }
-}
-
-const char*
-meta_core_get_workspace_name_with_index (Display *xdisplay,
-                                         Window   xroot,
-                                         int      index)
-{
-  MetaDisplay *display;
-  MetaScreen *screen;
-  MetaWorkspace *workspace;
-
-  display = meta_display_for_x_display (xdisplay);
-  screen = meta_display_screen_for_root (display, xroot);
-  g_assert (screen != NULL);
-  workspace = meta_screen_get_workspace_by_index (screen, index);
-  return workspace ? meta_workspace_get_name (workspace) : NULL;
-}
-
-gboolean
-meta_core_begin_grab_op (Display    *xdisplay,
-                         Window      frame_xwindow,
-                         MetaGrabOp  op,
-                         gboolean    pointer_already_grabbed,
-                         int         event_serial,
-                         int         button,
-                         gulong      modmask,
-                         Time        timestamp,
-                         int         root_x,
-                         int         root_y)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  MetaScreen *screen;
-  
-  display = meta_display_for_x_display (xdisplay);
-  screen = meta_display_screen_for_xwindow (display, frame_xwindow);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  g_assert (screen != NULL);
-  
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  return meta_display_begin_grab_op (display, screen, window,
-                                     op, pointer_already_grabbed,
-                                     event_serial,
-                                     button, modmask,
-                                     timestamp, root_x, root_y);
-}
-
-void
-meta_core_end_grab_op (Display *xdisplay,
-                       Time     timestamp)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  meta_display_end_grab_op (display, timestamp);
-}
-
-MetaGrabOp
-meta_core_get_grab_op (Display *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  return display->grab_op;
-}
-
-Window
-meta_core_get_grab_frame (Display *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  g_assert (display != NULL);
-  g_assert (display->grab_op == META_GRAB_OP_NONE || 
-            display->grab_screen != NULL);
-  g_assert (display->grab_op == META_GRAB_OP_NONE ||
-            display->grab_screen->display->xdisplay == xdisplay);
-  
-  if (display->grab_op != META_GRAB_OP_NONE &&
-      display->grab_window &&
-      display->grab_window->frame)
-    return display->grab_window->frame->xwindow;
-  else
-    return None;
-}
-
-int
-meta_core_get_grab_button (Display  *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  if (display->grab_op == META_GRAB_OP_NONE)
-    return -1;
-  
-  return display->grab_button;
-}
-
-void
-meta_core_grab_buttons  (Display *xdisplay,
-                         Window   frame_xwindow)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  meta_verbose ("Grabbing buttons on frame 0x%lx\n", frame_xwindow);
-  meta_display_grab_window_buttons (display, frame_xwindow);
-}
-
-void
-meta_core_set_screen_cursor (Display *xdisplay,
-                             Window   frame_on_screen,
-                             MetaCursor cursor)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_on_screen);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_on_screen);  
-
-  meta_frame_set_screen_cursor (window->frame, cursor);
-}
-
-void
-meta_core_get_screen_size (Display *xdisplay,
-                           Window   frame_on_screen,
-                           int     *width,
-                           int     *height)
-{
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_on_screen);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_on_screen);  
-
-  if (width)
-    *width = window->screen->rect.width;
-  if (height)
-    *height = window->screen->rect.height;
-}
-
-void
-meta_core_increment_event_serial (Display *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  meta_display_increment_event_serial (display);
-}
-

src/core/async-getprop.c

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Asynchronous X property getting hack */
 
 /*
@@ -66,7 +68,7 @@ struct _AgGetPropertyTask
 
   unsigned long  n_items;
   unsigned long  bytes_after;
-  unsigned char *data;
+  char          *data;
 
   Bool have_reply;
 };
@@ -316,7 +318,7 @@ async_get_property_handler (Display *dpy,
           /* there's padding to word boundary */
           netbytes = ALIGN_VALUE (nbytes, 4);
           if (nbytes + 1 > 0 &&
-              (task->data = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+              (task->data = (char *) Xmalloc ((unsigned)nbytes + 1)))
             {
 #ifdef DEBUG_SPEW
               printf ("%s: already read %d bytes using %ld, more eating %ld more\n",
@@ -334,7 +336,7 @@ async_get_property_handler (Display *dpy,
           netbytes = reply->nItems << 1;
           netbytes = ALIGN_VALUE (netbytes, 4); /* align to word boundary */
           if (nbytes + 1 > 0 &&
-              (task->data = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+              (task->data = (char *) Xmalloc ((unsigned)nbytes + 1)))
             {
 #ifdef DEBUG_SPEW
               printf ("%s: already read %d bytes using %ld more, eating %ld more\n",
@@ -351,7 +353,7 @@ async_get_property_handler (Display *dpy,
           nbytes = reply->nItems * sizeof (long);
           netbytes = reply->nItems << 2; /* wire size is always 32 bits though */
           if (nbytes + 1 > 0 &&
-              (task->data = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+              (task->data = (char *) Xmalloc ((unsigned)nbytes + 1)))
             {
 #ifdef DEBUG_SPEW
               printf ("%s: already read %d bytes using %ld more, eating %ld more\n",
@@ -363,9 +365,9 @@ async_get_property_handler (Display *dpy,
                */
               if (sizeof (long) == 8)
                 {
-                  unsigned char *netdata;
-                  unsigned char *lptr;
-                  unsigned char *end_lptr;
+                  char *netdata;
+                  char *lptr;
+                  char *end_lptr;
                   
                   /* Store the 32-bit values in the end of the array */
                   netdata = task->data + nbytes / 2;
@@ -522,7 +524,6 @@ ag_task_create (Display *dpy,
 {
   AgGetPropertyTask *task;
   xGetPropertyReq *req;
-  xError error;
   AgPerDisplayData *dd;  
   
   /* Fire up our request */
@@ -543,8 +544,6 @@ ag_task_create (Display *dpy,
   req->longOffset = offset;
   req->longLength = length;
 
-  error.sequenceNumber = dpy->request;
-
   /* Queue up our async task */
   task = Xcalloc (1, sizeof (AgGetPropertyTask));
   if (task == NULL)
@@ -587,7 +586,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                             int                *actual_format,
                             unsigned long      *nitems,
                             unsigned long      *bytesafter,
-                            unsigned char     **prop)
+                            char              **prop)
 {
   Display *dpy;
 

src/core/async-getprop.h

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Asynchronous X property getting hack */
 
 /*
@@ -45,7 +47,7 @@ Status             ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                                                int                *actual_format,
                                                unsigned long      *nitems,
                                                unsigned long      *bytesafter,
-                                               unsigned char     **prop);
+                                               char              **prop);
 
 Bool     ag_task_have_reply   (AgGetPropertyTask *task);
 Atom     ag_task_get_property (AgGetPropertyTask *task);

src/core/bell.c

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity visual bell */
 
 /* 
@@ -20,11 +22,57 @@
  * 02111-1307, USA.
  */
 
+/**
+ * \file core/bell.c Ring the bell or flash the screen
+ *
+ * Sometimes, X programs "ring the bell", whatever that means. Metacity 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.
+ *
+ * Visual bells come in at meta_bell_notify(), which checks we are actually
+ * in visual mode and calls through to meta_bell_visual_notify(). That
+ * function then checks what kind of visual flash you like, and calls either
+ * meta_bell_flash_fullscreen()-- which calls meta_bell_flash_screen() to do
+ * its work-- or meta_bell_flash_frame(), which flashes the focussed window
+ * using meta_bell_flash_window_frame(), unless there is no such window, in
+ * which case it flashes the screen instead. meta_bell_flash_window_frame()
+ * flashes the frame and calls meta_bell_unflash_frame() as a timeout to
+ * remove the flash.
+ *
+ * The visual bell was the result of a discussion in Bugzilla here:
+ * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
+ *
+ * Several of the functions in this file are ifdeffed out entirely if we are
+ * found not to have the XKB extension, which is required to do these clever
+ * things with bells; some others are entirely no-ops in that case.
+ *
+ * \bug Static functions should not be called meta_*.
+ */
+
 #include <config.h>
 #include "bell.h"
 #include "screen.h"
 #include "prefs.h"
 
+/**
+ * Flashes one entire screen.  This is done by making a window the size of the
+ * whole screen (or reusing the old one, if it's still around), mapping it,
+ * painting it white and then black, and then unmapping it. We set saveunder so
+ * that all the windows behind it come back immediately.
+ *
+ * Unlike frame flashes, we don't do fullscreen flashes with a timeout; rather,
+ * we do them in one go, because we don't have to rely on the theme code
+ * redrawing the frame for us in order to do the flash.
+ *
+ * \param display  The display which owns the screen (rather redundant)
+ * \param screen   The screen to flash
+ *
+ * \bug The way I read it, this appears not to do the flash
+ * the first time we flash a particular display. Am I wrong?
+ *
+ * \bug This appears to destroy our current XSync status.
+ */
 static void
 meta_bell_flash_screen (MetaDisplay *display, 
 			MetaScreen  *screen)
@@ -87,6 +135,16 @@ meta_bell_flash_screen (MetaDisplay *display,
   XFlush (display->xdisplay);
 }
 
+/**
+ * Flashes one screen, or all screens, in response to a bell event.
+ * If the event is on a particular window, flash the screen that
+ * window is on. Otherwise, flash every screen on this display.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the event came in on
+ * \param xkb_ev   The bell event
+ */
 #ifdef HAVE_XKB
 static void
 meta_bell_flash_fullscreen (MetaDisplay *display, 
@@ -114,6 +172,20 @@ meta_bell_flash_fullscreen (MetaDisplay *display,
     }
 }
 
+/**
+ * Makes a frame be not flashed; this is the timeout half of
+ * meta_bell_flash_window_frame(). This is done simply by clearing the
+ * flash flag and queuing a redraw of the frame.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param data  The frame to unflash, cast to a gpointer so it can go into
+ *              a callback function.
+ * \return Always FALSE, so we don't get called again.
+ *
+ * \bug This is the parallel to meta_bell_flash_window_frame(), so it should
+ * really be called meta_bell_unflash_window_frame().
+ */
 static gboolean 
 meta_bell_unflash_frame (gpointer data)
 {
@@ -123,6 +195,17 @@ meta_bell_unflash_frame (gpointer data)
   return FALSE;
 }
 
+/**
+ * Makes a frame flash and then return to normal shortly afterwards.
+ * This is done by setting a flag so that the theme
+ * code will temporarily draw the frame as focussed if it's unfocussed and
+ * vice versa, and then queueing a redraw. Lastly, we create a timeout so
+ * that the flag can be unset and the frame re-redrawn.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param window  The window to flash
+ */
 static void
 meta_bell_flash_window_frame (MetaWindow *window)
 {
@@ -133,6 +216,13 @@ meta_bell_flash_window_frame (MetaWindow *window)
       meta_bell_unflash_frame, window->frame, NULL);
 }
 
+/**
+ * Flashes the frame of the focussed window. If there is no focussed window,
+ * flashes the screen.
+ *
+ * \param display  The display the bell event came in on
+ * \param xkb_ev   The bell event we just received
+ */
 static void
 meta_bell_flash_frame (MetaDisplay *display, 
 		       XkbAnyEvent *xkb_ev)
@@ -156,6 +246,17 @@ meta_bell_flash_frame (MetaDisplay *display,
     }
 }
 
+/**
+ * Gives the user some kind of visual bell substitute, in response to a
+ * bell event. What this is depends on the "visual bell type" pref.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the bell event came in on
+ * \param xkb_ev   The bell event we just received
+ *
+ * \bug This should be merged with meta_bell_notify().
+ */
 static void
 meta_bell_visual_notify (MetaDisplay *display, 
 			 XkbAnyEvent *xkb_ev)
@@ -174,6 +275,16 @@ meta_bell_visual_notify (MetaDisplay *display,
     }
 }
 
+/**
+ * Gives the user some kind of visual bell; in fact, this is our response
+ * to any kind of bell request, but we set it up so that we only get
+ * notified about visual bells, and X deals with audible ones.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the bell event came in on
+ * \param xkb_ev   The bell event we just received
+ */
 void
 meta_bell_notify (MetaDisplay *display, 
 		  XkbAnyEvent *xkb_ev)
@@ -182,8 +293,17 @@ meta_bell_notify (MetaDisplay *display,
   if (meta_prefs_get_visual_bell ()) 
     meta_bell_visual_notify (display, xkb_ev);
 }
-#endif
+#endif /* HAVE_XKB */
 
+/**
+ * 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.
+ *
+ * If the configure script found we had no XKB, this is a no-op.
+ *
+ * \param display  The display we're configuring
+ * \param audible  True for an audible bell, false for a visual bell
+ */
 void
 meta_bell_set_audible (MetaDisplay *display, gboolean audible)
 {
@@ -195,6 +315,27 @@ meta_bell_set_audible (MetaDisplay *display, gboolean audible)
 #endif  
 }
 
+/**
+ * Initialises the bell subsystem. This involves intialising
+ * XKB (which, despite being a keyboard extension, is the
+ * place to look for bell notifications), then asking it
+ * to send us bell notifications, and then also switching
+ * off the audible bell if we're using a visual one ourselves.
+ *
+ * Unlike most X extensions we use, we only initialise XKB here
+ * (rather than in main()). It's possible that XKB is not
+ * installed at all, but if that was known at build time
+ * we will have HAVE_XKB undefined, which will cause this
+ * function to be a no-op.
+ *
+ * \param display  The display which is opening
+ *
+ * \bug There is a line of code that's never run that tells
+ * XKB to reset the bell status after we quit. Bill H said
+ * (<http://bugzilla.gnome.org/show_bug.cgi?id=99886#c12>)
+ * that XFree86's implementation is broken so we shouldn't
+ * call it, but that was in 2002. Is it working now?
+ */
 gboolean
 meta_bell_init (MetaDisplay *display)
 {
@@ -236,6 +377,15 @@ meta_bell_init (MetaDisplay *display)
   return FALSE;
 }
 
+/**
+ * Shuts down the bell subsystem.
+ *
+ * \param display  The display which is closing
+ *
+ * \bug This is never called! If we had XkbSetAutoResetControls
+ * enabled in meta_bell_init(), this wouldn't be a problem, but
+ * we don't.
+ */
 void
 meta_bell_shutdown (MetaDisplay *display)
 {
@@ -248,6 +398,14 @@ meta_bell_shutdown (MetaDisplay *display)
 #endif
 }
 
+/**
+ * Deals with a frame being destroyed. This is important because if we're
+ * using a visual bell, we might be flashing the edges of the frame, and
+ * so we'd have a timeout function waiting ready to un-flash them. If the
+ * frame's going away, we can tell the timeout not to bother.
+ *
+ * \param frame  The frame which is being destroyed
+ */
 void
 meta_bell_notify_frame_destroy (MetaFrame *frame)
 {

src/core/bell.h

@@ -1,5 +1,6 @@
 /* Metacity visual bell */
 
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* 
  * Copyright (C) 2002 Sun Microsystems Inc.
  * 

src/core/boxes.c

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Simple box operations */
 
 /* 
@@ -545,10 +547,10 @@ meta_rectangle_get_minimal_spanning_set_for_region (
   ret = g_list_prepend (NULL, temp_rect);
 
   strut_iter = all_struts;
-  while (strut_iter)
+  for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next)
     {
       GList *rect_iter; 
-      MetaRectangle *strut = (MetaRectangle*) strut_iter->data;
+      MetaRectangle *strut_rect = &((MetaStrut*)strut_iter->data)->rect;
 
       tmp_list = ret;
       ret = NULL;
@@ -556,45 +558,45 @@ meta_rectangle_get_minimal_spanning_set_for_region (
       while (rect_iter)
         {
           MetaRectangle *rect = (MetaRectangle*) rect_iter->data;
-          if (!meta_rectangle_overlap (rect, strut))
+          if (!meta_rectangle_overlap (rect, strut_rect))
             ret = g_list_prepend (ret, rect);
           else
             {
               /* If there is area in rect left of strut */
-              if (rect->x < strut->x)
+              if (BOX_LEFT (*rect) < BOX_LEFT (*strut_rect))
                 {
                   temp_rect = g_new (MetaRectangle, 1);
                   *temp_rect = *rect;
-                  temp_rect->width = strut->x - rect->x;
+                  temp_rect->width = BOX_LEFT (*strut_rect) - BOX_LEFT (*rect);
                   ret = g_list_prepend (ret, temp_rect);
                 }
               /* If there is area in rect right of strut */
-              if (rect->x + rect->width > strut->x + strut->width)
+              if (BOX_RIGHT (*rect) > BOX_RIGHT (*strut_rect))
                 {
                   int new_x;
                   temp_rect = g_new (MetaRectangle, 1);
                   *temp_rect = *rect;
-                  new_x = strut->x + strut->width;
-                  temp_rect->width = rect->x + rect->width - new_x;
+                  new_x = BOX_RIGHT (*strut_rect);
+                  temp_rect->width = BOX_RIGHT(*rect) - new_x;
                   temp_rect->x = new_x;
                   ret = g_list_prepend (ret, temp_rect);
                 }
               /* If there is area in rect above strut */
-              if (rect->y < strut->y)
+              if (BOX_TOP (*rect) < BOX_TOP (*strut_rect))
                 {
                   temp_rect = g_new (MetaRectangle, 1);
                   *temp_rect = *rect;
-                  temp_rect->height = strut->y - rect->y;
+                  temp_rect->height = BOX_TOP (*strut_rect) - BOX_TOP (*rect);
                   ret = g_list_prepend (ret, temp_rect);
                 }
               /* If there is area in rect below strut */
-              if (rect->y + rect->height > strut->y + strut->height)
+              if (BOX_BOTTOM (*rect) > BOX_BOTTOM (*strut_rect))
                 {
                   int new_y;
                   temp_rect = g_new (MetaRectangle, 1);
                   *temp_rect = *rect;
-                  new_y = strut->y + strut->height;
-                  temp_rect->height = rect->y + rect->height - new_y;
+                  new_y = BOX_BOTTOM (*strut_rect);
+                  temp_rect->height = BOX_BOTTOM (*rect) - new_y;
                   temp_rect->y = new_y;
                   ret = g_list_prepend (ret, temp_rect);
                 }
@@ -603,7 +605,6 @@ meta_rectangle_get_minimal_spanning_set_for_region (
           rect_iter = rect_iter->next;
         }
       g_list_free (tmp_list);
-      strut_iter = strut_iter->next;
     }
 
   /* Sort by maximal area, just because I feel like it... */
@@ -660,6 +661,76 @@ meta_rectangle_expand_region_conditionally (GList     *region,
   return region;
 }
 
+void
+meta_rectangle_expand_to_avoiding_struts (MetaRectangle       *rect,
+                                          const MetaRectangle *expand_to,
+                                          const MetaDirection  direction,
+                                          const GSList        *all_struts)
+{
+  const GSList *strut_iter;
+
+  /* If someone wants this function to handle more fine-grained
+   * direction expanding in the future (e.g. only left, or fully
+   * horizontal plus upward), feel free.  But I'm hard-coding for both
+   * horizontal directions (exclusive-)or both vertical directions.
+   */
+  g_assert ((direction == META_DIRECTION_HORIZONTAL) ^
+            (direction == META_DIRECTION_VERTICAL  ));
+ 
+  if (direction == META_DIRECTION_HORIZONTAL)
+    {
+      rect->x      = expand_to->x;
+      rect->width  = expand_to->width;
+    }
+  else
+    {
+      rect->y      = expand_to->y;
+      rect->height = expand_to->height;
+    }
+
+ 
+  /* Run over all struts */
+  for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next)
+    {
+      MetaStrut *strut = (MetaStrut*) strut_iter->data;
+ 
+      /* Skip struts that don't overlap */
+      if (!meta_rectangle_overlap (&strut->rect, rect))
+        continue;
+
+      if (direction == META_DIRECTION_HORIZONTAL)
+        {
+          if (strut->side == META_SIDE_LEFT)
+            {
+              int offset = BOX_RIGHT(strut->rect) - BOX_LEFT(*rect);
+              rect->x     += offset;
+              rect->width -= offset;
+            }
+          else if (strut->side == META_SIDE_RIGHT)
+            {
+              int offset = BOX_RIGHT (*rect) - BOX_LEFT(strut->rect);
+              rect->width -= offset;
+            }
+          /* else ignore the strut */
+        }
+      else /* direction == META_DIRECTION_VERTICAL */
+        {
+          if (strut->side == META_SIDE_TOP)
+            {
+              int offset = BOX_BOTTOM(strut->rect) - BOX_TOP(*rect);
+              rect->y      += offset;
+              rect->height -= offset;
+            }
+          else if (strut->side == META_SIDE_BOTTOM)
+            {
+              int offset = BOX_BOTTOM(*rect) - BOX_TOP(strut->rect);
+              rect->height -= offset;
+            }
+          /* else ignore the strut */
+        }
+    } /* end loop over struts */
+} /* end meta_rectangle_expand_to_avoiding_struts */
+
 void
 meta_rectangle_free_list_and_elements (GList *filled_list)
 {
@@ -705,6 +776,25 @@ meta_rectangle_contained_in_region (const GList         *spanning_rects,
   return contained;
 }
 
+gboolean
+meta_rectangle_overlaps_with_region (const GList         *spanning_rects,
+                                     const MetaRectangle *rect)
+{
+  const GList *temp;
+  gboolean     overlaps;
+
+  temp = spanning_rects;
+  overlaps = FALSE;
+  while (!overlaps && temp != NULL)
+    {
+      overlaps = overlaps || meta_rectangle_overlap (temp->data, rect);
+      temp = temp->next;
+    }
+
+  return overlaps;
+}
+
+
 void
 meta_rectangle_clamp_to_fit_into_region (const GList         *spanning_rects,
                                          FixedDirections      fixed_directions,
@@ -718,39 +808,36 @@ meta_rectangle_clamp_to_fit_into_region (const GList         *spanning_rects,
   /* First, find best rectangle from spanning_rects to which we can clamp
    * rect to fit into.
    */
-  temp = spanning_rects;
-  while (temp)
+  for (temp = spanning_rects; temp; temp = temp->next)
     {
-      int factor = 1;
       MetaRectangle *compare_rect = temp->data;
       int            maximal_overlap_amount_for_compare;
       
-      /* If x is fixed and the entire width of rect doesn't fit in compare, set
-       * factor to 0.
+      /* If x is fixed and the entire width of rect doesn't fit in compare,
+       * skip this rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_X) &&
           (compare_rect->x > rect->x || 
            compare_rect->x + compare_rect->width < rect->x + rect->width))
-        factor = 0;
+        continue;
         
-      /* If y is fixed and the entire height of rect doesn't fit in compare, set
-       * factor to 0.
+      /* If y is fixed and the entire height of rect doesn't fit in compare,
+       * skip this rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_Y) &&
           (compare_rect->y > rect->y || 
            compare_rect->y + compare_rect->height < rect->y + rect->height))
-        factor = 0;
+        continue;
 
-      /* If compare can't hold the min_size window, set factor to 0 */
+      /* If compare can't hold the min_size window, skip this rectangle. */
       if (compare_rect->width  < min_size->width ||
           compare_rect->height < min_size->height)
-        factor = 0;
+        continue;
 
       /* Determine maximal overlap amount */
       maximal_overlap_amount_for_compare =
         MIN (rect->width,  compare_rect->width) *
         MIN (rect->height, compare_rect->height);
-      maximal_overlap_amount_for_compare *= factor;
 
       /* See if this is the best rect so far */
       if (maximal_overlap_amount_for_compare > best_overlap)
@@ -758,8 +845,6 @@ meta_rectangle_clamp_to_fit_into_region (const GList         *spanning_rects,
           best_rect    = compare_rect;
           best_overlap = maximal_overlap_amount_for_compare;
         }
-
-      temp = temp->next;
     }
 
   /* Clamp rect appropriately */
@@ -792,34 +877,31 @@ meta_rectangle_clip_to_region (const GList         *spanning_rects,
   /* First, find best rectangle from spanning_rects to which we will clip
    * rect into.
    */
-  temp = spanning_rects;
-  while (temp)
+  for (temp = spanning_rects; temp; temp = temp->next)
     {
-      int factor = 1;
       MetaRectangle *compare_rect = temp->data;
       MetaRectangle  overlap;
       int            maximal_overlap_amount_for_compare;
-      
-      /* If x is fixed and the entire width of rect doesn't fit in compare, set
-       * factor to 0.
+     
+      /* If x is fixed and the entire width of rect doesn't fit in compare,
+       * skip the rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_X) &&
           (compare_rect->x > rect->x || 
            compare_rect->x + compare_rect->width < rect->x + rect->width))
-        factor = 0;
+        continue;
         
-      /* If y is fixed and the entire height of rect doesn't fit in compare, set
-       * factor to 0.
+      /* If y is fixed and the entire height of rect doesn't fit in compare,
+       * skip the rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_Y) &&
           (compare_rect->y > rect->y || 
            compare_rect->y + compare_rect->height < rect->y + rect->height))
-        factor = 0;
+        continue;
 
       /* Determine maximal overlap amount */
       meta_rectangle_intersect (rect, compare_rect, &overlap);
       maximal_overlap_amount_for_compare = meta_rectangle_area (&overlap);
-      maximal_overlap_amount_for_compare *= factor;
 
       /* See if this is the best rect so far */
       if (maximal_overlap_amount_for_compare > best_overlap)
@@ -827,8 +909,6 @@ meta_rectangle_clip_to_region (const GList         *spanning_rects,
           best_rect    = compare_rect;
           best_overlap = maximal_overlap_amount_for_compare;
         }
-
-      temp = temp->next;
     }
 
   /* Clip rect appropriately */
@@ -875,36 +955,35 @@ meta_rectangle_shove_into_region (const GList         *spanning_rects,
   /* First, find best rectangle from spanning_rects to which we will shove
    * rect into.
    */
-  temp = spanning_rects;
-  while (temp)
+  
+  for (temp = spanning_rects; temp; temp = temp->next)
     {
-      int factor = 1;
       MetaRectangle *compare_rect = temp->data;
       int            maximal_overlap_amount_for_compare;
       int            dist_to_compare;
       
-      /* If x is fixed and the entire width of rect doesn't fit in compare, set
-       * factor to 0.
+      /* If x is fixed and the entire width of rect doesn't fit in compare,
+       * skip this rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_X) &&
           (compare_rect->x > rect->x || 
            compare_rect->x + compare_rect->width < rect->x + rect->width))
-        factor = 0;
+        continue;
         
-      /* If y is fixed and the entire height of rect doesn't fit in compare, set
-       * factor to 0.
+      /* If y is fixed and the entire height of rect doesn't fit in compare,
+       * skip this rectangle.
        */
       if ((fixed_directions & FIXED_DIRECTION_Y) &&
           (compare_rect->y > rect->y || 
            compare_rect->y + compare_rect->height < rect->y + rect->height))
-        factor = 0;
+        continue;
 
       /* Determine maximal overlap amount between rect & compare_rect */
       maximal_overlap_amount_for_compare =
         MIN (rect->width,  compare_rect->width) *
         MIN (rect->height, compare_rect->height);
 
-      /* Determine distance necessary to put rect into comapre_rect */
+      /* Determine distance necessary to put rect into compare_rect */
       dist_to_compare = 0;
       if (compare_rect->x > rect->x)
         dist_to_compare += compare_rect->x - rect->x;
@@ -917,13 +996,6 @@ meta_rectangle_shove_into_region (const GList         *spanning_rects,
         dist_to_compare += (rect->y + rect->height) -
                            (compare_rect->y + compare_rect->height);
 
-      /* If we'd have to move in the wrong direction, disqualify compare_rect */
-      if (factor == 0)
-        {
-          maximal_overlap_amount_for_compare = 0;
-          dist_to_compare = G_MAXINT;
-        }
-
       /* See if this is the best rect so far */
       if ((maximal_overlap_amount_for_compare > best_overlap) ||
           (maximal_overlap_amount_for_compare == best_overlap &&
@@ -933,8 +1005,6 @@ meta_rectangle_shove_into_region (const GList         *spanning_rects,
           best_overlap      = maximal_overlap_amount_for_compare;
           shortest_distance = dist_to_compare;
         }
-
-      temp = temp->next;
     }
 
   /* Shove rect appropriately */
@@ -1054,9 +1124,9 @@ meta_rectangle_edge_aligns (const MetaRectangle *rect, const MetaEdge *edge)
     case META_DIRECTION_BOTTOM:
       return BOX_LEFT (*rect)      <= BOX_RIGHT (edge->rect) &&
              BOX_LEFT (edge->rect) <= BOX_RIGHT (*rect);
+    default:
+      g_assert_not_reached ();
     }
-
-  g_assert_not_reached ();
 }
 
 static GList*
@@ -1140,27 +1210,27 @@ replace_rect_with_list (GList *old_element,
 }
 
 /* Make a copy of the strut list, make sure that copy only contains parts
- * of the old_struts that intersect with the rection rect, and then do some
+ * of the old_struts that intersect with the region rect, and then do some
  * magic to make all the new struts disjoint (okay, we we break up struts
  * that aren't disjoint in a way that the overlapping part is only included
  * once, so it's not really magic...).
  */
 static GList*
-get_disjoint_strut_list_in_region (const GSList        *old_struts,
-                                   const MetaRectangle *region)
+get_disjoint_strut_rect_list_in_region (const GSList        *old_struts,
+                                        const MetaRectangle *region)
 {
-  GList *struts;
+  GList *strut_rects;
   GList *tmp;
 
   /* First, copy the list */
-  struts = NULL;
+  strut_rects = NULL;
   while (old_struts)
     {
-      MetaRectangle *cur = old_struts->data;
+      MetaRectangle *cur = &((MetaStrut*)old_struts->data)->rect;
       MetaRectangle *copy = g_new (MetaRectangle, 1);
       *copy = *cur;
       if (meta_rectangle_intersect (copy, region, copy))
-        struts = g_list_prepend (struts, copy);
+        strut_rects = g_list_prepend (strut_rects, copy);
       else
         g_free (copy);
 
@@ -1170,7 +1240,7 @@ get_disjoint_strut_list_in_region (const GSList        *old_struts,
   /* Now, loop over the list and check for intersections, fixing things up
    * where they do intersect.
    */
-  tmp = struts;
+  tmp = strut_rects;
   while (tmp)
     {
       GList *compare;
@@ -1197,10 +1267,10 @@ get_disjoint_strut_list_in_region (const GSList        *old_struts,
               cur_leftover = g_list_prepend (cur_leftover, overlap_allocated);
 
               /* Fix up tmp, compare, and cur -- maybe struts too */
-              if (struts == tmp)
+              if (strut_rects == tmp)
                 {
-                  struts = replace_rect_with_list (tmp, cur_leftover);
-                  tmp = struts;
+                  strut_rects = replace_rect_with_list (tmp, cur_leftover);
+                  tmp = strut_rects;
                 }
               else
                 tmp   = replace_rect_with_list (tmp,     cur_leftover);
@@ -1218,7 +1288,7 @@ get_disjoint_strut_list_in_region (const GSList        *old_struts,
       tmp = tmp->next;
     }
 
-  return struts;
+  return strut_rects;
 }
 
 gint
@@ -1326,7 +1396,7 @@ rectangle_and_edge_intersection (const MetaRectangle *rect,
   /* Find out if the intersection is empty; have to do it this way since
    * edges have a thickness of 0
    */
-  if ((result->width < 0 || result->height < 0) ||
+  if ((result->width <  0 || result->height <  0) ||
       (result->width == 0 && result->height == 0))
     {
       result->width = 0;
@@ -1376,6 +1446,8 @@ rectangle_and_edge_intersection (const MetaRectangle *rect,
           else
             *handle_type = 0;
           break;
+        default:
+          g_assert_not_reached ();
         }
     }
   return intersect;
@@ -1482,23 +1554,25 @@ split_edge (GList *cur_list,
           cur_list = g_list_prepend (cur_list, temp_edge);
         }
       break;
+    default:
+      g_assert_not_reached ();
     }
 
   return cur_list;
 }
 
 /* Split up edge and remove preliminary edges from strut_edges depending on
- * if and how strut and edge intersect.
+ * if and how rect and edge intersect.
  */
 static void
-fix_up_edges (MetaRectangle *strut,        MetaEdge *edge, 
+fix_up_edges (MetaRectangle *rect,         MetaEdge *edge, 
               GList         **strut_edges, GList    **edge_splits,
               gboolean      *edge_needs_removal)
 {
   MetaEdge overlap;
   int      handle_type;
 
-  if (!rectangle_and_edge_intersection (strut, edge, &overlap, &handle_type))
+  if (!rectangle_and_edge_intersection (rect, edge, &overlap, &handle_type))
     return;
 
   if (handle_type == 0 || handle_type == 1)
@@ -1607,9 +1681,9 @@ meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
                                     const GSList        *all_struts)
 {
   GList        *ret;
-  GList        *fixed_struts;
+  GList        *fixed_strut_rects;
   GList        *edge_iter; 
-  const GList  *strut_iter;
+  const GList  *strut_rect_iter;
 
   /* The algorithm is basically as follows:
    *   Make sure the struts are disjoint
@@ -1627,18 +1701,19 @@ meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
    */
 
   /* Make sure the struts are disjoint */
-  fixed_struts = get_disjoint_strut_list_in_region (all_struts, basic_rect);
+  fixed_strut_rects =
+    get_disjoint_strut_rect_list_in_region (all_struts, basic_rect);
 
   /* Start off the list with the edges of basic_rect */
   ret = add_edges (NULL, basic_rect, TRUE);
 
-  strut_iter = fixed_struts;
-  while (strut_iter)
+  strut_rect_iter = fixed_strut_rects;
+  while (strut_rect_iter)
     {
-      MetaRectangle *strut = (MetaRectangle*) strut_iter->data;
+      MetaRectangle *strut_rect = (MetaRectangle*) strut_rect_iter->data;
 
       /* Get the new possible edges we may need to add from the strut */
-      GList *new_strut_edges = add_edges (NULL, strut, FALSE);
+      GList *new_strut_edges = add_edges (NULL, strut_rect, FALSE);
 
       edge_iter = ret;
       while (edge_iter)
@@ -1647,7 +1722,7 @@ meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
           GList *splits_of_cur_edge = NULL;
           gboolean edge_needs_removal = FALSE;
 
-          fix_up_edges (strut,            cur_edge, 
+          fix_up_edges (strut_rect,       cur_edge, 
                         &new_strut_edges, &splits_of_cur_edge,
                         &edge_needs_removal);
 
@@ -1671,14 +1746,14 @@ meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
         }
 
       ret = g_list_concat (new_strut_edges, ret);
-      strut_iter = strut_iter->next;
+      strut_rect_iter = strut_rect_iter->next;
     }
 
   /* Sort the list */
   ret = g_list_sort (ret, meta_rectangle_edge_cmp);
 
   /* Free the fixed struts list */
-  meta_rectangle_free_list_and_elements (fixed_struts);
+  meta_rectangle_free_list_and_elements (fixed_strut_rects);
 
   return ret;
 }
@@ -1695,6 +1770,7 @@ meta_rectangle_find_nonintersected_xinerama_edges (
    */
   GList *ret;
   const GList  *cur;
+  GSList *temp_rects;
 
   /* Initialize the return list to be empty */
   ret = NULL;
@@ -1802,8 +1878,13 @@ meta_rectangle_find_nonintersected_xinerama_edges (
       cur = cur->next;
     }
 
+  temp_rects = NULL;
+  for (; all_struts; all_struts = all_struts->next)
+    temp_rects = g_slist_prepend (temp_rects,
+                                  &((MetaStrut*)all_struts->data)->rect);
   ret = meta_rectangle_remove_intersections_with_boxes_from_edges (ret, 
-                                                                   all_struts);
+                                                                   temp_rects);
+  g_slist_free (temp_rects);
 
   /* Sort the list */
   ret = g_list_sort (ret, meta_rectangle_edge_cmp);