2.13.55 release

2006-01-30  Elijah Newren  <newren gmail com>

	* NEWS:	2.13.55 release

.cvsignore

@@ -15,6 +15,7 @@ ltconfig
 ltmain.sh
 stamp-h
 stamp-h.in
+stamp-h1
 stamp.h
 version.h
 config.h.in
@@ -26,3 +27,5 @@ intl
 ABOUT-NLS
 COPYING
 intltool-*
+metacity.spec
+autom4te.cache

AUTHORS

@@ -0,0 +1 @@
+Havoc Pennington <hp@redhat.com>

COMPLIANCE

@@ -0,0 +1,159 @@
+Metacity Standards Compliance
+=============================
+$Id$
+
+1) Introduction
+2) EWMH Compliance
+  a. Root Window Properties
+  b. Root Window Messages
+  c. Application Window Properties
+  d. Window Manager Protocols
+3) ICCCM Compliance
+
+1) Introduction
+---------------
+
+This document details metacity compliance with the relevent standards.
+The format of this document is as follows:
+
+[-/+?] Hint Name/Feature Name (Version number)
+       Errata/Comments
+
+The first character indicates the level of compliance as follows:
+    -   none
+    /   partial
+    +   complete
+    ?   unknown
+
+The title indicates a feature or a hint in the specification, and the
+version number indicates the minimum version of the specification
+supported by metacity.  Later versions may be supported if no
+incompatible changes have been made in the specification.
+
+2) EWMH Compliance
+------------------
+
+The EWMH, or Extended Window Manager Hints is a freedesktop.org-
+developed standard to support a number of conventions for
+communication between the window manager and clients.  It builds on
+and extends the ICCCM (See Section 3).  A copy of the current EWMH
+standard is available at http://freedesktop.org/Standards/wm-spec/
+
+  a. Root Window Properties
+  -------------------------
+
++ _NET_SUPPORTED (1.3)
+
++ _NET_CLIENT_LIST (1.3)
+
++ _NET_NUMBER_OF_DESKTOPS (1.3)
+
++ _NET_DESKTOP_GEOMETRY (1.3)
+  Metacity does not implement large desktops, so this is kept set to
+  the screen size.
+
++ _NET_DESKTOP_VIEWPORT (1.3)
+  Metacity does not implement viewports, so this is a constant (0,0).
+
++ _NET_CURRENT_DESKTOP (1.3)
+
++ _NET_DESKTOP_NAMES (1.3)
+
++ _NET_ACTIVE_WINDOW (1.3)
+
++ _NET_WORKAREA (1.3)
+
++ _NET_SUPPORTING_WM_CHECK (1.3)
+
++ _NET_VIRTUAL_ROOTS (1.3)
+  Metacity does not read or set this property, but it does not use
+  virtual roots to implement virtual desktops, so it complies with the
+  specification.
+
++ _NET_DESKTOP_LAYOUT (1.3)
+
++ _NET_SHOWING_DESKTOP (1.3)
+
+  b. Root Window Messages
+  -----------------------
+
++ _NET_CLOSE_WINDOW (1.3)
+
+- _NET_MOVERESIZE_WINDOW (1.3)
+  Metacity supports this message, but the specification is unclear on
+  the layout of the detail value, and as such it is #if 0'd in the code
+
++ _NET_WM_MOVERESIZE (1.3)
+
+- _NET_RESTACK_WINDOW (1.3)
+  Metacity will raise or lower windows in response to this message,
+  but the sibling restack modes are not supported, and it is currently
+  #if 0'd in the code.
+
++ _NET_REQUEST_FRAME_EXTENTS (1.3)  
+
+  c. Application Window Properties
+  --------------------------------
+
++ _NET_WM_NAME (1.3)
+
++ _NET_WM_VISIBLE_NAME (1.3)
+  Metacity does not set this property, but metacity will never display
+  a name different from _NET_WM_NAME
+
++ _NET_WM_ICON_NAME (1.3)
+
++ _NET_WM_VISIBLE_ICON_NAME (1.3)
+  Metacity does not set this property, but metacity will never display
+  a name different from _NET_WM_NAME
+
++ _NET_WM_DESKTOP (1.3)
+
++ _NET_WM_WINDOW_TYPE (1.3)
+
+/ _NET_WM_STATE (1.3)
+  This property is read and updated according to the specification,
+  but see caveat below.
+  Metacity does not recognize separate vertical and horizontal
+  maximization states.  Currently metacity will do a two-dimensional
+  maximization if either property is set.
+  See: http://bugzilla.gnome.org/show_bug.cgi?id=113601
+  Metacity doesn't implement viewports so _NET_WM_STATE_STICKY is
+  unimplemented.
+
++ _NET_WM_ALLOWED_ACTIONS (1.3)
+  Metacity keeps this hint up to date.  The code is somewhat crufty
+  and should be rewritten, though it is functional.
+  See: http://bugzilla.gnome.org/show_bug.cgi?id=90420
+
++ _NET_WM_STRUT (1.3)
+
++ _NET_WM_STRUT_PARTIAL (1.3)
+
++ _NET_WM_ICON_GEOMETRY (1.3)
+  Metacity uses this property to draw minimize/restore animations
+
++ _NET_WM_ICON (1.3)
+
++ _NET_WM_PID (1.3)
+
++ _NET_WM_HANDLED_ICONS (1.3)
+  Metacity does not read or set this property.  However, metacity
+  never manages iconified windows, and so has no need to do so.
+
++ _NET_WM_USER_TIME (1.3)
+  Metacity uses this property to prevent applications from stealing
+  focus if supported by the toolkit.
+
++ _NET_FRAME_EXTENTS (1.3)
+  If set in response to a _NET_REQUEST_FRAME_EXTENTS message received
+  prior to the window being mapped, this may be an estimate.  This is,
+  however, expressly allowed by the specification.
+
+  d. Window Manager Protocols
+  ---------------------------
++ _NET_WM_PING (1.3)
+
+3) ICCCM Compliance
+-------------------
+TODO

HACKING

@@ -1,67 +1,253 @@
+Intro...
 
-Don't commit substantive code in here without asking me,
-hp@redhat.com.  Adding translations, no-brainer typo fixes, etc.  is
-fine.
+Window managers have a few ways in which they are significantly different
+from other applications.  This file, combined with the code overview in
+doc/code-overview.txt, should hopefully provide a series of relatively
+quick pointers (hopefully only a few minutes each) to some of the places
+one can look to orient themselves and get started.  Some of this will be
+general to window managers on X, much will be specific to Metacity, and
+there's probably some information that's common to programs in general but
+is nonetheless useful.
 
-The script src/run-metacity.sh is useful to hack on the window manager. 
-It runs metacity in an Xnest. e.g.:
- CLIENTS=3 ./run-metacity.sh
-or 
- DEBUG=memprof ./run-metacity.sh
-or
- DEBUG_TEST=1 ./run-metacity-sh
-or whatever.
-
-The tool metacity-message can be used as follows:
- metacity-message reload-theme
- metacity-message restart
- metacity-message enable-keybindings
- metacity-message disable-keybindings
-
-metacity-window-demo is good for trying behavior of various kinds of window
-without launching a full desktop.
-
-src/window.c is where all the guts of the window manager live. This is
-basically the only remotely scary file.
-
-src/frames.c is the GtkWidget that handles drawing window frames.
-
-src/core.h defines the interface used by the GTK portion of the window
-manager to talk to the other portions. There's some cruft in here
-that's unused, since nearly all window operations have moved out of
-this file so frameless apps can have window operations.
-
-src/ui.h defines the interface the plain Xlib portion of the window
-manager uses to talk to the GTK portion.
-
-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.
-
-src/theme.c and src/theme-parser.c have the theme system; this is
-well-modularized from the rest of the code, since the theme viewer app
-links to these files in addition to the WM itself.
-
-When hacking, remember that you can have multiple screens. The code is
-also written to support multiple displays, but this is useless, since
-you can just run two copies of the WM. Also, an XKillClient() or
-shutdown on any display causes Xlib to exit the app, so it would be
-broken. So the multi-display thing is mostly just for code
-cleanliness.  Multi-screen on the other hand is important for some
-people.
-
-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.
-
-If you make any X request involving a client window, you have to
-meta_error_trap_push() around the call; this is not necessary for 
-X requests on the frame windows.
-
-Remember that not all windows have frames, and window->frame can 
-be NULL.
-
-The code could use cleanup in a lot of places, feel free to do so.
+Overview
+  Administrative issues
+  Relevant standards and X properties
+  Debugging and testing
+    Debugging logs
+    Adding information to the log
+    Valgrind
+    Testing Utilities
+  Technical gotchas to keep in mind
+  Other important reading
+    Extra reading
+    Ideas for tasks to work on
 
 
+Administrative issues
+  Don't commit substantive code in here without asking hp@redhat.com.
+  Adding translations, no-brainer typo fixes, etc. is fine.
+
+  The code could use cleanup in a lot of places, feel free to do so.
+
+  See http://developer.gnome.org/dotplan/for_maintainers.html for
+  information on how to make a release.  The only difference from those
+  instructions is that the minor version number of a Metacity release
+  should always be a number from the Fibonacci sequence.
+
+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
+  Manual) and EWMH (Extended Window Manager Hints).  You can find these at
+  the following locations:
+    ICCCM - http://tronche.com/gui/x/icccm/
+    EWMH  - :pserver:anoncvs@pdx.freedesktop.org:/cvs
+  The ICCCM is usually available in RPM or DEB format as well.  There is
+  actually an online version of the EWMH, but it is almost always woefully
+  out of date.  Just get it from cvs with these commands (the backslash
+  means include the stuff from the next line):
+    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions login
+    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions \
+      checkout wm-spec
+
+  DO NOT GO AND READ THOSE THINGS.  THEY ARE REALLY, REALLY BORING.
+
+  If you do, you'll probably end up catching up on your sleep instead of
+  hacking on Metacity. ;-)  Instead, just look at the table of contents and
+  glance at a page or two to get an idea of what's in there.  Then only
+  refer to it if you see something weird in the code and you don't know
+  what it is but has some funny looking name like you see in one of those
+  two documents.
+
+  You can refer to the COMPLIANCE file for additional information on these
+  specifications and Metacity's compliance therewith.
+
+  One of the major things those documents cover that are useful to learn
+  about immediately are X properties.  The right way to learn about those,
+  though, is through hand on experimentation with the xprop command (and
+  then look up things you find from xprop in those two manuals if you're
+  curious enough).  First, try running
+    xprop
+  in a terminal and click on one of the windows on your screen.  That gives
+  you the x properties for that window.  Look through them and get a basic
+  idea of what's there for kicks.  Note that you can get rid of some of the
+  verboseness by grepping out the _NET_WM_ICON stuff, i.e.
+    xprop | grep -v _NET_WM_ICON
+  Next, try running
+    xprop -root
+  in a terminal.  There's all the properties of the root window (which you
+  can think of as the "main" Xserver window).  You can also manually
+  specify individual windows that you want the properties of with
+    xprop -id <id>
+  if you know the id of the window in question.  You can get the id of a
+  given window by either running xwininfo, e.g.
+    xwininfo | grep "Window id" | cut -f 4 -d ' '
+  or by looking at the _NET_CLIENT_STACKING property of the root
+  window.  Finally, it can also be useful to add "-spy" (without the
+  quotes) to the xprop command to get it to continually monitor that
+  window and report any changes to you.
+
+Debugging information
+  Trying to run a window manager under a typical debugger, such as gdb,
+  unfortunately just doesn't work very well.  So, we have to resort to
+  other methods.
+
+  Debugging logs
+
+  First, note that you can start a new version of metacity to replace the
+  existing one by running
+    metacity --replace
+  (which also comes in handy in the form "./src/metacity --replace" when
+  trying to quickly test a small change while hacking on metacity without
+  doing a full "make install", though I'm going off topic...)  This will
+  allow you to see any warnings printed at the terminal.  Sometimes it's
+  useful to have these directed to a logfile instead, which you can do by
+  running
+    METACITY_USE_LOGFILE=1 metacity --replace
+  The logfile it uses will be printed in the terminal.  Sometimes, it's
+  useful to get more information than just warnings.  You can set
+  METACITY_VERBOSE to do that, like so:
+    METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 metacity --replace
+  (note that METACITY_VERBOSE=1 can be problematic without
+  METACITY_USE_LOGFILE=1; avoid it unless running in from something that
+  won't be managed by the new Metacity--see bug 305091 for more details).
+  There are also other flags, such as METACITY_DEBUG, most of which I
+  haven't tried and don't know what they do.  Go to the source code
+  directory and run
+    grep "METACITY_" * | grep getenv
+  to find out what the other ones are.
+
+  Adding information to the log
+
+  Since we can't single step with a debugger, we often have to fall back to
+  the primitive method of getting information we want to know: adding
+  "print" statements.  Metacity has a fairly structured way to do this,
+  using the functions meta_warning, meta_topic, and meta_verbose.  All
+  three have the same basic format as printf, except that meta_topic also
+  takes a leading enumeration parameter to specify the type of message
+  being shown (makes it easier for grepping in a verbose log).  You'll find
+  tons of examples in the source code if you need them; just do a quick
+  grep or look in most any file.  Note that meta_topic and meta_verbose
+  messages only appear if verbosity is turned on.  I tend to frequently add
+  temporary meta_warning statements (or switch meta_topic or meta_verbose
+  ones to meta_warning ones) and then undo the changes once I've learned
+  the info that I needed.
+
+  There is also a meta_print_backtrace (which again is only active if
+  verbosity is turned on) that can also be useful if you want to learn how
+  a particular line of code gets called.  And, of course, there's always
+  g_assert if you want to make sure some section isn't executed (or isn't
+  executed under certain conditions).
+
+  Valgrind
+
+  Valgrind is awesome for finding memory leaks or corruption and
+  uninitialized variables.  But I also tend to use it in a non-traditional
+  way as a partial substitute for a normal debugger: it can provide me with
+  a stack trace of where metacity is crashing if I made a change that
+  caused it to do so, which is one of the major uses of debuggers.  (And,
+  what makes it cooler than a debugger is that there will also often be
+  warnings pinpointing the cause of the crash from either some kind of
+  simple memory corruption or an uninitialized variable).  Sometimes, when
+  I merely want to know what is calling a particular function I'll just
+  throw in an "int i; printf("%d\n", i);" just because valgrind will give
+  me a full stacktrace whenever it sees that uninitialized variable being
+  used (yes, I could use meta_print_backtrace, but that means I have to
+  turn verbosity on).
+
+  To run metacity under valgrind, use options typical for any Gnome
+  program, such as
+    valgrind --logfile=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
+  line with the previous one.
+
+  However, there is a downside.  Things run a little bit slowly, and it
+  appears that you'll need about 1.5GB of ram, which unfortunately prevents
+  most people from trying this.
+
+  Testing Utilities
+
+  src/run-metacity.sh
+    The script src/run-metacity.sh is useful to hack on the window manager. 
+    It runs metacity in an Xnest. e.g.:
+      CLIENTS=3 ./run-metacity.sh
+    or 
+      DEBUG=memprof ./run-metacity.sh
+    or
+      DEBUG_TEST=1 ./run-metacity-sh
+    or whatever.
+
+  metacity-message
+    The tool metacity-message can be used as follows:
+      metacity-message reload-theme
+      metacity-message restart
+      metacity-message enable-keybindings
+      metacity-message disable-keybindings
+    The first of these is useful for testing themes, the second is just
+    another way (besides the --restart flag to metacity itself) of
+    restarting metacity, and the third is useful for testing Metacity when
+    running it under an Xnest (typically, the Metacity under the Xnest
+    wouldn't get keybinding notifications--making keyboard navigation not
+    work--but if you disable the keybindings for the global Metacity then
+    the Metacity under the Xnest can then get those keybinding notifications).
+
+  metacity-window-demo
+    metacity-window-demo is good for trying behavior of various kinds
+    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 in the core (display.[hc], window.[hc]) are not supposed to include
+  gdk.h or gtk.h.
+
+  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.
+
+  If you make any X request involving a client window, you have to
+  meta_error_trap_push() around the call; this is not necessary for X
+  requests on the frame windows.
+
+  Remember that not all windows have frames, and window->frame can be NULL.
+
+Other important reading & where to get started
+  Extra reading
+
+  There are some other important things to read to get oriented as well.
+  These are:
+    http://pobox.com/~hp/features.html
+    rationales.txt
+    doc/code-overview.txt
+
+  It pays to read http://pobox.com/~hp/features.html in order
+  to understand the philosophy of Metacity.
+
+  The rationales.txt file has two things: (1) a list of design choices with
+  links in the form of bugzilla bugs that discuss the issue, and (2) a list
+  outstanding bug categories, each of which is tracked by a particular
+  tracker bug in bugzilla from which you can find several closely related
+  bug reports.
+
+  doc/code-overview.txt provides a fairly good overview of the code,
+  including coverage of the function of the various files, the main
+  structures and their relationships, and places to start looking in the
+  code tailored to general categories of tasks.
+
+  Ideas for tasks to work on
+
+  There are a variety of things you could work on in the code.  You may
+  have ideas of your own, but in case you don't, let me provide a list of
+  ideas you could choose from:
+
+  If you're ambitious, there's a list of things Havoc made that he'd really
+  like to see tackled, which you can find at
+  http://log.ometer.com/2004-05.html.  Be sure to double check with someone
+  to make sure the item is still relevant if you're interested in one of
+  these.  Another place to look for ideas, of course, is bugzilla.  One can
+  just do queries and look for things that look fixable.
+
+  However, perhaps the best way of getting ideas of related tasks to work
+  on, is to look at the second half of the rationales.txt file, which tries
+  to group bugs by type.

Makefile.am

@@ -1,5 +1,7 @@
 
-SUBDIRS=src po
+SUBDIRS=src po doc
 
-EXTRA_DIST=HACKING theme-format.txt metacity.spec.in metacity.spec \
+EXTRA_DIST=HACKING rationales.txt \
 	intltool-extract.in intltool-merge.in intltool-update.in
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update

README

@@ -6,15 +6,30 @@ 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.
+
+Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x
+
 COMPILING METACITY
 ===
 
-You need GTK+ 2.0, ideally the latest in the 2.0.x series.
+You need GTK+ 2.2.  For startup notification to work you need
+libstartup-notification at
+http://www.freedesktop.org/software/startup-notification/ or on the
+GNOME ftp site. You also need GConf 1.2 (unless building a funky
+extra-small embedded metacity with --disable-gconf, see below).
 
 REPORTING BUGS AND SUBMITTING PATCHES
 ===
 
-Report new bugs on http://bugzilla.gnome.org.
+Report new bugs on http://bugzilla.gnome.org. Please check for
+duplicates, *especially* if you are reporting a feature request. 
+
+Please do *not* add "me too!" or "yes I really want this!" comments to
+feature requests in bugzilla. Please read
+http://pobox.com/~hp/features.html prior to adding any kind of flame
+about missing features or misfeatures.
 
 Feel free to send patches too; Metacity is relatively small and
 simple, so if you find a bug or want to add a feature it should be
@@ -22,6 +37,39 @@ pretty easy.  Send me mail, or put the patch in bugzilla.
 
 See the HACKING file for some notes on hacking Metacity.
 
+SHRINKING METACITY
+===
+
+Not that metacity is huge, but a substantial amount of code is in
+preferences handling, in static strings that aren't essential, and in
+the theme engine.
+
+You can strip about 70K from the metacity binary by compiling with 
+options such as:
+
+ --disable-gconf
+ --disable-sm
+ --disable-verbose 
+ --disable-startup-notification
+
+However the result is no good for desktop use, all prefs have to be
+hardcoded in the binary, for example. If you wanted to make a really
+small metacity, here's some additional stuff you might consider
+implementing:
+ 
+ - add --disable-themes, which would replace theme.c and theme-parser.c 
+   with a hardcoded implementation of the interface in theme.h, 
+   should save about 80K. This should be fairly easy.
+
+ - add --disable-gtk, which would implement the interface in ui.h
+   without using GTK. This one is easier than you think because the
+   main part of the window manager doesn't use GTK directly, but is
+   still fairly hard to do.  You would probably have to give up some
+   of the features, such as window menus, as menus are pretty complex
+   to implement well.  So time may be better spent adding a GTK
+   configure script feature to build GTK with only a small core set of
+   functionality.
+
 METACITY FEATURES
 ===
 
@@ -31,8 +79,22 @@ METACITY FEATURES
  - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts, 
    etc. come from GTK+ theme.
 
+ - Does not expose the concept of "window manager" to the user.  Some
+   of the features in the GNOME control panel and other parts of the
+   desktop happen to be implemented in metacity, such as changing your
+   window border theme, or changing your window navigation shortcuts,
+   but the user doesn't need to know this.
+
+ - Includes only the window manager; does not try to be a desktop
+   environment. The pager, configuration, etc. are all separate and
+   modular. The "libwnck" library (which I also wrote) is available
+   for writing metacity extensions, pagers, and so on. (But libwnck
+   isn't metacity specific, or GNOME-dependent; it requires only GTK,
+   and should work with KWin, fvwm2, and other EWMH-compliant WMs.)
+
  - Has a simple theme system and a couple of extra themes come with it.
-   Change themes via gconf-editor or gconftool:
+   Change themes via gconf-editor or gconftool or GNOME themes control
+   panel:
      gconftool-2 --type=string --set /apps/metacity/general/theme Crux
      gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
      gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
@@ -51,7 +113,7 @@ METACITY FEATURES
      gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
      gconftool-2 --type=string --set /apps/metacity/general/focus_mode click
 
- - Global keybinding defaults:   
+ - Global keybinding defaults include:   
 
     Alt-Tab                forward cycle window focus
     Alt-Shift-Tab          backward cycle focus
@@ -66,7 +128,10 @@ METACITY FEATURES
 
      unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
    
-   See metacity.schemas for available bindings.
+   Also try the GNOME keyboard shortcuts control panel, or
+   gconf-editor.
+
+   See metacity.schemas for all available bindings.
 
  - Window keybindings:
 
@@ -83,8 +148,9 @@ METACITY FEATURES
     Choose Resize from menu, and nothing happens yet, but 
       eventually I might implement something.
 
-    Keybindings for things like maximize window, etc. can be bound, 
-    but don't exist by default. See metacity.schemas.
+    Keybindings for things like maximize window, vertical maximize,
+    etc. can be bound, but may not all exist by default. See
+    metacity.schemas.
 
  - Window mouse bindings:
 
@@ -99,11 +165,15 @@ METACITY FEATURES
     If you click and drag the titlebar with button 1 it moves the 
      window.
 
+    If you click anywhere on the frame with button 2 it lowers the 
+     window.
+
     If you click anywhere on the frame with button 3 it shows the 
      window menu.
 
-    If you hold down Alt and click inside a window, it will move the 
-     window (buttons 1 and 2) or show menu (button 3).
+    If you hold down Super (windows key) and click inside a window, it
+     will move the window (buttons 1 and 2) or show menu (button 3).
+     Or you can configure a different modifier for this.
 
     If you pick up a window with button 1 and then switch workspaces
      the window will come with you to the new workspace, this is 
@@ -118,10 +188,10 @@ METACITY FEATURES
      be respawned. It theoretically restores sizes/positions/workspace
      for session-aware applications.
 
- - Metacity implements much of the new window manager spec from
-   freedesktop.org, and much of the ICCCM. But then there are 
-   parts of each that it doesn't implement, just because I haven't
-   yet.
+ - Metacity implements much of the EWMH window manager specification
+   from freedesktop.org, as well as the older ICCCM.  Please refer to
+   the COMPLIANCE file for information on metacity compliance with
+   these standards.
 
  - Uses Pango to render text, so has cool i18n capabilities. 
    Supports UTF-8 window titles and such.
@@ -144,80 +214,83 @@ METACITY FEATURES
 
  - does basic colormap handling
 
+ - and much more! well, maybe not a lot more.
+
+HOW TO ADD EXTERNAL FEATURES
+===
+
+You can write a metacity "plugin" such as a pager, window list, icon
+box, task menu, or even things like "window matching" using the
+Extended Window Manager Hints. See http://www.freedesktop.org for the
+EWMH specification. An easy-to-use library called "libwnck" is
+available that uses the EWMH and is specifically designed for writing
+WM accessories.
+
+You might be interested in existing accessories such as "Devil's Pie"
+by Ross Burton, which add features to Metacity (or other
+EWMH-compliant WMs).
+
 METACITY BUGS, NON-FEATURES, AND CAVEATS
 ===
 
- - You need an EWMH-spec compliant pager/tasklist to be able 
-   to navigate graphically; this does NOT include GNOME 1.x, 
-   but should include GNOME 2 and KDE 3.
-
- - doesn't do WM_COLORMAPS from the ICCCM, may matter on some really
-   old obscure hardware with some really obscure apps.
-
- - There are probably other ICCCM-compliance issues.
-
- - The first-fit algorithm for placement isn't very clever.
-
- - Should Metacity support flipping in right-to-left locales?
-   I don't know what window managers look like in a right-to-left
-   locale. I assume the window titles should be right-justified;
-   should the window controls also be flipped?
+See bugzilla: http://bugzilla.gnome.org/query.cgi
 
 FAQ
 ===
 
 Q: Will you add my feature?
 
-A: If it makes sense to turn on unconditionally,
-   or is genuinely a harmless preference that I would not 
-   be embarrassed to put in a simple, uncluttered, user-friendly
-   configuration dialog.
+A: If it makes sense to turn on unconditionally, or is genuinely a
+   harmless preference that I would not be embarrassed to put in a
+   simple, uncluttered, user-friendly configuration dialog.
 
    If the only rationale for your feature is that other window
-   managers have it, or that you are personally used to it, or something
-   like that, then I will not be impressed. Metacity is firmly in the
-   "choose good defaults" camp rather than the "offer 6 equally broken
-   ways to do it, and let the user pick one" camp.
+   managers have it, or that you are personally used to it, or
+   something like that, then I will not be impressed. Metacity is
+   firmly in the "choose good defaults" camp rather than the "offer 6
+   equally broken ways to do it, and let the user pick one" camp.
 
    This is part of a "no crackrock" policy, despite some exceptions
    I'm mildly embarrassed about. For example, multiple workspaces
-   probably constitute crackrock, they confuse most users
-   and really are not that useful if you have a decent tasklist and 
-   so on. But I am too used to them to turn them off.
-   Or alternatively iconification/tasklist is crack, and workspaces/pager
-   are good. But having both is certainly a bit wrong.
-   Sloppy focus is probably crackrock too.
+   probably constitute crackrock, they confuse most users and really
+   are not that useful if you have a decent tasklist and so on. But I
+   am too used to them to turn them off.  Or alternatively
+   iconification/tasklist is crack, and workspaces/pager are good. But
+   having both is certainly a bit wrong.  Sloppy focus is probably
+   crackrock too.
 
    But don't think unlimited crack is OK just because I slipped up a
-   little. No slippery slope here.   
+   little. No slippery slope here.
 
    Don't let this discourage patches and fixes - I love those. ;-)
-   Just be prepared to hear the above objections if your patch
-   adds some crack-ridden configuration option.
+   Just be prepared to hear the above objections if your patch adds
+   some crack-ridden configuration option.
 
    http://pobox.com/~hp/free-software-ui.html
+   http://pobox.com/~hp/features.html   
 
 Q: Will Metacity be part of GNOME?
 
-A: Many people are now asking for this, though it was not the original 
-   plan - Metacity started out as sort of an experiment. 
-
-   A decision hasn't really been made but the issue will probably 
-   be raised shortly after the GNOME 2 release.
+A: It is officially part of GNOME as of GNOME 2.2. Prior to that, 
+   it was unofficially shipped as the default GNOME WM by several 
+   OS vendors.
 
 Q: Is Metacity a Red Hat project?
 
-A: Metacity is in no way funded, endorsed, or encouraged by Red Hat,
-   Inc. - I'm guessing Red Hat would not consider "insufficient number
-   of window managers for Linux" an urgent problem. Just a wild guess
-   though.
+A: Metacity's original creation was in no way funded, endorsed, or
+   encouraged by Red Hat, Inc. - I'm guessing Red Hat would not
+   consider "insufficient number of window managers for Linux" an
+   urgent problem. Just a wild guess though.
+
+   Now that metacity is the default WM however, Red Hat supports some
+   bugfixing and other work.
  
 Q: Why does Metacity remember the workspace/position of some apps 
-   but not others?
+   but not others across logout/login?
 
-A: Metacity only stores sizes/positions for apps that are session 
-   managed. As far as I can determine, there is no way to attempt 
-   to remember workspace/position for non-session-aware apps without
+A: Metacity only stores sizes/positions for apps that are session
+   managed. As far as I can determine, there is no way to attempt to
+   remember workspace/position for non-session-aware apps without
    causing a lot of weird effects.
 
    The reason is that you don't know which non-SM-aware apps were
@@ -270,6 +343,125 @@ A: I could conceivably be convinced to use viewports _instead_ of
    features traditionally associated with either kind if those
    features make sense.
 
+Q: Why is the panel always on top?
+
+A: Because it's a better user interface, and until we made this not
+   configurable a bunch of apps were not getting fixed (the app
+   authors were just saying "put your panel on the bottom" instead of
+   properly supporting fullscreen mode, and such).
+
+   rationales.txt has the bugzilla URL for some flamefesting on this,
+   if you want to go back and relive the glory.
+   Read these and the bugzilla stuff before asking/commenting:
+     http://pobox.com/~hp/free-software-ui.html
+     http://pobox.com/~hp/features.html   
+
+Q: Why is there no edge flipping?
+
+A: This one is also in rationales.txt. Because "ouija board" UI, where
+   you just move the mouse around and the computer guesses what you
+   mean, has a lot of issues. This includes mouse focus, shade-hover
+   mode, edge flipping, autoraise, etc. Metacity has mouse focus and
+   autoraise as a compromise, but these features are all confusing for
+   many users, and cause problems with accessibility, fitt's law, and
+   so on.
+
+   Read these and the bugzilla stuff before asking/commenting:
+     http://pobox.com/~hp/free-software-ui.html
+     http://pobox.com/~hp/features.html   
+
+Q: Why does wireframe move/resize suck?
+
+A: You can turn it on with the reduced_resources setting.
+
+   But: it has low usability, and is a pain
+   to implement, and there's no reason opaque move/resize should be a
+   problem on any setup that can run a modern desktop worth a darn to
+   begin with.
+
+   Read these and the bugzilla stuff before asking/commenting:
+     http://pobox.com/~hp/free-software-ui.html
+     http://pobox.com/~hp/features.html   
+
+   The reason we had to add wireframe anyway was broken 
+   proprietary apps that can't handle lots of resize events.
+
+Q: Why no XYZ?
+
+A: You are probably getting the idea by now - check rationales.txt,
+   query/search bugzilla, and read http://pobox.com/~hp/features.html
+   and http://pobox.com/~hp/free-software-ui.html
+
+   Then sit down and answer the question for yourself.  Is the feature
+   good? What's the rationale for it? Answer "why" not just "why not."
+   Justify in terms of users as a whole, not just users like
+   yourself. How else can you solve the same problem? etc. If that
+   leads you to a strong opinion, then please, post the rationale for
+   discussion to an appropriate bugzilla bug, or to
+   usability@gnome.org.
+
+   Please don't just "me too!" on bugzilla bugs, please don't think
+   flames will get you anywhere, and please don't repeat rationale
+   that's already been offered.
+
+Q: Your dumb web pages you made me read talk about solving problems in
+   fundamental ways instead of adding preferences or workarounds.
+   What are some examples where metacity has done this?
+
+A: There are quite a few, though many opportunities remain.  Sometimes
+   the real fix involves application changes. The metacity approach is
+   that it's OK to require apps to change, though there are also
+   plenty of workarounds in metacity for battles considered too hard
+   to fight.
+
+   Here are some examples:
+
+   - fullscreen mode was introduced to allow position constraints,
+     panel-on-top, and other such things to apply to normal windows
+     while still allowing video players etc. to "just work"
+
+   - "whether to include minimized windows in Alt+Tab" was solved 
+     by putting minimized windows at the *end* of the tab order. 
+
+   - Whether to pop up a feedback display during Alt+Tab was solved by
+     having both Alt+Tab and Alt+Esc
+
+   - Whether to have a "kill" feature was solved by automatically
+     detecting and offering to kill stuck apps. Better, metacity
+     actually does "kill -9" on the process, it doesn't just
+     disconnect the process from the X server. You'll appreciate this
+     if you ever did a "kill" on Netscape 4, and watched it keep
+     eating 100% CPU even though the X server had booted it.
+
+   - The workspaces vs. viewports mess was avoided by adding
+     directional navigation and such to workspaces, see discussion
+     earlier in this file.
+
+   - Instead of configurable placement algorithms, there's just one 
+     that works fairly well most of the time.
+
+   - To avoid excess CPU use during opaque move/resize, we rate limit
+     the updates to the application window's size.
+
+   - Instead of configurable "show size of window while resizing,"
+     it's only shown for windows where it matters, such as terminals.
+     (Only use-case given for all windows is for web designers
+     choosing their web browser size, but there are web sites and
+     desktop backgrounds that do this for you.)
+
+   - Using startup notification, applications open on the workspace
+     where you launched them, not the active workspace when their
+     window is opened.
+
+   - and much more.
+
+Q: I think metacity sucks.
+
+A: Feel free to use any WM you like. The reason metacity follows the
+   ICCCM and EWMH specifications is that it makes metacity a modular,
+   interchangeable part in the desktop. libwnck-based apps such as the
+   GNOME window list will work just fine with any EWMH-compliant WM.
+
 Q: Did you spend a lot of time on this?
 
 A: Originally the answer was no. Sadly the answer is now yes.
@@ -278,5 +470,3 @@ Q: How can you claim that you are anti-crack, while still
    writing a window manager?
 
 A: I have no comment on that.
-
-

acconfig.h

@@ -1,19 +0,0 @@
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef ENABLE_NLS
-#undef HAVE_PTHREAD_H
-#undef GETTEXT_PACKAGE
-#undef HAVE_SHAPE_EXT
-#undef HAVE_XFT
-#undef HAVE_SM
-#undef HAVE_XINERAMA
-#undef HAVE_SOLARIS_XINERAMA
-#undef HAVE_XFREE_XINERAMA
-#undef HAVE_SHAPE
-#undef HAVE_RANDR
-#undef HAVE_STARTUP_NOTIFICATION
-

autogen.sh

@@ -12,40 +12,42 @@ FILE=src/display.c
 
 DIE=0
 
-AUTOMAKE=automake-1.4
-ACLOCAL=aclocal-1.4
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-        AUTOMAKE=automake
-        ACLOCAL=aclocal
-}
-
 (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 ftp://ftp.gnu.org/pub/gnu/"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
 	DIE=1
 }
 
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to compile $PROJECT."
-	echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=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 ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    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
   }
 }
 
+CONFIGURE=configure.in
 if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" "$CONFIGURE" >/dev/null; then
   if grep "sed.*POTFILES" "$CONFIGURE" >/dev/null; then
     GETTEXTIZE=""
@@ -83,10 +85,7 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
+topdir=`pwd`
 for coin in .
 do 
   dr=`dirname $coin`
@@ -94,51 +93,40 @@ do
     echo skipping $dr -- flagged as no auto-gen
   else
     echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $macrodirs; do
-  	if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-  	##else 
-	##  echo "**Warning**: No such directory \`$k'.  Ignored."
-        fi
-      done
-      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
-	  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
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	echo "Running libtoolize..."
-	libtoolize --force --copy
+    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 $aclocalinclude ..."
-      $ACLOCAL $aclocalinclude
+    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 $?
 
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-
-      echo "Running $AUTOMAKE --gnu $am_opt ..."
-      $AUTOMAKE --add-missing --gnu $am_opt
-
-      echo "Running autoconf ..."
-      autoconf
-    )
+    cd $topdir
   fi
 done
 
@@ -149,7 +137,7 @@ 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 1
+  && echo Now type \`make\' to compile $PROJECT  || exit $?
 else
   echo Skipping configure process.
 fi

configure.in

@@ -1,26 +1,45 @@
-AC_INIT(src/display.c)
+AC_PREREQ(2.50)
 
-AM_CONFIG_HEADER(config.h)
+# 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.55],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
-# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987 
-AM_INIT_AUTOMAKE(metacity, 2.4.3)
+AC_CONFIG_SRCDIR(src/display.c)
+AC_CONFIG_HEADERS(config.h)
+
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
 
 # Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
 GETTEXT_PACKAGE=metacity
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-
-AM_MAINTAINER_MODE
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 
 AC_PROG_INTLTOOL([0.21])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
-AC_ARG_PROGRAM
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
+#### Integer sizes 
+
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(__int64)
+
+## byte order
+AC_C_BIGENDIAN
+
+#### Warnings
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
@@ -82,37 +101,181 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
+METACITY_PC_MODULES='gtk+-2.0 >= 2.2.0 pango >= 1.2.0'
+
+AC_ARG_ENABLE(gconf,
+  AC_HELP_STRING([--disable-gconf],
+                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
+  enable_gconf=yes)
+
+if test x$enable_gconf = xyes; then
+    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
+    METACITY_PC_MODULES="$METACITY_PC_MODULES gconf-2.0 >= 1.2.0"
+fi
+
+AC_ARG_ENABLE(verbose-mode,
+  AC_HELP_STRING([--disable-verbose],
+                 [disable metacity's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
+  enable_verbose_mode=yes)
+
+if test x$enable_verbose_mode = xyes; then
+    AC_DEFINE(WITH_VERBOSE_MODE,1,[Build with verbose mode support])
+fi
+
+AC_ARG_ENABLE(sm,
+  AC_HELP_STRING([--disable-sm],
+                 [disable metacity's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
+  enable_sm=auto)
+
+AC_ARG_ENABLE(startup-notification,
+  AC_HELP_STRING([--disable-startup-notification],
+                 [disable metacity's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
+  enable_startup_notification=auto)
+
+AC_ARG_ENABLE(compositor,
+  AC_HELP_STRING([--disable-compositor],
+                 [disable metacity's compositing manager]),,
+  enable_compositor=auto)
+
+AC_ARG_ENABLE(xsync,
+  AC_HELP_STRING([--disable-xsync],
+                 [disable metacity's use of the XSync extension]),,
+  enable_xsync=auto)
+
+AC_ARG_ENABLE(render,
+  AC_HELP_STRING([--disable-render],
+                 [disable metacity's use of the RENDER extension]),,
+  enable_render=auto)
+
+AC_ARG_ENABLE(shape,
+  AC_HELP_STRING([--disable-shape],
+                 [disable metacity's use of the shaped window extension]),,
+  enable_shape=auto)
 
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
-
-ALL_LINGUAS="az ca cs da de el es fr gl hu it ja ko lv ms no pl pt pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
+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
-PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.0.0)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.0.0)
-PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.0.0 gconf-2.0 >= 1.1.9 libglade-2.0)
+# GOptionEntry requires	glib-2.6.0    
+PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
+# gtk_window_set_icon_name requires gtk2+-2.60
+PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
 
-STARTUP_NOTIFICATION_VERSION=0.2
+if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
+   echo "pangoxft found"
+else
+   AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
+fi
+
+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
+   have_startup_notification=yes
+else
+   have_startup_notification=no
+fi
+AC_MSG_RESULT($have_startup_notification)
+
+if test x$enable_startup_notification = xyes; then
+   have_startup_notification=yes
+   echo "startup-notification support forced on"
+elif test x$enable_startup_notification = xauto; then
+   true
+else
+   have_startup_notification=no
+fi
+
+if test x$have_startup_notification = xyes; then
   echo "Building with libstartup-notification"
-  PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 2.0.0 gconf-2.0 >= 1.1.9 libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION)
-  AC_DEFINE(HAVE_STARTUP_NOTIFICATION)
-  with_startup_notification=yes
+  METACITY_PC_MODULES="$METACITY_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
+  AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
 else
   echo "Building without libstartup-notification"
-  PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 2.0.0 gconf-2.0 >= 1.1.9)
-  with_startup_notification=no
 fi
 
-if $PKG_CONFIG --atleast-version 2.1.0 gtk+-2.0; then
-   AC_DEFINE(HAVE_GTK_MULTIHEAD,,[gtk+ with multihead support found])
-   with_multihead=yes
+## init this, it gets set either in the compositor check below 
+## or the render-specific check later
+have_xrender=no
+
+XCOMPOSITE_VERSION=0.2
+AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
+if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
+   have_xcomposite=yes
 else
-   with_multihead=no
+   have_xcomposite=no
 fi
+AC_MSG_RESULT($have_xcomposite)
+
+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
+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"
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
+
+  ## force on render also
+  have_xrender=yes
+else
+  echo "Building without compositing manager"
+fi
+
+## if no compositor, still possibly enable render
+if test x$have_xcomposite = xno; then
+  XRENDER_VERSION=0.0
+  AC_MSG_CHECKING([xrender >= $XRENDER_VERSION])
+  if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then
+     have_xrender=yes
+  else
+     have_xrender=no
+  fi
+  AC_MSG_RESULT($have_xrender)
+
+  if test x$enable_render = xyes; then
+     have_xrender=yes
+     echo "Render support forced on"
+  elif test x$enable_render = xauto; then
+     true
+  else
+     have_xrender=no
+  fi
+
+  if test x$have_xrender = xyes; then
+     echo "Building with Render"
+     METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
+  fi
+fi ## have_composite
+
+if test x$have_xrender = xyes; then
+  AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
+fi
+
+AC_MSG_CHECKING([Xcursor])
+if $PKG_CONFIG xcursor; then
+     have_xcursor=yes
+  else
+     have_xcursor=no
+  fi
+  AC_MSG_RESULT($have_xcursor)
+
+if test x$have_xcursor = xyes; then
+  echo "Building with Xcursor"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
+  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) 
+fi
+
+PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
 
 AC_PATH_XTRA
 
@@ -122,46 +285,53 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 metacity_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
+AC_ARG_ENABLE(xinerama,
+  AC_HELP_STRING([--disable-xinerama],
+                 [disable metacity's use of the Xinerama extension]),
+  try_xinerama=$enable_xinerama,try_xinerama=yes)
+
 use_solaris_xinerama=no
 use_xfree_xinerama=no
-case "$host" in
-    *-*-solaris*)
-        # Check for solaris
-        use_solaris_xinerama=yes
-        AC_CHECK_LIB(Xext, XineramaGetInfo,
-        	     use_solaris_xinerama=yes, use_solaris_xinerama=no,
-                     $ALL_X_LIBS)
-        if test "x$use_solaris_xinerama" = "xyes"; then
-            AC_CHECK_HEADER(X11/extensions/xinerama.h,
-                      	    if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-        	            fi
-                            AC_DEFINE(HAVE_SOLARIS_XINERAMA)
-          	            AC_DEFINE(HAVE_XINERAMA),
-                            use_solaris_xinerama=no,
-                            [#include <X11/Xlib.h>])
-        fi	
-        AC_MSG_CHECKING(for Xinerama support on Solaris)
-        AC_MSG_RESULT($use_solaris_xinerama);
-        ;;
-    *)
-        # Check for XFree
-        use_xfree_xinerama=yes
-        AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-            [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-       	                     X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"   
-      	                     if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-             	                 X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-      	                     fi
-        	             AC_DEFINE(HAVE_XFREE_XINERAMA)
-      	                     AC_DEFINE(HAVE_XINERAMA), 
-      	                     use_xfree_xinerama=no,
-                             [#include <X11/Xlib.h>])],
-            use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
-        AC_MSG_CHECKING(for Xinerama support on XFree86)
-        AC_MSG_RESULT($use_xfree_xinerama);
-        ;;
-esac
+if test "${try_xinerama}" != no; then
+    case "$host" in
+        *-*-solaris*)
+            # Check for solaris
+            use_solaris_xinerama=yes
+            AC_CHECK_LIB(Xext, XineramaGetInfo,
+                         use_solaris_xinerama=yes, use_solaris_xinerama=no,
+                         $ALL_X_LIBS)
+            if test "x$use_solaris_xinerama" = "xyes"; then
+                AC_CHECK_HEADER(X11/extensions/xinerama.h,
+                                if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+                                    X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+                                fi
+                                AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
+                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
+                                use_solaris_xinerama=no,
+                                [#include <X11/Xlib.h>])
+            fi	
+            AC_MSG_CHECKING(for Xinerama support on Solaris)
+            AC_MSG_RESULT($use_solaris_xinerama);
+            ;;
+        *)
+            # Check for XFree
+            use_xfree_xinerama=yes
+            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"   
+                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+                                 fi
+                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
+                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]), 
+                                 use_xfree_xinerama=no,
+                                 [#include <X11/Xlib.h>])],
+                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
+            AC_MSG_CHECKING(for Xinerama support on XFree86)
+            AC_MSG_RESULT($use_xfree_xinerama);
+            ;;
+    esac
+fi
 
 CPPFLAGS="$metacity_save_cppflags"
 
@@ -172,23 +342,69 @@ AC_CHECK_LIB(Xext, XShapeQueryExtension,
                                 SHAPE_LIBS=-lXext found_shape=yes)],
                , $ALL_X_LIBS)
 
-if test "x$found_shape" = "xyes"; then
-   AC_DEFINE(HAVE_SHAPE)
+if test x$enable_shape = xno; then
+   found_shape=no
 fi
 
+if test x$enable_shape = xyes; then
+   if test "$found_shape" = "no"; then
+      AC_MSG_ERROR([--enable-shape forced and Shape not found])
+      exit 1
+   fi
+fi
+
+if test "x$found_shape" = "xyes"; then
+   AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
+fi
+
+found_xkb=no
+AC_CHECK_LIB(X11, XkbQueryExtension,
+               [AC_CHECK_HEADER(X11/XKBlib.h,
+                                found_xkb=yes)],
+	, $ALL_X_LIBS)
+
+if test "x$found_xkb" = "xyes"; then
+   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
+fi
+
+
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
                [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                 RANDR_LIBS=-lXrandr found_randr=yes,,
 				[#include <X11/Xlib.h>])],
-               , -lXrender $ALL_X_LIBS)
+               , -lXrender -lXext $ALL_X_LIBS)
 
 if test "x$found_randr" = "xyes"; then
-   AC_DEFINE(HAVE_RANDR)
+   AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
 fi
 
-METACITY_LIBS="$RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
+XSYNC_LIBS=
+found_xsync=no
+AC_CHECK_LIB(Xext, XSyncQueryExtension,
+               [AC_CHECK_HEADER(X11/extensions/sync.h,
+                                found_xsync=yes,,
+				[#include <X11/Xlib.h>])],
+               , $ALL_X_LIBS)
+
+if test x$enable_xsync = xno; then
+   found_xsync=no
+fi
+
+if test x$enable_xsync = xyes; then
+   if test "$found_xsync" = "no"; then
+      AC_MSG_ERROR([--enable-xsync forced and XSync not found])
+      exit 1
+   fi
+fi
+
+if test "x$found_xsync" = "xyes"; then
+   XSYNC_LIBS=-lXext
+   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"
@@ -206,8 +422,19 @@ case "$METACITY_LIBS" in
     ;;
 esac
 
+if test x$enable_sm = xno; then
+   found_sm=no
+fi
+
+if test x$enable_sm = xyes; then
+   if test "$found_sm" = "no"; then
+      AC_MSG_ERROR([--enable-sm forced and -lSM not found])
+      exit 1
+   fi
+fi
+
 if test "$found_sm" = "yes"; then
-   AC_DEFINE(HAVE_SM)
+   AC_DEFINE(HAVE_SM, , [Building with SM support])
 fi
 
 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") 
@@ -229,38 +456,69 @@ LDFLAGS="$METACITY_LIBS $LDFLAGS"
 AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream)
 LDFLAGS=$save_LDFLAGS
 
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+if test x$enable_gconf = xyes; then 
+   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
 
-if test x"$GCONFTOOL" = xno; then
-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   AM_GCONF_SOURCE_2
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
 fi
 
-AM_GCONF_SOURCE_2
-
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
+doc/Makefile
+doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
+src/libmetacity-private.pc
 src/tools/Makefile
 src/themes/Makefile
 po/Makefile.in
-metacity.spec
 ])
 
+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 "*** This is intended for embedded systems etc., not for normal use."
+fi
+
+if test x$enable_verbose_mode = xno; then
+        echo "*** WARNING WARNING WARNING WARNING WARNING"
+        echo "*** Building without verbose mode"
+        echo "*** This means there's no way to debug metacity problems."
+        echo "*** Please build normal desktop versions of metacity"
+        echo "*** with verbose mode enabled so users can use it when they report bugs."
+fi
+
 dnl ==========================================================================
 echo "
 metacity-$VERSION:
 
-	prefix:                 ${prefix}
-	source code location:	${srcdir}
-	compiler:		${CC}
-
-	XFree86 Xinerama:       ${use_xfree_xinerama}
-	Solaris Xinerama:       ${use_solaris_xinerama}
-	Multihead:              ${with_multihead}
-	Startup notification:   ${with_startup_notification}
-	Session management:     ${found_sm}
-	Shape extension:        ${found_shape}
-	Resize-and-rotate:      ${found_randr}
+	prefix:                   ${prefix}
+	source code location:	  ${srcdir}
+	compiler:		  ${CC}
 
+	GConf:                    ${enable_gconf}
+	XFree86 Xinerama:         ${use_xfree_xinerama}
+	Solaris Xinerama:         ${use_solaris_xinerama}
+	Startup notification:     ${have_startup_notification}
+	Compositing manager:      ${have_xcomposite}
+	Session management:       ${found_sm}
+	Shape extension:          ${found_shape}
+	Resize-and-rotate:        ${found_randr}
+	Xsync:                    ${found_xsync}
+	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)"

doc/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

doc/Makefile.am

@@ -0,0 +1,4 @@
+SUBDIRS = man 
+
+EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
+	how-to-get-focus-right.txt

doc/code-overview.txt

@@ -0,0 +1,185 @@
+This is not meant to be comprehensive by any means.  Rather it is
+meant as just a brief overview of some of the bigger structures and
+files, with guides for a variety of task categories providing places
+to start looking in the code and things to look for.
+
+Overview
+  Jobs of various files
+  Major data structures and their relationships
+  Getting started -- where to look
+
+
+Jobs of various files
+  src/window.c is where all the guts of the window manager live. This is
+  basically the only remotely scary file.
+
+  src/frames.c is the GtkWidget that handles drawing window frames.
+
+  src/core.h defines the interface used by the GTK portion of the window
+  manager to talk to the other portions. There's some cruft in here that's
+  unused, since nearly all window operations have moved out of this file so
+  frameless apps can have window operations.
+
+  src/ui.h defines the interface the plain Xlib portion of the window
+  manager uses to talk to the GTK portion.
+
+  src/theme.c and src/theme-parser.c have the theme system; this is
+  well-modularized from the rest of the code, since the theme viewer app
+  links to these files in addition to the WM itself.
+
+Major data structures and their relationships
+  Major structs have a "Meta" prefix, thus MetaDisplay, MetaScreen,
+  MetaWindow, etc.  This serves as a way of namespacing in C.  It also has
+  the side effect of avoiding conflicts with common names that X already
+  uses such as Display, Screen, Window, etc.  Note that when I refer to a
+  display below, I'm meaning a MetaDisplay and not a Display.
+
+  Don't confuse displays and screens.  While Metacity can run with multiple
+  displays, it is kind of useless since you might as well just run two
+  copies of Metacity.  However, having multiple screens per display is
+  useful and increasingly common (known as "multiscreen" and "xinerama"
+  setups, where users make use of more than one monitor).  You should
+  basically think of a display as a combination of one or more monitors
+  with a single keyboard (...and usually only one mouse).
+
+  There is also a significant difference between multiscreen and xinerama
+  as well.  Basically, each MetaScreen is a root window (root node in the
+  tree of windows).  With Xinerama, a single root window appears to span
+  multiple monitors, whereas with multiscreen a root window is confined to
+  a single monitor.  To re-emphasize the distinction between a display and
+  a screen, the pointer and keyboard are shared between all root windows
+  for a given display.
+
+  The display keeps track of a lot of various global quantities, but in
+  particular has a compositor and a list (GList) of screens.
+
+  A compositor is an opaque structure (only defined in compositor.c),
+  meaning that you'll only reference the API for it.  It handles (or will
+  handle) cool stuff with the new X extensions, such as smooth resizing and
+  alpha transparency.
+
+  A screen keeps track of a number of quantities as well, in particular a
+  stack and a list of workspaces.
+
+  A stack is basically a list of windows, and the depth order they have
+  relative to each other (which thus determines which windows are on top
+  and which are obscured).
+
+  A workspace mostly contains a list of windows for the workspace, but also
+  has a few other quantities as well (a list of struts which are areas
+  where windows should not be placed and an mru_list or "most recently used
+  window list").
+
+  A window has a huge list of quantities for keeping track of things about
+  a window on the screen.  (We want to avoid making this list larger
+  because the memory for all these quantities is per window.)  One item in
+  particular that a window has, though, is a frame.
+
+  A frame is the decorations that surround the window (i.e. the titlebar and
+  the minimize and close buttons and the part that you can use to resize),
+  and contains a handful of variables related to that, but no other major
+  structures.
+
+Getting started -- where to look
+  Getting started on developing free software projects can often be like
+  being dropped off in a town that is unknown to you and being told to make
+  a map, when various road and building signs are missing or fading.  To
+  try to alleviate that initial difficulty in orientation, below I list a
+  variety of general task categories with file, function, variable, and x
+  property names that may be useful to fixing bugs or writing features that
+  fall within that category.
+
+  First, though, it's useful to note that most event and message passing
+  goes through display.c:event_callback(), so that's often a good place to
+  start reading for general familiarity with the code (actually, I'd
+  suggest skipping down to the first switch statement within that
+  function).  Of course, not all events go through that function, as there
+  are a few other places that handle events too such as frames.c.
+
+  Anyway, without further ado, here are the categories and (hopefully)
+  useful things to look at for each:
+
+    Focus issues (i.e. issues with which window is active):
+      doc/how-to-get-focus-right.txt
+      meta_workspace_focus_default_window
+      _NET_ACTIVE_WINDOW
+      _NET_WM_USER_TIME
+      meta_window_focus
+      meta_display_(set_input|focus_the_no)_focus_window
+      XSetInputFocus (only for purposes of understanding how X focus/input works)
+      CurrentTime (mostly, you should just think "Bad; don't use it")
+
+    Compositor stuff (X extension for eye candy like transparency):
+      compositor.c
+      The luminocity module in CVS
+
+    Window depth (i.e. stacking or lowering/raising) issues:
+      stack.c
+      _NET_CLIENT_LIST_STACKING
+      transient_for
+      WM_TRANSIENT_FOR
+      meta_window_(raise|lower)
+      _NET_WM_WINDOW_TYPE
+      _NET_WM_MOUSE_ACTION/_NET_WM_TAKE_ACTIVITY? (aren't yet in EWMH)
+
+    Window placement issues:
+      place.c
+      constraints.c
+      _NET_WM_STRUT
+      WM_SIZE_HINTS
+
+    Moving and resizing issues:
+      constraints.c
+      update_move
+      update_resize
+      meta_window_handle_mouse_grab_op_event
+      _NET_MOVERESIZE_WINDOW
+      _NET_WM_STRUT
+
+    Drag and drop issues:
+      the XDND protocol (see http://www.newplanetsoftware.com/xdnd/ and
+        http://freedesktop.org/Standards/XDND)
+      _NET_WM_MOUSE_ACTION/_NET_WM_TAKE_ACTIVITY (aren't yet in EWMH)
+      A general pointer: what causes the difficulty here is that when the
+        application receives a mouse click to start a drag, it does a grab
+        so that the window manager doesn't get any further events; thus
+        correcting things require standards so that applications and window
+        managers can collaborate correctly
+
+    Theme issues: ???
+      doc/theme-format.txt
+      theme.c
+      theme-parser.c
+      (ui.c, core.c, frames.c, frame.c?  I dunno...)
+
+    Session management issues: ???
+      session.c
+      http://www.x.org/X11R6.8.1/doc/SM/xsmp.pdf ?
+      http://www.x.org/X11R6.8.1/doc/SM/SMlib.pdf ?
+      meta_window_apply_session_info
+
+    Tasklist and Workspace switcher issues:
+      window-props.c
+      various functions in screen.c (especially ones using XChangeProperty)
+      xprops.c
+      The libwnck module in cvs
+      meta_window_client_message
+      Lots of the EWMH
+
+    Window and workspace selection/changing issues:
+      tabpopup.c
+      keybindings.c, functions: *_workspace*, *_tab_*
+      meta_screen_ensure_*_popup
+      display.c, functions: *_tab*
+
+    Key and mouse binding actions:
+      keybindings.c
+      meta_frames_button_(press|release)_event
+      display.c: event_callback, but only the (Key|Button)_(Press|Release) cases
+
+    Xinerama and multiscreen: ???
+      In general, just search for Xinerama, but in particular see
+      screen.c
+      window.c
+      place.c
+      constraints.c

doc/dialogs.txt

@@ -0,0 +1,32 @@
+Dialogs which have no transient parent or root window being 
+their tranisent parent are the ones which will be visible in 
+the tasklist. 
+
+All such dialogs will be *always* on top of the window
+group i.e they would transients for the whole group.
+
+
+1) Modal dialogs 
+
+   
+   * If you wish to open another window from a modal dialog 
+
+     open *only* a modal dialog and set it's transient parent.
+     
+	 
+2) Normal dialog
+
+    
+   without transient parent
+
+   * If you wish to open another window from a normal dialog
+
+     open either a normal dialog or a modal dialog only.
+     Set the transient parent for the child dialog if you do not
+     want them to be transient for all the other windows in the group.
+     
+   with transient parent 
+ 
+   * If you wish to open another window from a normal dialog
+     
+     you could open any type of window.

doc/how-constraints-works.txt

@@ -0,0 +1,283 @@
+File contents:
+  Basic Ideas
+  Important points to remember
+  Explanation of fields in the ConstraintInfo struct
+  Gory details of resize_gravity vs. fixed_directions
+
+IMPORTANT NOTE: There's a big comment at the top of constraints.c
+explaining how to add extra constraints or tweak others.  Read it.  I put
+that information there because it may be enough information by itself for
+people to hack on constraints.c.  I won't duplicate that information in
+this file; this file is for deeper details.
+
+
+---------------------------------------------------------------------------
+Basic Ideas
+---------------------------------------------------------------------------
+There are a couple basic ideas behind how this constraints.c code works and
+why it works that way:
+
+  1) Split the low-level error-prone operations into a special file
+  2) Add robustness by prioritizing constraints
+  3) Make use of a minimal spanning set of rectangles for the
+     "onscreen region" (screen minus struts).
+  4) Constraints can be user-action vs app-action oriented
+  5) Avoid over-complification  ;-)
+
+Some more details explaining these basic ideas:
+
+  1) Split tedious operations out
+
+     boxes.[ch] have been added which contain many common, tedious, and
+     error-prone operations.  I find that this separation helps a lot for
+     managing the complexity and ensuring that things work correctly.
+     Also, note that testboxes.c thoroughly tests all functionality in
+     boxes.[ch] and a testboxes program is automatically compiled.
+
+     Note that functions have also been added to this file to handle some
+     of the tedium necessary for edge resistance as well.
+
+  2) Prioritize constraints
+
+     In the old code, if each and every constraint could not be
+     simultaneously satisfied, then it would result in some
+     difficult-to-predict set of constraints being violated.  This was
+     because constraints were applied in order, with the possibility for
+     each making changes that violated previous constraints, with no
+     checking done at the end.
+
+     Now, all constraints have an associated priority, defined in the
+     ConstraintPriority enum near the top of constraints.c.  The
+     constraints are all applied, and then are all checked; if not all are
+     satisfied then the least important constraints are dropped and the
+     process is repeated.  This ensures that the most important constraints
+     are satisfied.
+
+     A special note to make here is that if any one given constraint is
+     impossible to satisfy even individually (e.g. if minimum size hints
+     specify a larger window than the screen size, making the
+     fully-onscreen constraint impossible to satisfy) then we treat the
+     constraint as being satisfied.  This sounds counter-intuitive, but the
+     idea is that we want to satisfy as many constraints as possible and if
+     we treat it as a violation then all constraints with a lesser priority
+     also get dropped along with the impossible to satisfy one.
+
+  3) Using maximal/spanning rectangles
+
+     The constraints rely heavily on something I call spanning rectangles
+     (which Soeren referred to as maximal rectangles, a name which I think
+     I like better but I don't want to go change all the code now).  These
+     spanning rectangles have the property that a window will fit on the
+     screen if and only if it fits within at least one of the rectangles.
+     Soeren had an alternative way of describing these rectangles, namely
+     that they were rectangles with the property that if you made any of
+     them larger in any direction, they would overlap with struts or be
+     offscreen (with the implicit assumption that there are enough of these
+     rectangles that combined they cover all relevant parts of the screen).
+     Note that, by necessity, these spanning/maximal rectangles will often
+     overlap each other.
+
+     Such a list makes it relatively easy to define operations like
+     window-is-onscreen or clamp-window-to-region or
+     shove-window-into-region.  Since we have a on-single-xinerama
+     constraint in addition to the onscreen constraint(s), we cache
+     number_xineramas + 1 of these lists in the workspace.  These lists
+     then only need to be updated whenever the workarea is (e.g. when strut
+     list change or screen or xinerama size changes).
+
+  4) Constraints can be user-action vs app-action oriented
+
+     Such differentiation requires special care for the constraints to be
+     consistent; e.g. if the user does something and one constraint
+     applies, then the app does something you have to be careful that the
+     constraint on the app action doesn't result in some jarring motion.
+
+     In particular, the constraints currently allow offscreen movement or
+     resizing for user actions only.  The way consistency is handled is
+     that at the end of the constraints, update_onscreen_requirements()
+     checks to see if the window is offscreen or split across xineramas and
+     updates window->require_fully_onscreen and
+     window->require_on_single_xinerama appropriately.
+
+  5) Avoid over-complification
+
+     The previous code tried to reform the constraints into terms of a
+     single variable.  This made the code rather difficult to
+     understand. ("This is a rather complicated fix for an obscure bug
+     that happened when resizing a window and encountering a constraint
+     such as the top edge of the screen.")  It also failed, even on the
+     very example for which it used as justification for the complexity
+     (bug 312104 -- when keyboard resizing the top of the window,
+     Metacity extends the bottom once the titlebar hits the top panel),
+     though the reason why it failed is somewhat mysterious as it should
+     have worked.  Further, it didn't really reform the constraints in
+     terms of a single variable -- there was both an x_move_delta and an
+     x_resize_delta, and the existence of both caused bug 109553
+     (gravity with simultaneous move and resize doesn't work)
+
+
+---------------------------------------------------------------------------
+Important points to remember
+---------------------------------------------------------------------------
+
+  - Inner vs Outer window
+
+    Note that because of how configure requests work and
+    meta_window_move_resize_internal() and friends are set up, that the
+    rectangles passed to meta_window_constrain() are with respect to inner
+    window positions instead of outer window positions (meaning that window
+    manager decorations are not included in the position/size).  For the
+    constraints that need to be enforced with respect to outer window
+    positions, you'll need to make use of the extend_by_frame() and
+    unextend_by_frame() functions.
+
+  - meta_window_move_resize_internal() accepts a really hairy set of
+    inputs.  See the huge comment at the beginning of that function.
+    constraints gets screwed up if that function can't sanitize the input,
+    so be very careful about that.  It used to be pretty busted.
+
+
+---------------------------------------------------------------------------
+Explanation of fields in the ConstraintInfo strut
+---------------------------------------------------------------------------
+
+As of the time of this writing, ConstraintInfo had the following fields:
+  orig
+  current
+  fgeom
+  action_type
+  is_user_action
+  resize_gravity
+  fixed_directions
+  work_area_xinerama
+  entire_xinerama
+  usable_screen_region
+  usable_xinerama_region
+
+A brief description of each and/or pointers to more information are found
+below:
+  orig
+    The previous position and size of the window, ignoring any window
+    decorations
+  current
+    The requested position and size of the window, ignoring any window
+    decorations.  This rectangle gets modified by the various constraints
+    to specify the allowed position closest to the requested position.
+  fgeom
+    The geometry of the window frame (i.e. "decorations"), if it exists.
+    Otherwise, it's a dummy 0-size frame for convenience (i.e. this pointer
+    is guaranteed to be non-NULL so you don't have to do the stupid check).
+  action_type
+    Whether the action being constrained is a move, resize, or a combined
+    move and resize.  Some constraints can run faster with this information
+    (e.g. constraining size increment hints or min size hints don't need to
+    do anything for pure move operations).  This may also be used for
+    providing slightly different behavior (e.g. clip-to-region instead of
+    shove-into-region for resize vs. moving operations), but doesn't
+    currently have a lot of use for this.
+  is_user_action
+    Used to determine whether the action being constrained is a user
+    action.  If so, certain parts of the constraint may be relaxed.  Note
+    that this requires care to get right; see item 4 of the basic ideas
+    section for more details.
+  resize_gravity
+    The gravity used in the resize operation, used in order to make sure
+    windows are resized correctly if constraints specify that their size
+    must be modified.  Explained further in the resize_gravity
+    vs. fixed_directions section.
+  fixed_directions
+    There may be multiple solutions to shoving a window back onscreen.
+    Typically, the shortest distance used is the solution picked, but if
+    e.g. an application only moved its window in a single direction, it's
+    more desirable that the window is shoved back in that direction than in
+    a different one.  fixed_directions facilitates that.  Explained further
+    in the resize_gravity vs. fixed_directions section.
+  work_area_xinerama
+    This region is defined in the workspace and just cached here for
+    convenience.  It is basically the area obtained by taking the current
+    xinerama, treating all partial struts as full struts, and then
+    subtracting all struts from the current xinerama region.  Useful
+    e.g. for enforcing maximization constraints.
+  entire_xinerama
+    Just a cache of the rectangle corresponding to the entire current
+    xinerama, including struts.  Useful e.g. for enforcing fullscreen
+    constraints.
+  usable_screen_region
+    The set of maximal/spanning rectangles for the entire screen; this
+    region doesn't overlap with any struts and helps to enforce
+    e.g. onscreen constraints.
+  usable_xinerama_region
+    The set of maximal/spanning rectangles for the current xinerama; this
+    region doesn't overlap with any struts on the xinerama and helps to
+    enforce e.g. the on-single-xinerama constraint.
+
+
+---------------------------------------------------------------------------
+Gory details of resize_gravity vs. fixed_directions
+---------------------------------------------------------------------------
+
+Note that although resize_gravity and fixed_directions look similar, they
+are used for different purposes:
+
+  - resize_gravity is only for resize operations and is used for
+    constraints unrelated to keeping a window within a certain region
+  - fixed_directions is for both move and resize operations and is
+    specifically for keeping a window within a specified region.
+
+Examples of where each are used:
+
+  - If a window is simultaneously moved and resized to the southeast corner
+    with SouthEastGravity, but it turns out that the window was sized to
+    something smaller than the minimum size hint, then the size_hints
+    constraint should resize the window using the resize_gravity to ensure
+    that the southeast corner doesn't move.
+  - If an application resizes itself so that it grows downward only (which
+    I note could be using any of three different gravities, most likely
+    NorthWest), and happens to put the southeast part of the window under a
+    partial strut, then the window needs to be forced back on screen.
+    (Yes, shoved onscreen and not clipped; see bug 136307).  It may be the
+    case that moving the window to the left results in less movement of the
+    window than moving the window up, which, in the absence of fixed
+    directions would cause us to chose moving to the left.  But since the
+    user knows that only the height of the window is changing, they would
+    find moving to the left weird (especially if this were a dialog that
+    had been centered on its parent).  It'd be better to shove the window
+    upwards so we make sure to keep the left and right sides fixed in this
+    case.  Note that moving the window upwards (or leftwards) is probably
+    totally against the gravity in this case; but that's okay because
+    gravity typically assumes there's more than enough onscreen space for
+    the resize and we only override the gravity when that assumption is
+    wrong.
+
+For the paranoid, a fixed directions might give an impossible to fulfill
+constraint (I don't think that's true currently in the code, but I haven't
+thought it through in a while).  If this ever becomes a problem, it should
+be relatively simple to throw out the fixed directions when this happens
+and rerun the constraint.  Of course, it might be better to rethink things
+to just avoid such a problem.
+
+The nitty gritty of what gets fixed:
+  User move:
+    in x direction - y direction fixed
+    in y direction - x direction fixed
+    in both dirs.  - neither direction fixed
+  User resize: (note that for clipping, only 1 side ever changed)
+    in x direction - y direction fixed (technically opposite x side fixed too)
+    in y direction - x direction fixed (technically opposite y side fixed too)
+    in both dirs.  - neither direction fixed
+  App move:
+    in x direction - y direction fixed
+    in y direction - x direction fixed
+    in both dirs.  - neither direction fixed
+  App resize
+    in x direction - y direction fixed
+    in y direction - x direction fixed
+    in 2 parallel directions (center side gravity) - other dir. fixed
+    in 2 orthogonal directions (corner gravity) - neither dir. fixed
+    in 3 or 4 directions (a center-like gravity) - neither dir. fixed
+  Move & resize
+    Treat like resize case though this will usually mean all four sides
+    change and result in neither direction being fixed
+  Note that in all cases, if neither direction moves it is likely do to a
+  change in struts and thus neither direction should be fixed despite the
+  lack of movement.

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

@@ -0,0 +1,250 @@
+To make choice of focus window consistent for each focus method, a
+number of guidelines should be followed.  (For purposes of discussion
+here, I'm excluding things like the panel and the desktop from
+"windows".  It is technically incorrect to do this, but I'm lazy and
+"windows" is shorter than something like "normal windows".  See the
+end of the discussion for how these special cases are handled.)  The
+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
+
+Note that these choices (along with the choice that clicking on a
+window raises it for the click focus method) introduces the following
+invariants for focus from mouse activity:
+
+Focus method  Invariant
+    click     The window on top is focused
+   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
+
+However, there are a number of cases where the current focus window
+becomes invalid and another should be chosen.  Some examples are when
+a focused window is closed or minimized, or when the user changes
+workspaces.  In these cases, there needs to be a rule consistent with
+the above about the new window to choose.
+
+Focus method  Behavior
+    click     Focus the most recently used window (same as the window
+              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".
+
+Note that "most recently used window", as used here, has a slightly
+different connotation than "most recent to have keyboard focus".  This
+is because when a user activates a window that is a transient, its
+ancestor(s) should be considered to be more recently used than other
+windows that have had the keyboard focus more recently.  (See bug
+157360; this may mean that the alt-tab order should also change
+simultaneously, although the current implementation does not do that.)
+
+Also, sometimes a new window will be mapped (e.g. unminimizing a
+window or launching a new application).  Most users want to interact
+with new windows right away, so these should typically be focused.
+This does conflict with the invariants for sloppy and mouse focus
+modes, so this wouldn't be true for a strict-pointer-focus mode.  For
+all other modes (non-strict-pointer-focus modes), there are only two
+cases in which a new window shouldn't be focused:
+
+  1) If the window takes a while to launch and the user starts
+     interacting with a different application, the new window should
+     not take focus.
+  2) If the window that will appear was not launched by the user
+     (error dialogs, instant messaging windows, etc.), then the window
+     should not take focus when it appears.
+
+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)
+
+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:
+  1) The _NET_WM_DEMANDS_ATTENTION hint should be set
+  2) If the new window isn't modal for the focused window, it should
+     appear below the focused window so that it doesn't obscure the
+     focused window that the user is interacting with.
+  3) If the new window is modal to the focused window, the currently
+     focused window should lose focus but the modal window should
+     appear on top.
+
+Additionally, the user may decide to use the keyboard instead of the mouse
+to navigate between windows (referred to as "keynav").  This poses no
+problems for click-to-focus (because the same invariant can be
+maintained), but for sloppy and mouse focus it requires extra work to
+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
+     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.
+  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.
+Note that grabs present a special case since they can generate EnterNotify
+and LeaveNotify events without using the mouse, thus these events should be
+ignored when the crossing mode is NotifyGrab or NotifyUngrab.  THIS
+MOUSENAV/KEYNAV MODERATION METHOD IS NOT PERFECT--there are corner cases
+when trying to mix-and-match between mousenav and keynav simultaneously
+that cause problems; but it appears to be the most reasonable tradeoff and
+works well in most cases, especially if the user sticks to just mousenav
+for a long time or just keynav for a long time.
+
+Finally, windows of type WM_DOCK or WM_DESKTOP (e.g. the desktop and
+the panel) present a special case, at least partially due to the lack
+of decorations.  For WM_DESKTOP windows, we only focus them if the
+user explicitly requests it (e.g. clicks on the window, uses
+Ctrl-Alt-Tab to navigate to it, uses a keybinding to show the desktop,
+etc.).  For WM_DOCK windows, we do not focus unless we receive a very
+explicit request (e.g. Ctrl-Alt-Tab or a _NET_ACTIVE_WINDOW message;
+not normal clicks).
+
+
+
+
+To read more about the bugs that inspired these choices:
+  - When a focused window becomes invalid and another should be chosen
+    http://bugzilla.gnome.org/show_bug.cgi?id=135810
+  - When a new window is mapped
+    http://bugzilla.gnome.org/show_bug.cgi?id=118372
+    Also, the EWMH spec, especially the parts relating to _NET_WM_USER_TIME
+  - Modal vs. non-modal dialogs that get denied focus when mapped
+    http://bugzilla.gnome.org/show_bug.cgi?id=151996
+  - 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
+  - Not focusing panels
+    http://bugzilla.gnome.org/show_bug.cgi?id=160470
+    http://bugzilla.gnome.org/show_bug.cgi?id=120100
+
+There were many bugs which had to be fixed to get all the above
+working; they helped form these policies and/or show the difficulties
+in implementing this policy (my apologies in advance for producing a
+list heavily lopsided to what I've done; it's just that these bugs are
+the ones I'm the most familiar with):
+  bug  72314  ignore LeaveNotify events from grabs
+  bug  82921  focus windows on map
+  bug  87531  only show focus for sticky windows on active workspace (pager)
+  bug  94545  focus window on workspace switch is non-deterministic
+  bug  95747  should ignore EnterNotify events with NotifyInferior detail set
+  bug  97635  sticky windows always keep focus when switching workspaces
+  bug 102665  a window unminimized from the tasklist should be focused
+  bug 107347  focus windows that manually position themselves too
+  bug 108643  focus in MRU order instead of stack order
+  bug 110970  moving a window to another workspace loses focus
+  bug 112031  closing a dialog can result in a strange focus window
+  bug 115650  add _NET_WM_USER_TIME support to gtk+ (see also 150502)
+  bug 120100  panel shouldn't be focused after workspace applet usage
+  bug 123803  need final EnterNotify after workspace switch (see also 124798)
+  bug 124981  focus clicked window in pager only if on current workspace
+  bug 125492  catch the xserver unfocusing everything and fix its braindeadedness
+  bug 128200  focus correct window on libwnck window minimize (see 107681 too)
+  bug 131582  fix race condition on window minimize/close
+  bug 133120  wrong window focused when changing workspaces
+  bug 135024  _NET_ACTIVE_WINDOW messages need timestamps
+  bug 135786  middle-clicking on focused window to lower it should defocus too
+  bug 136581  window minimization vs. activation for mouse focus
+  bug 144900  fix focus choice on "un-showing" the desktop
+  bug 147475  don't lock keyboard on workspace change
+  bug 148364  DEMANDS_ATTENTION support for metacity & libwnck (and other stuff)
+  bug 149028  focus-stealing-prevention for metacity-dialog (and other stuff)
+  bug 149366  windows denied focus on map occur in wrong order in alt-tab list
+  bug 149543  consistent focus window when unshowing desktop
+  bug 149589  race in focus choice from libwnck messages
+  bug 150271  make sure "run application" dialog gets focused
+  bug 150668  update gtk+ _NET_ACTIVE_WINDOW support
+  bug 151245  application startup notification forwarding (partially rejected)
+  bug 151984  Soeren's idea--backup timestamp when startup notification not used
+  bug 151990  prevent focus inconsistencies by only providing one focus method
+  bug 151996  modal dialogs denied focus should not be lowered
+  bug 152000  fix race on window close followed by rapid mouse movement
+  bug 152004  ways to handle new window versus mouse invariants
+  bug 153220  catch the root window getting focus and reset to default window
+  bug 157360  focus parents of dismissed transient windows in preference to
+              the window that most recently had focus
+  bug 159257  focus the desktop when showing it
+  bug 160470  don't focus panels on click
+  bug 163450  correct highlighting in workspace switcher popup
+  bug 164716  refuse to focus a window with a modal transient, and focus
+              the transient instead
+  bug 166524  avoid new windows being obscured by the focus window
+  bug 167545  mousenav vs. keynav in mouse and sloppy focus modes
+  <a massive heap of bugs relating to focus stealing prevention...>
+
+
+Addendum on sloppy and mouse focus
+  You may occasionally hear people refer to sloppy or mouse focus
+  modes as inherently buggy.  This is what they mean by that:
+
+  1) Keynav doesn't maintain the same invariants as mouse navigation
+     for these focus modes; switching back and forth between
+     navigation methods, therefore, may have or appear to have
+     inconsistencies.  Examples:
+     a) If the user uses Alt-Tab to change the window with focus, then
+        starts to move the mouse, at that moment the window where the
+        mouse is does not have focus.
+     b) Users expect that a workspace they previously used will not
+        change when the return to it.  This means things like window
+        position and stacking order, but also the focus window.
+        Unfortunately, using the original focus window (which would be
+        the most recently used window on that workspace) will
+        sometimes conflict with the invariants for mouse and sloppy
+        focus modes.  Users are much more surprised by the invariant
+        being broken than by having the focus window changed (see bug
+        94545 and probably others), so we maintain the invariant.
+        This only matters when using Ctrl-Alt-Arrow to switch
+        workspaces instead of clicking in the workspace switcher, so
+        this really is a keynav vs mouse issue.  Either that, or a
+        windows-are-being-mapped exception.  ;-)
+     c) Opening a menu, then moving the mouse to a different window,
+        and then pressing escape to dismiss the menu will result in
+        the window containing the mouse not being focused.  This is
+        actually correct behavior (because pressing escape shows that
+        the user is using key navigation to interact with the window
+        containing the menu) but is one of those hard-to-get-right
+        keynav and mouse focus mixture cases.  (See bug 101190 for
+        more details)
+     d) Similar to (c), moving the mouse off the menu doesn't immediately
+        focus the window that the mouse goes over, due to an application
+        grab (we couldn't change this and wouldn't want to, but
+        technically it does break the invariant).
+     e) If mouse_mode is off and the user does something to cause focus to
+        change (e.g. switch workspaces, close or minimize a window, etc.)
+        and simultaneously tries to move the mouse, the choice of which
+        window to focus is inherently race-y.  (You probably can't satisfy
+        both keynav and mousenav invariants simultaneously...)
+  2) The sloppy/mouse invariants are often not strictly maintained;
+     for example, we provide an exception to the invariant for newly
+     mapped windows.  (Most find that not allowing this exception is
+     confusing)
+  3) There are an awful lot of little cases to handle to get any focus
+     mode right, even for click-to-focus.  Since mouse and sloppy
+     focus have sometimes been hard to even determine what correct
+     behavior is, it is much harder to get them completely right.
+     Plus mouse and sloppy focus users are a minority, decreasing the
+     motivation of window manager implementors to get those focus
+     modes right.
+  4) Because of -1-, -2-, and -3-, implementations are often buggy or
+     inconsistent and people form their opinions from usage of these
+     implementations.
+  5) Sloppy focus suffers from a bit of a discoverability problem (for
+     example, I have seen a scientist sit down to a computer for which
+     sloppy focus was in use and take a few minutes before figuring
+     out how window activation worked; granted the layout of the
+     windows in that situation was a bit unusual but it still
+     illustrates that sloppy focus is harder than it should be to
+     figure out).  Mouse focus solves this problem; however, people
+     that have experience with other computing environments are
+     accustomed to being able to move their mouse outside the window
+     they are working with and still continue interacting with that
+     window, which conflicts with mouse focus.

doc/man/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

doc/man/Makefile.am

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

doc/man/metacity-theme-viewer.1

@@ -0,0 +1,43 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-THEME-VIEWER 1 "1 June 2004" 
+.SH NAME
+metacity-theme-viewer \- view metacity themes
+.SH SYNOPSIS
+.B metacity-theme-viewer
+[
+.I THEMENAME
+]
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+.B metacity-theme-viewer
+allows you to preview any installed Metacity theme.
+.PP
+When designing a new Metacity theme, you can use
+.B metacity-theme-viewer
+to measure the performance of a window frame option, and to preview
+the option.
+.SH OPTIONS
+.TP
+.I THEMENAME
+Name of the theme to be shown (\fIAtlanta\fR by default).
+It is case-sensitive.
+.SH FILES
+.br
+.nf
+.TP
+.I /usr/share/themes
+system themes directory
+.TP
+.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+theme specification file
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR metacity (1),
+.BR metacity-window-demo (1).

doc/man/metacity-window-demo.1

@@ -0,0 +1,25 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-WINDOW-DEMO 1 "1 June 2004" 
+.SH NAME
+metacity-window-demo \- demo of window features
+.SH SYNOPSIS
+.B metacity-window-demo
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+This program demonstrates various kinds of windows that window
+managers and window manager themes should handle.
+.PP
+Be sure to tear off the menu and toolbar, those are also a special
+kind of window.
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR x-window-manager (1),
+.BR metacity (1),
+.BR metacity-theme-viewer (1).

doc/metacity-theme.dtd

@@ -0,0 +1,273 @@
+<!--
+ DTD for Metacity themes, as of Metacity 2.4.1
+ Author: Ross Burton <ross@burtonini.com>
+ Copyright (C) 2002 Ross Burton
+ Licensed under the GPL, version 2
+-->
+
+<!-- Top-level element -->
+<!ELEMENT metacity_theme (info,(window|frame_style_set|frame_style|frame_geometry|constant|draw_ops|menu_icon)+)>
+
+<!-- Theme metadata -->
+<!ELEMENT info (name?|author?|copyright?|date?|description?)*>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT author (#PCDATA)>
+<!ELEMENT copyright (#PCDATA)>
+<!ELEMENT date (#PCDATA)>
+<!ELEMENT description (#PCDATA)>
+
+<!ENTITY % xyrequired "
+	x			CDATA #REQUIRED
+	y			CDATA #REQUIRED
+">
+
+<!ENTITY % xyimplied "
+	x			CDATA #IMPLIED
+	y			CDATA #IMPLIED
+">
+
+<!ENTITY % widthheightrequired "
+	width		CDATA #REQUIRED
+	height		CDATA #REQUIRED
+">
+
+<!ENTITY % widthheightimplied "
+	width		CDATA #IMPLIED
+	height		CDATA #IMPLIED
+">
+
+<!ENTITY % boolean "(true|false)">
+
+<!ENTITY % piece_positions "
+(entire_background|titlebar|titlebar_middle|left_titlebar_edge|right_titlebar_edge|top_titlebar_edge|bottom_titlebar_edge|title|left_edge|right_edge|bottom_edge|overlay)
+">
+
+<!ENTITY % gtk-state "
+	state (normal|prelight|active|selected|insensitive) #REQUIRED
+">
+
+<!ENTITY % gtk-shadow "
+	shadow (none|in|out|etched_in|etched_out) #REQUIRED
+">
+
+
+<!-- The actual theme -->
+
+<!ELEMENT window EMPTY>
+<!ATTLIST window
+	type		(normal|dialog|modal_dialog|menu|utility|border) #REQUIRED
+	style_set		CDATA #REQUIRED
+>
+
+
+<!ELEMENT frame_style_set (frame+)>
+<!ATTLIST frame_style_set
+	name		CDATA #REQUIRED
+	parent		CDATA #IMPLIED
+>
+
+<!ELEMENT frame EMPTY>
+<!ATTLIST frame
+	focus		(yes|no) #REQUIRED
+	state		(normal|maximized|shaded|maximized_and_shaded) #REQUIRED
+	resize		(both|horizontal|vertical|none) #IMPLIED
+	style		CDATA #REQUIRED
+>
+
+<!ELEMENT frame_style (piece|button)*>
+<!ATTLIST frame_style
+	name		CDATA #REQUIRED
+	geometry		CDATA #REQUIRED
+	parent		CDATA #IMPLIED
+>
+
+<!ELEMENT piece (draw_ops?)>
+<!ATTLIST piece
+	position		%piece_positions; #REQUIRED
+	draw_ops		CDATA #IMPLIED
+>
+
+<!ELEMENT button (draw_ops?)>
+<!ATTLIST button
+	function		(menu|minimize|maximize|close|left_left_background|left_middle_background|left_right_background|right_left_background|right_middle_background|right_right_background) #REQUIRED
+	state		(normal|prelight|pressed) #REQUIRED
+	draw_ops		CDATA #IMPLIED
+>
+
+<!ELEMENT frame_geometry (border|(aspect_ratio|distance))+>
+<!ATTLIST frame_geometry
+	name		CDATA #REQUIRED
+	parent		CDATA #IMPLIED
+	title_scale		(xx-small|x-small|small|medium|large|x-large|xx-large) #IMPLIED
+	has_title		(true|false) 'true'
+	rounded_top_left		%boolean; #IMPLIED
+	rounded_top_right		%boolean; #IMPLIED
+	rounded_bottom_left	%boolean; #IMPLIED
+	rounded_bottom_right	%boolean; #IMPLIED
+>
+
+<!ELEMENT distance EMPTY>
+<!ATTLIST distance
+	name		(left_width|right_width|bottom_height|title_vertical_pad|right_titlebar_edge|left_titlebar_edge|button_width|button_height) #REQUIRED
+	value		CDATA #REQUIRED
+>
+
+<!ELEMENT border EMPTY>
+<!ATTLIST border
+	name		CDATA #REQUIRED
+	top		CDATA #REQUIRED
+	bottom		CDATA #REQUIRED
+	left		CDATA #REQUIRED
+	right		CDATA #REQUIRED
+>
+
+<!ELEMENT aspect_ratio EMPTY>
+<!ATTLIST aspect_ratio
+	name		CDATA #REQUIRED
+	value		CDATA #REQUIRED
+>
+
+<!ELEMENT draw_ops (line|rectangle|arc|tint|gradient|image|gtk_arrow|gtk_box|gtk_vline|icon|title|clip|include|tile)*>
+<!-- not sure about this.. maybe it should be removed. see #3478 in theme-parser.c -->
+<!ATTLIST draw_ops
+	name		CDATA #IMPLIED
+>
+
+<!ELEMENT line EMPTY>
+<!ATTLIST line
+	color			CDATA #REQUIRED
+	x1			CDATA #REQUIRED
+	y1			CDATA #REQUIRED
+	x2			CDATA #REQUIRED
+	y2			CDATA #REQUIRED
+	width		CDATA #IMPLIED
+	dash_on_length CDATA #IMPLIED
+	dash_off_length CDATA #IMPLIED
+>
+
+<!ELEMENT rectangle EMPTY>
+<!ATTLIST rectangle
+	color			CDATA #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	filled			%boolean; 'false'
+>
+
+<!ELEMENT arc EMPTY>
+<!ATTLIST arc
+	color			CDATA #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	start_angle	CDATA	#REQUIRED
+	extent_angle	CDATA	#REQUIRED
+	filled			%boolean; 'false'
+>
+
+<!ELEMENT icon EMPTY>
+<!ATTLIST icon
+	%xyrequired;
+	width		CDATA #REQUIRED
+	height		CDATA #REQUIRED
+	alpha		CDATA #IMPLIED
+	fill_type		(tile|scale) 'scale'
+>
+
+<!ELEMENT image EMPTY>
+<!ATTLIST image
+	filename		CDATA #REQUIRED
+	colorize		CDATA #IMPLIED
+	%xyrequired;
+	%widthheightrequired;
+	alpha		CDATA #IMPLIED
+	fill_type		(tile|scale) 'scale'
+>
+
+<!ELEMENT tile EMPTY>
+<!ATTLIST tile
+	name		CDATA #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	tile_xoffset	CDATA #IMPLIED
+	tile_yoffset	CDATA #IMPLIED
+	tile_width		CDATA #REQUIRED
+	tile_height	CDATA #REQUIRED
+>
+
+<!ELEMENT clip EMPTY>
+<!ATTLIST clip
+	%xyrequired;
+	%widthheightrequired;
+>
+
+<!ELEMENT title EMPTY>
+<!ATTLIST title
+	color			CDATA #REQUIRED
+	%xyrequired;
+>
+
+<!ELEMENT tint EMPTY>
+<!ATTLIST tint
+	color			CDATA #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	alpha		CDATA #REQUIRED
+>
+
+<!ELEMENT gtk_box EMPTY>
+<!ATTLIST gtk_box
+	%gtk-state;
+	%gtk-shadow;
+	%xyrequired;
+	%widthheightrequired;
+>
+
+<!ELEMENT gtk_arrow EMPTY>
+<!ATTLIST gtk_arrow
+	%gtk-state;
+	%gtk-shadow;
+	arrow		(up|down|left|right) #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	filed			CDATA #IMPLIED
+>
+
+<!ELEMENT gtk_vline EMPTY>
+<!ATTLIST gtk_vline
+	%gtk-state;
+	x			CDATA #REQUIRED
+	y1			CDATA #REQUIRED
+	y2			CDATA #REQUIRED
+>
+
+<!ELEMENT gradient (color)+>
+<!ATTLIST gradient
+	type		(vertical|horizontal|diagonal) #REQUIRED
+	%xyrequired;
+	%widthheightrequired;
+	alpha		CDATA #IMPLIED
+>
+
+<!ELEMENT color EMPTY>
+<!ATTLIST color
+	value		CDATA #REQUIRED
+>
+
+<!ELEMENT include EMPTY>
+<!ATTLIST include
+	name		CDATA #REQUIRED
+	%xyimplied;
+	%widthheightimplied;
+>
+
+<!ELEMENT constant EMPTY>
+<!ATTLIST constant
+	name		CDATA #REQUIRED
+	value		CDATA #REQUIRED
+>
+
+<!ELEMENT menu_icon (draw_ops?)>
+<!ATTLIST menu_icon
+	function		(close|maximize|minimize|unmaximize) #REQUIRED
+	%gtk-state;
+	draw_ops		CDATA #IMPLIED
+>

doc/strut-and-related-updating.txt

@@ -0,0 +1,54 @@
+How updates happen for struts, workareas, and screen/xinerama regions/edges:
+  One of three things causes meta_window_update_struts to be called
+    (a) initial window map (window.c:meta_window_new_with_attrs())
+    (b) update of _net_wm_strut* properties (window.c:process_property_notify())
+    (c) screen resizes (e.g. via xrandr; from screen.c:meta_screen_resize_func())
+  meta_window_update_struts (MetaWindow *window)
+    - Gets new list of struts from window properties
+    - Makes sure window doesn't single-handedly fill the screen
+    - records new struts if different and calls invalidate_work_areas()
+  invalidate_work_areas ()
+    - Calls meta_workspace_invalidate_work_area() for each workspace it's on
+  meta_workspace_invalidate_work_area()
+    - Cleans out all strut lists
+    - queues all windows for resizing
+    - Calls meta_screen_queue_workarea_recalc (workspace->screen);
+  meta_screen_queue_workarea_recalc()
+    - Adds set_work_area_idle_func() as an idle handler
+
+  set_work_area_idle_func()
+    - Calls set_work_area_hint()
+  set_work_area_hint()
+    - Calls meta_workspace_get_work_area_all_xineramas()
+    - Sets _NET_WORKAREA property
+  meta_workspace_get_work_area_all_xineramas()
+    - Calls ensure_work_areas_validated()
+  ensure_work_areas_validated()
+    - Loops over xineramas
+      - Loops over windows, then struts:
+        - Adds struts to list first time through xinerama loop
+        - Find the amount of the strut on the given xinerama for <dir>_strut
+        - Just max the amount of the strut with the all_<dir>_strut
+      - Makes sure there's a non-empty xinerama workarea
+      - Record the xinerama workarea
+    - Make sure there's a non-empty screen workarea
+    - Record the screen workarea
+    - Cache the spanning rects for the screen and xinerama regions
+    - Cache the screen and xinerama edges
+
+  Alternatively to all the above, if the idle function for the screen
+  has not yet fired, constraints.c:setup_constraint_info() can call
+  either workspace.c:meta_workspace_get_onscreen_region() or
+  workspace.c:meta_workspace_get_onxinerama_region() which in turn
+  call workspace.c:ensure_work_areas_validated().
+
+Meaning of related functions that might be difficult to tell apart:
+  screen.c:meta_screen_get_current_xinerama ()
+    - Finds out which xinerama the mouse is on with an XQueryPointer
+  window.c:meta_window_get_work_area_current_xinerama()
+  window.c:meta_window_get_work_area_for_xinerama()
+  window.c:meta_window_get_work_area_all_xineramas ()
+    - All three are for finding the intersection of workareas across
+      multiple workspaces so that placement of windows can be
+      determined in such a way that they remain in the workarea for
+      all workspaces that they are on.

metacity.spec.in

@@ -1,87 +0,0 @@
-%define ver @VERSION@
-%define RELEASE 1
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-
-Summary: Metacity window manager
-Name: metacity
-Version: %ver
-Release: %rel
-URL: http://people.redhat.com/~hp/metacity/
-Source0: %{name}-%{version}.tar.gz
-License: GPL
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: GConf2-devel >= 1.1.9
-
-%description
-
-Metacity is a simple window manager that integrates nicely with 
-GNOME 2.
-
-%prep
-%setup -q
-
-%build
-%configure
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="metacity.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS COPYING NEWS HACKING theme-format.txt
-%{_bindir}/*
-%{_libexecdir}/*
-%{_datadir}/gnome/wm-properties/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/metacity
-%{_datadir}/pixmaps/*
-%{_datadir}/themes/*
-
-%changelog
-* Tue Aug 20 2002 Steve Fox <drfickle@k-lug.org>
-- Autoconf-ize the spec file to magic updates
-- Include missing dirs
-
-* Thu May  2 2002 Havoc Pennington <hp@redhat.com>
-- 2.3.233
-
-* Thu Apr 25 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-- add gconf schemas boilerplate
-
-* Mon Apr 15 2002 Havoc Pennington <hp@pobox.com>
-- 2.3.89
-
-* Tue Oct 30 2001 Havoc Pennington <hp@redhat.com>
-- 2.3.34
-
-* Fri Oct 13 2001 Havoc Pennington <hp@redhat.com>
-- 2.3.21 
-
-* Mon Sep 17 2001 Havoc Pennington <hp@redhat.com>
-- 2.3.8
-- 2.3.13
-
-* Wed Sep  5 2001 Havoc Pennington <hp@redhat.com>
-- Initial build.
-
-

po/POTFILES.in

@@ -1,5 +1,6 @@
 # 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
@@ -16,10 +17,10 @@ src/resizepopup.c
 src/screen.c
 src/session.c
 src/theme-parser.c
+src/theme-viewer.c
 src/theme.c
-src/tools/metacity-properties.desktop.in
-src/tools/metacity-properties.glade
 src/util.c
+src/window-props.c
 src/window.c
 src/workspace.c
 src/xprops.c

rationales.txt

@@ -1,8 +1,64 @@
 
-Focus windows on map: see http://bugzilla.gnome.org/show_bug.cgi?id=82921
-Keep panel always on top: http://bugzilla.gnome.org/show_bug.cgi?id=81551
-Edge flipping: http://bugzilla.gnome.org/show_bug.cgi?id=82917
-Opaque resize: http://bugzilla.gnome.org/show_bug.cgi?id=92618
-Super+click to resize: http://bugzilla.gnome.org/show_bug.cgi?id=79315
-minimized windows in Alt+tab: http://bugzilla.gnome.org/show_bug.cgi?id=89416
+History
+====
 
+Focus issues:
+  see doc/how-to-get-focus-right.txt
+
+Keep panel always on top:
+  http://bugzilla.gnome.org/show_bug.cgi?id=81551
+
+Edge flipping:
+  http://bugzilla.gnome.org/show_bug.cgi?id=82917
+
+Opaque resize:
+  http://bugzilla.gnome.org/show_bug.cgi?id=92618
+
+Alt+click to move/resize:
+  http://bugzilla.gnome.org/show_bug.cgi?id=101151
+  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=80918
+
+minimized windows in Alt+tab:
+  http://bugzilla.gnome.org/show_bug.cgi?id=89416
+
+dialogs above entire app group:
+  http://bugzilla.gnome.org/show_bug.cgi?id=88926
+
+display window size/position: 
+  http://bugzilla.gnome.org/show_bug.cgi?id=85213
+  http://bugzilla.gnome.org/show_bug.cgi?id=106645
+  http://bugzilla.gnome.org/show_bug.cgi?id=130821
+
+configure click actions, alt+click:
+  http://bugzilla.gnome.org/show_bug.cgi?id=83210
+
+system modal dialogs:
+  http://bugzilla.gnome.org/show_bug.cgi?id=83357
+
+workspace wrapping:
+  http://bugzilla.gnome.org/show_bug.cgi?id=89315
+
+raise windows on click:
+  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
+
+
+Tracking bugs
+====
+
+          revise theme format: http://bugzilla.gnome.org/show_bug.cgi?id=102547
+           session management: http://bugzilla.gnome.org/show_bug.cgi?id=107063
+    focus-stealing-prevention: http://bugzilla.gnome.org/show_bug.cgi?id=149028
+             other focus bugs: http://bugzilla.gnome.org/show_bug.cgi?id=155450
+                drag-and-drop: http://bugzilla.gnome.org/show_bug.cgi?id=155451
+             raising/stacking: http://bugzilla.gnome.org/show_bug.cgi?id=155452
+  tasklist/workspace switcher: http://bugzilla.gnome.org/show_bug.cgi?id=155453
+   window/workspace selection: http://bugzilla.gnome.org/show_bug.cgi?id=155456
+    key/mouse-binding actions: http://bugzilla.gnome.org/show_bug.cgi?id=155457
+moving/resizing (constraints): http://bugzilla.gnome.org/show_bug.cgi?id=155458
+             window placement: http://bugzilla.gnome.org/show_bug.cgi?id=155460
+   logout/system-monitor keys: http://bugzilla.gnome.org/show_bug.cgi?id=155462
+                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

src/.cvsignore

@@ -5,7 +5,10 @@ Makefile
 metacity
 metacity-theme-viewer
 metacity-dialog
+testboxes
 testgradient
 inlinepixbufs.h
 metacity.desktop
 metacity.schemas
+libmetacity-private.pc
+testasyncgetprop

src/Makefile.am

@@ -1,7 +1,8 @@
+lib_LTLIBRARIES = libmetacity-private.la
 
 SUBDIRS=wm-tester tools themes
 
-INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
+INCLUDES=@METACITY_CFLAGS@ -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	\
@@ -10,7 +11,15 @@ EGGFILES=			\
 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				\
@@ -18,6 +27,8 @@ metacity_SOURCES= 				\
 	display.h				\
 	draw-workspace.c			\
 	draw-workspace.h			\
+	edge-resistance.c			\
+	edge-resistance.h			\
 	effects.c				\
 	effects.h				\
 	errors.c				\
@@ -34,6 +45,9 @@ metacity_SOURCES= 				\
 	gradient.h				\
 	group.c					\
 	group.h					\
+	group-private.h				\
+	group-props.c				\
+	group-props.h				\
 	iconcache.c				\
 	iconcache.h				\
 	inlinepixbufs.h				\
@@ -72,13 +86,18 @@ metacity_SOURCES= 				\
 	util.h					\
 	window.c				\
 	window.h				\
+	window-props.c				\
+	window-props.h				\
 	workspace.c				\
 	workspace.h				\
 	xprops.c				\
 	xprops.h				\
 	$(EGGFILES)
 
-metacity_theme_viewer_SOURCES=  \
+# 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	\
@@ -87,9 +106,25 @@ metacity_theme_viewer_SOURCES=  \
 	theme.h			\
 	theme-parser.c		\
 	theme-parser.h		\
-	theme-viewer.c		\
 	util.c			\
-	util.h	
+	util.h			\
+	common.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
+
+metacity_theme_viewer_SOURCES=  \
+	theme-viewer.c
 
 metacity_dialog_SOURCES= 	\
 	metacity-dialog.c
@@ -97,21 +132,25 @@ metacity_dialog_SOURCES= 	\
 bin_PROGRAMS=metacity metacity-theme-viewer
 libexec_PROGRAMS=metacity-dialog
 
-metacity_LDADD= @METACITY_LIBS@
-metacity_theme_viewer_LDADD= @METACITY_LIBS@
+EFENCE=
+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
 
-noinst_PROGRAMS=testgradient testasyncgetprop
+noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
+testboxes_LDADD= @METACITY_LIBS@
 testgradient_LDADD= @METACITY_LIBS@
 testasyncgetprop_LDADD= @METACITY_LIBS@
 
 desktopfilesdir=$(datadir)/gnome/wm-properties
 desktopfiles_in_files=metacity.desktop.in
-desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
+desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+desktopfiles_DATA = $(desktopfiles_files)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -120,8 +159,12 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+else
+install-data-local:
+endif
 
 IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=default_icon_data $(srcdir)/default_icon.png \
@@ -130,12 +173,22 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
           stock_delete_data $(srcdir)/stock_delete.png
 
 BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas
 
 inlinepixbufs.h: $(IMAGES)
 	   $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
 
-EXTRA_DIST=$(desktopfiles_DATA) $(IMAGES) $(schema_DATA) update-from-egg.sh $(desktopfiles_in_files) $(schema_in_files)
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = libmetacity-private.pc
+
+EXTRA_DIST=$(desktopfiles_files) 	\
+	$(IMAGES) $(schema_DATA) 	\
+	update-from-egg.sh		\
+	$(desktopfiles_in_files)	\
+	$(schema_in_files)		\
+	libmetacity-private.pc.in
+
 
 EGGDIR=$(srcdir)/../../libegg/libegg