From f786ae7d6a4d13a17d0a095d648ca16f6b3df5a1 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 8 Sep 2004 15:59:31 +0000
Subject: [PATCH] Include Sami Samhuri <sami@no-eff-eks.com> patch for
"cycle_hidden" option, Update the default boring theme.
(Old svn revision: 11938)
---
defaults/defaults | 1 +
doc/C/xfwm4.html | 10 ++--
doc/C/xfwm4.xml | 6 +++
src/client.c | 10 ++--
src/settings.c | 3 ++
src/settings.h | 1 +
themes/default/bottom-active.png | Bin 121 -> 130 bytes
themes/default/bottom-active.xpm | 2 +-
themes/default/bottom-inactive.xpm | 2 +-
themes/default/bottom-left-active.png | Bin 139 -> 150 bytes
themes/default/bottom-left-active.xpm | 28 +++++-----
themes/default/bottom-left-inactive.xpm | 28 +++++-----
themes/default/bottom-right-active.png | Bin 137 -> 154 bytes
themes/default/bottom-right-active.xpm | 28 +++++-----
themes/default/bottom-right-inactive.xpm | 28 +++++-----
themes/default/left-active.xpm | 64 +++++++++++------------
themes/default/left-inactive.xpm | 64 +++++++++++------------
themes/default/right-active.xpm | 64 +++++++++++------------
themes/default/right-inactive.xpm | 64 +++++++++++------------
themes/default/top-left-active.xpm | 38 +++++++-------
themes/default/top-left-inactive.xpm | 38 +++++++-------
themes/default/top-right-active.xpm | 38 +++++++-------
themes/default/top-right-inactive.xpm | 38 +++++++-------
23 files changed, 287 insertions(+), 268 deletions(-)
diff --git a/defaults/defaults b/defaults/defaults
index 6238db1c8..c98167e27 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 baf1c84af..55539ab93 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 f77b602d0..c980e1019 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 7098ac083..1b896f2a4 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 b02c8fab9..519deb029 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 f85716845..fadec5ea6 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
GIT binary patch
delta 66
zcmb<yVw~V+qweYA7*cU7`Op9V_J<vq#Ms!_9ygXSJa%Yj5I)Sn>;~k|2l5%_JY#Eq
T`B{*Q0SG)@{an^LB{Ts5C#V*#
delta 57
zcmZo-teoIxEa&Os7*cU7`Op9V_J<vq)Y=%?7V{;fBqV&0^k8RT*gBIrX!3>7rwl;g
M>FVdQ&MBb@0CT?-s{jB1
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index d7081095a..b7390a9a0 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 be572e06f..723aabf3b 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
GIT binary patch
delta 87
zcmeBXoW?l8Ex_8-#WAGfR&qi@!iS&#|JyU~oYC3nWRP`W1!MDJ1~HwaV^gFGrlsf`
q7#V3zc+Gn3|NsBSK=!W**$fO$+=d&rIMl^60D-5gpUXO@geCw~-XiJ%
delta 76
zcmbQn*v&Y>&DFru#WAGf*4s0NybK0BM;vy0aB2K`S#$l&ODXR-{sof^{(iX0#I19I
g;j16x<OSD6Dw?Vd*0ku!H822yr>mdKI;Vst0IFLaGXMYp
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index ac81f5198..fa1a878d8 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 4cb03fe61..6976ec6ae 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
GIT binary patch
delta 91
zcmeBVoW(f7EyUi_#WAGf*4y(N1sMcHST5Qw7O>55-g)bX>D-vMh6B&Or}=HW=^NxN
v^R1D84`a##y}Ts0N2gdlSsfg1yXJgn)Y0LLnW9(|#sCDKu6{1-oD!M<yhbB?
delta 74
zcmbQm*vUA-%~{XW#WAGf*4s0Vj0^@GM>dpssd4Q5T>hCMUP(c1q4(Ou7uck840x_^
eD+JtCIr)3*U-oXx*%PuEfWXt$&t;ucLK6TgWE^1t
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 32efda729..c8a97f7ac 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 d6361b2a5..934394ac0 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 1e9e4ef61..809583b69 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 ebf6c5df1..68cc9cbf2 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 5ddbed9f5..b5eb3569c 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 fdd03ffd8..04d8696de 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 f95068232..ff5f9d074 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 dc1c0be78..d55c7f30e 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 b7b3173cb..f4b9528e9 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 19258151c..402ded78c 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[] = {
"$$$+$@@ ",
"$$$$$#@ ",
"$$$$$$@@",
-"$$$$$$#@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"$$$$$$$@",
-"@@@@$$$@"};
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"$$$$$$@@",
+"@@@@$$@@"};
--
GitLab