2.17.1 release.

2006-10-16  Elijah Newren  <newren gmail com>

        * NEWS: 2.17.1 release.

.cvsignore

@@ -15,6 +15,7 @@ ltconfig
 ltmain.sh
 stamp-h
 stamp-h.in
+stamp-h1
 stamp.h
 version.h
 config.h.in
@@ -28,3 +29,7 @@ COPYING
 intltool-*
 metacity.spec
 autom4te.cache
+compile
+depcomp
+omf.make
+xmldocs.make

HACKING

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

MAINTAINERS

@@ -0,0 +1,14 @@
+Currently active maintainers
+----------------------------
+
+Havoc Pennington
+E-mail: hp@redhat.com
+
+Elijah Newren
+E-mail: newren@gmail.com
+
+Søren Sandmann
+E-mail: sandmann@redhat.com
+
+Thomas Thurman
+E-mail: thomas@thurman.org.uk

Makefile.am

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

NEWS

@@ -1,3 +1,765 @@
+2.17.1
+======
+
+Thanks to Bruno Boaventura and Carlo Wood for improvements in this
+release.
+
+  - sync metacity workspace previous with libwnck (Bruno) [#341893]
+  - fix cases when titlebar is allowed offscreen and shouldn't be, and
+    vice-versa (Carlo) [#333995]
+
+Translations
+  Ilkka Tuohela (fi)
+
+2.17.0
+======
+
+Thanks to Elijah Newren, Jens Granseuer, Bruno Boaventura, Carlo Wood,
+and Thomas Thurman for changes in this release.
+
+  - version 2 of theme format: stick, shade and above buttons on titlebar,
+    variable rounding on corners, variable transparency on window
+    backgrounds, stock icons in themes, can remove all titlebar buttons
+    from certain classes of window, and more (Thomas) [#102547 and
+    dependencies]
+  - improve "Force Quit" dialog (Bruno) [#121936]
+  - ignore edge resistance when resizing with keyboard (Elijah) [#346782]
+  - maintain window size and placement across restarts (Carlo) [#358042]
+  - prevent crash when closing certain remote apps (Elijah) [#358514]
+  - longstanding mouse-focus bug fixed which affected firefox's
+    autocompletion (Elijah) [#357695]
+  - ignore maximum size constraints when maximising (Elijah) [#327543]
+  - warn translators to keep translations in sync with libwnck (Bruno)
+    [#355620]
+  - fixes for compilation warnings, etc (Elijah, Jens) [#348067, #356631]
+
+Translators
+  Ivar Smolin (et), Gabor Kelemen (hu), Luca Ferretti (it),
+  Runa Bhattacharjee (bn_IN)
+
+2.16.2
+======
+
+Thanks to Eljah Newren, Maik Beckmann, Christian Hamar, Thomas Andersen,
+and Bruno Boaventura de Oliveira for changes in this release.
+
+  - partial audit to fix timestamp usage (Elijah) [part of #355180]
+  - remove compilation warnings (Maik) [#355876]; (Bruno) [#355490,
+    #355489]
+  - automatic detection of stable/unstable in configure script
+    (Christian/Elijah) [#356122]
+  - make windows be stacked correctly before showing them (Thomas)
+    [#332385]
+  - use guint32 for timestamps (Elijah) [#348305]
+
+Translators
+  Wouter Bolsterlee (nl), Matic Žgur (sl), Francisco Javier F. Serrador (es),
+  Vladimir Petkov (bg), Jordi Mallach (ca), Ilkka Tuohela (fi),
+  Rajesh Ranjan (hi), Woodman Tuen (zh_HK, zh_TW), Ani Peter (ml),
+  Felix (ta), Ankit Patel (gu), Mohammad DAMT (id)
+ 
+2.16.1
+======
+
+Thanks to Elijah Newren, Colin Watson, and Bruno Boaventura de Oliveira
+Lacerda for changes in this release.
+
+  - fix stuck grab, letting focus be transferred between windows (Elijah)
+    [#354422 partial]
+  - windows returning from fullscreen are constrained to be onscreen
+    (Elijah) [#353699]
+  - Clear the transient_for flag of a window after emitting a warning
+    (Colin)
+  - Replace copy_of_gdk_x11_window_set_user_time() with the real thing
+    (Bruno) [#352293]
+
+Translators
+  David Lodge (en_GB), Ivar Smolin (et), Matic Žgur (sl),
+  Vasiliy Faronov (ru)
+
+2.16.0
+==
+
+Thanks to Jens Granseuer for changes in this release.
+
+ - Fix the build with c89/gcc 2.95.
+
+Translators
+  Rahul Bhalerao (mr), Runa Bhattacharjee (bn_IN), Woodman Tuen
+  (zh_HK, zh_TW), Kostas Papadimas (el), Ani Peter (ml),
+  Jonathan Ernst (fr), Горан Ракић (sr, Gabor Kelemen (hu),
+  Maxim Dziumanenko (uk), Duarte Loreto (pt), Jordi Mallach (ca),
+  Gintautas Miliauskas (lt)
+
+2.15.34
+==
+
+Thanks to Stéphane Rosi, Vytautus Liuolia, Will Walker, Baptiste
+Mille-Mathias, Elijah Newren, Ed Catmur, and Thomas Andersen for fixes
+in this release.
+
+ - allow moving maximized windows between xineramas again (Stéphane)
+   [#338660]
+ - fix an uninitialized-usage bug with net_wm_user_time that breaks
+   focus with new windows (Vytautus)
+ - re-fix accessibility events for the alt-tab popup (Will) [#350624]
+ - update the close pixmap to fit better with the other pixmaps of the
+   menu (Baptiste) [#345498]
+ - fix several fullscreen handling bugs I introduced, causing
+   fullscreen windows to not actually be shown fullscreen (Elijah)
+   [#343115]
+ - fix keybindings with hex-values, coming from special extended
+   keyboard keys (Ed) [#140448]
+ - fix metacity-dialog handling of arguments (Thomas) [#340690]
+
+Translators
+  Vladimir Petkov (bg), Jordi Mallach (ca), Gabor Kelemen (hu),
+  Mohammad DAMT (id), Wouter Bolsterlee (nl), Daniel Nylander (sv),
+  Funda Wang (zh_CN)
+
+2.15.21
+==
+
+Thanks to Vincent Untz, Jens Granseuer, Björn Lindqvist, Dmitry
+Timoshkov, Thomas Thurman, Vytautas Liuolia, Thomas Andersen, Chris
+Ball, and Elijah Newren for fixes in this release.
+
+ - kill usage of libegg (Vincent) [#348633]
+ - fix another C89 vs. C99 issue (Jens) [#347621]
+ - make it so maximized windows do not have rounded corners (Björn)
+   [#336850]
+ - fix the heuristic for determining if windows can be made
+   fullscreen, needed for WINE and possible also some legacy
+   applications (Dmitry) [#346927]
+ - make sure window features get recalculated when the screen is
+   resized via XRandR (Dmitry) [#346927]
+ - fitts' law fixes for titlebar buttons on maximized windows (Thomas
+   Thurman) [#97703]
+ - react to _NET_STARTUP_ID changes, as proposed for the new
+   startup-notification/EWMH spec (Vytautas) [#347515]
+ - return the window to maximized state if the window was "shaken
+   loose" from maximized state during a resize but the resize is later
+   aborted (Thomas Andersen) [#346719]
+ - fix button lighting with dragged clicks (Björn) [#321474]
+ - don't minimize in response to double clicks on the titlebar when
+   minimiziation should not be allowed (Chris) [#347377]
+ - fix some titlebar-not-on-screen constraint issues (Elijah)
+   [#333328, #345522]
+
+Translators
+ Mahay Alam Khan (bn_IN), Jakub Friedl (cs), Iñaki Larrañaga 
+ Murgoitio (eu), Yuval Tanny (he), Rajesh Ranjan (hi), Jovan
+ Naumovski (mk) Kjartan Maraas (nb), Leonid Kanter (ru)
+
+2.15.13
+==
+
+Thanks to Björn Lindqvist and Thomas Thurman for improvements in this
+release.
+
+ - grab alt+shift+button1 when trying to snap-move windows (Björn)
+ - avoid a case where memory is written after it's freed (Thomas)
+
+Translators
+ Hendrik Richter (de), Kostas Papadimas (el), Jonathan Ernst (fr),
+ Satoru SATOH (ja)
+
+2.15.8
+==
+
+Known as the "Elijah sucks for not reviewing a couple dozen patches"
+release.  And for not getting on IRC soon enough to catch Marnanel and
+show him how to do the release.  So, just translations this time.
+
+Translations
+
+  Mahay Alam Khan (bn_IN), Rhys Jones (cy), Francisco Javier
+  F. Serrador (es), Ilkka Tuohela (fi), Rajesh Ranjan (hi), Changwoo
+  Ryu (ko), Fano Rajaonarisoa (mg), Sanlig Badral (mn), Слободан Д. 
+  Средојевић (sr), Funda Wang (zh_CN)
+
+2.15.5
+==
+
+Thanks to Björn Lindqvist, Søren Sandmann, Adam Jackson, Elijah
+Newren, and Aidan Delaney for improvements in this release.
+	
+ - code cleanup in resizepopup.c (Björn) [#341648]
+ - fix a logic bug so that the whole titlebar becomes sensitive to
+   mouse clicks (Björn) [#336320]
+ - make mouse cursor when moving windows become a hand (Björn) [#337376]
+ - lots and lots of compositor improvements -- beginning of a new
+   layer to abstract transition effects, shrinking and minimizing and
+   exploding effects, fading in and out, unminimize animation that
+   reverses minimize one, translucent menus, bounce on window focus,
+   and all kinds of stuff I don't understand and can't summarize well
+   (Søren, Adam)
+ - Fix a crash on exit/logout from assuming a compositor would always
+   exist (Elijah) [#342166]
+ - code cleanup in tabpopup.c (Aidan Delaney) [#166890]
+
+Translations
+  Pema Geyleg (dz), Iñaki Larrañaga Murgoitio (eu), Theppitak
+  Karoonboonyanan (th), Clytie Siddall (vi)
+
+2.15.3
+==
+
+Thanks to Søren Sandmann, Elijah Newren, Paolo Borelli, Björn
+Lindqvist, jylefort at FreeBSD org, 
+
+ - various code cleanups (Søren)
+ - prevent long titles from "sticking" in the tasklist (Elijah) [#330671]
+ - handle sync counter notifications in the compositor (Søren)
+ - notes/documentation updates (Elijah)
+ - plug a small leak (Paolo)
+ - remove a lot of dead code obsoleted by the new edge-resistance
+   stuff (Björn) [#341561]
+ - prevent a crash when changing resolution (jylefort) [#340847]
+ - revert an accessibility module loading workaround from Gnome 2.6
+   that has long since been fixed for us in gtk+ (Elijah) [#123372]
+
+Translations
+  Francisco Javier F. Serrador (es), Ignacio Casal Quinteiro (gl),
+  Raivis Dejus (lv), Kjartan Maraas (nb), Funda Wang (zh_CN), Woodman
+  Tuen (zh_HK), Woodman Tuen (zh_TW)
+
+2.15.2
+==
+
+Here's hoping that "third time's a charm."  ;-) This release just
+fixes the translations-not-included issue.  See
+http://mail.gnome.org/archives/desktop-devel-list/2006-April/msg00483.html
+for more details.
+
+ - Use gnome-autogen.sh like most other modules (Rodney)
+
+2.15.1
+==
+
+This release just fixes the control-center build (which depends upon
+libmetacity-private).  Thanks to Vincent for catching the problem.
+
+ - Include boxes.h in the includes dir (Elijah) [#339708]
+
+2.15.0
+==
+
+Thanks to Thomas Thurman, Elijah Newren, Havoc Pennington, Björn
+Lindqvist, Gora Mohanty, Alejandro Andres, Andy Morum, Dan Sanders,
+Thomas Andersen, Brian Pepple, and Søren Sandmann for improvements in
+this release. (Note that "Thomas" below refers to Thomas Thurman if
+last name isn't specified)
+
+ - An endless array of compositor updates, not all of which are well
+   explained in the ChangeLog. ;-)  Includes an ability to enable and
+   disable the compositor at runtime, fixed up wobbling effect and new
+   explosion effect, special magnification handling, different opacity
+   for different window types like menus, a way of scaling windows,
+   handling of foreign displays, improved handling of window
+   moving/resizing, various code restructuring, special runtime checks
+   for correct extensions and other compositors, lots of bug fixes,
+   and possibly other stuff I'm missing or not understanding (Søren)
+ - Removed "move to another workspace" menu when there are exactly two
+   workspaces (Thomas) [#151183]
+ - fix type for compositing_manager schema entry (Elijah) [#335901]
+ - Port more properties to our async system for code cleanliness and
+   speed improvements (Havoc, Thomas)
+ - Lots of code cleanup, even more code cleanup, wow our code was
+   messy (Björn) [#335177, #337507, #336890, #338359]
+ - Abstract out the functions for setting/unsetting demands attention
+   hint and avoid doing it when the window isn't obscured (Thomas)
+   [#305882]
+ - Change strings to make them more readable, and more
+   translatable (Gora) [#335720]
+ - Reduce compiling warnings -- add a number of casts and change
+   signedness on a number of variables (Björn) [#336032]
+ - Fixed broken links in README (Alejandro) [#333303]
+ - Add a tabbing function, bound to alt-f6 by default, to cycle
+   through the windows of the current application (Thomas) [#94682]
+ - Fix the build with --disable-xsync (Andy) [#336605]
+ - Raise windows on maximize/unmaximize (Dan) [#335076]
+ - Don't have confirmation windows make applications appear to be
+   locked when closing via the window list (Dan) [#334899]
+ - Allow any keybinding pref to be specified either with <foo>, a
+   string, or <foo>_list, a list of strings, or both (Thomas)
+   [#164831]
+ - warn and ignore if transient_for is set to a non-top-level window
+   (Thomas Andersen) [#335524]
+ - Use po/LINGUAS for listing supported languages (Brian) [#337951]
+
+Translations
+  Vladimir Petkov (bg), Jordi Mallach (ca), Miloslav Trmac (cs), Rhys
+  Jones (cy), Lasse Bang Mikkelsen (da), Frank Arnold (de), Kostas
+  Papadimas (el), Francisco Javier F. Serrador (es), Ivar Smolin (et), Iñaki
+  Larrañaga (eu), Farzaneh Sarafraz (fa), Ilkka Tuohela (fi), Ignacio Casal
+  Quinteiro (gl), Ankit Patel (gu), Rajesh Ranjan (hi), Gabor Kelemen (hu), 
+  Satoru SATOH (ja), Alexander Didebulidze (ka), Žygimantas Beručka (lt), 
+  Kjartan Maraas (nb), Michiel Sikkes (nl), Åsmund Skjæveland (nn), Gora
+  Mohanty (or), Raphael Higino (pt_BR), Duarte Loreto (pt), Mugurel Tudor (ro),
+  Leonid Kanter (ru), Steve Murphy (rw), Laurent Dhima (sq), Слободан Д.
+  Средојевић (sr), Daniel Nylander (sv), Theppitak Karoonboonyanan (th), Maxim
+  Dziumanenko (uk), Clytie Siddall (vi), Funda Wang (zh_CN)
+
+2.14.3
+==
+
+This release just reverts the widely hated new focus behavior of Metacity
+2.14.x to the behavior found in 2.12.x.  Patch came from Ron Yorston.  
+See http://blogs.gnome.org/view/newren/2006/04/13/0 and
+http://mail.gnome.org/archives/release-team/2006-April/msg00025.html for
+more details.
+
+ - Add a focus_new_windows gconf key, change the default to 'smart' (2.12
+   behavior) and add a 'strict' option to get 2.14 behavior.  (Ron)
+   [#326159]
+
+Translations
+  Vladimir Petkov (bg), Miloslav Trmac (cs), Frank Arnold (de), Francisco
+  Javier F. Serrador (es), Ilkka Tuohela (fi), Tino Meinen (nl), Åsmund
+  Skjæveland (nn), Raphael Higino (pt_BR), Daniel Nylander (sv)
+
+2.14.2
+==
+
+Thanks to Thomas Thurman, Paolo Borelli, Björn Lindqvist, and
+Elijah Newren for fixes in this release.
+
+ - Fix constraints bug causing negative width windows and crashes
+   (Elijah) [#336651]
+ - Fix window grouping with parent/child windows (Björn) [#336184]
+ - use g_str_has_prefix instead of a local copy of the function
+   (Paolo) [#334643]
+ - Make sure pager can refresh when window is minimized on a different
+   workspace (Thomas) [#315142]
+ - Add debugging information for edge resistance (Elijah)
+
+Translations
+
+  Vladimir Petkov (bg), tangi.bzh (br), Jordi Mallach (ca), Miloslav
+  Trmac (cs), Rhys Jones (cy), Lasse Bang Mikkelsen (da), Frank
+  Arnold (de), Mindu Dorji (dz), Kostas Papadimas (el), Francisco
+  Javier F. Serrador (es), Ivar Smolin (et), Iñaki Larrañaga 
+  Murgoitio (eu), Elnaz Sarbar (fa), Ilkka Tuohela (fi),
+  Ignacio Casal Quinteiro (gl), Ankit Patel (gu), Rajesh Ranjan (hi)
+  Gabor Kelemen (hu), Luca Ferretti (it), Satoru SATOH (ja), Vladimer
+  Sichinava (ka), Žygimantas Beručka (lt), Kjartan Maraas (nb),
+  Tino Meinen (nl), Kjartan Maraas (no), Gora Mohanty (or), Gnome PL
+  Team (pl), Evandro Fernandes Giovanini (pt_BR), Duarte Loreto (pt),
+  Mugurel Tudor (ro), Leonid Kanter (ru), Laurent Dhima (sq),
+  Слободан Д. Средојевић (sr), Daniel Nylander (sv), Theppitak
+  Karoonboonyanan (th), Maxim Dziumanenko (uk), Clytie Siddall (vi),
+  Funda Wang (zh_CN)
+
+2.14.1
+==
+
+The only change since 2.14.0 is to remove the "This is the UNSTABLE
+branch" warning from configure for those compiling Metacity from
+source.
+
+2.14.0
+==
+
+Thanks to Ryan Lortie and Thomas Thurman for fixes in this release.
+
+ - Mark the app-running-remotely-window-title string for translation
+   (Thomas) [#334332]
+ - Only unmaximise window before freeing if the window is actually
+   maximised (Ryan) [#333563]
+
+Translations
+  Jordi Mallach (ca), Frank Arnold (de), Luca Ferretti (it), Evandro
+  Fernandes Giovanini (pt_BR), Theppitak Karoonboonyanan (th)
+
+2.13.144
+==
+
+Thanks to Jens Granseuer, Kristian, Søren Sandmann, Sylvain
+Bertrand, and Thomas Thurman for improvements in this release.
+
+ - Fix build with gcc 2.95 (Jens) [#331166]
+ - Compositor improvements [remember, still off by default]: add
+   unused wobbly (un)minimize animation (Kristian), add support for
+   turning updates on and off (Søren), use sync counter to make
+   composited resizing tear free (Søren), add ability to unmanage
+   the screen (Søren), 
+ - Fix build issue with library search order (Sylvain) [#330695]
+ - Work around buggy application grouping with transient windows
+   (Thomas) [#328211]
+ - Prevent setting cycle_windows to keybindings that won't work.
+   (Thomas) [#329676]
+
+2.13.89
+==
+
+Thanks to Søren Sandmann, Thomas Thurman, Thom May, Akira Tagoh,
+Luke Morton, and Philip O'Brien for improvements in this release.
+
+ - Compositor improvements [remember that the compositor is still
+   disabled by default]: New fancy minimize animation that fades in
+   and out, new debug stuff, various bug fixes (Søren)
+ - When buggy apps create synthetic button or keypresses without a
+   timestamp, produce a warning instead of failing an assertion
+   (Thomas) [#313490]
+ - Avoid a memory leak when checking which workspace(s) a window is
+   on (Thomas) [#322059]
+ - Add a man page for metacity (Thom, Akira, Luke, Philip) [#321279]
+ - Disable alt-f7 if a window can't be moved, and alt-f8 if it can't
+   be resized (Thomas) [#328920]
+ - Allow alt-escape to cancel alt-tabbing, and vice versa (Thomas)
+   [#141425]
+
+Translations
+  Miloslav Trmac (cs), Kjartan Maraas (nb), Tino Meinen (nl), 
+  Kjartan Maraas (no), Слободан Д. Средојевић (sr), Funda Wang (zh_CN)
+
+2.13.55
+==
+
+Thanks to Dick Marinus, Christian Kirbach, and Elijah Newren for
+improvements in this release.
+
+ - Add a minimize and none double-click-titlebar-action (Dick)
+   [#300210]
+ - Prevent a critical warning crasher when switching themes
+   (Christian) [#327847]
+ - Fix some uninitialized value problems (Elijah)
+ - If the mouse enters a window on a different screen, activate the
+   default window on the new screen (Elijah) [#319348]
+
+Translations
+  Jordi Mallach (ca), Adam Weinberger (en_CA), Francisco Javier
+  F. Serrador (es), Ilkka Tuohela (fi), Ignacio Casal Quinteiro (gl),
+  Ankit Patel (gu), Kjartan Maraas (nb), Kjartan Maraas (no), Evandro
+  Fernandes Giovanini (pt_BR), Theppitak Karoonboonyanan (th), Clytie
+  Siddall (vi), Funda Wang (zh_CN)
+
+2.13.34
+==
+
+Thanks to Damien Carbery, Havoc Pennington, Søren Sandmann,
+Björn Lindqvist, Kjartan Maraas, Elijah Newren for improvements in
+this release.
+
+ - manually define HOST_NAME_MAX if not already defined to fix Solaris
+   compilation issue (Damien, Havoc) [#326745]
+ - compositor improvements: port to changes in libcm, do it again, fix
+   unrefing, make minimize animation update again (all done by Søren)
+ - make sure an outline border is shown even if a window decoration's
+   width is 0 (Björn) [#98340]
+ - correctly handle window alt-tab outlines in showing desktop mode
+   (Björn) [#98340]
+ - fix lots of tiny issues spotted by the intel compiler (Kjartan)
+   [#321439]
+ - prevent rapidly repeated visual bells from hanging metacity
+   (Elijah) [#322032]
+ - more careful error handling of values returned by GConf (Elijah)
+   [#326615]
+ - fix various initialization and default issues, especially for
+   running with --disable-gconf.  Make --disable-gconf actually work.
+   (Elijah) [#326661]
+ - fix some reading-from-free'd-data errors (Søren) [#327575]
+ - fix an unitialized value problem when in raise-on-click mode
+   (Søren) [#327572]
+ - avoid flashing original-sized window when closing a maximized
+   window (Elijah) [#317254]
+ - prevent windows from sometimes getting shoved and smashed by
+   sliding (and possibly auto-hiding) panels (Elijah) [#327822]
+
+Translations
+  Ilkka Tuohela (fi), Ignacio Casal Quinteiro (gl), Tino Meinen (nl),
+  Funda Wang (zh_CN)
+
+2.13.21
+==
+
+Thanks to Damien Carbery, Ray Strode, Søren Sandmann, Elijah
+Newren, Jens Granseuer, and Kyle Ambroff for improvements in this
+release.
+
+  - Fix Solaris compilation issues (Ray, Damien) [#326281, #326746]
+  - Merge compositor work from branches to get the beginnings of an openGL
+    based compositor.  Still not ready and thus disabled by default.
+    (Søren)
+  - Composite fixes: Only update composite on damage events (Søren), get
+    non-composite compilation working again (Elijah), Really turn off
+    draw-in-a-loop (Søren)
+  - Don't dereference a NULL string (Elijah) [#327013]
+  - GCC 2.95 fix; remove more C99 style variable initiailizations (Jens)
+    [#327050]
+  - Fix accidental overzealous focus holding by the terminal (introduced in
+    last release) so that windows launched from panel icons, the panel
+    menu, or global keybindings should get focus now.  (Elijah) [#326159]
+  - If no valid window is found in the MRU list, then set focus to the
+    desktop window. (Kyle) [#317405]
+
+Translations
+  Adam Weinberger (en_CA), Francisco Javier F. Serrador (es), Ankit
+  Patel (gu), Takeshi AIHANA (ja), Theppitak Karoonboonyanan (th),
+  Clytie Siddall (vi)
+
+2.13.13
+==
+
+Thanks to Jens Granseuer, Björn Lindqvist, and Elijah Newren for
+improvements in this release.
+
+ - Remove C99 style variable initiailization (Jens) [#322622]
+ - Fix a logic error (Björn) [#322149]
+ - Plug a few leaks (Elijah) [#309178]
+ - Allow edge resistance at both sides of a window and also when edges
+   don't overlap but are a single pixel away from doing so (Elijah)
+   [part of #321905]
+ - Remove the timeout resistance at screen/xinerama edges (Elijah)
+   [part of #321905]
+ - Revert to the old edge resistance behavior for keyboard
+   movement/resizing based resistance (Elijah) [part of #321905]
+ - Remove the "pull-away" edge resistance (Elijah) [part of #321905]
+ - Avoid crashing when visual bell is in use and focus window is
+   closed (Elijah) [#322031]
+ - Be more strict about what is considered a valid region with partial
+   struts (Elijah) [#322070]
+ - Fix reduced resources resize handling for windows with sizing or
+   resizing constraints (Elijah) [#325774]
+ - Fix window outline for minimized windows when using alt-esc
+   (Elijah) [#325092]
+ - Make the taskbar less flash happy and fix up some related stacking
+   issues (Elijah) [#326035]
+ - More thorough handling of source indication (Elijah) [part of #326041]
+ - Don't "steal" focus from terminal windows for new window mappings
+   as the difference in usage between terminals and other apps seems
+   to suggest this difference in treatment.  See bug #326159 for
+   details, feedback welcome (Elijah) [#326159]
+ - Add a raise on click option, basically only because all the major
+   distros are patching it in anyway (though each and every one of
+   them has bugs in their implementations).  (Elijah) [#326156]
+
+Translations
+  Kjartan Maraas (nb), Kjartan Maraas (no)
+
+2.13.8
+==
+
+Thanks to Kang Jeong-Hee and Elijah Newren for improvements in this
+release.
+
+ - Fix some compilation warnings and issues (Kang)
+ - Escape the title since it is going to be treated as Markup (Elijah)
+   [#324846]
+ - Make the workspace switcher work with dual-head (non-xinerama)
+   setups (Elijah) [#319423]
+
+Translations
+  Ilkka Tuohela (fi), Ankit Patel (gu), Kang Joeng-Hee (ko)
+
+2.13.5
+==
+
+Thanks to Davyd Madeley, Kjartan Maraas, and Björn Lindqvist for
+improvements in this release.
+
+ - Make a debugging message actually correspond to the code (Björn)
+   [#322051]
+ - Make the wireframe a bit slimmer (Kjartan) [#320051]
+ - Display hostname in titlebar for remote X clients (Davyd) [#322202]
+
+Translations
+  Miloslav Trmac (cs), Adam Weinberger (en_CA), Ankit Patel (gu),
+  Kjartan Maraas (nb), Kjartan Maraas (no), Marcel Telka (sk)
+
+2.13.3
+==
+
+This is a special edition release just for gicmo, code-named 'elijah,
+please do a release so magic seb can bring it to me'.  It fixes a
+number of issues due to the major constraints changes found since the
+last release.
+
+Thanks to Davyd Madeley and Elijah Newren for improvements in this release.
+
+ - Differentiate between movement towards an edge and movement away from
+   one for edge-resistance.  Pick smaller constants for movement away from
+   an edge (Elijah)
+ - Use GPOINTER_TO_INT() macro instead of cast to allow compilation on
+   64-bit architectures without warning (Davyd)
+ - compute the frame geometry due to maximization only after actually
+   maximizing (Elijah) [#321902]
+ - add some developer documentation on updating struts, workareas, regions,
+   and edges (Elijah)
+ - When updating the xinerama due to placement, update which
+   maximal/spanning rect set to use as well (Elijah) [#322068]
+ - Relax the partially onscreen constraint to allow the titlebar to touch
+   the bottom panel in order to make the new constraints code function the
+   same as the old version (Elijah) [#322071]
+ - Don't allow removing a window from maximized or fullscreened state to
+   place the titlebar under the top panel (Elijah) [#322075]
+
+Translations
+  Vladimir Petkov (bg), Francisco Javier F. Serrador (es), Ignacio Casal
+  Quinteiro (gl), Takeshi AIHANA (ja), Theppitak Karoonboonyanan (th)
+
+2.13.2
+==
+
+This release just contains a merge of all the changes on the
+constraints_experiments branch.
+
+Thanks to Havoc Pennington for reviewing the gargantuan patch and
+suggesting lots of little fixes for making it better, to Rob Adams and
+Soeren Sandmann for grilling me on how some of the difficult internals work
+-- allowing me to improve the documentation, to Olav Vitters for finding an
+easy-to-fix crasher bug in early testing and for repeatedly extending my
+deadline for switching from working on Metacity to Bugzilla, to Ray Strode
+for finding two crashers and fixing one of them in early testing, to Bryan
+Clark for usability advice, to Davyd Madeley and Christian Kellner for
+testing Xinerama stuff, to Sebastien Bacher for packaging an early version
+and finding some obscure bugs (that I unfortunately still can't duplicate
+and will probably still need to fix once I can),
+
+Bugs fixed:
+  unfiled - constraints.c is overly complicated[1]
+  unfiled - constraints.c is not robust when all constraints cannot
+            simultaneously be met (constraints need to be prioritized)
+  unfiled - keep-titlebar-onscreen constraint is decoration unaware (since
+            get_outermost_onscreen_positions() forgets to include
+            decorations)
+  unfiled - keyboard snap-moving and snap-resizing snap to hidden edges
+    86644 - resize should have a shift option like move does
+   109553 - gravity w/ simultaneous move & resize doesn't work
+   113601 - maximize vertical and horizontal should toggle and be
+            constrained
+   122196 - windows show up under vertical panels
+   122670 - jerky/random resizing of window via keyboard[2]
+   124582 - keyboard and mouse snap-resizing and snap-moving erroneously
+            moves the window multidimensionally
+   136307 - don't allow apps to resize themselves off the screen (*cough*
+            filechooser *cough*)
+   142016, 143784 - windows should not span multiple xineramas unless
+            placed there by the user
+   143145 - clamp new windows to screensize and force them onscreen, if
+            they'll fit
+   144126 - Handle pathological strut lists sanely[3]
+   149867 - fixed aspect ratio windows are difficult to resize[4]
+   152898 - make screen edges consistent; allow easy slamming of windows
+            into the left, right, and bottom edges of the screen too.
+   154706 - bouncing weirdness at screen edge with keyboard moving or
+            resizing
+   156699 - avoid struts when placing windows, if possible (nasty a11y
+            blocker)
+   302456 - dragging offscreen too restrictive
+   304857 - wireframe moving off the top of the screen is misleading
+   308521 - make uni-directional resizing easier with alt-middle-drag and
+            prevent the occasional super annoying resize-the-wrong-side(s)
+            behavior
+   312007 - snap-resize moves windows with a minimum size constraint
+   312104 - resizing the top of a window can cause the bottom to grow
+   319351 - don't instantly snap on mouse-move-snapping, remove
+            braindeadedness of having order of releasing shift and
+            releasing button press matter so much
+
+   [1] fixed in my opinion, anyway.
+   [2] Actually, it's not totally fixed--it's just annoying
+       instead of almost completely unusable.  Matthias had a
+       suggestion that may fix the remainder of the problems (see
+       http://tinyurl.com/bwzuu).
+   [3] This bug was originally about not-quite-so-pathological
+       cases but was left open for the worse cases. The code from
+       the branch handles the remainder of the cases mentioned in
+       this bug.
+   [4] Actually, although it's far better there's still some minor
+       issues left: a slight drift that's only noticeable after
+       lots of resizing, and potential problems with partially
+       onscreen constraints due to not clearing any
+       fixed_directions flags (aspect ratio windows get resized in
+       both directions and thus aren't fixed in one of them)
+        
+New feature:
+  81704 - edge resistance for user move and resize operations; in
+          particular 3 different kinds of resistance are implemented:
+     Pixel-Distance: window movement is resisted when it aligns with an
+       edge unless the movement is greater than a threshold number of
+       pixels
+     Timeout: window movement past an edge is prevented until a certain
+       amount of time has elapsed during the operation since the first
+       request to move it past that edge
+     Keyboard-Buildup: when moving or resizing with the keyboard, once a
+       window is aligned with a certain edge it cannot move past until the
+       correct direction has been pressed enough times (e.g. 2 or 3 times)
+
+Major code changes:
+  - constraints.c has been rewritten; very few lines of code from the old
+    version remain.  There is a comment near the top of the function
+    explaining the basics of how the new framework works.  A more detailed
+    explanation can be found in doc/how-constraints-works.txt
+  - edge-resistance.[ch] are new files implementing edge-resistance.
+  - boxes.[ch] are new files containing low-level error-prone functions
+    used heavily in constraints.c and edge-resistance.c, among various
+    places throughout the code.  testboxes.c contains a thorough testsuite
+    for the boxes.[ch] functions compiled into a program, testboxes.
+  - meta_window_move_resize_internal() *must* be told the gravity of the
+    associated operation (if it's just a move operation, the gravity will
+    be ignored, but for resize and move+resize the correct value is needed)
+  - the craziness of different values that
+    meta_window_move_resize_internal() accepts has been documented in a
+    large comment at the beginning of the function.  It may be possible to
+    clean this up some, but until then things will remain as they were
+    before--caller beware.
+  - screen and xinerama usable areas (i.e. places not covered by
+    e.g. panels) are cached in the workspace now, as are the screen and
+    xinerama edges.  These get updated with the workarea in
+    src/workspace.c:ensure_work_areas_validated()
+
+Translation
+  Michiel Sikkes (nl)
+
+2.13.1
+==
+
+Thanks to Philip O'Brien, Kjartan Maraas, and Aidan Delaney for
+improvements in this release.
+
+ - add handling for META_PREF_CURSOR_THEME and META_PREF_CURSOR_SIZE
+   for more complete debug info (Philip) [#318976]
+ - Remove possible g_source leak in #ifdef'd out code, in case anyone uses
+   it in the future (Kjartan) [#320050]
+ - Changed the 'minimized' field of the MetaTabEntry struct to 'hidden'
+   (Aidan) [#168455]
+
+Translations
+  Miloslav Trmac (cs), Francisco Javier F. Serrador (es), Takeshi AIHANA (ja),
+  Erdal Ronahi (ku), Theppitak Karoonboonyanan (th)
+
+2.13.0
+==
+
+Thanks to Björn Lindqvist, Kjartan Maraas, Søren Sandmann,
+Elijah Newren, Ross Cohen, and Muktha for improvements in this release
+since 2.12.1.
+
+ - Mave ancestors come along with the transient when moving the window from
+   one workspace to another (Björn) [#314977]
+ - Fix the workspace switcher tabpopup to display the right windows and to
+   fix the pick-a-new-window-to-focus algorithm in order to not select
+   windows that aren't showing (Björn) [#170475]
+ - Fix a couple memory leaks (Kjartan, Søren, Elijah) [#313030]
+ - Make alt-esc (the "switch between windows immediately" keybinding)
+   actually show minimized windows too (Ross) [#107072]
+ - Make alt-esc consistent with alt-tab by leaving stacking of unselected
+   windows unchanged (Ross) [#314285]
+ - Clarify the meaning of the auto_raise preference (Elijah) [#312421]
+ - Fix a crash that occurs when removing some virtual desktops and windows
+   happen to be on those desktops (Elijah) [#318306]
+ - Make the unfocussed Simple window border visible with high contrast
+   inverse theme (Muktha) [#121361]
+ - Fix edge snapping for multi-screen (non-xinerama) setups (Elijah)
+   [#319425]
+
+Translations
+  Vladimir Petkov (bg), Kostas Papadimas (el), Adam Weinberger (en_CA),
+  Ivar Smolin (et), Michiel Sikkes (nl), Marcel Telka (sk), Funda 
+  Wang (zh_CN)
+
 2.12.1
 ==
 
@@ -11,7 +773,7 @@ improvements in this release.
 
 Translations
   Mahay Alam Khan (bn), Francisco Javier F. Serrador (es), Ivar Smolin (et),
-  I<EFBFBD>aki Larra<EFBFBD>aga Murgoitio (eu), Luca Ferretti (it), Christian Rose (sv),
+  Iñaki Larrañaga Murgoitio (eu), Luca Ferretti (it), Christian Rose (sv),
   Clytie Siddall (vi), Funda Wang (zh_CN)
 
 2.12.0
@@ -24,16 +786,16 @@ Thanks to Brent Smith for finding the crasher in the release candidate!
 Translations
   Bryn Salisbury (cy), Hendrik Richter (de), Christophe Merlet (RedFox) (fr),
   Ignacio Casal Quinteiro (gl), Norayr Chilingaryan (hy), Young-Ho Cha (ko),
-  <EFBFBD>ygimantas Berucka (lt), Michiel Sikkes (nl), Leonid Kanter (ru), Danilo
-  <1B>egan(sr), Baris Cicek (tr)
+  Žygimantas Berucka (lt), Michiel Sikkes (nl), Leonid Kanter (ru), Danilo
+  Šegan (sr), Baris Cicek (tr)
 
 2.11.3
 ==
 
-Thanks to Bj<EFBFBD>rn Lindqvist and Elijah Newren for improvements in
+Thanks to Björn Lindqvist and Elijah Newren for improvements in
 this release.
 
- - Check for the right versions of glib and gtk+ (Bj<EFBFBD>rn) [#314116]
+ - Check for the right versions of glib and gtk+ (Björn) [#314116]
  - Avoid obscuring centered-on-desktop windows which are denied focus
    (Elijah) [#313234]
 
@@ -101,13 +863,13 @@ Translations
 
 This release contains all fixes up to Metacity 2.10.2 plus some new goodies.
 
-Thanks to Matthias Clasen, Aivars Kalvans, Bj<EFBFBD>rn Lindqvist, and
+Thanks to Matthias Clasen, Aivars Kalvans, Björn Lindqvist, and
 Andrew Johnson for improvements in this release.
 
  - React to cursor theme changes (Matthias) [#308106]
  - Plug a small leak with xinerama information (Aivars) [#307884]
  - Split up main() into more manageable chunks and make use of GOpt
-   (Bj<EFBFBD>rn) [#305331]
+   (Björn) [#305331]
  - Speed up vertical gradients (Andrew) [#169982]
 
 Translations
@@ -168,8 +930,8 @@ The only difference between this version and 2.9.34 is some
 translation updates.
 
 Translations
-  Vladimir Petkov (bg), Gabor Kelemen (hu), <EFBFBD>ygimantas Berucka (lt),
-  Reinout van Schouwen (nl), Mugurel Tudor (ro), Danilo <EFBFBD>egan (sr),
+  Vladimir Petkov (bg), Gabor Kelemen (hu), Žygimantas Berucka (lt),
+  Reinout van Schouwen (nl), Mugurel Tudor (ro), Danilo Šegan (sr),
   Woodman Tuen (zh_TW)
 
 2.9.34
@@ -234,7 +996,7 @@ Marcus Clarke for fixes in this release.
 Translations
   Jordi Mallach (ca), Martin Willemoes Hansen (da), 
   Kostas Papadimas (el), David Lodge (en_GB), 
-  Francisco Javier F.  Serrador (es), T<EFBFBD>ivo Leedj<EFBFBD>rv (et),
+  Francisco Javier F.  Serrador (es), Tõivo Leedjärv (et),
   Christophe Merlet (RedFox) (fr), Takeshi AIHANA (ja), 
   Young-Ho, Cha (ko), Kjartan Maraas (nb), Michiel Sikkes (nl),
   Kjartan Maraas (no), Duarte Loreto (pt), Leonid Kanter (ru), 
@@ -302,7 +1064,7 @@ Translations
   Vladimir Petkov (bg), Miloslav Trmac (cs), Frank Arnold (de), 
   Adam Weinberger (en_CA), David Lodge (en_GB), 
   Francisco Javier F. Serrador (es), Pauli Virtanen (fi), 
-  Young-Ho, Changwoo Ryu (ko), <EFBFBD>ygimantas Berucka (lt),
+  Young-Ho, Changwoo Ryu (ko), Žygimantas Berucka (lt),
   Kjartan Maraas (nb),  Kjartan Maraas (no), Duarte Loreto (pt),
   Marcel Telka (sk), Christian Rose (sv), 
   Theppitak Karoonboonyanan (th)
@@ -409,7 +1171,7 @@ Vincent Untz for fixes/features in this release.
 
 Translations
  da (Martin Willemoes Hansen), fr(Christophe Merlet, Baptiste
- Mille-Mathias), lt(<EFBFBD>ygimantas Berucka), ja(Takeshi AIHANA)
+ Mille-Mathias), lt(Žygimantas Berucka), ja(Takeshi AIHANA)
 
 2.9.0
 ==
@@ -440,7 +1202,7 @@ and Vincent Untz for fixes and features in this release.
  - Re-enable focus stealing prevention (Elijah)
 
 Translations
- es(Francisco Javier F. Serrador), sq(Laurent Dhima), sr(Danilo <EFBFBD>egan), 
+ es(Francisco Javier F. Serrador), sq(Laurent Dhima), sr(Danilo Šegan), 
  cs(Miloslav Trmac), en_CA(Adam Weinberger), en_GB(David Lodge)
 
 2.8.6
@@ -475,7 +1237,7 @@ Translations
 
   * ar(Abdulaziz Al-Arfaj), cs(Miloslav Trmac), cy(Dafydd Harries),
     en_GB(David Lodge), fr(Christophe Merlet (RedFox)), 
-    nn(<EFBFBD>smund Skj<EFBFBD>veland), or(Gora Mohanty), 
+    nn(Åsmund Skjæveland), or(Gora Mohanty), 
     pr_BR(Gustavo Noronha Silva), ro(Mugurel Tudor), 
     th(Paisa Seeluangsawat), tr(Baris Cicek), zh_TW(Woodman Tuen)
 
@@ -513,7 +1275,7 @@ Fixes
 Translations
   * az(Metin Amiroff), bs(Kemal Sanjta), ca(Jordi Mallach), 
     el(Kostas Papadimas), es(Francisco Javier F. Serrador), 
-    eu(I<EFBFBD><EFBFBD>aki Larra<EFBFBD><EFBFBD>aga Murgoitio), fi(Pauli Virtanen),
+    eu(Iñaki Larrañaga Murgoitio), fi(Pauli Virtanen),
     nb(Kjartan Maraas), sq(Laurent Dhima), uk(Maxim Dziumanenko)
 
 
@@ -541,7 +1303,7 @@ Fixes
 
 Translations
   * fi (Pauli Virtanen), ja (Takeshi AIHANA), ko (Young-Ho, Cha), 
-    pl (Gnome PL Team), ru (Dmitry G. Mastrukov), sr (Danilo <EFBFBD>Ł<EFBFBD>egan),
+    pl (Gnome PL Team), ru (Dmitry G. Mastrukov), sr (Danilo Šegan),
     tk (Gurban M. Tewekgeli), zh_CN (Funda Wang)
 
 2.8.2

README

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

autogen.sh

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

configure.in

@@ -1,8 +1,14 @@
 AC_PREREQ(2.50)
 
+m4_define([metacity_major_version], [2])
+m4_define([metacity_minor_version], [17])
 # 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.12.1],
+m4_define([metacity_micro_version], [1])
+
+m4_define([metacity_version],
+          [metacity_major_version.metacity_minor_version.metacity_micro_version])
+AC_INIT([metacity], [metacity_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
 AC_CONFIG_SRCDIR(src/display.c)
@@ -18,7 +24,7 @@ GETTEXT_PACKAGE=metacity
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 
-AC_PROG_INTLTOOL([0.21])
+IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -101,7 +107,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-METACITY_PC_MODULES='gtk+-2.0 >= 2.2.0 pango >= 1.2.0'
+METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
 
 AC_ARG_ENABLE(gconf,
   AC_HELP_STRING([--disable-gconf],
@@ -155,7 +161,6 @@ AC_ARG_ENABLE(shape,
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy id is it ja ko 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
@@ -222,7 +227,7 @@ fi
 
 if test x$have_xcomposite = xyes; then
   echo "Building with CompositeExt"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+  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
@@ -404,10 +409,10 @@ if test "x$found_xsync" = "xyes"; then
    AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi
 
-METACITY_LIBS="$XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
-METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS"
-METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"
-METACITY_PROPS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_PROPS_LIBS"
+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
 found_sm=no
 case "$METACITY_LIBS" in
@@ -463,6 +468,9 @@ if test x$enable_gconf = xyes; then
    fi
 
    AM_GCONF_SOURCE_2
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
 fi
 
 AC_CONFIG_FILES([
@@ -481,11 +489,8 @@ AC_OUTPUT
 
 if test x$enable_gconf = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
-        echo "*** Building without GConf"
-        echo "*** This means there's no way to change prefs except"
-        echo "*** hacking source code, at least for now."
-        echo "*** Also, some prefs may have broken defaults."
-        echo "*** Patches needed for a simple no-gconf config file."
+        echo "*** Building without GConf.  This means there's no"
+        echo "*** way to change prefs except hacking source code."
         echo "*** This is intended for embedded systems etc., not for normal use."
 fi
 
@@ -517,5 +522,13 @@ metacity-$VERSION:
 	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
 "
-#echo "This is the UNSTABLE branch of metacity"
-#echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"
+
+METACITY_MINOR_VERSION=metacity_minor_version
+if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
+   stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
+   echo "This is the UNSTABLE branch of metacity"
+   echo -n "Use 2.$stable_version.x for stable "
+   echo    "(gnome-2-$stable_version branch in CVS)"
+else
+   echo "This is the stable branch of metacity"
+fi

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

@@ -9,7 +9,8 @@ basics are easy:
 Focus method  Behavior
     click     When a user clicks on a window, focus it
    sloppy     When an EnterNotify is received, focus the window
-    mouse     Same as sloppy, but also defocus on LeaveNotify
+    mouse     Same as sloppy, but also defocus when mouse enters DESKTOP
+              window
 
 Note that these choices (along with the choice that clicking on a
 window raises it for the click focus method) introduces the following
@@ -20,8 +21,9 @@ Focus method  Invariant
    sloppy     If the mouse is in a window, then it is focused; if the
               mouse is not in a window, then the most recently used
               window is focused.
-    mouse     If the mouse is in a window, then it is focused; otherwise,
-              the designated "no_focus_window" is focused
+
+    mouse     If the mouse is in a non-DESKTOP window, then it is focused;
+              otherwise, the designated "no_focus_window" is focused
 
 However, there are a number of cases where the current focus window
 becomes invalid and another should be chosen.  Some examples are when
@@ -34,8 +36,10 @@ Focus method  Behavior
               on top)
    sloppy     Focus the window containing the pointer if there is such
               a window, otherwise focus the most recently used window.
-    mouse     Focus the window containing the pointer if there is one,
-              otherwise focus the designated "no_focus_window".
+
+    mouse     Focus the non-DESKTOP window containing the pointer if
+              there is one, otherwise focus the designated
+              "no_focus_window".
 
 Note that "most recently used window", as used here, has a slightly
 different connotation than "most recent to have keyboard focus".  This
@@ -123,6 +127,7 @@ To read more about the bugs that inspired these choices:
   - Mousenav vs. Keynav in mouse and sloppy focus modes
     http://bugzilla.gnome.org/show_bug.cgi?id=167545
     http://bugzilla.gnome.org/show_bug.cgi?id=101190
+    http://bugzilla.gnome.org/show_bug.cgi?id=357695
   - Not focusing panels
     http://bugzilla.gnome.org/show_bug.cgi?id=160470
     http://bugzilla.gnome.org/show_bug.cgi?id=120100

doc/man/Makefile.am

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

doc/man/metacity.1

@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH METACITY 1 "11 February 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+METACITY \- minimal GTK2 Window Manager
+.SH SYNOPSIS
+.B metacity
+[\-\-display=\fIDISPLAY\fP] [\-\-replace] [\-\-sm\-client\-id=\fIID\fP] [\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-version] [\-\-help]
+.SH DESCRIPTION
+This manual page documents briefly
+.B metacity\fP.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBmetacity\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop.  \fBmetacity\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
+.SH OPTIONS
+.TP
+.B \-\-display=DISPLAY
+Connect to X display \fIDISPLAY\fP.
+.TP
+.B \-\-replace
+a window manager which is running is replaced by \fBmetacity\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
+.TP
+.B \-\-sm\-client\-id=ID
+Specify a session management \fIID\fP.
+.TP
+.B \-\-sm\-disable
+Disable the session management.
+.TP
+.B \-\-sm\-save\-file=FILENAME
+Load a session from \fIFILENAME\fP.
+.TP
+.B \-\-version
+Print the version number.
+.TP
+.B \-?, \-\-help
+Show summary of options.
+.SH CONFIGURATION
+\fBmetacity\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
+.SH SEE ALSO
+.BR metacity-message (1)
+.SH AUTHOR
+The original manual page was written by Thom May <thom@debian.org>.  It was updated by Akira TAGOH <tagoh@debian.org>
+for the Debian GNU/Linux system (with permission to use by others), and then updated by Luke Morton and Philip O'Brien
+for inclusion in metacity.

doc/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.

doc/theme-format.txt

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

po/.cvsignore

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

po/LINGUAS

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

po/hy.po

@@ -90,7 +90,7 @@ msgstr "Պատուհանի մենյու"
 
 #: ../src/frames.c:1131
 msgid "Minimize Window"
-msgstr "Պատուհանը փոքրացնել"
+msgstr "Պատուհանը իջեցնել"
 
 #: ../src/frames.c:1134
 msgid "Maximize Window"
@@ -586,7 +586,7 @@ msgstr "Պատուհանը մեծացնել ուղղահայաց ուղղութ
 
 #: ../src/metacity.schemas.in.h:26
 msgid "Minimize window"
-msgstr "Պատուհանը փոքրացնել"
+msgstr "Պատուհանը իջեցնել"
 
 #: ../src/metacity.schemas.in.h:27
 msgid "Modifier to use for modified window click actions"

po/sk.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-19 12:30+0200\n"
-"PO-Revision-Date: 2005-07-20 23:36+0200\n"
+"POT-Creation-Date: 2005-11-22 23:56+0100\n"
+"PO-Revision-Date: 2005-11-23 00:07+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -26,44 +26,44 @@ msgstr ""
 msgid "Usage: %s\n"
 msgstr "Použitie: %s\n"
 
-#: ../src/tools/metacity-message.c:176 ../src/util.c:128
+#: ../src/tools/metacity-message.c:176 ../src/util.c:130
 msgid "Metacity was compiled without support for verbose mode\n"
 msgstr "Metacity bol skompilovaný bez podpory zobrazovania informácií\n"
 
-#: ../src/delete.c:63 ../src/delete.c:90 ../src/metacity-dialog.c:70
+#: ../src/delete.c:64 ../src/delete.c:91 ../src/metacity-dialog.c:71
 #: ../src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Nepodarilo sa spracovať \"%s\" ako celé číslo"
 
-#: ../src/delete.c:70 ../src/delete.c:97 ../src/metacity-dialog.c:77
+#: ../src/delete.c:71 ../src/delete.c:98 ../src/metacity-dialog.c:78
 #: ../src/theme-parser.c:476 ../src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Nerozpoznané znaky na konci \"%s\" v reťazci \"%s\""
 
-#: ../src/delete.c:128
+#: ../src/delete.c:129
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "Nepodarilo sa spracovať správu \"%s\" z dialógového procesu\n"
 
-#: ../src/delete.c:263
+#: ../src/delete.c:264
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "Chyba pri čítaní z procesu pre zobrazenie dialógu: %s\n"
 
-#: ../src/delete.c:344
+#: ../src/delete.c:345
 #, c-format
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr "Chyba pri spustení dialógu metacity pre zabitie aplikácie: %s\n"
 
-#: ../src/delete.c:452
+#: ../src/delete.c:453
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Nepodarilo sa získať meno hostiteľa: %s\n"
 
-#: ../src/display.c:319
+#: ../src/display.c:308
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepodarilo sa otvoriť displej X Window '%s'\n"
@@ -83,27 +83,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Kritická chyba V/V %d (%s) na displeji '%s'\n"
 
-#: ../src/frames.c:1125
+#: ../src/frames.c:1123
 msgid "Close Window"
 msgstr "Zavrieť okno"
 
-#: ../src/frames.c:1128
+#: ../src/frames.c:1126
 msgid "Window Menu"
 msgstr "Menu okna"
 
-#: ../src/frames.c:1131
+#: ../src/frames.c:1129
 msgid "Minimize Window"
 msgstr "Minimalizovať okno"
 
-#: ../src/frames.c:1134
+#: ../src/frames.c:1132
 msgid "Maximize Window"
 msgstr "Maximalizovať okno"
 
-#: ../src/frames.c:1137
+#: ../src/frames.c:1135
 msgid "Unmaximize Window"
 msgstr "Odmaximalizovať okno"
 
-#: ../src/keybindings.c:994
+#: ../src/keybindings.c:996
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -111,17 +111,17 @@ msgid ""
 msgstr ""
 "Iný program už používa kláves %s s modifikátormi %x ako klávesovú skratku.\n"
 
-#: ../src/keybindings.c:2620
+#: ../src/keybindings.c:2494
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "Chyba pri spustení dialógu metacity pre zobrazenie chyby príkazu: %s\n"
 
-#: ../src/keybindings.c:2725
+#: ../src/keybindings.c:2599
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Nedefinovaný príkaz %d.\n"
 
-#: ../src/keybindings.c:3570
+#: ../src/keybindings.c:3461
 msgid "No terminal command has been defined.\n"
 msgstr "Nebol definovaný terminálový príkaz.\n"
 
@@ -181,83 +181,87 @@ msgstr ""
 msgid "Failed to restart: %s\n"
 msgstr "Nepodarilo znovu spustiť: %s\n"
 
-#: ../src/menu.c:54
+#: ../src/menu.c:55
 msgid "Mi_nimize"
 msgstr "_Minimalizovať"
 
-#: ../src/menu.c:55
+#: ../src/menu.c:56
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/menu.c:56
+#: ../src/menu.c:57
 msgid "Unma_ximize"
 msgstr "_Odmaximalizovať"
 
-#: ../src/menu.c:57
+#: ../src/menu.c:58
 msgid "Roll _Up"
 msgstr "_Zabaliť"
 
-#: ../src/menu.c:58
+#: ../src/menu.c:59
 msgid "_Unroll"
 msgstr "_Rozbaliť"
 
-#: ../src/menu.c:59 ../src/menu.c:60
+#: ../src/menu.c:60 ../src/menu.c:61
 msgid "On _Top"
 msgstr "Na_vrch"
 
-#: ../src/menu.c:61
+#: ../src/menu.c:62
 msgid "_Move"
 msgstr "_Presunúť"
 
-#: ../src/menu.c:62
+#: ../src/menu.c:63
 msgid "_Resize"
 msgstr "Zmeniť _veľkosť"
 
-#. separator
 #: ../src/menu.c:64
+msgid "Move Titlebar On_screen"
+msgstr "Presunúť titulok na _obrazovku"
+
+#. separator
+#: ../src/menu.c:66
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #. separator
-#: ../src/menu.c:66
+#: ../src/menu.c:68
 msgid "_Always on Visible Workspace"
 msgstr "_Vždy na viditeľnej pracovnej ploche"
 
-#: ../src/menu.c:67
+#: ../src/menu.c:69
 msgid "_Only on This Workspace"
 msgstr "_Len na tejto pracovnej ploche"
 
-#: ../src/menu.c:68
+#: ../src/menu.c:70
 msgid "Move to Workspace _Left"
 msgstr "Presunúť na pracovnú plochu _vľavo"
 
-#: ../src/menu.c:69
+#: ../src/menu.c:71
 msgid "Move to Workspace R_ight"
 msgstr "Presunúť na pracovnú plochu v_pravo"
 
-#: ../src/menu.c:70
+#: ../src/menu.c:72
 msgid "Move to Workspace _Up"
 msgstr "Presunúť na pracovnú plochu _hore"
 
-#: ../src/menu.c:71
+#: ../src/menu.c:73
 msgid "Move to Workspace _Down"
 msgstr "Presunúť na pracovnú plochu _dole"
 
-#: ../src/menu.c:162 ../src/prefs.c:2106
+#: ../src/menu.c:164 ../src/prefs.c:2112
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovná plocha %d"
 
-#: ../src/menu.c:171
+#: ../src/menu.c:173
 msgid "Workspace 1_0"
 msgstr "Pracovná plocha 1_0"
 
-#: ../src/menu.c:173
+#: ../src/menu.c:175
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Pracovná plocha %s%d"
 
-#: ../src/menu.c:368
+#: ../src/menu.c:370
 msgid "Move to Another _Workspace"
 msgstr "Presunúť na inú _pracovnú plochu"
 
@@ -351,29 +355,29 @@ msgstr "Mod4"
 msgid "Mod5"
 msgstr "Mod5"
 
-#: ../src/metacity-dialog.c:110
+#: ../src/metacity-dialog.c:111
 #, c-format
 msgid "The window \"%s\" is not responding."
 msgstr "Okno \"%s\" neodpovedá."
 
-#: ../src/metacity-dialog.c:118
+#: ../src/metacity-dialog.c:119
 msgid ""
 "Forcing this application to quit will cause you to lose any unsaved changes."
 msgstr "Vynútené ukončenie tejto aplikácie spôsobí stratu neuložených zmien."
 
-#: ../src/metacity-dialog.c:129
+#: ../src/metacity-dialog.c:130
 msgid "_Force Quit"
 msgstr "_Vynútiť ukončenie"
 
-#: ../src/metacity-dialog.c:226
+#: ../src/metacity-dialog.c:227
 msgid "Title"
 msgstr "Titulok"
 
-#: ../src/metacity-dialog.c:238
+#: ../src/metacity-dialog.c:239
 msgid "Class"
 msgstr "Trieda"
 
-#: ../src/metacity-dialog.c:264
+#: ../src/metacity-dialog.c:265
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -381,7 +385,7 @@ msgstr ""
 "Tieto okná nepodporujú \"uložiť aktuálne nastavenie\n"
 " a pri budúcom prihlásení ich budete musieť znovu spustiť ručne."
 
-#: ../src/metacity-dialog.c:330
+#: ../src/metacity-dialog.c:331
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -498,11 +502,25 @@ msgstr "Skryť všetky okná a aktivovať plochu"
 msgid ""
 "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
 "focused window will be automatically raised after a delay (the delay is "
-"specified by the auto_raise_delay key)."
+"specified by the auto_raise_delay key). This preference is poorly named, but "
+"kept for backwards compatibility. To try to be more clear (at least to the "
+"technically inclined), its meaning is \"automatically raise the window "
+"following a timeout which is triggered by non-grabbed mouse entry in sloppy "
+"or mouse focus modes\". It is unrelated to clicking behavior (i.e. this is "
+"not related to raise-on-click/orthogonal-raise). It is unrelated to entering "
+"a window during drag and drop (because that results in the application "
+"grabbing the mouse)"
 msgstr ""
 "Ak je true a režim aktivácie je buď \"sloppy\" alebo \"mouse\", aktívne okno "
 "sa automaticky po danej dobe posunie dopredu (čakanie je nastavené v kľúči "
-"auto_raise_delay)."
+"auto_raise_delay). Táto predvoľba je zle pomenovaná, ale je ponechaná pre "
+"spätnú kompatibilitu. Aby to bolo viac jasné (aspoň po technickej stránke), "
+"jej význam je \"automaticky presunúť okno nad ostatné po uplynutí časového "
+"limitu, ktorý je spustený nezachyteným vstupom myši v režimoch aktivácie "
+"'sloppy' alebo 'mouse'\". Nemá to vzťah k správaniu sa klikania (t.j. nemá "
+"to vzťah k posunúť-dopredu-pri-kliknutí/ortogonálne-posunutie-dopredu). Nemá "
+"to vzťah k vstupu do okna počas 'presuň a pusť' (pretože to má za následok "
+"zachytenie myši aplikáciou)"
 
 #: ../src/metacity.schemas.in.h:18
 msgid ""
@@ -1985,12 +2003,12 @@ msgstr ""
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "Hodnota %d uložená v GConf kľúči %s nie je v rozsahu od 0 do %d\n"
 
-#: ../src/prefs.c:1589
+#: ../src/prefs.c:1595
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Chyba pri nastavovaní počtu pracovných plôch na %d: %s\n"
 
-#: ../src/prefs.c:1833
+#: ../src/prefs.c:1839
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1999,7 +2017,7 @@ msgstr ""
 "V konfiguračnej databázi nájdené \"%s\", čo nie je platná hodnota pre "
 "klávesovú skratku \"%s\".\n"
 
-#: ../src/prefs.c:2187
+#: ../src/prefs.c:2193
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Chyba pri nastavovaní mena pracovnej plochy %d na \"%s\": %s\n"
@@ -2009,12 +2027,12 @@ msgstr "Chyba pri nastavovaní mena pracovnej plochy %d na \"%s\": %s\n"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/screen.c:408
+#: ../src/screen.c:403
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji '%s' nie je platná\n"
 
-#: ../src/screen.c:424
+#: ../src/screen.c:419
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -2023,7 +2041,7 @@ msgstr ""
 "Obrazovka %d na displeji \"%s\" už má správcu okien. Skúste použiť prepínač "
 "--replace, aby sa aktuálny správca predefinoval.\n"
 
-#: ../src/screen.c:448
+#: ../src/screen.c:443
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -2031,80 +2049,80 @@ msgstr ""
 "Nepodarilo sa získať výber správcu okien pre obrazovku %d na displeji \"%s"
 "\".\n"
 
-#: ../src/screen.c:506
+#: ../src/screen.c:501
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Obrazovka %d na displeji \"%s\" už má správcu okien\n"
 
-#: ../src/screen.c:716
+#: ../src/screen.c:712
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nepodarilo sa uvoľniť obrazovku %d na displeji \"%s\"\n"
 
-#: ../src/session.c:884 ../src/session.c:891
+#: ../src/session.c:844 ../src/session.c:851
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Nepodarilo sa vytvoriť priečinok '%s': %s\n"
 
-#: ../src/session.c:901
+#: ../src/session.c:861
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Nepodarilo sa otvoriť súbor sedenia '%s' pre zápis: %s\n"
 
-#: ../src/session.c:1053
+#: ../src/session.c:1013
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Chyba pri zápise súboru sedenia '%s': %s\n"
 
-#: ../src/session.c:1058
+#: ../src/session.c:1018
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Chyba pri zatváraní súboru sedenia '%s': %s\n"
 
-#: ../src/session.c:1133
+#: ../src/session.c:1093
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Nepodarilo sa prečítať uložený súbor sedenia %s: %s\n"
 
-#: ../src/session.c:1168
+#: ../src/session.c:1128
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Nepodarilo sa spracovať uložený súbor sedenia: %s\n"
 
-#: ../src/session.c:1217
+#: ../src/session.c:1177
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "Nájdený atribút <metacity_session>, ale ID sedenia už je nastavené"
 
-#: ../src/session.c:1230
+#: ../src/session.c:1190
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Neznámy atribút %s v elemente <metacity_session>"
 
-#: ../src/session.c:1247
+#: ../src/session.c:1207
 msgid "nested <window> tag"
 msgstr "vnorená značka <window>"
 
-#: ../src/session.c:1305 ../src/session.c:1337
+#: ../src/session.c:1265 ../src/session.c:1297
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Neznámy atribúť %s v elemente <window>"
 
-#: ../src/session.c:1409
+#: ../src/session.c:1369
 #, c-format
 msgid "Unknown attribute %s on <maximized> element"
 msgstr "Neznámy atribút %s v elemente <maximized>"
 
-#: ../src/session.c:1469
+#: ../src/session.c:1429
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Neznámy atribúť %s v elemente <geometry>"
 
-#: ../src/session.c:1489
+#: ../src/session.c:1449
 #, c-format
 msgid "Unknown element %s"
 msgstr "Neznámy element %s"
 
-#: ../src/session.c:1961
+#: ../src/session.c:1921
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -3099,44 +3117,44 @@ msgstr "Používateľské konštanty musia začítať veľkým písmenom, \"%s\"
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konštanta \"%s\" už je definovaná"
 
-#: ../src/util.c:93
+#: ../src/util.c:95
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Nepodarilo sa otvoriť záznam pre ladenie: %s\n"
 
-#: ../src/util.c:103
+#: ../src/util.c:105
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Nepodarilo sa otvoriť súbor so záznamom pomocou fdopen() %s: %s\n"
 
-#: ../src/util.c:109
+#: ../src/util.c:111
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Otvorený súbor so záznamom %s\n"
 
-#: ../src/util.c:203
+#: ../src/util.c:219
 msgid "Window manager: "
 msgstr "Správca okien:"
 
-#: ../src/util.c:349
+#: ../src/util.c:365
 msgid "Bug in window manager: "
 msgstr "Chyba v správcovi okien:"
 
-#: ../src/util.c:378
+#: ../src/util.c:394
 msgid "Window manager warning: "
 msgstr "Varovanie správcu okien:"
 
-#: ../src/util.c:402
+#: ../src/util.c:418
 msgid "Window manager error: "
 msgstr "Chyba správcu okien:"
 
-#: ../src/window-props.c:162
+#: ../src/window-props.c:163
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikácia nastavila neplatné _NET_WM_PID %ld\n"
 
 #. first time through
-#: ../src/window.c:5205
+#: ../src/window.c:5238
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3152,7 +3170,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/window.c:5876
+#: ../src/window.c:5878
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"

rationales.txt

@@ -39,10 +39,22 @@ workspace wrapping:
   http://bugzilla.gnome.org/show_bug.cgi?id=89315
 
 raise windows on click:
+  http://bugzilla.gnome.org/show_bug.cgi?id=326156
   http://bugzilla.gnome.org/show_bug.cgi?id=86108
   http://bugzilla.gnome.org/show_bug.cgi?id=115072
   http://bugzilla.gnome.org/show_bug.cgi?id=115753
 
+Pointer warping:
+  http://bugzilla.gnome.org/show_bug.cgi?id=134353
+  http://bugzilla.gnome.org/show_bug.cgi?id=134352
+  (Think about tasklist & window selector too; this would be a very bad idea)
+
+
+Bugs for easy dupe-finding that seem to be hard to find otherwise:
+===
+Applications opening in wrong workspace:
+  http://bugzilla.gnome.org/show_bug.cgi?id=160687
+
 
 Tracking bugs
 ====
@@ -60,3 +72,8 @@ 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
+          output-only windows: http://bugzilla.gnome.org/show_bug.cgi?id=340584
+  allowed actions/window-type: http://bugzilla.gnome.org/show_bug.cgi?id=340682
+        EWMH/ICCCM compliance: http://bugzilla.gnome.org/show_bug.cgi?id=340691

src/.cvsignore

@@ -5,6 +5,7 @@ Makefile
 metacity
 metacity-theme-viewer
 metacity-dialog
+testboxes
 testgradient
 inlinepixbufs.h
 metacity.desktop

src/Makefile.am

@@ -2,18 +2,20 @@ lib_LTLIBRARIES = libmetacity-private.la
 
 SUBDIRS=wm-tester tools themes
 
-INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DMETACITY_LIBDIR=\"$(libdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
-
-EGGFILES=			\
-	eggaccelerators.c	\
-	eggaccelerators.h
+INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
 
 metacity_SOURCES= 				\
 	async-getprop.c				\
 	async-getprop.h				\
 	bell.h					\
 	bell.c					\
+	boxes.h					\
+	boxes.c					\
 	common.h				\
+	c-screen.c				\
+	c-screen.h				\
+	c-window.c				\
+	c-window.h				\
 	compositor.c				\
 	compositor.h				\
 	constraints.c				\
@@ -25,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				\
@@ -66,6 +70,8 @@ metacity_SOURCES= 				\
 	screen.h				\
 	session.c				\
 	session.h				\
+	spring-model.c				\
+	spring-model.h				\
 	stack.c					\
 	stack.h					\
 	tabpopup.c				\
@@ -87,13 +93,14 @@ metacity_SOURCES= 				\
 	workspace.c				\
 	workspace.h				\
 	xprops.c				\
-	xprops.h				\
-	$(EGGFILES)
+	xprops.h
 
 # 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=	\
+	boxes.c			\
+	boxes.h			\
 	gradient.c		\
 	gradient.h		\
 	preview-widget.c	\
@@ -112,6 +119,7 @@ libmetacity_private_la_LIBADD  = @METACITY_LIBS@
 libmetacityincludedir = $(includedir)/metacity-1/metacity-private
 
 libmetacityinclude_HEADERS =	\
+	boxes.h			\
 	common.h		\
 	gradient.h		\
 	preview-widget.h	\
@@ -133,11 +141,13 @@ 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@
 
@@ -178,13 +188,6 @@ 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
-
-regenerate-built-sources:
-	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh

src/api.c

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity misc. public entry points */
 
 /* 

src/api.h

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity misc. public entry points */
 
 /* 

src/async-getprop.c

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

src/async-getprop.h

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

src/bell.c

@@ -1,7 +1,10 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity visual bell */
 
 /* 
  * Copyright (C) 2002 Sun Microsystems Inc.
+ * Copyright (C) 2005, 2006 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -29,8 +32,8 @@ meta_bell_flash_screen (MetaDisplay *display,
 			MetaScreen  *screen)
 {
   Window root = screen->xroot;
-  int width = screen->width;
-  int height = screen->height;
+  int width = screen->rect.width;
+  int height = screen->rect.height;
   
   if (screen->flash_window == None)
     {
@@ -77,6 +80,7 @@ meta_bell_flash_screen (MetaDisplay *display,
       XFlush (display->xdisplay);
       XSync (display->xdisplay, False);
       XUnmapWindow (display->xdisplay, screen->flash_window);
+      XFreeGC (display->xdisplay, gc);
     }
 
   if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
@@ -250,5 +254,5 @@ void
 meta_bell_notify_frame_destroy (MetaFrame *frame)
 {
   if (frame->is_flashing) 
-    g_idle_remove_by_data (frame);
+    g_source_remove_by_funcs_user_data (&g_timeout_funcs, frame);
 }

src/bell.h

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

src/boxes.h

@@ -0,0 +1,268 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Simple box operations */
+
+/* 
+ * Copyright (C) 2005, 2006 Elijah Newren
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_BOXES_H
+#define META_BOXES_H
+
+#include <glib.h>
+#include "common.h"
+
+typedef struct _MetaRectangle MetaRectangle;
+
+struct _MetaRectangle
+{
+  int x;
+  int y;
+  int width;
+  int height;
+};
+
+#define BOX_LEFT(box)    ((box).x)                /* Leftmost pixel of rect */
+#define BOX_RIGHT(box)   ((box).x + (box).width)  /* One pixel past right   */
+#define BOX_TOP(box)     ((box).y)                /* Topmost pixel of rect  */
+#define BOX_BOTTOM(box)  ((box).y + (box).height) /* One pixel past bottom  */
+
+typedef enum
+{
+  FIXED_DIRECTION_X = 1 << 0,
+  FIXED_DIRECTION_Y = 1 << 1,
+} FixedDirections;
+
+typedef enum
+{
+  META_EDGE_WINDOW,
+  META_EDGE_XINERAMA,
+  META_EDGE_SCREEN
+} MetaEdgeType;
+
+typedef struct _MetaEdge MetaEdge;
+struct _MetaEdge
+{
+  MetaRectangle rect;      /* width or height should be 1 */
+  MetaDirection side_type; /* should only have 1 of the 4 directions set */
+  MetaEdgeType  edge_type;
+};
+
+/* Output functions -- note that the output buffer had better be big enough:
+ *   rect_to_string:   RECT_LENGTH
+ *   region_to_string: (RECT_LENGTH+strlen(separator_string)) *
+ *                     g_list_length (region)
+ *   edge_to_string:   EDGE_LENGTH
+ *   edge_list_to_...: (EDGE_LENGTH+strlen(separator_string)) * 
+ *                     g_list_length (edge_list)
+ */
+#define RECT_LENGTH 27
+#define EDGE_LENGTH 37
+char* meta_rectangle_to_string        (const MetaRectangle *rect,
+                                       char                *output);
+char* meta_rectangle_region_to_string (GList               *region,
+                                       const char          *separator_string,
+                                       char                *output);
+char* meta_rectangle_edge_to_string   (const MetaEdge      *edge,
+                                       char                *output);
+char* meta_rectangle_edge_list_to_string (
+                                       GList               *edge_list,
+                                       const char          *separator_string,
+                                       char                *output);
+
+/* Function to make initializing a rect with a single line of code easy */
+MetaRectangle                 meta_rect (int x, int y, int width, int height);
+
+/* Basic comparison functions */
+int      meta_rectangle_area            (const MetaRectangle *rect);
+gboolean meta_rectangle_intersect       (const MetaRectangle *src1,
+                                         const MetaRectangle *src2,
+                                         MetaRectangle       *dest);
+gboolean meta_rectangle_equal           (const MetaRectangle *src1,
+                                         const MetaRectangle *src2);
+
+/* overlap is similar to intersect but doesn't provide location of
+ * intersection information.
+ */
+gboolean meta_rectangle_overlap         (const MetaRectangle *rect1,
+                                         const MetaRectangle *rect2);
+
+/* vert_overlap means ignore the horizontal location and ask if the
+ * vertical parts overlap.  An alternate way to think of it is "Does there
+ * exist a way to shift either rect horizontally so that the two rects
+ * overlap?"  horiz_overlap is similar.
+ */
+gboolean meta_rectangle_vert_overlap    (const MetaRectangle *rect1,
+                                         const MetaRectangle *rect2);
+gboolean meta_rectangle_horiz_overlap   (const MetaRectangle *rect1,
+                                         const MetaRectangle *rect2);
+
+/* could_fit_rect determines whether "outer_rect" is big enough to contain
+ * inner_rect.  contains_rect checks whether it actually contains it.
+ */
+gboolean meta_rectangle_could_fit_rect  (const MetaRectangle *outer_rect,
+                                         const MetaRectangle *inner_rect);
+gboolean meta_rectangle_contains_rect   (const MetaRectangle *outer_rect,
+                                         const MetaRectangle *inner_rect);
+
+/* Resize old_rect to the given new_width and new_height, but store the
+ * result in rect.  NOTE THAT THIS IS RESIZE ONLY SO IT CANNOT BE USED FOR
+ * A MOVERESIZE OPERATION (that simplies the routine a little bit as it
+ * means there's no difference between NorthWestGravity and StaticGravity.
+ * Also, I lied a little bit--technically, you could use it in a MoveResize
+ * operation if you muck with old_rect just right).
+ */
+void meta_rectangle_resize_with_gravity (const MetaRectangle *old_rect,
+                                         MetaRectangle       *rect,
+                                         int                  gravity,
+                                         int                  new_width,
+                                         int                  new_height);
+
+/* find a list of rectangles with the property that a window is contained
+ * in the given region if and only if it is contained in one of the
+ * rectangles in the list.
+ *
+ * In this case, the region is given by taking basic_rect, removing from
+ * it the intersections with all the rectangles in the all_struts list,
+ * then expanding all the rectangles in the resulting list by the given
+ * amounts on each side.
+ *
+ * See boxes.c for more details.
+ */
+GList*   meta_rectangle_get_minimal_spanning_set_for_region (
+                                         const MetaRectangle *basic_rect,
+                                         const GSList        *all_struts);
+
+/* Expand all rectangles in region by the given amount on each side */
+GList*   meta_rectangle_expand_region   (GList               *region,
+                                         const int            left_expand,
+                                         const int            right_expand,
+                                         const int            top_expand,
+                                         const int            bottom_expand);
+/* Same as for meta_rectangle_expand_region except that rectangles not at
+ * least min_x or min_y in size are not expanded in that direction
+ */
+GList*   meta_rectangle_expand_region_conditionally (
+                                         GList                *region,
+                                         const int            left_expand,
+                                         const int            right_expand,
+                                         const int            top_expand,
+                                         const int            bottom_expand,
+                                         const int            min_x,
+                                         const int            min_y);
+
+/* Free the list created by
+ *   meta_rectangle_get_minimal_spanning_set_for_region()
+ * or
+ *   meta_rectangle_find_onscreen_edges ()
+ * or
+ *   meta_rectangle_find_nonintersected_xinerama_edges()
+ */
+void     meta_rectangle_free_list_and_elements (GList *filled_list);
+
+/* could_fit_in_region determines whether one of the spanning_rects is
+ * big enough to contain rect.  contained_in_region checks whether one
+ * actually contains it.
+ */
+gboolean meta_rectangle_could_fit_in_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+gboolean meta_rectangle_contained_in_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+gboolean meta_rectangle_overlaps_with_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+
+/* Make the rectangle small enough to fit into one of the spanning_rects,
+ * but make it no smaller than min_size.
+ */
+void     meta_rectangle_clamp_to_fit_into_region (
+                                         const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect,
+                                         const MetaRectangle *min_size);
+
+/* Clip the rectangle so that it fits into one of the spanning_rects, assuming
+ * it overlaps with at least one of them
+ */
+void     meta_rectangle_clip_to_region  (const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect);
+
+/* Shove the rectangle into one of the spanning_rects, assuming it fits in
+ * one of them.
+ */
+void     meta_rectangle_shove_into_region(
+                                         const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect);
+
+/* Finds the point on the line connecting (x1,y1) to (x2,y2) which is closest
+ * to (px, py).  Useful for finding an optimal rectangle size when given a
+ * range between two sizes that are all candidates.
+ */
+void meta_rectangle_find_linepoint_closest_to_point (double x1,    double y1,
+                                                     double x2,    double y2,
+                                                     double px,    double py,
+                                                     double *valx, double *valy);
+
+/***************************************************************************/
+/*                                                                         */
+/* Switching gears to code for edges instead of just rectangles            */
+/*                                                                         */
+/***************************************************************************/
+
+/* Return whether an edge overlaps or is adjacent to the rectangle in the
+ * nonzero-width dimension of the edge.
+ */
+gboolean meta_rectangle_edge_aligns (const MetaRectangle *rect, 
+                                     const MetaEdge      *edge);
+
+/* Compare two edges, so that sorting functions can put a list of edges in
+ * canonical order.
+ */
+gint   meta_rectangle_edge_cmp (gconstpointer a, gconstpointer b);
+
+/* Compare two edges, so that sorting functions can put a list of edges in
+ * order.  This function doesn't separate left edges first, then right edges,
+ * etc., but rather compares only upon location.
+ */
+gint   meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b);
+
+/* Removes an parts of edges in the given list that intersect any box in the
+ * given rectangle list.  Returns the result.
+ */
+GList* meta_rectangle_remove_intersections_with_boxes_from_edges (
+                                           GList *edges,
+                                           const GSList *rectangles);
+
+/* Finds all the edges of an onscreen region, returning a GList* of
+ * MetaEdgeRect's.
+ */
+GList* meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
+                                           const GSList        *all_struts);
+
+/* Finds edges between adjacent xineramas which are not covered by the given
+ * struts.
+ */
+GList* meta_rectangle_find_nonintersected_xinerama_edges (
+                                           const GList         *xinerama_rects,
+                                           const GSList        *all_struts);
+
+#endif /* META_BOXES_H */

src/c-screen.c

@@ -0,0 +1,679 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* 
+ * Copyright (C) 2006 Red Hat, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+#include <cm/ws.h>
+#include <cm/stacker.h>
+#include <cm/wsint.h>
+#include <cm/drawable-node.h>
+#include <cm/state.h>
+#include <cm/magnifier.h>
+#include <cm/square.h>
+#include <string.h>
+
+#include "screen.h"
+#include "c-screen.h"
+#include "c-window.h"
+
+struct MetaCompScreen
+{
+  WsDisplay *display;
+  CmStacker *stacker;
+  CmMagnifier *magnifier;
+  
+  WsWindow *gl_window;
+  WsWindow *root_window;
+  
+  WsScreen *screen;
+  MetaScreen *meta_screen;
+  
+  int repaint_id;
+  int idle_id;
+  
+  WsWindow *selection_window;
+
+  GHashTable *windows_by_xid;
+};
+
+static MetaCompWindow *
+meta_comp_window_lookup (MetaCompScreen *info,
+			 Window xid)
+{
+    MetaCompWindow *window;
+    
+    window = g_hash_table_lookup (info->windows_by_xid, (gpointer)xid);
+    
+    return window;
+}
+
+MetaCompWindow *
+meta_comp_screen_lookup_window   (MetaCompScreen *info,
+				  Window          xwindow)
+{
+    return meta_comp_window_lookup (info, xwindow);
+}
+
+#if 0
+static void
+update_frame_counter (void)
+{
+#define BUFSIZE 128
+  static GTimer *timer;
+  static double buffer [BUFSIZE];
+  static int next = 0;
+  
+  if (!timer)
+    timer = g_timer_new ();
+  
+  buffer[next++] = g_timer_elapsed (timer, NULL);
+  
+  if (next == BUFSIZE)
+    {
+      int i;
+      double total;
+      
+      next = 0;
+      
+      total = 0.0;
+      for (i = 1; i < BUFSIZE; ++i)
+	total += buffer[i] - buffer[i - 1];
+      
+      g_print ("frames per second: %f\n", 1 / (total / (BUFSIZE - 1)));
+    }
+}
+#endif
+
+static void
+dump_stacking_order (GList *nodes)
+{
+  GList *list;
+  
+  for (list = nodes; list != NULL; list = list->next)
+    {
+      CmDrawableNode *node = list->data;
+      
+      if (node)
+	g_print ("%lx, ", WS_RESOURCE_XID (node->drawable));
+    }
+  g_print ("\n");
+}
+
+static gboolean
+repaint (gpointer data)
+{
+  MetaCompScreen *info = data;
+  CmState *state;
+#if 0
+  g_print ("repaint\n");
+#endif
+  glViewport (0, 0,
+	      info->meta_screen->rect.width,
+	      info->meta_screen->rect.height);
+  
+  glLoadIdentity();
+  
+#if 0
+  glClearColor (0, 0, 0, 1.0);
+  glClear (GL_COLOR_BUFFER_BIT);
+#endif
+  
+  ws_window_raise (info->gl_window);
+  
+#if 0
+  glDisable (GL_TEXTURE_2D);
+  glDisable (GL_TEXTURE_RECTANGLE_ARB);
+  glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+  glColor4f (0.0, 1.0, 0.0, 1.0);
+  glRectf (-1.0, -1.0, 1.0, 1.0);
+  glFinish();
+#endif
+  
+  state = cm_state_new ();
+  
+  cm_state_disable_depth_buffer_update (state);
+  
+  cm_node_render (CM_NODE (info->magnifier), state);
+  
+  cm_state_enable_depth_buffer_update (state);
+  
+  g_object_unref (state);
+
+  ws_window_gl_swap_buffers (info->gl_window);
+  glFinish();
+  
+#if 0
+  dump_stacking_order (info->stacker->children);
+#endif
+  
+  info->idle_id = 0;
+  return FALSE;
+}
+
+static MetaCompWindow *
+find_comp_window (MetaCompScreen *info,
+		  Window	       xwindow)
+{
+  return meta_comp_window_lookup (info, xwindow);
+}
+
+static CmNode *
+find_node (MetaCompScreen *info,
+	   Window	   xwindow)
+{
+  MetaCompWindow *window = meta_comp_window_lookup (info, xwindow);
+  
+  if (window)
+    return meta_comp_window_get_node (window);
+  
+  return NULL;
+}
+
+static GList *all_screen_infos;
+
+MetaCompScreen *
+meta_comp_screen_get_by_xwindow (Window xwindow)
+{
+  GList *list;
+  
+  for (list = all_screen_infos; list != NULL; list = list->next)
+    {
+      MetaCompScreen *info = list->data;
+      
+      if (find_node (info, xwindow))
+	return info;
+    }
+  
+  return NULL;
+}
+
+MetaCompScreen *
+meta_comp_screen_new (WsDisplay *display,
+		      MetaScreen *screen)
+{
+  MetaCompScreen *scr_info = g_new0 (MetaCompScreen, 1);
+  
+  scr_info->screen = ws_display_get_screen_from_number (
+							display, screen->number);
+  scr_info->root_window = ws_screen_get_root_window (scr_info->screen);
+  scr_info->display = display;
+  scr_info->meta_screen = screen;
+  scr_info->windows_by_xid = g_hash_table_new (g_direct_hash, g_direct_equal);
+  
+  all_screen_infos = g_list_prepend (all_screen_infos, scr_info);
+  
+  return scr_info;
+}
+
+static char *
+make_selection_name (MetaCompScreen *info)
+{
+  char *buffer;
+  
+  buffer = g_strdup_printf ("_NET_WM_CM_S%d", info->meta_screen->number);
+  
+  return buffer;
+}
+
+static void
+on_selection_clear (WsWindow *window,
+		    WsSelectionClearEvent *event,
+		    gpointer data)
+{
+  MetaCompScreen *info = data;
+  char *buffer = make_selection_name (info);
+  
+  if (strcmp (event->selection, buffer))
+    {
+      /* We lost the selection */
+      meta_comp_screen_unredirect (info);
+    }
+}
+
+static WsWindow *
+claim_selection (MetaCompScreen *info)
+{
+  WsWindow *window = ws_window_new (info->root_window);
+  char *buffer = make_selection_name (info);
+  
+#if 0
+  g_print ("selection window: %lx\n", WS_RESOURCE_XID (window));
+#endif
+  
+  ws_window_own_selection (window, buffer, WS_CURRENT_TIME);
+  
+  g_signal_connect (window, "selection_clear_event", G_CALLBACK (on_selection_clear), info);
+  
+  g_free (buffer);
+  
+  return window;
+}
+
+static void
+queue_paint (CmNode *node,
+	     MetaCompScreen *info)
+{
+#if 0
+  g_print ("queueing %s\n", G_OBJECT_TYPE_NAME (node));
+#endif
+  meta_comp_screen_queue_paint (info);
+}
+
+void
+meta_comp_screen_redirect (MetaCompScreen *info)
+{
+  WsWindow *root = ws_screen_get_root_window (info->screen);
+  WsRectangle source;
+  WsRectangle target;
+  WsServerRegion *region;
+  int screen_w;
+  int screen_h;
+  CmSquare *square;
+  
+#if 0
+  g_print ("redirecting %lx\n", WS_RESOURCE_XID (root));
+#endif
+  
+  ws_window_redirect_subwindows (root);
+  info->gl_window = ws_screen_get_gl_window (info->screen);
+  /* FIXME: This should probably happen in libcm */
+  ws_window_set_override_redirect (info->gl_window, TRUE);
+  region = ws_server_region_new (info->display);
+  ws_window_set_input_shape (info->gl_window, region);
+  g_object_unref (G_OBJECT (region));
+  
+  ws_display_begin_error_trap (info->display);
+  
+  ws_window_unredirect (info->gl_window);
+  
+  ws_display_end_error_trap (info->display);
+  
+  info->selection_window = claim_selection (info);
+  
+  ws_window_map (info->gl_window);
+  
+  info->stacker = cm_stacker_new ();
+  
+  square = cm_square_new (0.3, 0.3, 0.8, 1.0);
+  
+  cm_stacker_add_child (info->stacker, CM_NODE (square));
+  
+  g_object_unref (square);
+  
+  screen_w = ws_screen_get_width (info->screen);
+  screen_h = ws_screen_get_height (info->screen);
+  
+#if 0
+  g_print ("width: %d height %d\n", screen_w, screen_h);
+#endif
+  
+  source.x = (screen_w - (screen_w / 4)) / 2;
+  source.y = screen_h / 16;
+  source.width = screen_w / 4;
+  source.height = screen_h / 16;
+  
+  target.x = 0;
+  target.y = screen_h - screen_h / 4;
+  target.width = screen_w;
+  target.height = screen_h / 4;
+  
+  info->magnifier = cm_magnifier_new (CM_NODE (info->stacker), &source, &target);
+  
+  g_object_unref (info->stacker);
+  
+  if (g_getenv ("USE_MAGNIFIER"))
+    cm_magnifier_set_active (info->magnifier, TRUE);
+  else
+    cm_magnifier_set_active (info->magnifier, FALSE);
+  
+  info->repaint_id =
+    g_signal_connect (info->magnifier, "need_repaint",
+		      G_CALLBACK (queue_paint), info);
+  
+  ws_display_sync (info->display);
+}
+
+static void
+listify (gpointer key,
+	 gpointer value,
+	 gpointer data)
+{
+    GList **windows = data;
+
+    *windows = g_list_prepend (*windows, (gpointer)value);
+}
+
+static void
+free_all_windows (MetaCompScreen *info)
+{
+    GList *windows = NULL, *list;
+    
+    g_hash_table_foreach (info->windows_by_xid, listify, &windows);
+
+    for (list = windows; list != NULL; list = list->next)
+    {
+	MetaCompWindow *window = list->data;
+
+	meta_comp_window_free (window);
+    }
+
+    g_list_free (windows);
+}
+
+void
+meta_comp_screen_unredirect (MetaCompScreen *info)
+{
+  WsScreen *ws_screen = info->screen;
+  WsWindow *root = ws_screen_get_root_window (ws_screen);
+  
+  g_signal_handler_disconnect (info->magnifier, info->repaint_id);
+  g_object_unref (info->magnifier);
+  
+  ws_window_unredirect_subwindows (root);
+  ws_screen_release_gl_window (ws_screen);
+
+  free_all_windows (info);
+  
+  ws_display_sync (info->display);
+  
+  /* FIXME: libcm needs a way to guarantee that a window is destroyed,
+   * without relying on ref counting having it as a side effect
+   */
+  g_object_unref (info->selection_window);
+}
+
+void
+meta_comp_screen_queue_paint (MetaCompScreen *info)
+{
+#if 0
+  g_print ("queuing\n");
+#endif
+  if (!info->idle_id)
+    info->idle_id = g_idle_add (repaint, info);
+}
+
+void
+meta_comp_screen_restack (MetaCompScreen *info,
+			  Window	  window,
+			  Window	  above_this)
+{
+  MetaCompWindow *comp_window = find_comp_window (info, window);
+  MetaCompWindow *above_comp_window = find_comp_window (info, above_this);
+  CmNode *window_node = find_node (info, window);
+  CmNode *above_node  = find_node (info, above_this);
+
+  if ((comp_window && meta_comp_window_stack_frozen (comp_window)) ||
+      (above_comp_window && meta_comp_window_stack_frozen (above_comp_window)))
+  {
+      return;
+  }
+  
+#if 0
+  dump_stacking_order (info->stacker->children);
+#endif
+  
+  if (window_node == above_node)
+    return;
+  
+  if (window_node && above_this == WS_RESOURCE_XID (info->gl_window))
+    {
+      cm_stacker_raise_child (info->stacker, window_node);
+    }
+  else if (window_node && above_this == None)
+    {
+      cm_stacker_lower_child (info->stacker, window_node);
+    }
+  else if (window_node && above_node)
+    {
+      cm_stacker_restack_child (info->stacker, window_node, above_node);
+    }
+#if 0
+  else
+    g_print ("nothing happened\n");
+#endif
+  
+#if 0
+  g_print ("done restacking; new order:\n");
+#endif
+#if 0
+  dump_stacking_order (info->stacker->children);
+#endif
+  
+}
+
+void
+meta_comp_screen_raise_window (MetaCompScreen  *info,
+			       Window           window)
+{
+  CmNode *node = find_node (info, window);
+  
+  if (node)
+    cm_stacker_raise_child (info->stacker, node);
+}
+
+void
+meta_comp_screen_set_size (MetaCompScreen *info,
+			   Window	   xwindow,
+			   gint		   x,
+			   gint		   y,
+			   gint		   width,
+			   gint		   height)
+{
+  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
+  
+  if (comp_window)
+    {
+      WsRectangle rect;
+      
+      rect.x = x;
+      rect.y = y;
+      rect.width = width;
+      rect.height = height;
+      
+      meta_comp_window_set_size (comp_window, &rect);
+    }
+}
+
+static void
+print_child_titles (WsWindow *window)
+{
+  GList *children = ws_window_query_subwindows (window);
+  GList *list;
+  int i;
+  
+  g_print ("window: %lx %s\n", WS_RESOURCE_XID (window), ws_window_query_title (window));
+  
+  i = 0;
+  for (list = children; list != NULL; list = list->next)
+    {
+      WsWindow *child = list->data;
+      
+      g_print ("  %d adding: %lx %s\n", i++, WS_RESOURCE_XID (child), ws_window_query_title (child));
+    }
+}
+
+typedef struct
+{
+    MetaCompScreen *cscreen;
+    XID		    xid;
+} DestroyData;
+
+static void
+on_window_destroy (MetaCompWindow *comp_window,
+		   gpointer        closure)
+{
+    DestroyData *data = closure;
+    CmNode *node = meta_comp_window_get_node (comp_window);
+    
+    cm_stacker_remove_child (data->cscreen->stacker, node);
+    g_hash_table_remove (data->cscreen->windows_by_xid, (gpointer)data->xid);
+}
+
+void
+meta_comp_screen_add_window (MetaCompScreen *info,
+			     Window	     xwindow)
+{
+  WsDrawable *drawable;
+  MetaCompWindow *comp_window;
+  DestroyData *data;
+  
+  ws_display_begin_error_trap (info->display);
+  
+  comp_window = meta_comp_window_lookup (info, xwindow);
+  
+  if (comp_window)
+    goto out;
+  
+  drawable = WS_DRAWABLE (ws_window_lookup (info->display, xwindow));
+  
+  if (ws_window_query_input_only (WS_WINDOW (drawable)))
+    goto out;
+  
+  if (WS_WINDOW (drawable) == info->gl_window ||
+      WS_WINDOW (drawable) == info->screen->overlay_window)
+    {
+#if 0
+      g_print ("gl window\n");
+#endif
+      goto out;
+    }
+
+  data = g_new (DestroyData, 1);
+  data->cscreen = info;
+  data->xid = WS_RESOURCE_XID (drawable);
+  
+  comp_window = meta_comp_window_new (info->meta_screen, drawable,
+				      on_window_destroy, data);
+  
+  g_hash_table_insert (info->windows_by_xid, (gpointer)WS_RESOURCE_XID (drawable), comp_window);
+  
+  cm_stacker_add_child (info->stacker, meta_comp_window_get_node (comp_window));
+  
+ out:
+  if (comp_window)
+  {
+      /* This function is called both when windows are created and when they
+       * are mapped, so for now we have this silly function.
+       */
+      meta_comp_window_refresh_attrs (comp_window);
+  }
+  
+  ws_display_end_error_trap (info->display);
+  
+#if 0
+  g_print ("done checking\n");
+#endif
+  
+  return;
+}
+
+
+void
+meta_comp_screen_remove_window (MetaCompScreen *info,
+				Window	        xwindow)
+{
+  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
+  
+  if (comp_window)
+      meta_comp_window_free (comp_window);
+}
+
+void
+meta_comp_screen_set_updates (MetaCompScreen *info,
+			      Window	      xwindow,
+			      gboolean	      updates)
+{
+  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
+  
+  meta_comp_window_set_updates (comp_window, updates);
+}
+
+
+void
+meta_comp_screen_set_patch (MetaCompScreen *info,
+			    Window	    xwindow,
+			    CmPoint         points[4][4])
+{
+  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
+  
+  if (node)
+    cm_drawable_node_set_patch (node, points);
+}
+
+void
+meta_comp_screen_unset_patch (MetaCompScreen *info,
+			      Window	      xwindow)
+{
+  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
+  
+  if (node)
+    cm_drawable_node_unset_patch (node);
+}
+
+void
+meta_comp_screen_set_alpha (MetaCompScreen *info,
+			    Window	xwindow,
+			    gdouble alpha)
+{
+  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
+#if 0
+  g_print ("alpha: %f\n", alpha);
+#endif
+  cm_drawable_node_set_alpha (node, alpha);
+}
+
+void
+meta_comp_screen_get_real_size (MetaCompScreen *info,
+				Window xwindow,
+				WsRectangle *size)
+{
+  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
+  
+  if (!size)
+    return;
+  
+  cm_drawable_node_get_clipbox (node, size);
+}
+
+void
+meta_comp_screen_unmap (MetaCompScreen *info,
+			Window		xwindow)
+{
+    MetaCompWindow *window = find_comp_window (info, xwindow);
+
+    if (window)
+	meta_comp_window_hide (window);
+}
+
+void
+meta_comp_screen_set_target_rect (MetaCompScreen *info,
+				  Window xwindow,
+				  WsRectangle *rect)
+{
+  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
+  
+  if (node)
+    cm_drawable_node_set_scale_rect (node, rect);
+}
+
+#endif
+

src/c-screen.h

@@ -0,0 +1,53 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "screen.h"
+#include "c-window.h"
+
+typedef struct MetaCompScreen MetaCompScreen;
+
+MetaCompScreen *meta_comp_screen_new             (WsDisplay      *display,
+						  MetaScreen     *screen);
+MetaCompScreen *meta_comp_screen_get_by_xwindow  (Window          xwindow);
+void            meta_comp_screen_destroy         (MetaCompScreen *scr_info);
+void            meta_comp_screen_redirect        (MetaCompScreen *info);
+void            meta_comp_screen_unredirect      (MetaCompScreen *info);
+void            meta_comp_screen_add_window      (MetaCompScreen *scr_info,
+						  Window          xwindow);
+void            meta_comp_screen_remove_window   (MetaCompScreen *scr_info,
+						  Window          xwindow);
+void            meta_comp_screen_restack         (MetaCompScreen *scr_info,
+						  Window          window,
+						  Window          above_this);
+void            meta_comp_screen_set_size        (MetaCompScreen *info,
+						  Window          window,
+						  gint            x,
+						  gint            y,
+						  gint            width,
+						  gint            height);
+void            meta_comp_screen_raise_window    (MetaCompScreen *scr_info,
+						  Window          window);
+void            meta_comp_screen_queue_paint     (MetaCompScreen *info);
+void            meta_comp_screen_set_updates     (MetaCompScreen *info,
+						  Window          xwindow,
+						  gboolean        updates);
+void            meta_comp_screen_set_patch       (MetaCompScreen *info,
+						  Window          xwindow,
+						  CmPoint         points[4][4]);
+void            meta_comp_screen_unset_patch     (MetaCompScreen *info,
+						  Window          xwindow);
+void            meta_comp_screen_set_alpha       (MetaCompScreen *info,
+						  Window          xwindow,
+						  gdouble         alpha);
+void            meta_comp_screen_get_real_size   (MetaCompScreen *info,
+						  Window          xwindow,
+						  WsRectangle    *size);
+void            meta_comp_screen_set_target_rect (MetaCompScreen *info,
+						  Window          xwindow,
+						  WsRectangle    *rect);
+void            meta_comp_screen_set_explode     (MetaCompScreen *info,
+						  Window          xwindow,
+						  gdouble         level);
+void            meta_comp_screen_unmap           (MetaCompScreen *info,
+						  Window          xwindow);
+MetaCompWindow *meta_comp_screen_lookup_window   (MetaCompScreen *info,
+						  Window          xwindow);

src/c-window.h

@@ -0,0 +1,72 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* 
+ * Copyright (C) 2006 Red Hat, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <cm/node.h>
+#include "display.h"
+#include "effects.h"
+
+#ifndef C_WINDOW_H
+#define C_WINDOW_H
+
+typedef struct _MetaCompWindow MetaCompWindow;
+
+typedef void (* MetaCompWindowDestroy) (MetaCompWindow *window,
+                                        gpointer        closure);
+
+MetaCompWindow *meta_comp_window_new (MetaScreen *screen,
+				      WsDrawable *drawable,
+				      MetaCompWindowDestroy destroy,
+				      gpointer data);
+CmNode	       *meta_comp_window_get_node (MetaCompWindow *window);
+gboolean        meta_comp_window_free (MetaCompWindow *window);
+void		meta_comp_window_set_size (MetaCompWindow *window,
+					   WsRectangle *size);
+
+void		meta_comp_window_hide (MetaCompWindow *comp_window);
+void		meta_comp_window_show (MetaCompWindow *comp_window);
+void		meta_comp_window_refresh_attrs (MetaCompWindow *comp_window);
+void		meta_comp_window_set_updates (MetaCompWindow *comp_window,
+					      gboolean updates);
+
+void		meta_comp_window_explode (MetaCompWindow *comp_window,
+					  MetaEffect *effect);
+void		meta_comp_window_shrink (MetaCompWindow *comp_window,
+					 MetaEffect *effect);
+void		meta_comp_window_unshrink (MetaCompWindow *comp_window,
+					   MetaEffect *effect);
+void		meta_comp_window_run_focus (MetaCompWindow *comp_window,
+					    MetaEffect *effect);
+void		meta_comp_window_restack (MetaCompWindow *comp_window,
+					  MetaCompWindow *above);
+void		meta_comp_window_freeze_stack (MetaCompWindow *comp_window);
+void		meta_comp_window_thaw_stack (MetaCompWindow *comp_window);
+gboolean	meta_comp_window_stack_frozen (MetaCompWindow *comp_window);
+void            meta_comp_window_run_minimize (MetaCompWindow *window,
+					       MetaEffect     *effect);
+void	        meta_comp_window_run_unminimize (MetaCompWindow *comp_window,
+						 MetaEffect     *effect);
+
+#if 0
+void		meta_comp_window_set_explode (MetaCompWindow *comp_window,
+					      double	      level);
+#endif
+
+#endif
+

src/colors.c

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity RGB color stuff */
 
 /* 

src/colors.h

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity RGB color stuff */
 
 /* 

src/common.h

@@ -1,7 +1,10 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity common types shared by core.h and ui.h */
 
 /* 
  * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2005 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -43,7 +46,8 @@ typedef enum
   META_FRAME_ALLOWS_SHADE             = 1 << 10,
   META_FRAME_ALLOWS_MOVE              = 1 << 11,
   META_FRAME_FULLSCREEN               = 1 << 12,
-  META_FRAME_IS_FLASHING              = 1 << 13
+  META_FRAME_IS_FLASHING              = 1 << 13,
+  META_FRAME_ABOVE                    = 1 << 14
 } MetaFrameFlags;
 
 typedef enum
@@ -64,7 +68,8 @@ typedef enum
   META_MENU_OP_MOVE_LEFT   = 1 << 13,
   META_MENU_OP_MOVE_RIGHT  = 1 << 14,
   META_MENU_OP_MOVE_UP     = 1 << 15,
-  META_MENU_OP_MOVE_DOWN   = 1 << 16
+  META_MENU_OP_MOVE_DOWN   = 1 << 16,
+  META_MENU_OP_RECOVER     = 1 << 17
 } MetaMenuOp;
 
 typedef struct _MetaWindowMenu MetaWindowMenu;
@@ -72,7 +77,7 @@ typedef struct _MetaWindowMenu MetaWindowMenu;
 typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
                                      Display        *xdisplay,
                                      Window          client_xwindow,
-				     Time	     timestamp,
+                                     guint32         timestamp,
                                      MetaMenuOp      op,
                                      int             workspace,
                                      gpointer        data);
@@ -114,6 +119,11 @@ typedef enum
   /* Alt+Esc */
   META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL,
   META_GRAB_OP_KEYBOARD_ESCAPING_DOCK,
+
+  META_GRAB_OP_KEYBOARD_ESCAPING_GROUP,
+  
+  /* Alt+F6 */
+  META_GRAB_OP_KEYBOARD_TABBING_GROUP,
   
   META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING,
   
@@ -122,7 +132,13 @@ typedef enum
   META_GRAB_OP_CLICKING_MAXIMIZE,
   META_GRAB_OP_CLICKING_UNMAXIMIZE,
   META_GRAB_OP_CLICKING_DELETE,
-  META_GRAB_OP_CLICKING_MENU
+  META_GRAB_OP_CLICKING_MENU,
+  META_GRAB_OP_CLICKING_SHADE,
+  META_GRAB_OP_CLICKING_UNSHADE,
+  META_GRAB_OP_CLICKING_ABOVE,
+  META_GRAB_OP_CLICKING_UNABOVE,
+  META_GRAB_OP_CLICKING_STICK,
+  META_GRAB_OP_CLICKING_UNSTICK
 } MetaGrabOp;
 
 typedef enum
@@ -136,8 +152,7 @@ typedef enum
   META_CURSOR_SW_RESIZE,
   META_CURSOR_NE_RESIZE,
   META_CURSOR_NW_RESIZE,
-  META_CURSOR_MOVE_WINDOW,
-  META_CURSOR_RESIZE_WINDOW,
+  META_CURSOR_MOVE_OR_RESIZE_WINDOW,
   META_CURSOR_BUSY
 
 } MetaCursor;
@@ -149,10 +164,18 @@ typedef enum
   META_FOCUS_MODE_MOUSE
 } MetaFocusMode;
 
+typedef enum
+{
+  META_FOCUS_NEW_WINDOWS_SMART,
+  META_FOCUS_NEW_WINDOWS_STRICT
+} MetaFocusNewWindows;
+
 typedef enum
 {
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_SHADE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_MAXIMIZE,
+  META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE,
+  META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST
 } MetaActionDoubleClickTitlebar;
 
@@ -184,6 +207,21 @@ typedef enum
   META_VIRTUAL_MOD5_MASK     = 1 << 14
 } MetaVirtualModifier;
 
+/* Relative directions or sides seem to come up all over the place... */
+/* FIXME: Replace
+ *   screen.[ch]:MetaScreenDirection,
+ *   workspace.[ch]:MetaMotionDirection,
+ * with the use of MetaDirection.
+ */
+typedef enum
+{
+  META_DIRECTION_LEFT      = 1 << 0,
+  META_DIRECTION_RIGHT     = 1 << 1,
+  META_DIRECTION_TOP       = 1 << 2,
+  META_DIRECTION_BOTTOM    = 1 << 3,
+  META_DIRECTION_UP        = 1 << 2, /* Alternate name for TOP */
+  META_DIRECTION_DOWN      = 1 << 3  /* Alternate name for BOTTOM */
+} MetaDirection;
 
 /* Function a window button can have.  Note, you can't add stuff here
  * without extending the theme format to draw a new function and
@@ -195,6 +233,12 @@ typedef enum
   META_BUTTON_FUNCTION_MINIMIZE,
   META_BUTTON_FUNCTION_MAXIMIZE,
   META_BUTTON_FUNCTION_CLOSE,
+  META_BUTTON_FUNCTION_SHADE,
+  META_BUTTON_FUNCTION_ABOVE,
+  META_BUTTON_FUNCTION_STICK,
+  META_BUTTON_FUNCTION_UNSHADE,
+  META_BUTTON_FUNCTION_UNABOVE,
+  META_BUTTON_FUNCTION_UNSTICK,
   META_BUTTON_FUNCTION_LAST
 } MetaButtonFunction;
 
@@ -226,7 +270,3 @@ struct _MetaButtonLayout
   (ycoord) <  ((rect).y + (rect).height))
 
 #endif
-
-
-
-

src/compositor.h

@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity compositing manager */
 
 /* 
@@ -25,6 +27,11 @@
 #include "util.h"
 #include "display.h"
 
+typedef void (* MetaAnimationFinishedFunc) (gpointer data);
+
+/* XXX namespace me */
+void compute_window_rect (MetaWindow *window, MetaRectangle *rect);
+
 MetaCompositor* meta_compositor_new           (MetaDisplay       *display);
 void            meta_compositor_unref         (MetaCompositor    *compositor);
 void            meta_compositor_process_event (MetaCompositor    *compositor,
@@ -35,22 +42,44 @@ void            meta_compositor_add_window    (MetaCompositor    *compositor,
                                                XWindowAttributes *attrs);
 void            meta_compositor_remove_window (MetaCompositor    *compositor,
                                                Window             xwindow);
+void		meta_compositor_set_debug_updates (MetaCompositor *compositor,
+						   gboolean	   debug_updates);
 
 void meta_compositor_manage_screen   (MetaCompositor *compositor,
                                       MetaScreen     *screen);
 void meta_compositor_unmanage_screen (MetaCompositor *compositor,
                                       MetaScreen     *screen);
 
-void meta_compositor_damage_window   (MetaCompositor *compositor,
-                                      MetaWindow     *window);
+#if 0
+void meta_compositor_minimize (MetaCompositor            *compositor,
+			       MetaWindow                *window,
+			       int                        x,
+			       int                        y,
+			       int                        width,
+			       int                        height,
+			       MetaAnimationFinishedFunc  finished_cb,
+			       gpointer                   finished_data);
+#endif
+
+void
+meta_compositor_set_updates (MetaCompositor *compositor,
+			     MetaWindow *window,
+			     gboolean updates);
+void
+meta_compositor_destroy (MetaCompositor *compositor);
+
+void meta_compositor_begin_move (MetaCompositor *compositor,
+				 MetaWindow *window,
+				 MetaRectangle *initial,
+				 int grab_x, int grab_y);
+void meta_compositor_update_move (MetaCompositor *compositor,
+				  MetaWindow *window,
+				  int x, int y);
+void meta_compositor_end_move (MetaCompositor *compositor,
+			       MetaWindow *window);
+void meta_compositor_free_window (MetaCompositor *compositor,
+				  MetaWindow *window);
+void meta_compositor_free_window (MetaCompositor *compositor,
+				  MetaWindow *window);
 
 #endif /* META_COMPOSITOR_H */
-
-
-
-
-
-
-
-
-

src/constraints.h

@@ -1,7 +1,10 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity size/position constraints */
 
 /* 
  * Copyright (C) 2002 Red Hat, Inc.
+ * Copyright (C) 2005 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -28,32 +31,18 @@
 
 typedef enum
 {
-  META_RESIZE_LEFT_OR_TOP,
-  META_RESIZE_CENTER,
-  META_RESIZE_RIGHT_OR_BOTTOM
-} MetaResizeDirection;
+  META_IS_CONFIGURE_REQUEST = 1 << 0,
+  META_DO_GRAVITY_ADJUST    = 1 << 1,
+  META_IS_USER_ACTION       = 1 << 2,
+  META_IS_MOVE_ACTION       = 1 << 3,
+  META_IS_RESIZE_ACTION     = 1 << 4
+} MetaMoveResizeFlags;
 
 void meta_window_constrain (MetaWindow          *window,
-                            MetaFrameGeometry   *fgeom,
+                            MetaFrameGeometry   *orig_fgeom,
+                            MetaMoveResizeFlags  flags,
+                            int                  resize_gravity,
                             const MetaRectangle *orig,
-                            int                  x_move_delta,
-                            int                  y_move_delta,
-                            MetaResizeDirection  x_direction,
-                            int                  x_delta,
-                            MetaResizeDirection  y_direction,
-                            int                  y_delta,
                             MetaRectangle       *new);
 
-MetaResizeDirection meta_x_direction_from_gravity (int gravity);
-MetaResizeDirection meta_y_direction_from_gravity (int gravity);
-
 #endif /* META_CONSTRAINTS_H */
-
-
-
-
-
-
-
-
-

src/core.c

@@ -1,8 +1,11 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface used by GTK+ UI to talk to core */
 
 /* 
  * Copyright (C) 2001 Havoc Pennington
  * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -26,11 +29,20 @@
 #include "workspace.h"
 #include "prefs.h"
 
-void
-meta_core_get_client_size (Display *xdisplay,
-                           Window   frame_xwindow,
-                           int     *width,
-                           int     *height)
+/* Looks up the MetaWindow representing the frame of the given X window.
+ * Used as a helper function by a bunch of the functions below.
+ *
+ * FIXME: The functions that use this function throw the result away
+ * after use. Many of these functions tend to be called in small groups,
+ * which results in get_window() getting called several times in succession
+ * with the same parameters. We should profile to see whether this wastes
+ * much time, and if it does we should look into a generalised
+ * meta_core_get_window_info() which takes a bunch of pointers to variables
+ * to put its results in, and only fills in the non-null ones.
+ */
+static MetaWindow *
+get_window (Display *xdisplay,
+	    Window   frame_xwindow)
 {
   MetaDisplay *display;
   MetaWindow *window;
@@ -39,7 +51,21 @@ meta_core_get_client_size (Display *xdisplay,
   window = meta_display_lookup_x_window (display, frame_xwindow);
 
   if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+    {
+      meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+      return NULL;
+    }
+
+  return window;
+}
+
+void
+meta_core_get_client_size (Display *xdisplay,
+                           Window   frame_xwindow,
+                           int     *width,
+                           int     *height)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   if (width)
     *width = window->rect.width;
@@ -47,9 +73,9 @@ meta_core_get_client_size (Display *xdisplay,
     *height = window->rect.height;
 }
 
-Window
-meta_core_get_client_xwindow (Display *xdisplay,
-                              Window   frame_xwindow)
+gboolean
+meta_core_window_has_frame (Display *xdisplay,
+                            Window frame_xwindow)
 {
   MetaDisplay *display;
   MetaWindow *window;
@@ -57,8 +83,23 @@ meta_core_get_client_xwindow (Display *xdisplay,
   display = meta_display_for_x_display (xdisplay);
   window = meta_display_lookup_x_window (display, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  return window != NULL && window->frame != NULL;
+}
+
+gboolean
+meta_core_titlebar_is_onscreen (Display *xdisplay,
+                                Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  return meta_window_titlebar_is_onscreen (window);  
+}
+
+Window
+meta_core_get_client_xwindow (Display *xdisplay,
+                              Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   return window->xwindow;
 }
@@ -67,15 +108,8 @@ MetaFrameFlags
 meta_core_get_frame_flags (Display *xdisplay,
                            Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
-
   return meta_frame_get_flags (window->frame);
 }
 
@@ -83,15 +117,10 @@ MetaFrameType
 meta_core_get_frame_type (Display *xdisplay,
                           Window   frame_xwindow)
 {
-  MetaDisplay *display;
   MetaWindow *window;
   MetaFrameType base_type;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  window = get_window (xdisplay, frame_xwindow);
 
   base_type = META_FRAME_TYPE_LAST;
   
@@ -138,14 +167,7 @@ GdkPixbuf*
 meta_core_get_mini_icon (Display *xdisplay,
                          Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   return window->mini_icon;
 }
@@ -154,14 +176,7 @@ GdkPixbuf*
 meta_core_get_icon (Display *xdisplay,
                     Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   return window->icon;
 }
@@ -170,14 +185,7 @@ void
 meta_core_queue_frame_resize (Display *xdisplay,
                               Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_queue_move_resize (window);
 }
@@ -188,14 +196,7 @@ meta_core_user_move (Display *xdisplay,
                      int      x,
                      int      y)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_move (window, TRUE, x, y);
 }
@@ -207,14 +208,7 @@ meta_core_user_resize  (Display *xdisplay,
                         int      width,
                         int      height)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_resize_with_gravity (window, TRUE, width, height, gravity);
 }
@@ -223,14 +217,7 @@ void
 meta_core_user_raise (Display *xdisplay,
                       Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   meta_window_raise (window);
 }
@@ -238,20 +225,14 @@ meta_core_user_raise (Display *xdisplay,
 void
 meta_core_user_lower_and_unfocus (Display *xdisplay,
                                   Window   frame_xwindow,
-                                  Time     timestamp)
+                                  guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   meta_window_lower (window);
 
-  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK)
+  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
+      meta_prefs_get_raise_on_click ())
     {
       /* Move window to the back of the focusing workspace's MRU list.
        * Do extra sanity checks to avoid possible race conditions.
@@ -287,16 +268,9 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
 void
 meta_core_user_focus (Display *xdisplay,
                       Window   frame_xwindow,
-                      Time     timestamp)
+                      guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
   meta_window_focus (window, timestamp);
 }
@@ -307,14 +281,7 @@ meta_core_get_position (Display *xdisplay,
                         int     *x,
                         int     *y)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_get_position (window, x, y);
 }
@@ -325,14 +292,7 @@ meta_core_get_size (Display *xdisplay,
                     int     *width,
                     int     *height)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   if (width)
     *width = window->rect.width;
@@ -345,14 +305,7 @@ void
 meta_core_minimize (Display *xdisplay,
                     Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_minimize (window);
 }
@@ -361,51 +314,43 @@ void
 meta_core_maximize (Display *xdisplay,
                     Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
 
-  meta_window_maximize (window);
+  meta_window_maximize (window, 
+                        META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
 }
 
 void
 meta_core_toggle_maximize (Display *xdisplay,
                            Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
 
-  if (window->maximized)
-    meta_window_unmaximize (window);
+  if (META_WINDOW_MAXIMIZED (window))
+    meta_window_unmaximize (window, 
+                            META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
   else
-    meta_window_maximize (window);
+    meta_window_maximize (window,
+                          META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
 }
 
 void
 meta_core_unmaximize (Display *xdisplay,
                       Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
 
-  meta_window_unmaximize (window);
+  meta_window_unmaximize (window,
+                          META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
 }
 
 void
@@ -413,78 +358,63 @@ meta_core_delete (Display *xdisplay,
                   Window   frame_xwindow,
                   guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-  
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
      
   meta_window_delete (window, timestamp);
 }
 
 void
 meta_core_unshade (Display *xdisplay,
-                   Window   frame_xwindow)
+                   Window   frame_xwindow,
+                   guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_unshade (window);
+  meta_window_unshade (window, timestamp);
 }
 
 void
 meta_core_shade (Display *xdisplay,
-                 Window   frame_xwindow)
+                 Window   frame_xwindow,
+                 guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_shade (window);
+  meta_window_shade (window, timestamp);
 }
 
 void
 meta_core_unstick (Display *xdisplay,
                    Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_unstick (window);
 }
 
+void
+meta_core_make_above (Display *xdisplay,
+                      Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  meta_window_make_above (window);
+}
+
+void
+meta_core_unmake_above (Display *xdisplay,
+                        Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  meta_window_unmake_above (window);
+}
+
 void
 meta_core_stick (Display *xdisplay,
                  Window   frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_stick (window);
 }
@@ -494,14 +424,7 @@ meta_core_change_workspace (Display *xdisplay,
                             Window   frame_xwindow,
                             int      new_workspace)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   meta_window_change_workspace (window,
                                 meta_screen_get_workspace_by_index (window->screen,
@@ -532,14 +455,7 @@ int
 meta_core_get_frame_workspace (Display *xdisplay,
                                Window frame_xwindow)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   return meta_window_get_net_wm_desktop (window);
 }
@@ -552,14 +468,7 @@ meta_core_get_frame_extents   (Display        *xdisplay,
                                int            *width,
                                int            *height)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
 
   if (x)
     *x = window->frame->rect.x;
@@ -578,18 +487,12 @@ meta_core_show_window_menu (Display *xdisplay,
                             int      root_x,
                             int      root_y,
                             int      button,
-                            Time     timestamp)
+                            guint32  timestamp)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
-  meta_window_raise (window);
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
   meta_window_focus (window, timestamp);
 
   meta_window_show_menu (window, root_x, root_y, button, timestamp);
@@ -690,6 +593,9 @@ meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
     case META_MENU_OP_MOVE_DOWN:
       name = META_KEYBINDING_MOVE_WORKSPACE_DOWN;
       break;
+    case META_MENU_OP_RECOVER:
+      /* No keybinding for this one */
+      break;
     }
 
   if (name)
@@ -724,28 +630,26 @@ meta_core_begin_grab_op (Display    *xdisplay,
                          Window      frame_xwindow,
                          MetaGrabOp  op,
                          gboolean    pointer_already_grabbed,
+                         gboolean    frame_action,
                          int         event_serial,
                          int         button,
                          gulong      modmask,
-                         Time        timestamp,
+                         guint32     timestamp,
                          int         root_x,
                          int         root_y)
 {
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
   MetaDisplay *display;
-  MetaWindow *window;
   MetaScreen *screen;
   
   display = meta_display_for_x_display (xdisplay);
   screen = meta_display_screen_for_xwindow (display, frame_xwindow);
-  window = meta_display_lookup_x_window (display, frame_xwindow);
 
   g_assert (screen != NULL);
   
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);  
-
   return meta_display_begin_grab_op (display, screen, window,
                                      op, pointer_already_grabbed,
+                                     frame_action,
                                      event_serial,
                                      button, modmask,
                                      timestamp, root_x, root_y);
@@ -753,7 +657,7 @@ meta_core_begin_grab_op (Display    *xdisplay,
 
 void
 meta_core_end_grab_op (Display *xdisplay,
-                       Time     timestamp)
+                       guint32  timestamp)
 {
   MetaDisplay *display;
   
@@ -811,7 +715,7 @@ meta_core_grab_buttons  (Display *xdisplay,
                          Window   frame_xwindow)
 {
   MetaDisplay *display;
-  
+    
   display = meta_display_for_x_display (xdisplay);
 
   meta_verbose ("Grabbing buttons on frame 0x%lx\n", frame_xwindow);
@@ -823,14 +727,7 @@ meta_core_set_screen_cursor (Display *xdisplay,
                              Window   frame_on_screen,
                              MetaCursor cursor)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_on_screen);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_on_screen);  
+  MetaWindow *window = get_window (xdisplay, frame_on_screen);
 
   meta_frame_set_screen_cursor (window->frame, cursor);
 }
@@ -841,19 +738,12 @@ meta_core_get_screen_size (Display *xdisplay,
                            int     *width,
                            int     *height)
 {
-  MetaDisplay *display;
-  MetaWindow *window;
-  
-  display = meta_display_for_x_display (xdisplay);
-  window = meta_display_lookup_x_window (display, frame_on_screen);
-
-  if (window == NULL || window->frame == NULL)
-    meta_bug ("No such frame window 0x%lx!\n", frame_on_screen);  
+  MetaWindow *window = get_window (xdisplay, frame_on_screen);
 
   if (width)
-    *width = window->screen->width;
+    *width = window->screen->rect.width;
   if (height)
-    *height = window->screen->height;
+    *height = window->screen->rect.height;
 }
 
 void
@@ -866,3 +756,31 @@ meta_core_increment_event_serial (Display *xdisplay)
   meta_display_increment_event_serial (display);
 }
 
+void
+meta_invalidate_default_icons (void)
+{
+  GSList *displays, *windows;
+
+  for (displays = meta_displays_list ();
+       displays != NULL;
+       displays = displays->next)
+    {
+
+      for (windows = meta_display_list_windows (displays->data);
+           windows != NULL;
+           windows = windows->next)
+        {
+
+          MetaWindow *window = (MetaWindow*)windows->data;
+
+          if (window->icon_cache.origin == USING_FALLBACK_ICON)
+            {
+              meta_icon_cache_free (&(window->icon_cache));
+              meta_window_update_icon_now (window);
+            }
+        }
+
+      g_slist_free (windows);
+    }
+}
+

src/core.h

@@ -1,7 +1,10 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface used by GTK+ UI to talk to core */
 
 /* 
  * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2005 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -31,6 +34,13 @@ void meta_core_get_client_size (Display *xdisplay,
                                 int     *width,
                                 int     *height);
 
+gboolean meta_core_titlebar_is_onscreen (Display *xdisplay,
+                                         Window   frame_xwindow);
+
+gboolean meta_core_window_has_frame (Display *xdisplay,
+                                     Window   frame_xwindow);
+
+
 Window meta_core_get_client_xwindow (Display *xdisplay,
                                      Window   frame_xwindow);
 
@@ -62,11 +72,11 @@ void meta_core_user_raise   (Display *xdisplay,
                              Window   frame_xwindow);
 void meta_core_user_lower_and_unfocus (Display *xdisplay,
                                        Window   frame_xwindow,
-                                       Time     timestamp);
+                                       guint32  timestamp);
 
 void meta_core_user_focus   (Display *xdisplay,
                              Window   frame_xwindow,
-                             Time     timestamp);
+                             guint32  timestamp);
 
 /* get position of client, same coord space expected by move */
 void meta_core_get_position (Display *xdisplay,
@@ -91,13 +101,19 @@ void meta_core_delete           (Display *xdisplay,
                                  Window   frame_xwindow,
                                  guint32  timestamp);
 void meta_core_unshade          (Display *xdisplay,
-                                 Window   frame_xwindow);
+                                 Window   frame_xwindow,
+                                 guint32  timestamp);
 void meta_core_shade            (Display *xdisplay,
-                                 Window   frame_xwindow);
+                                 Window   frame_xwindow,
+                                 guint32  timestamp);
 void meta_core_unstick          (Display *xdisplay,
                                  Window   frame_xwindow);
 void meta_core_stick            (Display *xdisplay,
                                  Window   frame_xwindow);
+void meta_core_unmake_above     (Display *xdisplay,
+                                 Window   frame_xwindow);
+void meta_core_make_above       (Display *xdisplay,
+                                 Window   frame_xwindow);
 void meta_core_change_workspace (Display *xdisplay,
                                  Window   frame_xwindow,
                                  int      new_workspace);
@@ -123,7 +139,7 @@ void meta_core_show_window_menu (Display *xdisplay,
                                  int      root_x,
                                  int      root_y,
                                  int      button,
-                                 Time     timestamp);
+                                 guint32  timestamp);
 
 void meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
                                      int                  workspace,
@@ -134,14 +150,15 @@ gboolean   meta_core_begin_grab_op (Display    *xdisplay,
                                     Window      frame_xwindow,
                                     MetaGrabOp  op,
                                     gboolean    pointer_already_grabbed,
+                                    gboolean    frame_action,
                                     int         event_serial,
                                     int         button,
                                     gulong      modmask,
-                                    Time        timestamp,
+                                    guint32     timestamp,
                                     int         root_x,
                                     int         root_y);
 void       meta_core_end_grab_op   (Display    *xdisplay,
-                                    Time        timestamp);
+                                    guint32     timestamp);
 MetaGrabOp meta_core_get_grab_op     (Display    *xdisplay);
 Window     meta_core_get_grab_frame  (Display   *xdisplay);
 int        meta_core_get_grab_button (Display  *xdisplay);
@@ -167,6 +184,8 @@ void meta_core_increment_event_serial (Display *display);
 
 int meta_ui_get_last_event_serial (Display *xdisplay);
 
+void meta_invalidate_default_icons (void);
+
 #endif
 
 

src/delete.c

@@ -1,7 +1,10 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window deletion */
 
 /* 
  * Copyright (C) 2001, 2002 Havoc Pennington
+ * Copyright (C) 2004 Elijah Newren
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -33,12 +36,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-static void meta_window_present_delete_dialog (MetaWindow *window);
+static void meta_window_present_delete_dialog (MetaWindow *window,
+                                               guint32     timestamp);
 
 static void
 delete_ping_reply_func (MetaDisplay *display,
                         Window       xwindow,
-                        Time         timestamp,
+                        guint32      timestamp,
                         void        *user_data)
 {
   meta_topic (META_DEBUG_PING,
@@ -247,7 +251,7 @@ io_from_ping_dialog (GIOChannel   *channel,
   if (condition & G_IO_IN)
     {
       char *str;
-      int len;
+      unsigned int len;
       GError *err;
 
       /* Go ahead and block for all data from child */
@@ -291,7 +295,7 @@ io_from_ping_dialog (GIOChannel   *channel,
 static void
 delete_ping_timeout_func (MetaDisplay *display,
                           Window       xwindow,
-                          Time         timestamp,
+                          guint32      timestamp,
                           void        *user_data)
 {
   MetaWindow *window = user_data;
@@ -310,14 +314,14 @@ delete_ping_timeout_func (MetaDisplay *display,
 
   if (window->dialog_pid >= 0)
     {
-      meta_window_present_delete_dialog (window);
+      meta_window_present_delete_dialog (window, timestamp);
       return;
     }
   
   window_id_str = g_strdup_printf ("0x%lx", window->xwindow);
 
   sprintf (numbuf, "%d", window->screen->number);
-  sprintf (timestampbuf, "%lu", timestamp);
+  sprintf (timestampbuf, "%u", timestamp);
   
   argv[0] = METACITY_LIBEXECDIR"/metacity-dialog";
   argv[1] = "--screen";
@@ -363,7 +367,7 @@ delete_ping_timeout_func (MetaDisplay *display,
 
 void
 meta_window_delete (MetaWindow  *window,
-                    Time         timestamp)
+                    guint32      timestamp)
 {
   meta_error_trap_push (window->display);
   if (window->delete_window)
@@ -475,7 +479,7 @@ meta_window_free_delete_dialog (MetaWindow *window)
 }
 
 static void
-meta_window_present_delete_dialog (MetaWindow *window)
+meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
 {
   meta_topic (META_DEBUG_PING,
               "Presenting existing ping dialog for %s\n",
@@ -500,8 +504,7 @@ meta_window_present_delete_dialog (MetaWindow *window)
               w->res_class &&
               g_strcasecmp (w->res_class, "metacity-dialog") == 0)
             {
-              meta_window_activate (w,
-                                    meta_display_get_current_time (w->display));
+              meta_window_activate (w, timestamp);
               break;
             }