Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
NEWS | 11 +++++++++++
doc/Makefile.am | 1 +
doc/wmaker.in | 3 +++
3 files changed, 15 insertions(+)
diff --git a/NEWS b/NEWS
index 6561c4e..023ceb1 100644
--- a/NEWS
+++ b/NEWS
@@ -66,6 +66,17 @@ tell Window Maker to just ignore them. This is done with the
new setting called
"IgnoreGtkHints", which is available in the "Expert" panel in WPrefs.
+Cooperative Window Manager Replacement
+--------------------------------------
+
+The ICCCM defines a protocol for window managers to ask to replace the
currently
+running one; Window Maker now supports it. You can ask Window Maker to take the
+place of current one by running "wmaker --replace", or any other window manager
+can ask Window Maker to leave the place for them when started the same way.
+Please note that this feature must be explicitely enabled at compile time
because
+by default it is not compiled in ("configure --enable-wmreplace").
+
+
--- 0.95.6
More image format supported
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fff203f..706158c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = wmaker.in wmsetbg.in
wmaker.1x: wmaker.in Makefile $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" --filter "HAVE_INOTIFY" \
+ --filter "USE_ICCCM_WMREPLACE" \
-D"sysconfdir=$(sysconfdir)" --replace "sysconfdir" \
-D"pkgdatadir=$(pkgdatadir)" --replace "pkgdatadir" \
-o "wmaker.1x" "$(srcdir)/wmaker.in"
diff --git a/doc/wmaker.in b/doc/wmaker.in
index dc09ce0..48e2879 100644
--- a/doc/wmaker.in
+++ b/doc/wmaker.in
@@ -51,6 +51,9 @@ disable the Drawers in the Dock
@!HAVE_INOTIFY@.TP
@!HAVE_INOTIFY@.B \-\-no\-polling
@!HAVE_INOTIFY@disable the periodic check on the configuration file to reload
it automatically
+@USE_ICCCM_WMREPLACE@.TP
+@USE_ICCCM_WMREPLACE@.B \-\-replace
+@USE_ICCCM_WMREPLACE@ask the currently running window manager to let Window
Maker take his place
.TP
.B \-\-static
do not update or save automatically the configuration
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
