diff --git a/doc/C/images/workspace_margins.png b/doc/C/images/workspace_margins.png
index b935051f6579bb76d843d5f6026fba983263ef0b..0f1c45bd0045d1730d93e8936a38dcd98b726b44 100644
Binary files a/doc/C/images/workspace_margins.png and b/doc/C/images/workspace_margins.png differ
diff --git a/doc/C/images/xfwm_workspaces.png b/doc/C/images/xfwm_workspaces.png
index 131de5546c550be3699cb2a90b2a1d370332ff3d..0f049f179c0c03e5c5b16c1b66b06966bbf37af7 100644
Binary files a/doc/C/images/xfwm_workspaces.png and b/doc/C/images/xfwm_workspaces.png differ
diff --git a/doc/C/xfwm4.html b/doc/C/xfwm4.html
index 744160930ccb4d1018ae44b6a643254d0a7722a9..8a371e9022055ce24d6fa620d18e3d6af8367129 100644
--- a/doc/C/xfwm4.html
+++ b/doc/C/xfwm4.html
@@ -1,7 +1,7 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Window Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.61.2"><link rel="home" href="#xfwm4" title="XFce 4 Window Manager"><link rel="next" href="#wm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfwm4"></a>XFce 4 Window Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">François</span> <span class="surname">Le Clainche</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:fleclainche@wanadoo.fr">fleclainche@wanadoo.fr</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfwm4</tt></b> version 4.0
- <br></br></span></div><div><p class="copyright">Copyright © 2003 François Le Clainche</p></div><div><p class="copyright">Copyright © 2003 Jasper Huijsmans</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#wm-intro">Introduction</a></dt><dt><a href="#wm-using">Using xfwm4</a></dt><dd><dl><dt><a href="#wm-windows">Manage windows</a></dt><dt><a href="#wm-keybindings">Keyboard shortcuts summary</a></dt></dl></dd><dt><a href="#wm-settings">Customizing xfwm4</a></dt><dd><dl><dt><a href="#wm-style">Decoration style</a></dt><dt><a href="#wm-focus">Keyboard and focus</a></dt><dt><a href="#wm_advanced">Advanced settings</a></dt></dl></dd><dt><a href="#workspaces">Workspaces and Margins</a></dt><dd><dl><dt><a href="#id2819817">Workspaces</a></dt><dt><a href="#workspace-margins">Workspace margins</a></dt></dl></dd><dt><a href="#wm-copyright">About xfwm4</a></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-intro"></a>Introduction</h2></div></div><div></div></div><p>The XFce 4 Window Manager is part of the <a href="http://www.xfce.org" target="_top">XFce Desktop Environment</a>.
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Window Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="#xfwm4" title="XFce 4 Window Manager"><link rel="next" href="#wm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfwm4"></a>XFce 4 Window Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">François</span> <span class="surname">Le Clainche</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:fleclainche@wanadoo.fr">fleclainche@wanadoo.fr</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfwm4</tt></b> version 4.0
+ <br></br></span></div><div><p class="copyright">Copyright © 2003 François Le Clainche</p></div><div><p class="copyright">Copyright © 2003 Jasper Huijsmans</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#wm-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#wm-using">Using xfwm4</a></span></dt><dd><dl><dt><span class="sect2"><a href="#wm-windows">Manage windows</a></span></dt><dt><span class="sect2"><a href="#wm-keybindings">Keyboard shortcuts summary</a></span></dt></dl></dd><dt><span class="sect1"><a href="#wm-settings">Customizing xfwm4</a></span></dt><dd><dl><dt><span class="sect2"><a href="#wm-style">Decoration style</a></span></dt><dt><span class="sect2"><a href="#wm-focus">Keyboard and focus</a></span></dt><dt><span class="sect2"><a href="#wm_advanced">Advanced settings</a></span></dt></dl></dd><dt><span class="sect1"><a href="#workspaces">Workspaces and Margins</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2826402">Workspaces</a></span></dt><dt><span class="sect2"><a href="#workspace-margins">Workspace margins</a></span></dt></dl></dd><dt><span class="sect1"><a href="#wm-copyright">About xfwm4</a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-intro"></a>Introduction</h2></div></div><div></div></div><p>The XFce 4 Window Manager is part of the <a href="http://www.xfce.org" target="_top">XFce Desktop Environment</a>.
The actual command to run is <b class="application"><tt>xfwm4</tt></b>. To run it in the background use
- <b class="command"><b class="application"><tt>xfwm4</tt></b> --daemon</b>. The window manager is responsible for
+ <span><b class="command"><b class="application"><tt>xfwm4</tt></b> --daemon</b></span>. The window manager is responsible for
the placement of windows on the screen, provides the window
decorations and allows you for instance to move, resize or close them.
</p><p>If you are familiar with previous versions of XFce you will find many
@@ -69,7 +69,11 @@
all your workspaces. The same repeated action make a window to
stick/unstick :
</p><div class="itemizedlist"><ul type="disc"><li>click the stick/unstick button of the title bar</li><li>open the window menu button from the title bar and choose
- "Stick" or "Unstick" item</li><li>use the Alt + F10 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Move windows</span></dt><dd><p>There are several ways to move windows :</p><div class="itemizedlist"><ul type="disc"><li>left or right click on the title bar of the window and
+ "Stick" or "Unstick" item</li><li>use the Alt + F10 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Raise / lower windows</span></dt><dd><p>The "raise window" function makes a window frame appear above all the other frames.
+ To raise a window, you can :
+ </p><div class="itemizedlist"><ul type="disc"><li>left click on its titlebar</li><li>give the focus to the window, if the corresponding option is selected in the <a href="xfwm4.html#wm-focus" target="_top">Keyboard and focus preferences dialog</a></li><li>left click anywhere on its frame, if the corresponding option is selected in the <a href="xfwm4.html#wm-focus" target="_top">Keyboard and focus preferences dialog</a></li><li>click on its label in the taskbar or the iconbox</li><li>use the Shift + Alt + Page_Up keyboard shortcut (if the window is already focused)</li></ul></div><p>The "lower" function sends a window frame below all other frames.
+ To "lower" a window, you can :
+ </p><div class="itemizedlist"><ul type="disc"><li>middle-click on its title bar</li><li>use the Shift + Alt + Page_Down keyboard shortcut (if the window is focused)</li></ul></div><p> </p></dd><dt><span class="term">Move windows</span></dt><dd><p>There are several ways to move windows :</p><div class="itemizedlist"><ul type="disc"><li>left or right click on the title bar of the window and
drag it</li><li>use Alt + left click while the pointer is anywhere over
the window frame and move the mouse</li><li>use Control + Alt + Shift + (up, down, left or right)
Arrow keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Move a window to another workspace</span></dt><dd><p>You can send a window to another workspace by performing one of
@@ -90,7 +94,7 @@
"Close" item</li><li>or use Alt + F4 keyboard shortcut</li></ul></div></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-keybindings"></a>Keyboard shortcuts summary</h3></div></div><div></div></div><p>In the default configuration the following keybindings are
defined:</p><div class="itemizedlist"><ul type="disc"><li>close window : Alt + F4</li><li>Maximize window : Alt + F5</li><li>Maximize vertically : Alt + F6</li><li>Maximize horizontally : Alt + F7</li><li>Hide window : Alt + F8</li><li>Shade window : Alt + F9</li><li>Stick window : Alt + F10</li><li>Cycle windows focus : Alt + Tab</li><li>Move window : Control + Shift + Alt + Arrow (up, down, left,
or right)</li><li>Resize window : Shift + Alt + Arrow (up, down, left, or
- right)</li><li>Next workspace : Control + Alt + Arrow right
+ right)</li><li>Raise window : Shift + Alt + Page_Up</li><li>Lower window : Shift + Alt + Page_Down</li><li>Next workspace : Control + Alt + Arrow right
arrow</li><li>Previous workspace : Control + Alt + Arrow left</li><li>Add a workspace : Alt + Inser</li><li>Delete a workspace : Alt + Delete</li><li>Go to workspace number N (1-9) : Control + F(N)</li><li>Move the window to previous|next workspace : Alt + Control +
Home|End</li><li>Move a window to workspace number N (1-9) : Alt + Control +
keypad key number N</li><li>Start xfhelp4 : Alt + F1</li><li>Start xfrun4 : Alt + F2</li><li>Lock the screen : Alt + Control + Delete</li></ul></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-settings"></a>Customizing <b class="application"><tt>xfwm4</tt></b></h2></div></div><div></div></div><p>To open the Window Manager preferences dialog, click the button
@@ -163,7 +167,7 @@
<span class="emphasis"><em>Workspaces and Margins</em></span> from the the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">settings manager
dialog</a>. The dialog contains two tab folders where you can
change workspace settings and desktop margins.
- </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2819817"></a>Workspaces</h3></div></div><div></div></div><div class="figure"><a name="xfwm-workspace-fig"></a><p class="title"><b>Figure 5. Workspace Settings</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfwm_workspaces.png" alt="Shows workspace settings tab folder.
+ </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2826402"></a>Workspaces</h3></div></div><div></div></div><div class="figure"><a name="xfwm-workspace-fig"></a><p class="title"><b>Figure 5. Workspace Settings</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfwm_workspaces.png" alt="Shows workspace settings tab folder.
"></div></div></div><div class="variablelist"><dl><dt><span class="term">Workspaces</span></dt><dd><p>This option allows you too choose the number of workspaces you
want to use (between 1 and 32).
</p></dd><dt><span class="term">Worspace names</span></dt><dd><p>This field shows the list of avaible workspaces. If you want to
@@ -172,8 +176,8 @@
"Apply" button, or just press the Enter key, to return to the
list.
</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="workspace-margins"></a>Workspace margins</h3></div></div><div></div></div><div class="figure"><a name="workspace_margins-fig"></a><p class="title"><b>Figure 6. The workspace margins dialog</b></p><div class="screenshot"><div class="mediaobject"><img src="images/workspace_margins.png" alt="The workspace margins tab folder"></div></div></div><p>To open the Workspace Margins dialog, click the button labelled
- "Workspace Margins" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">settings manager
- dialog</a>.
+ "Workspaces and Margins" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">settings manager
+ dialog</a> and choose the tab labelled "Margins".
</p><p>Margins are areas on the edges of the screen that maximized windows
won't cover. You can adjust the size, in pixels, of all margins (left,
right, top and bottom). Use this feature, for example, if you do not want
diff --git a/doc/C/xfwm4.xml b/doc/C/xfwm4.xml
index 08af8008e1c46019b56071471b2c2fbe6e2499e9..84ef85f10b43607fe8fedd30509151849523de88 100644
--- a/doc/C/xfwm4.xml
+++ b/doc/C/xfwm4.xml
@@ -303,6 +303,32 @@ maintainers, etc. Commented out by default.
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Raise / lower windows</term>
+ <listitem>
+ <para>The "raise window" function makes a window frame appear above all the other frames.
+ To raise a window, you can :
+ </para>
+ <itemizedlist>
+ <listitem>left click on its titlebar</listitem>
+ <listitem>give the focus to the window, if the corresponding option is selected in the <ulink
+ url="xfwm4.html#wm-focus" type="http">Keyboard and focus preferences dialog</ulink></listitem>
+ <listitem>left click anywhere on its frame, if the corresponding option is selected in the <ulink
+ url="xfwm4.html#wm-focus" type="http">Keyboard and focus preferences dialog</ulink></listitem>
+ <listitem>click on its label in the taskbar or the iconbox</listitem>
+ <listitem>use the Shift + Alt + Page_Up keyboard shortcut (if the window is already focused)</listitem>
+ </itemizedlist>
+ <para>The "lower" function sends a window frame below all other frames.
+ To "lower" a window, you can :
+ </para>
+ <itemizedlist>
+ <listitem>middle-click on its title bar</listitem>
+ <listitem>use the Shift + Alt + Page_Down keyboard shortcut (if the window is focused)</listitem>
+ </itemizedlist>
+ <para> </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>Move windows</term>
<listitem>
@@ -388,6 +414,8 @@ maintainers, etc. Commented out by default.
or right)</listitem>
<listitem>Resize window : Shift + Alt + Arrow (up, down, left, or
right)</listitem>
+ <listitem>Raise window : Shift + Alt + Page_Up</listitem>
+ <listitem>Lower window : Shift + Alt + Page_Down</listitem>
<listitem>Next workspace : Control + Alt + Arrow right
arrow</listitem>
<listitem>Previous workspace : Control + Alt + Arrow left</listitem>
@@ -732,9 +760,9 @@ maintainers, etc. Commented out by default.
</figure>
<para>To open the Workspace Margins dialog, click the button labelled
- "Workspace Margins" in the <ulink
+ "Workspaces and Margins" in the <ulink
url="xfce-mcs-manager.html#manager-dialog" type="http">settings manager
- dialog</ulink>.
+ dialog</ulink> and choose the tab labelled "Margins".
</para>
<para>Margins are areas on the edges of the screen that maximized windows