diff --git a/defaults/defaults b/defaults/defaults
index 6238db1c8b08fffb6ebc9a997ec5ed0d222664e7..c98167e27b678de49987d52a52b2abe7afe33187 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -6,6 +6,7 @@ button_layout=OTS|HMC
button_offset=0
button_spacing=1
click_to_focus=true
+cycle_hidden=true
cycle_minimum=true
dbl_click_time=400
double_click_action=maximize
diff --git a/doc/C/xfwm4.html b/doc/C/xfwm4.html
index baf1c84afc98566bafad7b009fcf764718d8d47d..55539ab939cb7b36337625b21d9af779f1de70cc 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.1.x
- <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></dl></dd><dt><span class="sect1"><a href="#workspaces">Managing workspaces</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2509992">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></dl></dd><dt><span class="sect1"><a href="#workspaces">Managing workspaces</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2795628">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
@@ -42,7 +42,11 @@
If you want the panel, and apps that do not appear in the taskbar,
to be included when you switch the focus using the Alt+Tab
shortcut, edit your $HOME/.xfce4/xfwm4rc (or create an new one)
- and add this line : cycle_minimum=false</p><p>NOTE: the use of a keyboard shortcut in an application needs
+ and add this line : cycle_minimum=false</p><p>
+ To exclude hidden windows from the list presented when using
+ Alt+Tab edit your $HOME/.xfce4/xfwm4rc (or create a new one) and
+ add this line : cycle_hidden=false
+ </p><p>NOTE: the use of a keyboard shortcut in an application needs
the application window to have the focus :)
</p></dd><dt><span class="term">Maximize / unmaximize windows</span></dt><dd><p>If you maximize a window, it will expand on your display and use
all avaible space (as it is defined by <a href="xfdesktop.html#xfdesktop-workspace" target="_top">workspace
@@ -183,7 +187,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="id2509992"></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="id2795628"></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 f77b602d0911c4ce43ce30824e6d7b9710ff1e67..c980e10192c58c23f9f5d89192859aa2bbb1a2c7 100644
--- a/doc/C/xfwm4.xml
+++ b/doc/C/xfwm4.xml
@@ -181,6 +181,12 @@ maintainers, etc. Commented out by default.
shortcut, edit your $HOME/.xfce4/xfwm4rc (or create an new one)
and add this line : cycle_minimum=false</para>
+ <para>
+ To exclude hidden windows from the list presented when using
+ Alt+Tab edit your $HOME/.xfce4/xfwm4rc (or create a new one) and
+ add this line : cycle_hidden=false
+ </para>
+
<para>NOTE: the use of a keyboard shortcut in an application needs
the application window to have the focus :)
</para>
diff --git a/src/client.c b/src/client.c
index 7098ac0835d093e67b80a3c2b87ae9d7d07da7fd..1b896f2a4e6e2a740b0f9e6e103b8b19f9a94711 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3603,13 +3603,17 @@ clientCycle (Client * c, XEvent * e)
}
myDisplayGrabServer (display_info);
- if (screen_info->params->cycle_minimum)
+ if (screen_info->params->cycle_hidden)
{
- passdata.cycle_range = INCLUDE_HIDDEN;
+ passdata.cycle_range = INCLUDE_HIDDEN;
}
else
{
- passdata.cycle_range = INCLUDE_HIDDEN | INCLUDE_SKIP_TASKBAR | INCLUDE_SKIP_PAGER;
+ passdata.cycle_range = 0;
+ }
+ if (!screen_info->params->cycle_minimum)
+ {
+ passdata.cycle_range |= INCLUDE_SKIP_TASKBAR | INCLUDE_SKIP_PAGER;
}
passdata.c = clientGetNext (c, passdata.cycle_range);
if (passdata.c)
diff --git a/src/settings.c b/src/settings.c
index b02c8fab93cba43e55916576049384c96470cbe6..519deb029d159919cf4c6ea275173fd58b8f1305 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -967,6 +967,7 @@ loadSettings (ScreenInfo *screen_info)
{"button_offset", NULL, TRUE},
{"button_spacing", NULL, TRUE},
{"click_to_focus", NULL, TRUE},
+ {"cycle_hidden", NULL, TRUE},
{"cycle_minimum", NULL, FALSE},
{"dbl_click_time", NULL, TRUE},
{"double_click_action", NULL, TRUE},
@@ -1086,6 +1087,8 @@ loadSettings (ScreenInfo *screen_info)
!g_ascii_strcasecmp ("true", getValue ("easy_click", rc));
screen_info->params->cycle_minimum =
!g_ascii_strcasecmp ("true", getValue ("cycle_minimum", rc));
+ screen_info->params->cycle_hidden =
+ !g_ascii_strcasecmp ("true", getValue ("cycle_hidden", rc));
screen_info->params->focus_hint =
!g_ascii_strcasecmp ("true", getValue ("focus_hint", rc));
screen_info->params->focus_new =
diff --git a/src/settings.h b/src/settings.h
index f8571684507fb0fed7ae56ec757f9dc03d5e5b3f..fadec5ea663f655520a4258101e24e98291a5fc3 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -148,6 +148,7 @@ struct _XfwmParams
int title_horizontal_offset;
int wrap_resistance;
gboolean title_shadow[2];
+ gboolean cycle_hidden;
gboolean cycle_minimum;
gboolean box_move;
gboolean box_resize;
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index aa4a8567c36162552ff359362e6acd1deb7f5a7f..68ad163afa7db1fcf96b2b4b2c256b8c0970c6b8 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index d7081095a2e2ee68f4e5870bc68dfa92f6caa582..b7390a9a0a6c3aae326775f490d50e8ac63c0dd9 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -8,7 +8,7 @@ static char * bottom_active_xpm[] = {
"$ c #A8A8A8 s active_mid_1",
"# c #C2C2C2 s active_color_1",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++++++++++",
+"################################",
"################################",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index be572e06f9e30fdded3f900eb495fff8aae15cec..723aabf3b412b51c55fede86dc7a9448369f73c9 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -8,7 +8,7 @@ static char * bottom_inactive_xpm[] = {
"$ c #A8A8A8 s inactive_mid_1",
"# c #C2C2C2 s inactive_color_1",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++++++++++",
+"################################",
"################################",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 67951d39e39e025466aabedba07467bb65a669eb..e4469f62cd8309eb13adae23b923923830692815 100644
Binary files a/themes/default/bottom-left-active.png and b/themes/default/bottom-left-active.png differ
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index ac81f5198a4d22c7998fd2d80aa9b4b496f3140b..fa1a878d8506644565b43f700692711812709ef5 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_active_xpm[] = {
"@ c #858585 s active_shadow_1",
"$ c #A8A8A8 s active_mid_1",
"# c #C2C2C2 s active_color_1",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@@@@@@@@@@@@",
-"@###++++++++++++",
-"@###############",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@@@@@@@@@@@@",
+"@@##############",
+"@@##############",
"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 4cb03fe610eaaeab6c84edcb7bc8fae9c03179e1..6976ec6ae71918bc8e19996648ea4c158d9730ca 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_inactive_xpm[] = {
"@ c #858585 s inactive_shadow_1",
"$ c #A8A8A8 s inactive_mid_1",
"# c #C2C2C2 s inactive_color_1",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@ ",
-"@###@@@@@@@@@@@@",
-"@###++++++++++++",
-"@###############",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@ ",
+"@@##@@@@@@@@@@@@",
+"@@##############",
+"@@##############",
"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index ecee8e6877726a14277b661bdf6a69d473697217..7884631e5ed31fb4078b515fd1878ef4a70efbdc 100644
Binary files a/themes/default/bottom-right-active.png and b/themes/default/bottom-right-active.png differ
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 32efda72934a4163af67dccb9eb7d406d3c327c5..c8a97f7ac08f4a218856b44139d41063ce4b2cdb 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_active_xpm[] = {
"@ c #858585 s active_shadow_1",
"$ c #A8A8A8 s active_mid_1",
"# c #C2C2C2 s active_color_1",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-"@@@@@@@@@@@@###@",
-"++++++++++++###@",
-"###############@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+"@@@@@@@@@@@@##@@",
+"##############@@",
+"##############@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index d6361b2a52a2c5b8a9a689c65ec1a0ae82210850..934394ac0e9b164641e39acc5d5e734fcc1fcf2f 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_inactive_xpm[] = {
"@ c #858585 s inactive_shadow_1",
"$ c #A8A8A8 s inactive_mid_1",
"# c #C2C2C2 s inactive_color_1",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-" @###@",
-"@@@@@@@@@@@@###@",
-"++++++++++++###@",
-"###############@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+" @##@@",
+"@@@@@@@@@@@@##@@",
+"##############@@",
+"##############@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 1e9e4ef61aea4c7c897c9c01ef1d225a272bf790..809583b694761f8c515f1fb5b6acec3d72371166 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -7,35 +7,35 @@ static char * left_active_xpm[] = {
"@ c #858585 s active_shadow_1",
"$ c #A8A8A8 s active_mid_1",
"# c #C2C2C2 s active_color_1",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@"};
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index ebf6c5df119e5753b4b0a4187d115eb7f9936756..68cc9cbf203be0e267ce2399b3e6de6ceae2f619 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -7,35 +7,35 @@ static char * left_inactive_xpm[] = {
"@ c #858585 s inactive_shadow_1",
"$ c #A8A8A8 s inactive_mid_1",
"# c #C2C2C2 s inactive_color_1",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@"};
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@",
+"@@##@"};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 5ddbed9f54235817c6fbdc19d9eb4c84d8b33e83..b5eb3569c4c62977192706364ac5ec30f5d72e87 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -7,35 +7,35 @@ static char * right_active_xpm[] = {
"@ c #858585 s active_shadow_1",
"$ c #A8A8A8 s active_mid_1",
"# c #C2C2C2 s active_color_1",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@"};
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@"};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index fdd03ffd8f1f4c6b75bd43676c89e4bb3ea4b01b..04d8696ded0ba39d7fabae614e5b76976f246ddd 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -7,35 +7,35 @@ static char * right_inactive_xpm[] = {
"@ c #858585 s inactive_shadow_1",
"$ c #A8A8A8 s inactive_mid_1",
"# c #C2C2C2 s inactive_color_1",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@",
-"@###@"};
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@",
+"@##@@"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index f950682321f69fe5f09aaa6ee8bb378aefc65bef..ff5f9d0747b6c766b93b8df8cdcb147cb6f1f6a8 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -12,22 +12,22 @@ static char * top_left_active_xpm[] = {
" @@$+$$$",
" @#$$$$$",
"@@$$$$$$",
-"@#$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$@@@@"};
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$@@@@"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index dc1c0be78e86acbd120bb2f99b147177509958f0..d55c7f30e01bdc05762aed0685781e4d61eefb67 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -12,22 +12,22 @@ static char * top_left_inactive_xpm[] = {
" @@$+$$$",
" @#$$$$$",
"@@$$$$$$",
-"@#$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$$$$$",
-"@$$$@@@@"};
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$$$$$",
+"@@$$@@@@"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index b7b3173cb396cb80118827526d78f754962e5c8d..f4b9528e9b324a3475c3105a4afcda423d1a2401 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -12,22 +12,22 @@ static char * top_right_active_xpm[] = {
"$$$+$@@ ",
"$$$$$#@ ",
"$$$$$$@@",
-"$$$$$$#@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"@@@@$$$@"};
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"@@@@$$@@"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 19258151cabb3789d3d371ac9aa4fdb37bf7d0a8..402ded78cec9c0da329b65d18d45e7d19a4ee329 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -12,22 +12,22 @@ static char * top_right_inactive_xpm[] = {
"$$$+$@@ ",
"$$$$$#@ ",
"$$$$$$@@",
-"$$$$$$#@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"@@@@$$$@"};
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"@@@@$$@@"};