diff --git a/defaults/defaults b/defaults/defaults
index ee475a896b4c28f3b8356d77bdaacd7b0747cd16..b8b5d1cf60851e2de71766e992261fea7d4470f8 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -13,11 +13,13 @@ focus_hint=true
focus_new=true
full_width_title=true
keytheme=Default
+move_opacity=100
prevent_focus_stealing=false
raise_delay=250
raise_on_click=true
raise_on_focus=false
raise_with_any_button=true
+resize_opacity=100
scroll_workspaces=true
shadow_delta_height=0
shadow_delta_width=0
diff --git a/doc/C/xfwm4.html b/doc/C/xfwm4.html
index 5497c8738f645f254917c753ddaf009880bf5b45..e6b7c1eb3e2ceb098bf223e83598521f274c3e33 100644
--- a/doc/C/xfwm4.html
+++ b/doc/C/xfwm4.html
@@ -1,5 +1,5 @@
<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.65.1"><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.2
- <br></br></span></div><div><p class="copyright">Copyright © 2004 François Le Clainche</p></div><div><p class="copyright">Copyright © 2004 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></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="#keyboard_shortcuts">Keyboard shortcuts</a></span></dt><dt><span class="sect2"><a href="#focus">Focus preferences</a></span></dt><dt><span class="sect2"><a href="#wm_advanced">Advanced settings</a></span></dt><dt><span class="sect2"><a href="#hidden_options">Hidden options</a></span></dt></dl></dd><dt><span class="sect1"><a href="#workspaces">Managing workspaces</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2691337">Workspaces settings</a></span></dt><dt><span class="sect2"><a href="#workspace-margins">Workspaces 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>.
+ <br></br></span></div><div><p class="copyright">Copyright © 2004 François Le Clainche</p></div><div><p class="copyright">Copyright © 2004 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></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="#keyboard_shortcuts">Keyboard shortcuts</a></span></dt><dt><span class="sect2"><a href="#focus">Focus preferences</a></span></dt><dt><span class="sect2"><a href="#wm_advanced">Advanced settings</a></span></dt><dt><span class="sect2"><a href="#hidden_options">Hidden options</a></span></dt></dl></dd><dt><span class="sect1"><a href="#workspaces">Managing workspaces</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2888766">Workspaces settings</a></span></dt><dt><span class="sect2"><a href="#workspace-margins">Workspaces 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
<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
@@ -187,14 +187,20 @@
</p></dd><dt><span class="term">prevent_focus_stealing=true</span></dt><dd><p>Add this line to your xfwm4rc file to prevent windows from stealing focus.
</p></dd><dt><span class="term">raise_with_any_button=false</span></dt><dd><p>Add this line to your xfwm4rc file if you want to raise a window only when
clicked with the left mouse button.
- </p></dd><dt><span class="term">toggle_workspaces=true</span></dt><dd><p>Add this line to your xfwm4rc file if you want the Control+F(N) keyboard shortcut
+ </p></dd><dt><span class="term">move_opacity=100</span></dt><dd><p>Set the window opacity while being moved. Opacity is an integer value between 0 and 100;
+ 100 being opaque, 0 totally invisible.
+ </p><p>That option has no effect if the compositing manager is not enabled.</p></dd><dt><span class="term">resize_opacity=100</span></dt><dd><p>Set the window opacity while being resized. Opacity is an integer value between 0 and 100;
+ 100 being opaque, 0 totally invisible.
+ </p><p>That option has no effect if the compositing manager is not enabled.</p></dd><dt><span class="term">toggle_workspaces=true</span></dt><dd><p>Add this line to your xfwm4rc file if you want the Control+F(N) keyboard shortcut
to remember the previous workspace.
+ </p></dd><dt><span class="term">wrap_layout=true</span></dt><dd><p>wrap workspaces depending on the actual desktop layout.
+ </p></dd><dt><span class="term">wrap_cycle=true</span></dt><dd><p>wrap workspaces when the first or last workspace is reached.
</p></dd></dl></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="workspaces"></a>Managing workspaces</h2></div></div><div></div></div><p><b class="application"><tt>xfwm4</tt></b> also manages workspaces. There is a special settings dialog to
change the workspace properties. You can start it by choosing
<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="id2691337"></a>Workspaces settings</h3></div></div><div></div></div><div class="figure"><a name="xfwm-workspace-fig"></a><p class="title"><b>Figure 7. 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="id2888766"></a>Workspaces settings</h3></div></div><div></div></div><div class="figure"><a name="xfwm-workspace-fig"></a><p class="title"><b>Figure 7. 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
diff --git a/doc/C/xfwm4.xml b/doc/C/xfwm4.xml
index d8e9fcc79cf7d0249ede9e9aab30283b70d506fb..fb2c64efe5ea6bfcc11b04270178926523494495 100644
--- a/doc/C/xfwm4.xml
+++ b/doc/C/xfwm4.xml
@@ -833,6 +833,26 @@ maintainers, etc. Commented out by default.
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>move_opacity=100</term>
+ <listitem>
+ <para>Set the window opacity while being moved. Opacity is an integer value between 0 and 100;
+ 100 being opaque, 0 totally invisible.
+ </para>
+ <para>That option has no effect if the compositing manager is not enabled.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>resize_opacity=100</term>
+ <listitem>
+ <para>Set the window opacity while being resized. Opacity is an integer value between 0 and 100;
+ 100 being opaque, 0 totally invisible.
+ </para>
+ <para>That option has no effect if the compositing manager is not enabled.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>toggle_workspaces=true</term>
<listitem>
@@ -841,6 +861,23 @@ maintainers, etc. Commented out by default.
</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>wrap_layout=true</term>
+ <listitem>
+ <para>wrap workspaces depending on the actual desktop layout.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>wrap_cycle=true</term>
+ <listitem>
+ <para>wrap workspaces when the first or last workspace is reached.
+ </para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 8b4a4428c9525c164676f8123cf97bf0352eedea..14f7b481fb87f11e7712328e404baca0d57ed7a6 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-24 00:58+0100\n"
+"POT-Creation-Date: 2004-11-29 22:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,11 +58,11 @@ msgstr ""
msgid "Change name"
msgstr ""
-#: mcs-plugin/workspaces.c:355 mcs-plugin/xfwm4_shortcuteditor.c:480
-#: mcs-plugin/xfwm4_shortcuteditor.c:489 mcs-plugin/xfwm4_shortcuteditor.c:498
-#: mcs-plugin/xfwm4_shortcuteditor.c:507 mcs-plugin/xfwm4_shortcuteditor.c:516
-#: mcs-plugin/xfwm4_shortcuteditor.c:525 mcs-plugin/xfwm4_shortcuteditor.c:534
-#: mcs-plugin/xfwm4_shortcuteditor.c:543 mcs-plugin/xfwm4_shortcuteditor.c:552
+#: mcs-plugin/workspaces.c:355 mcs-plugin/xfwm4_shortcuteditor.c:482
+#: mcs-plugin/xfwm4_shortcuteditor.c:491 mcs-plugin/xfwm4_shortcuteditor.c:500
+#: mcs-plugin/xfwm4_shortcuteditor.c:509 mcs-plugin/xfwm4_shortcuteditor.c:518
+#: mcs-plugin/xfwm4_shortcuteditor.c:527 mcs-plugin/xfwm4_shortcuteditor.c:536
+#: mcs-plugin/xfwm4_shortcuteditor.c:545 mcs-plugin/xfwm4_shortcuteditor.c:554
#, c-format
msgid "Workspace %d"
msgstr ""
@@ -108,15 +108,15 @@ msgstr ""
msgid "Close"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_shortcuteditor.c:369
+#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_shortcuteditor.c:371
msgid "Shade window"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:87 mcs-plugin/xfwm4_shortcuteditor.c:364
+#: mcs-plugin/xfwm4_plugin.c:87 mcs-plugin/xfwm4_shortcuteditor.c:366
msgid "Hide window"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:88 mcs-plugin/xfwm4_shortcuteditor.c:349
+#: mcs-plugin/xfwm4_plugin.c:88 mcs-plugin/xfwm4_shortcuteditor.c:351
msgid "Maximize window"
msgstr ""
@@ -156,172 +156,172 @@ msgstr ""
msgid "Hidden"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1312
+#: mcs-plugin/xfwm4_plugin.c:1313
msgid "Font Selection Dialog"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1382 mcs-plugin/xfwm4_plugin.c:1887
+#: mcs-plugin/xfwm4_plugin.c:1384 mcs-plugin/xfwm4_plugin.c:1903
msgid "Window Manager"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1395
+#: mcs-plugin/xfwm4_plugin.c:1397
msgid "Window Manager Preferences"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1424
+#: mcs-plugin/xfwm4_plugin.c:1426
msgid "Title font"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1437
+#: mcs-plugin/xfwm4_plugin.c:1439
msgid "Title Alignment"
msgstr ""
#. XXX
-#: mcs-plugin/xfwm4_plugin.c:1443
+#: mcs-plugin/xfwm4_plugin.c:1445
msgid "Text alignment inside title bar :"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1445
+#: mcs-plugin/xfwm4_plugin.c:1447
msgid "Button layout"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1451
+#: mcs-plugin/xfwm4_plugin.c:1453
msgid "Style"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1477
+#: mcs-plugin/xfwm4_plugin.c:1491
msgid "Window shortcuts"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1497 mcs-plugin/xfwm4_plugin.c:1530
+#: mcs-plugin/xfwm4_plugin.c:1511 mcs-plugin/xfwm4_plugin.c:1544
msgid "Command"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1502 mcs-plugin/xfwm4_plugin.c:1534
+#: mcs-plugin/xfwm4_plugin.c:1516 mcs-plugin/xfwm4_plugin.c:1548
msgid "Shortcut"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1510
+#: mcs-plugin/xfwm4_plugin.c:1524
msgid "Command shortcuts"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1549
+#: mcs-plugin/xfwm4_plugin.c:1563
msgid "Keyboard"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1560
+#: mcs-plugin/xfwm4_plugin.c:1574
msgid "Focus model"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1568
+#: mcs-plugin/xfwm4_plugin.c:1582
msgid "Click to focus"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1575
+#: mcs-plugin/xfwm4_plugin.c:1589
msgid "Focus follows mouse"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1582
+#: mcs-plugin/xfwm4_plugin.c:1596
msgid "New window focus"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1586
+#: mcs-plugin/xfwm4_plugin.c:1600
msgid "Automatically give focus to newly created windows"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1591
+#: mcs-plugin/xfwm4_plugin.c:1605
msgid "Raise on focus"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1599
+#: mcs-plugin/xfwm4_plugin.c:1613
msgid "Automatically raise windows when they receive focus"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1609
+#: mcs-plugin/xfwm4_plugin.c:1623
msgid "Delay before raising focused window :"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1615
+#: mcs-plugin/xfwm4_plugin.c:1629
msgid "Slow"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1621
+#: mcs-plugin/xfwm4_plugin.c:1635
msgid "Fast"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1637
+#: mcs-plugin/xfwm4_plugin.c:1651
msgid "Raise on click"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1641
+#: mcs-plugin/xfwm4_plugin.c:1655
msgid "Raise window when clicking inside application window"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1646
+#: mcs-plugin/xfwm4_plugin.c:1660
msgid "Focus"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1656
+#: mcs-plugin/xfwm4_plugin.c:1670
msgid "Windows snapping"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1664
+#: mcs-plugin/xfwm4_plugin.c:1678
msgid "Snap windows to screen border"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1669
+#: mcs-plugin/xfwm4_plugin.c:1683
msgid "Snap windows to other windows"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1679
+#: mcs-plugin/xfwm4_plugin.c:1693
msgid "Distance :"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1685 mcs-plugin/xfwm4_plugin.c:1735
+#: mcs-plugin/xfwm4_plugin.c:1699 mcs-plugin/xfwm4_plugin.c:1749
msgid "Small"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1691 mcs-plugin/xfwm4_plugin.c:1741
+#: mcs-plugin/xfwm4_plugin.c:1705 mcs-plugin/xfwm4_plugin.c:1755
msgid "Wide"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1706
+#: mcs-plugin/xfwm4_plugin.c:1720
msgid "Wrap workspaces"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1714
+#: mcs-plugin/xfwm4_plugin.c:1728
msgid "Wrap workspaces when the pointer reaches a screen edge"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1719
+#: mcs-plugin/xfwm4_plugin.c:1733
msgid "Wrap workspaces when dragging a window off the screen"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1729
+#: mcs-plugin/xfwm4_plugin.c:1743
msgid "Edge Resistance :"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1756
+#: mcs-plugin/xfwm4_plugin.c:1770
msgid "Opaque move and resize"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1764
+#: mcs-plugin/xfwm4_plugin.c:1778
msgid "Display content of windows when resizing"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1769
+#: mcs-plugin/xfwm4_plugin.c:1783
msgid "Display content of windows when moving"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1774
+#: mcs-plugin/xfwm4_plugin.c:1788
msgid "Double click action"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1780
+#: mcs-plugin/xfwm4_plugin.c:1794
msgid "Action to perform when double clicking on title bar :"
msgstr ""
-#: mcs-plugin/xfwm4_plugin.c:1782
+#: mcs-plugin/xfwm4_plugin.c:1796
msgid "Advanced"
msgstr ""
@@ -345,219 +345,219 @@ msgstr ""
msgid "You have to provide a name for the keybinding theme"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:344
+#: mcs-plugin/xfwm4_shortcuteditor.c:346
msgid "Close window"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:354
+#: mcs-plugin/xfwm4_shortcuteditor.c:356
msgid "Maximize window vertically"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:359
+#: mcs-plugin/xfwm4_shortcuteditor.c:361
msgid "Maximize window horizontally"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:374
+#: mcs-plugin/xfwm4_shortcuteditor.c:376
msgid "Stick window"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:379
+#: mcs-plugin/xfwm4_shortcuteditor.c:381
msgid "Cycle windows"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:384
+#: mcs-plugin/xfwm4_shortcuteditor.c:386
msgid "Move window up"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:389
+#: mcs-plugin/xfwm4_shortcuteditor.c:391
msgid "Move window down"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:394
+#: mcs-plugin/xfwm4_shortcuteditor.c:396
msgid "Move window left"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:399
+#: mcs-plugin/xfwm4_shortcuteditor.c:401
msgid "Move window right"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:404
+#: mcs-plugin/xfwm4_shortcuteditor.c:406
msgid "Resize window up"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:409
+#: mcs-plugin/xfwm4_shortcuteditor.c:411
msgid "Resize window down"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:414
+#: mcs-plugin/xfwm4_shortcuteditor.c:416
msgid "Resize window left"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:419
+#: mcs-plugin/xfwm4_shortcuteditor.c:421
msgid "Resize window right"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:424
+#: mcs-plugin/xfwm4_shortcuteditor.c:426
msgid "Raise window"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:429
+#: mcs-plugin/xfwm4_shortcuteditor.c:431
msgid "Lower window"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:434
+#: mcs-plugin/xfwm4_shortcuteditor.c:436
msgid "Toggle fullscreen"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:439
+#: mcs-plugin/xfwm4_shortcuteditor.c:441
msgid "Upper workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:444
+#: mcs-plugin/xfwm4_shortcuteditor.c:446
msgid "Bottom workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:449
+#: mcs-plugin/xfwm4_shortcuteditor.c:451
msgid "Left workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:454
+#: mcs-plugin/xfwm4_shortcuteditor.c:456
msgid "Right workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:459
+#: mcs-plugin/xfwm4_shortcuteditor.c:461
msgid "Next workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:464
+#: mcs-plugin/xfwm4_shortcuteditor.c:466
msgid "Previous workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:469
+#: mcs-plugin/xfwm4_shortcuteditor.c:471
msgid "Add workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:474
+#: mcs-plugin/xfwm4_shortcuteditor.c:476
msgid "Delete workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:560
+#: mcs-plugin/xfwm4_shortcuteditor.c:562
msgid "Move window to next workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:565
+#: mcs-plugin/xfwm4_shortcuteditor.c:567
msgid "Move window to previous workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:570
+#: mcs-plugin/xfwm4_shortcuteditor.c:572
msgid "Move window to upper workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:575
+#: mcs-plugin/xfwm4_shortcuteditor.c:577
msgid "Move window to bottom workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:580
+#: mcs-plugin/xfwm4_shortcuteditor.c:582
msgid "Move window to left workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:585
+#: mcs-plugin/xfwm4_shortcuteditor.c:587
msgid "Move window to right workspace"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:590
+#: mcs-plugin/xfwm4_shortcuteditor.c:592
msgid "Move window to workspace 1"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:595
+#: mcs-plugin/xfwm4_shortcuteditor.c:597
msgid "Move window to workspace 2"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:600
+#: mcs-plugin/xfwm4_shortcuteditor.c:602
msgid "Move window to workspace 3"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:605
+#: mcs-plugin/xfwm4_shortcuteditor.c:607
msgid "Move window to workspace 4"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:610
+#: mcs-plugin/xfwm4_shortcuteditor.c:612
msgid "Move window to workspace 5"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:615
+#: mcs-plugin/xfwm4_shortcuteditor.c:617
msgid "Move window to workspace 6"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:620
+#: mcs-plugin/xfwm4_shortcuteditor.c:622
msgid "Move window to workspace 7"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:625
+#: mcs-plugin/xfwm4_shortcuteditor.c:627
msgid "Move window to workspace 8"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:630
+#: mcs-plugin/xfwm4_shortcuteditor.c:632
msgid "Move window to workspace 9"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:837
+#: mcs-plugin/xfwm4_shortcuteditor.c:839
msgid "Cannot open the theme directory !"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:856
+#: mcs-plugin/xfwm4_shortcuteditor.c:858
#, c-format
msgid ""
"Cannot open %s : \n"
"%s"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:871 mcs-plugin/xfwm4_shortcuteditor.c:882
+#: mcs-plugin/xfwm4_shortcuteditor.c:873 mcs-plugin/xfwm4_shortcuteditor.c:884
#, c-format
msgid ""
"Cannot write in %s : \n"
"%s"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:932
+#: mcs-plugin/xfwm4_shortcuteditor.c:934
msgid "Select command"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1078
+#: mcs-plugin/xfwm4_shortcuteditor.c:1080
msgid ""
"Shortcut already in use !\n"
"Are you sure you want to use it ?"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1141
+#: mcs-plugin/xfwm4_shortcuteditor.c:1143
msgid "Compose shortcut for :"
msgstr ""
#. Create dialog
-#: mcs-plugin/xfwm4_shortcuteditor.c:1144
-#: mcs-plugin/xfwm4_shortcuteditor.c:1372
+#: mcs-plugin/xfwm4_shortcuteditor.c:1146
+#: mcs-plugin/xfwm4_shortcuteditor.c:1374
msgid "Compose shortcut"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1146
-#: mcs-plugin/xfwm4_shortcuteditor.c:1374
+#: mcs-plugin/xfwm4_shortcuteditor.c:1148
+#: mcs-plugin/xfwm4_shortcuteditor.c:1376
msgid "No shortcut"
msgstr ""
#. Create dialog
-#: mcs-plugin/xfwm4_shortcuteditor.c:1268
+#: mcs-plugin/xfwm4_shortcuteditor.c:1270
msgid "Choose command"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1270
+#: mcs-plugin/xfwm4_shortcuteditor.c:1272
msgid "Command :"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1306
+#: mcs-plugin/xfwm4_shortcuteditor.c:1308
msgid "The command doesn't exist or the file is not executable !"
msgstr ""
-#: mcs-plugin/xfwm4_shortcuteditor.c:1369
+#: mcs-plugin/xfwm4_shortcuteditor.c:1371
msgid "Compose shortcut for command :"
msgstr ""
diff --git a/src/client.c b/src/client.c
index f80a9add6af97ca5e9e79ef4d208073e489be3cc..203de6bf952972e5af7836b674aca804ce52f5e2 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3060,6 +3060,7 @@ clientMove (Client * c, XEvent * e)
MoveResizeData passdata;
Cursor cursor = None;
int g1 = GrabSuccess, g2 = GrabSuccess;
+ gboolean restore_opacity = FALSE;
g_return_if_fail (c != NULL);
TRACE ("entering clientDoMove");
@@ -3126,6 +3127,14 @@ clientMove (Client * c, XEvent * e)
poswinShow (passdata.poswin);
#endif /* SHOW_POSITION */
+ /* Set window translucent while moving, looks nice */
+ if ((screen_info->params->move_opacity < 100) && !(screen_info->params->box_move))
+ {
+ compositorWindowSetOpacity (display_info, c->frame,
+ (guint) (c->opacity * (double) (screen_info->params->move_opacity / 100.0)));
+ restore_opacity = TRUE;
+ }
+
FLAG_SET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
TRACE ("entering move loop");
xfce_push_event_filter (display_info->xfilter, clientMove_event_filter, &passdata);
@@ -3137,6 +3146,7 @@ clientMove (Client * c, XEvent * e)
xfce_pop_event_filter (display_info->xfilter);
TRACE ("leaving move loop");
FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+
#ifdef SHOW_POSITION
if (passdata.poswin)
{
@@ -3148,6 +3158,12 @@ clientMove (Client * c, XEvent * e)
{
clientDrawOutline (c);
}
+ /* Set window opacity to its original value */
+ if (restore_opacity)
+ {
+ compositorWindowSetOpacity (display_info, c->frame, c->opacity);
+ }
+
wc.x = c->x;
wc.y = c->y;
clientConfigure (c, &wc, CWX | CWY, NO_CFG_FLAG);
@@ -3511,6 +3527,7 @@ clientResize (Client * c, int corner, XEvent * e)
XWindowChanges wc;
MoveResizeData passdata;
int g1 = GrabSuccess, g2 = GrabSuccess;
+ gboolean restore_opacity = FALSE;
g_return_if_fail (c != NULL);
TRACE ("entering clientResize");
@@ -3592,6 +3609,14 @@ clientResize (Client * c, int corner, XEvent * e)
}
#endif /* SHOW_POSITION */
+ /* Set window translucent while resizing, doesn't looks too nice :( */
+ if ((screen_info->params->resize_opacity < 100) && !(screen_info->params->box_resize))
+ {
+ compositorWindowSetOpacity (display_info, c->frame,
+ (guint) (c->opacity * (double) (screen_info->params->resize_opacity / 100.0)));
+ restore_opacity = TRUE;
+ }
+
FLAG_SET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
TRACE ("entering resize loop");
xfce_push_event_filter (display_info->xfilter, clientResize_event_filter, &passdata);
@@ -3612,6 +3637,11 @@ clientResize (Client * c, int corner, XEvent * e)
{
clientDrawOutline (c);
}
+ /* Set window opacity to its original value */
+ if (restore_opacity)
+ {
+ compositorWindowSetOpacity (display_info, c->frame, c->opacity);
+ }
wc.x = c->x;
wc.y = c->y;
diff --git a/src/settings.c b/src/settings.c
index df11015a5e186d4b3b4a80b66959697e90d10cc8..e9b149837536af96193341075edc6b2920ccca5c 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -155,6 +155,18 @@ notify_cb (const char *name, const char *channel_name, McsAction action, McsSett
{
screen_info->params->raise_on_focus = setting->data.v_int;
}
+ else if (!strcmp (name, "Xfwm/MoveOpacity"))
+ {
+ screen_info->params->move_opacity = setting->data.v_int;
+ }
+ else if (!strcmp (name, "Xfwm/ResizeOpacity"))
+ {
+ screen_info->params->resize_opacity = setting->data.v_int;
+ }
+ else if (!strcmp (name, "Xfwm/SnapToBorder"))
+ {
+ screen_info->params->snap_to_border = setting->data.v_int;
+ }
else if (!strcmp (name, "Xfwm/PreventFocusStealing"))
{
screen_info->params->prevent_focus_stealing = setting->data.v_int;
@@ -424,6 +436,18 @@ loadMcsData (ScreenInfo *screen_info, Settings rc[])
setBooleanValueFromInt ("raise_on_focus", setting->data.v_int, rc);
mcs_setting_free (setting);
}
+ if (mcs_client_get_setting (screen_info->mcs_client, "Xfwm/MoveOpacity", CHANNEL1,
+ &setting) == MCS_SUCCESS)
+ {
+ setIntValueFromInt ("move_opacity", setting->data.v_int, rc);
+ mcs_setting_free (setting);
+ }
+ if (mcs_client_get_setting (screen_info->mcs_client, "Xfwm/ResizeOpacity", CHANNEL1,
+ &setting) == MCS_SUCCESS)
+ {
+ setIntValueFromInt ("resize_opacity", setting->data.v_int, rc);
+ mcs_setting_free (setting);
+ }
if (mcs_client_get_setting (screen_info->mcs_client, "Xfwm/PreventFocusStealing", CHANNEL1,
&setting) == MCS_SUCCESS)
{
@@ -1068,6 +1092,8 @@ loadSettings (ScreenInfo *screen_info)
{"margin_right", NULL, FALSE},
{"margin_bottom", NULL, FALSE},
{"margin_top", NULL, FALSE},
+ {"move_opacity", NULL, TRUE},
+ {"resize_opacity", NULL, TRUE},
{"prevent_focus_stealing", NULL, TRUE},
{"raise_delay", NULL, TRUE},
{"raise_on_click", NULL, TRUE},
@@ -1208,6 +1234,10 @@ loadSettings (ScreenInfo *screen_info)
!g_ascii_strcasecmp ("true", getValue ("raise_on_click", rc));
screen_info->params->raise_with_any_button =
!g_ascii_strcasecmp ("true", getValue ("raise_with_any_button", rc));
+ screen_info->params->move_opacity =
+ abs (TOINT (getValue ("move_opacity", rc)));
+ screen_info->params->resize_opacity =
+ abs (TOINT (getValue ("resize_opacity", rc)));
screen_info->params->snap_to_border =
!g_ascii_strcasecmp ("true", getValue ("snap_to_border", rc));
diff --git a/src/settings.h b/src/settings.h
index 684094748c202322cae192689d65a8feeda9a5f9..5867fc59430d0a8775124a0bb5e0a659bd53c0b2 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -151,6 +151,8 @@ struct _XfwmParams
int button_offset;
int button_spacing;
int double_click_action;
+ int move_opacity;
+ int resize_opacity;
int raise_delay;
int snap_width;
int shadow_delta_x;