From 73491d3470fa47c84f4523c8058799d40eef6e5f Mon Sep 17 00:00:00 2001
From: Andrew Chadwick <a.t.chadwick@gmail.com>
Date: Mon, 10 Feb 2014 21:23:27 +0000
Subject: [PATCH 1/3] xfwm4: bigger buttons, top left/right px clickable
Allow the top left and right pixels of maximized windows to be clickable
if there's a window button there, for greater Fitts's Law compliance. The
exception is the window menu button, which needs a minor hack to be sized
correctly.
Somewhat darker inactive button icons, to match window title text.
Add an SVG-based build system to allow colours to be changed easily.
---
xfwm4/Makefile | 67 +++++++++++++++++++
xfwm4/close-active.xpm | 71 ++++++++++----------
xfwm4/close-inactive.xpm | 70 ++++++++++----------
xfwm4/close-prelight.xpm | 73 ++++++++++----------
xfwm4/close-pressed.xpm | 73 ++++++++++----------
xfwm4/hide-active.xpm | 56 ++++++++++------
xfwm4/hide-inactive.xpm | 56 ++++++++++------
xfwm4/hide-prelight.xpm | 56 ++++++++++------
xfwm4/hide-pressed.xpm | 56 ++++++++++------
xfwm4/maximize-active.xpm | 54 +++++++++------
xfwm4/maximize-inactive.xpm | 54 +++++++++------
xfwm4/maximize-prelight.xpm | 54 +++++++++------
xfwm4/maximize-pressed.xpm | 54 +++++++++------
xfwm4/maximize-toggled-active.xpm | 34 ++++++++++
xfwm4/maximize-toggled-inactive.xpm | 34 ++++++++++
xfwm4/maximize-toggled-prelight.xpm | 34 ++++++++++
xfwm4/maximize-toggled-pressed.xpm | 34 ++++++++++
xfwm4/menu-active.xpm | 42 ++++++------
xfwm4/menu-inactive.xpm | 42 ++++++------
xfwm4/menu-prelight.xpm | 42 ++++++------
xfwm4/menu-pressed.xpm | 42 ++++++------
xfwm4/shade-active.xpm | 59 +++++++++++------
xfwm4/shade-inactive.xpm | 57 ++++++++++------
xfwm4/shade-prelight.xpm | 59 +++++++++++------
xfwm4/shade-pressed.xpm | 58 ++++++++++------
xfwm4/shade-toggled-active.xpm | 59 +++++++++++------
xfwm4/shade-toggled-inactive.xpm | 58 ++++++++++------
xfwm4/shade-toggled-prelight.xpm | 59 +++++++++++------
xfwm4/shade-toggled-pressed.xpm | 58 ++++++++++------
xfwm4/src/button-base-active.xpm | 31 +++++++++
xfwm4/src/button-base-inactive.xpm | 31 +++++++++
xfwm4/src/button-base-menu.xpm | 21 ++++++
xfwm4/src/close.svg | 99 ++++++++++++++++++++++++++++
xfwm4/src/hide.svg | 87 ++++++++++++++++++++++++
xfwm4/src/icon_template.svgz | Bin 0 -> 850 bytes
xfwm4/src/maximize-toggled.svg | 86 ++++++++++++++++++++++++
xfwm4/src/maximize.svg | 86 ++++++++++++++++++++++++
xfwm4/src/shade-toggled.svg | 86 ++++++++++++++++++++++++
xfwm4/src/shade.svg | 87 ++++++++++++++++++++++++
xfwm4/src/stick-toggled.svg | 90 +++++++++++++++++++++++++
xfwm4/src/stick.svg | 90 +++++++++++++++++++++++++
xfwm4/stick-active.xpm | 44 +++++++++++++
xfwm4/stick-inactive.xpm | 40 +++++++++++
xfwm4/stick-prelight.xpm | 44 +++++++++++++
xfwm4/stick-pressed.xpm | 43 ++++++++++++
xfwm4/stick-toggled-active.xpm | 42 ++++++++++++
xfwm4/stick-toggled-inactive.xpm | 39 +++++++++++
xfwm4/stick-toggled-prelight.xpm | 43 ++++++++++++
xfwm4/stick-toggled-pressed.xpm | 42 ++++++++++++
xfwm4/themerc | 8 +--
50 files changed, 2147 insertions(+), 557 deletions(-)
create mode 100644 xfwm4/Makefile
create mode 100644 xfwm4/maximize-toggled-active.xpm
create mode 100644 xfwm4/maximize-toggled-inactive.xpm
create mode 100644 xfwm4/maximize-toggled-prelight.xpm
create mode 100644 xfwm4/maximize-toggled-pressed.xpm
create mode 100644 xfwm4/src/button-base-active.xpm
create mode 100644 xfwm4/src/button-base-inactive.xpm
create mode 100644 xfwm4/src/button-base-menu.xpm
create mode 100644 xfwm4/src/close.svg
create mode 100644 xfwm4/src/hide.svg
create mode 100644 xfwm4/src/icon_template.svgz
create mode 100644 xfwm4/src/maximize-toggled.svg
create mode 100644 xfwm4/src/maximize.svg
create mode 100644 xfwm4/src/shade-toggled.svg
create mode 100644 xfwm4/src/shade.svg
create mode 100644 xfwm4/src/stick-toggled.svg
create mode 100644 xfwm4/src/stick.svg
create mode 100644 xfwm4/stick-active.xpm
create mode 100644 xfwm4/stick-inactive.xpm
create mode 100644 xfwm4/stick-prelight.xpm
create mode 100644 xfwm4/stick-pressed.xpm
create mode 100644 xfwm4/stick-toggled-active.xpm
create mode 100644 xfwm4/stick-toggled-inactive.xpm
create mode 100644 xfwm4/stick-toggled-prelight.xpm
create mode 100644 xfwm4/stick-toggled-pressed.xpm
diff --git a/xfwm4/Makefile b/xfwm4/Makefile
new file mode 100644
index 0000000..d1f386f
--- /dev/null
+++ b/xfwm4/Makefile
@@ -0,0 +1,67 @@
+
+SRCDIR=src
+TARGS=close-pressed.xpm close-prelight.xpm close-inactive.xpm close-active.xpm \
+ hide-pressed.xpm hide-prelight.xpm hide-inactive.xpm hide-active.xpm \
+ menu-pressed.xpm menu-prelight.xpm menu-inactive.xpm menu-active.xpm \
+ shade-pressed.xpm shade-prelight.xpm shade-inactive.xpm shade-active.xpm \
+ shade-toggled-pressed.xpm shade-toggled-prelight.xpm \
+ shade-toggled-inactive.xpm shade-toggled-active.xpm \
+ stick-pressed.xpm stick-prelight.xpm stick-inactive.xpm stick-active.xpm \
+ stick-toggled-pressed.xpm stick-toggled-prelight.xpm \
+ stick-toggled-inactive.xpm stick-toggled-active.xpm \
+ maximize-pressed.xpm maximize-prelight.xpm \
+ maximize-inactive.xpm maximize-active.xpm \
+ maximize-toggled-pressed.xpm maximize-toggled-prelight.xpm \
+ maximize-toggled-inactive.xpm maximize-toggled-active.xpm
+
+BASE_MENU=$(SRCDIR)/button-base-menu.xpm
+BASE_ACTIVE=$(SRCDIR)/button-base-active.xpm
+BASE_INACTIVE=$(SRCDIR)/button-base-inactive.xpm
+
+COL_PRESSED=\#B44335
+COL_PRELIGHT=\#D64937
+COL_ACTIVE=\#DCDCDC
+COL_INACTIVE=\#888
+
+
+
+all: $(TARGS)
+
+
+
+# Base images for the menu, a 22x16 blank surface in all states. The 16px
+# constrains the window icon's size to 16x16.
+
+menu-%.xpm: $(BASE_MENU)
+ convert $< $@
+
+
+# Combined icon images built from 8x8 SVG sources
+# The base images are 22x25, width carefully chosen to provide the right
+# spacing and rhythm, and height including an additional top pixel of the
+# active/inactive edge colour.
+
+
+%-inactive.xpm: $(SRCDIR)/%.svg $(BASE_INACTIVE)
+ convert $(BASE_INACTIVE) \
+ \( -background none +level-colors "$(COL_INACTIVE)" $< \) \
+ -geometry +7+9 -composite $@
+
+%-pressed.xpm: $(SRCDIR)/%.svg $(BASE_ACTIVE)
+ convert $(BASE_ACTIVE) \
+ \( -background none +level-colors "$(COL_PRESSED)" $< \) \
+ -geometry +7+9 -composite $@
+
+%-prelight.xpm: $(SRCDIR)/%.svg $(BASE_ACTIVE)
+ convert $(BASE_ACTIVE) \
+ \( -background none +level-colors "$(COL_PRELIGHT)" $< \) \
+ -geometry +7+9 -composite $@
+
+%-active.xpm: $(SRCDIR)/%.svg $(BASE_ACTIVE)
+ convert $(BASE_ACTIVE) \
+ \( -background none +level-colors "$(COL_ACTIVE)" $< \) \
+ -geometry +7+9 -composite $@
+
+
+clean:
+ rm -f $(TARGS)
diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
index 91bfee6..22a7904 100644
--- a/xfwm4/close-active.xpm
+++ b/xfwm4/close-active.xpm
@@ -1,34 +1,39 @@
/* XPM */
-static char * close_active_xpm[] = {
-"16 16 15 1",
-" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
-"@ c #A4A4A4",
-"# c #3F3F3F",
-"$ c #A6A6A6",
-"% c #D1D1D1",
-"& c #525252",
-"* c #414141",
-"= c #D3D3D3",
-"- c #CECECE",
-"; c #575757",
-"> c #505050",
-", c #A2A2A2",
-"' c #3D3D3D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+--+%#....",
-"....$+->>-+@....",
-"....+,'..',+....",
-"................",
-"................",
-"................",
-"................"};
+static char *close_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #407740774077",
+"X c #454A454A454A",
+"o c #484848484848",
+"O c #C40FC40FC40F",
+"+ c #C4BFC4BFC4BF",
+"@ c #CBA3CBA3CBA3",
+"# c gainsboro",
+/* pixels */
+"oooooooooooooooooooooo",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" #O. .+# ",
+" @#O..+#+ ",
+" .O#@@#+. ",
+" .+##@. ",
+" X@##@X ",
+" X@#+@#@X ",
+" +#@X.@#+ ",
+" #+. .+# ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm
index 0ac3837..57c8e73 100644
--- a/xfwm4/close-inactive.xpm
+++ b/xfwm4/close-inactive.xpm
@@ -1,35 +1,37 @@
/* XPM */
-static char * close_inactive_xpm[] = {
-"16 16 16 1",
-" c None",
-". c #2D2D2D",
-"+ c #AAAAAA",
-"@ c #828282",
-"# c #3A3A3A",
-"$ c #848484",
-"% c #A2A2A2",
-"& c #474747",
-"* c #3B3B3B",
-"= c #A4A4A4",
-"- c #A0A0A0",
-"; c #4B4B4B",
-"> c #A1A1A1",
-", c #464646",
-"' c #818181",
-") c #383838",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+--+%#....",
-"....$+>,,>+@....",
-"....+')..)'+....",
-"................",
-"................",
-"................",
-"................"};
+static char *close_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 6 1 ",
+" c #2D2D2D2D2D2D",
+". c #375437543754",
+"X c #394439443944",
+"o c #7BA27BA27BA2",
+"O c #7F7C7F7C7F7C",
+"+ c #888888888888",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" +o. .o+ ",
+" O+o..o+O ",
+" .o+OO+o. ",
+" .O++O. ",
+" .O++O. ",
+" XO+oO+OX ",
+" o+OX.O+O ",
+" +o. .o+ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm
index 250c7f8..02fde2a 100644
--- a/xfwm4/close-prelight.xpm
+++ b/xfwm4/close-prelight.xpm
@@ -1,36 +1,39 @@
/* XPM */
-static char * close_prelight_xpm[] = {
-"16 16 17 1",
-" c None",
-". c #2D2D2D",
-"+ c #D64937",
-"@ c #A04034",
-"# c #3F302E",
-"$ c #A34033",
-"% c #CC4736",
-"& c #50322F",
-"* c #40302D",
-"= c #CE4736",
-"- c #C94636",
-"; c #57332F",
-"> c #C84636",
-", c #CA4736",
-"' c #4F332F",
-") c #9E3F33",
-"! c #3C2F2D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+>>+%#....",
-"....$+,'',+@....",
-"....+)!..!)+....",
-"................",
-"................",
-"................",
-"................"};
+static char *close_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #4007304C2E4A",
+"X c #452131252E98",
+"o c #484848484848",
+"O c #BEE2455135CC",
+"+ c #C23645DE35FF",
+"@ c #C60A46813639",
+"# c #D6D649493737",
+/* pixels */
+"oooooooooooooooooooooo",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" #O. .O# ",
+" +#O..O#+ ",
+" .O#@@#O. ",
+" .@##+. ",
+" X@##@X ",
+" X+#++#+X ",
+" +#@.X@#+ ",
+" #O. .+# ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm
index f7c47d5..af1d1d1 100644
--- a/xfwm4/close-pressed.xpm
+++ b/xfwm4/close-pressed.xpm
@@ -1,36 +1,39 @@
/* XPM */
-static char * close_pressed_xpm[] = {
-"16 16 17 1",
-" c None",
-". c #2D2D2D",
-"+ c #B44335",
-"@ c #893C32",
-"# c #3B2F2E",
-"$ c #8B3D33",
-"% c #AC4233",
-"& c #49312E",
-"* c #3C2F2D",
-"= c #AD4334",
-"- c #A94134",
-"; c #4E322F",
-"> c #A94135",
-", c #AA4134",
-"' c #47312E",
-") c #873B32",
-"! c #392E2D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+>>+%#....",
-"....$+,'',+@....",
-"....+)!..!)+....",
-"................",
-"................",
-"................",
-"................"};
+static char *close_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #3C0F2F9A2E0F",
+"X c #3C972FB02E17",
+"o c #402230442E4C",
+"O c #484848484848",
+"+ c #A1A940293414",
+"@ c #A76B4119346B",
+"# c #B4B443433535",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" #+. .+# ",
+" @#+.X+#+ ",
+" X+#@@#+X ",
+" .@##@X ",
+" X@##@X ",
+" X@#+@#@o ",
+" +#@oo+#@ ",
+" #+. X+# ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm
index a5f2f53..9610573 100644
--- a/xfwm4/hide-active.xpm
+++ b/xfwm4/hide-active.xpm
@@ -1,22 +1,36 @@
/* XPM */
-static char * hide_active_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *hide_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 5 1 ",
+" c #2D2D2D2D2D2D",
+". c #32B032B032B0",
+"X c #484848484848",
+"o c #D809D809D809",
+"O c gainsboro",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ........ ",
+" OOOOOOOO ",
+" oooooooo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm
index f8fc850..b7f9846 100644
--- a/xfwm4/hide-inactive.xpm
+++ b/xfwm4/hide-inactive.xpm
@@ -1,22 +1,36 @@
/* XPM */
-static char * hide_inactive_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *hide_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 5 1 ",
+" c #2D2D2D2D2D2D",
+". c #300B300B300B",
+"X c #393939393939",
+"o c #860686068606",
+"O c #888888888888",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ........ ",
+" OOOOOOOO ",
+" oooooooo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm
index 00568f4..0428040 100644
--- a/xfwm4/hide-prelight.xpm
+++ b/xfwm4/hide-prelight.xpm
@@ -1,22 +1,36 @@
/* XPM */
-static char * hide_prelight_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *hide_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 5 1 ",
+" c #2D2D2D2D2D2D",
+". c #32802E0F2D7E",
+"X c #484848484848",
+"o c #D22E488336F0",
+"O c #D6D649493737",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ........ ",
+" OOOOOOOO ",
+" oooooooo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm
index b499d8b..8fff897 100644
--- a/xfwm4/hide-pressed.xpm
+++ b/xfwm4/hide-pressed.xpm
@@ -1,22 +1,36 @@
/* XPM */
-static char * hide_pressed_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *hide_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 5 1 ",
+" c #2D2D2D2D2D2D",
+". c #316D2DDE2D6E",
+"X c #484848484848",
+"o c #B0FC42A834FD",
+"O c #B4B443433535",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ........ ",
+" OOOOOOOO ",
+" oooooooo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm
index 759799a..5b74c64 100644
--- a/xfwm4/maximize-active.xpm
+++ b/xfwm4/maximize-active.xpm
@@ -1,22 +1,34 @@
/* XPM */
-static char * maximize_active_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+static char *maximize_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c gainsboro",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm
index 62a9251..8666762 100644
--- a/xfwm4/maximize-inactive.xpm
+++ b/xfwm4/maximize-inactive.xpm
@@ -1,22 +1,34 @@
/* XPM */
-static char * maximize_inactive_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+static char *maximize_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #393939393939",
+"X c #888888888888",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm
index 203179c..cadb8fd 100644
--- a/xfwm4/maximize-prelight.xpm
+++ b/xfwm4/maximize-prelight.xpm
@@ -1,22 +1,34 @@
/* XPM */
-static char * maximize_prelight_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+static char *maximize_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c #D6D649493737",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm
index 18cdb1b..9fc6c6c 100644
--- a/xfwm4/maximize-pressed.xpm
+++ b/xfwm4/maximize-pressed.xpm
@@ -1,22 +1,34 @@
/* XPM */
-static char * maximize_pressed_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+static char *maximize_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c #B4B443433535",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
new file mode 100644
index 0000000..f8a489b
--- /dev/null
+++ b/xfwm4/maximize-toggled-active.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *maximize_toggled_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c gainsboro",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
new file mode 100644
index 0000000..7a0f2a8
--- /dev/null
+++ b/xfwm4/maximize-toggled-inactive.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *maximize_toggled_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #393939393939",
+"X c #888888888888",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm
new file mode 100644
index 0000000..619fd35
--- /dev/null
+++ b/xfwm4/maximize-toggled-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *maximize_toggled_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c #D6D649493737",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm
new file mode 100644
index 0000000..17cc04e
--- /dev/null
+++ b/xfwm4/maximize-toggled-pressed.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *maximize_toggled_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 3 1 ",
+" c #2D2D2D2D2D2D",
+". c #484848484848",
+"X c #B4B443433535",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XX XX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/menu-active.xpm b/xfwm4/menu-active.xpm
index 093c993..bcfa0d1 100644
--- a/xfwm4/menu-active.xpm
+++ b/xfwm4/menu-active.xpm
@@ -1,21 +1,23 @@
/* XPM */
-static char * menu_active_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *menu_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 16 1 1 ",
+" c #2D2D2D2D2D2D",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/menu-inactive.xpm b/xfwm4/menu-inactive.xpm
index 21812b4..2099db2 100644
--- a/xfwm4/menu-inactive.xpm
+++ b/xfwm4/menu-inactive.xpm
@@ -1,21 +1,23 @@
/* XPM */
-static char * menu_inactive_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *menu_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 16 1 1 ",
+" c #2D2D2D2D2D2D",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/menu-prelight.xpm b/xfwm4/menu-prelight.xpm
index 576b305..2b41cbd 100644
--- a/xfwm4/menu-prelight.xpm
+++ b/xfwm4/menu-prelight.xpm
@@ -1,21 +1,23 @@
/* XPM */
-static char * menu_prelight_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *menu_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 16 1 1 ",
+" c #2D2D2D2D2D2D",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm
index b13fc79..0496ed2 100644
--- a/xfwm4/menu-pressed.xpm
+++ b/xfwm4/menu-pressed.xpm
@@ -1,21 +1,23 @@
/* XPM */
-static char * menu_pressed_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+static char *menu_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 16 1 1 ",
+" c #2D2D2D2D2D2D",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm
index f533efd..5ed3e32 100644
--- a/xfwm4/shade-active.xpm
+++ b/xfwm4/shade-active.xpm
@@ -1,22 +1,39 @@
/* XPM */
-static char * shade_active_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #DBDBDB",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #449A449A449A",
+"X c #484848484848",
+"o c #7F297F297F29",
+"O c #855D855D855D",
+"+ c #C780C780C780",
+"@ c #C992C992C992",
+"# c gainsboro",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" oo ",
+" O##O ",
+" O####O ",
+" o#+##+#o ",
+" #@.##.@# ",
+" ## ",
+" ## ",
+" ## ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm
index ed6b2af..41a0e8f 100644
--- a/xfwm4/shade-inactive.xpm
+++ b/xfwm4/shade-inactive.xpm
@@ -1,22 +1,37 @@
/* XPM */
-static char * shade_inactive_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 6 1 ",
+" c #2D2D2D2D2D2D",
+". c #393C393C393C",
+"X c #57CF57CF57CF",
+"o c #5B085B085B08",
+"O c #7D6D7D6D7D6D",
+"+ c #888888888888",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XX ",
+" o++o ",
+" o++++o ",
+" X+O++O+o ",
+" +O.++.O+ ",
+" ++ ",
+" ++ ",
+" ++ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm
index f7226bd..6cb7e2f 100644
--- a/xfwm4/shade-prelight.xpm
+++ b/xfwm4/shade-prelight.xpm
@@ -1,22 +1,39 @@
/* XPM */
-static char * shade_prelight_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #43CC30EC2E84",
+"X c #7C5A3A4B31DC",
+"o c #484848484848",
+"O c #82573B493237",
+"+ c #C23645DE35FF",
+"@ c #C3E046253618",
+"# c #D6D649493737",
+/* pixels */
+"oooooooooooooooooooooo",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XX ",
+" O##O ",
+" O####O ",
+" X#+##+#X ",
+" #+.##.+# ",
+" ## ",
+" ## ",
+" ## ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm
index 4dceebd..26e0984 100644
--- a/xfwm4/shade-pressed.xpm
+++ b/xfwm4/shade-pressed.xpm
@@ -1,22 +1,38 @@
/* XPM */
-static char * shade_pressed_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 7 1 ",
+" c #2D2D2D2D2D2D",
+". c #3F3F301F2E3F",
+"X c #6C6C377C30EC",
+"o c #713538433135",
+"O c #484848484848",
+"+ c #A43A4094343B",
+"@ c #B4B443433535",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XX ",
+" o@@o ",
+" o@@@@o ",
+" X@+@@+@X ",
+" @+.@@.+@ ",
+" @@ ",
+" @@ ",
+" @@ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm
index 5986f3d..eb71991 100644
--- a/xfwm4/shade-toggled-active.xpm
+++ b/xfwm4/shade-toggled-active.xpm
@@ -1,22 +1,39 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #DBDBDB",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_toggled_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #41D841D841D8",
+"X c #484848484848",
+"o c #855D855D855D",
+"O c #8AE08AE08AE0",
+"+ c #C40FC40FC40F",
+"@ c #C6D0C6D0C6D0",
+"# c gainsboro",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ## ",
+" ## ",
+" ## ",
+" #+.##.@# ",
+" O#@##@#O ",
+" o####o ",
+" o##o ",
+" oo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm
index 89587d0..4346439 100644
--- a/xfwm4/shade-toggled-inactive.xpm
+++ b/xfwm4/shade-toggled-inactive.xpm
@@ -1,22 +1,38 @@
/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_toggled_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 7 1 ",
+" c #2D2D2D2D2D2D",
+". c #393939393939",
+"X c #5B085B085B08",
+"o c #5DE65DE65DE6",
+"O c #7BA27BA27BA2",
+"+ c #7C5A7C5A7C5A",
+"@ c #888888888888",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" @@ ",
+" @@ ",
+" @@ ",
+" @O.@@.O@ ",
+" o@+@@+@o ",
+" X@@@@X ",
+" X@@X ",
+" XX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm
index 30a6db5..2b2e4d6 100644
--- a/xfwm4/shade-toggled-prelight.xpm
+++ b/xfwm4/shade-toggled-prelight.xpm
@@ -1,22 +1,39 @@
/* XPM */
-static char * shade_toggled_prelight_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_toggled_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #4123307C2E5B",
+"X c #484848484848",
+"o c #82573B493237",
+"O c #87A93C2B3288",
+"+ c #BF8D456D35D6",
+"@ c #C18C45C235F4",
+"# c #D6D649493737",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ## ",
+" ## ",
+" ## ",
+" #+.##.+# ",
+" O#@##@#O ",
+" o####o ",
+" o##o ",
+" oo ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm
index a444c27..58fbd39 100644
--- a/xfwm4/shade-toggled-pressed.xpm
+++ b/xfwm4/shade-toggled-pressed.xpm
@@ -1,22 +1,38 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+static char *shade_toggled_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 7 1 ",
+" c #2D2D2D2D2D2D",
+". c #3D1F2FC62E1F",
+"X c #713538433135",
+"o c #757538F43176",
+"O c #484848484848",
+"+ c #A36E4072342F",
+"@ c #B4B443433535",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" @@ ",
+" @@ ",
+" @@ ",
+" @+.@@.+@ ",
+" X@+@@+@o ",
+" X@@@@X ",
+" X@@X ",
+" XX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/src/button-base-active.xpm b/xfwm4/src/button-base-active.xpm
new file mode 100644
index 0000000..406f4bc
--- /dev/null
+++ b/xfwm4/src/button-base-active.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * button_base_active_xpm[] = {
+"22 25 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #484848",
+"++++++++++++++++++++++",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/xfwm4/src/button-base-inactive.xpm b/xfwm4/src/button-base-inactive.xpm
new file mode 100644
index 0000000..e5e1704
--- /dev/null
+++ b/xfwm4/src/button-base-inactive.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * button_base_inactive_xpm[] = {
+"22 25 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #393939",
+"++++++++++++++++++++++",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/xfwm4/src/button-base-menu.xpm b/xfwm4/src/button-base-menu.xpm
new file mode 100644
index 0000000..103a9a8
--- /dev/null
+++ b/xfwm4/src/button-base-menu.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"22 16 2 1",
+" c None",
+". c #2D2D2D",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/xfwm4/src/close.svg b/xfwm4/src/close.svg
new file mode 100644
index 0000000..9ae0fbd
--- /dev/null
+++ b/xfwm4/src/close.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="close.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="45.254834"
+ inkscape:cx="1.1260667"
+ inkscape:cy="4.0483953"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ originx="0px"
+ originy="-8px" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="-7.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ d="M 0,0 1.5,0 8,6.5 8,8 6.5,8 0,1.5 z"
+ id="path2997"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path2997"
+ id="use3778"
+ transform="matrix(-1,0,0,1,8,0)"
+ width="8"
+ height="8" />
+ </g>
+</svg>
diff --git a/xfwm4/src/hide.svg b/xfwm4/src/hide.svg
new file mode 100644
index 0000000..9176690
--- /dev/null
+++ b/xfwm4/src/hide.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="hide.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.392433"
+ inkscape:cx="8.1378762"
+ inkscape:cy="8.2886004"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="rect2995"
+ width="8"
+ height="2"
+ x="7.1633207e-07"
+ y="10.968145" />
+ </g>
+</svg>
diff --git a/xfwm4/src/icon_template.svgz b/xfwm4/src/icon_template.svgz
new file mode 100644
index 0000000000000000000000000000000000000000..b9bceaf7568ac0ec910266de3b7a2d38285677a2
GIT binary patch
literal 850
zcmV-Y1FifYiwFP!000000KHYqj@vdA-TNz8W|N?mD9QGWWJu1Ug8%`#Y7=Bx&>}4p
zkw}50Eo;8Mm$V*!%m76fHDK7h=iH|bukz35rbZ{OjZm_{aTsC5WvQ5uRe`^M`x2xW
z8A~OjwUWHRQsK|rMgB_=px-s8mNV1|dq7|1PgByCqmKt`+YKRI*M(v*hDulD6AFUu
zVv(CuwLl0#UTHS0Eb!pa9(C=BtR%eV4VTuCIE)FN>E%o>U3PKerD_@_jrWx1!xdSx
z{ls?FbW2Z)vn(S~LXso^Mqqkr={dM{g&N;-O`<3wfX&Q*$J!VeXbazoJ{m%!j=JP~
z@Z+K6mb`p>nZO_lnPpdD#(Caky&1Bk4L2<<xgn$7`*(ubLxEF&IB-!N?06Eaz))?H
zrE7n_5<`3;41qQi5{0WYTp^uh%gj^8iZ@J^u7m=MQpvw9Z`v9(5<>h}yai^?_}(~=
zOI~+^#LpNJk4|x15Oxy0o4Gq`F1;Ys(h8n?t#pAu?EPl|c1km@N9f6aZXgA-5w^c5
zeTY4_=b}z{^fqn|l&P-3$vyb0R8!z(94@nDwOroA<r&5u#>?mQ`RT#8>>Ze-=~EP~
z9>Am4a20}@_8gk>Kk+~^2h~;D4ae#uzxQ-Vu-mEg+b}$;qq}6mQ3?w}ZqN6OPDp4r
z7_<{7>BC3{#we)l`8@{I@E+8^4>j~G8u7}Z!Pv_OBy!W<#SJ0byGwEIoehshHy39}
zK&F!s6zT4VUvKGTJqaUrHNP1Ya3uvJyR#Ze+kx+**FtimWZmD<n6lRS?r9CWz3BVD
zmcRc0%b%}T6iwF)p{x55C+k%fCD*0B;{?c+U$Ty}G#VC%kEul^q*F+^o<umB`+M^^
zS6}V0Hpt`N@b-pV%BZFD5*aNp)M!)`yahIYzI@pZ8S=8+{80Mmm=GaHpgVO0h2!mH
z&RMyEz1>i|6%DKgxAK35J)M&oxFNfzJO{mm)%@}Tc=IjD%0@UR@|P8L{naIzgfs;e
zw&t@jCqwl^Z{(`EoQ&Q3Q#DWJW~odHt?7=}1^&Z<=mD*?I<}2sd~hFdtEn`ud-sIk
cuUr2gqu+w`lP^7YQ`#>60b7B77k3B%06oB^HUIzs
literal 0
HcmV?d00001
diff --git a/xfwm4/src/maximize-toggled.svg b/xfwm4/src/maximize-toggled.svg
new file mode 100644
index 0000000..4906163
--- /dev/null
+++ b/xfwm4/src/maximize-toggled.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="maximize-toggled.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.392433"
+ inkscape:cx="4.1560249"
+ inkscape:cy="5.9313444"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="1280"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 0,8 0,8 8,0 0,-8 z m 2,2 4,0 0,4 -4,0 z"
+ id="rect2995"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ </g>
+</svg>
diff --git a/xfwm4/src/maximize.svg b/xfwm4/src/maximize.svg
new file mode 100644
index 0000000..4906163
--- /dev/null
+++ b/xfwm4/src/maximize.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="maximize-toggled.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.392433"
+ inkscape:cx="4.1560249"
+ inkscape:cy="5.9313444"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="1280"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 0,8 0,8 8,0 0,-8 z m 2,2 4,0 0,4 -4,0 z"
+ id="rect2995"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ </g>
+</svg>
diff --git a/xfwm4/src/shade-toggled.svg b/xfwm4/src/shade-toggled.svg
new file mode 100644
index 0000000..f0f078c
--- /dev/null
+++ b/xfwm4/src/shade-toggled.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="shade-toggled.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="45.254834"
+ inkscape:cx="-1.7689698"
+ inkscape:cy="4.4023135"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="1280"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ style="fill:#000000;stroke:none"
+ d="M 0,11 0,12 4,16 8,12 8,11 6.5,11 5,12.5 5,8 3,8 3,12.5 1.5,11 z"
+ id="path2997"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+</svg>
diff --git a/xfwm4/src/shade.svg b/xfwm4/src/shade.svg
new file mode 100644
index 0000000..48f0168
--- /dev/null
+++ b/xfwm4/src/shade.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="shade.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="45.254834"
+ inkscape:cx="-1.7689698"
+ inkscape:cy="4.4023135"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="1280"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ style="fill:#000000;stroke:none"
+ d="M 0,5 0,4 4,0 8,4 8,5 6.5,5 5,3.5 5,8 3,8 3,3.5 1.5,5 z"
+ id="path2997"
+ inkscape:connector-curvature="0"
+ transform="translate(0,8)"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+</svg>
diff --git a/xfwm4/src/stick-toggled.svg b/xfwm4/src/stick-toggled.svg
new file mode 100644
index 0000000..45cbd0f
--- /dev/null
+++ b/xfwm4/src/stick-toggled.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="stick.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.392433"
+ inkscape:cx="2.9455421"
+ inkscape:cy="8.2886004"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path3765"
+ sodipodi:cx="4"
+ sodipodi:cy="4"
+ sodipodi:rx="2"
+ sodipodi:ry="2"
+ d="M 6,4 A 2,2 0 1 1 2,4 2,2 0 1 1 6,4 z"
+ transform="translate(0,8)" />
+ </g>
+</svg>
diff --git a/xfwm4/src/stick.svg b/xfwm4/src/stick.svg
new file mode 100644
index 0000000..ac12534
--- /dev/null
+++ b/xfwm4/src/stick.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="8"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="icon_template.svgz">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.392433"
+ inkscape:cx="2.9455421"
+ inkscape:cy="8.2886004"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="970"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2993"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="false" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="8"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ color="#ff00ff"
+ opacity="0.1254902"
+ empcolor="#ff00ff"
+ empopacity="0.25098039"
+ originx="0.5px"
+ originy="0.5px"
+ dotted="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-8)">
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path3765"
+ sodipodi:cx="4"
+ sodipodi:cy="4"
+ sodipodi:rx="3"
+ sodipodi:ry="3"
+ d="M 7,4 A 3,3 0 1 1 1,4 3,3 0 1 1 7,4 z"
+ transform="translate(0,8)" />
+ </g>
+</svg>
diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm
new file mode 100644
index 0000000..4f7e01d
--- /dev/null
+++ b/xfwm4/stick-active.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char *stick_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 13 1 ",
+" c #2D2D2D2D2D2D",
+". c #3FF33FF33FF3",
+"X c #420442044204",
+"o c #444244424442",
+"O c #484848484848",
+"+ c #9F8B9F8B9F8B",
+"@ c #A19CA19CA19C",
+"# c #A95CA95CA95C",
+"$ c #C780C780C780",
+"% c #CA42CA42CA42",
+"& c #CFC5CFC5CFC5",
+"* c #D0A1D0A1D0A1",
+"= c gainsboro",
+/* pixels */
+"OOOOOOOOOOOOOOOOoOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" X@$$@X ",
+" X*====&X ",
+" @=#oo#=+ ",
+" %=X X=% ",
+" %=. X=% ",
+" +=#X.#=+ ",
+" X&====&X ",
+" X@&&@X ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm
new file mode 100644
index 0000000..d200cd4
--- /dev/null
+++ b/xfwm4/stick-inactive.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static char *stick_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 9 1 ",
+" c #2D2D2D2D2D2D",
+". c #375137513751",
+"X c #393839383938",
+"o c #68A568A568A5",
+"O c #697469746974",
+"+ c #6DA96DA96DA9",
+"@ c #7D6D7D6D7D6D",
+"# c #81B981B981B9",
+"$ c #888888888888",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" XO@@O. ",
+" X#$$$$#. ",
+" O$+XX+$O ",
+" @$. X$@ ",
+" @$. .$# ",
+" O$+..+$O ",
+" .#$$$$#. ",
+" XO##OX ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm
new file mode 100644
index 0000000..294d3b0
--- /dev/null
+++ b/xfwm4/stick-prelight.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char *stick_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 13 1 ",
+" c #2D2D2D2D2D2D",
+". c #3F2430272E3D",
+"X c #4123307C2E5B",
+"o c #43CC30EC2E84",
+"O c #484848484848",
+"+ c #9B9F3F7933B6",
+"@ c #9C9F3FA433C5",
+"# c #9D9E3FCE33D4",
+"$ c #A4F041053443",
+"% c #C23645DE35FF",
+"& c #C4DF464F3627",
+"* c #CB864769368C",
+"= c #D6D649493737",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" X#%%#X ",
+" X*====*X ",
+" #=$Xo$=+ ",
+" &=X X=& ",
+" &=. X=& ",
+" +=$..$=@ ",
+" .*====*X ",
+" X#**#X ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm
new file mode 100644
index 0000000..ad1a907
--- /dev/null
+++ b/xfwm4/stick-pressed.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char *stick_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 12 1 ",
+" c #2D2D2D2D2D2D",
+". c #3B872F842E07",
+"X c #3C0F2F9A2E0F",
+"o c #3D412FCC2E21",
+"O c #3F3F301F2E3F",
+"+ c #484848484848",
+"@ c #85943B95326A",
+"# c #86FF3BD03280",
+"$ c #8CD83CC432D8",
+"% c #A43A4094343B",
+"& c #ABAB41CA34AC",
+"* c #B4B443433535",
+/* pixels */
+"++++++++++++++++++++++",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" o#%%#o ",
+" o&****&o ",
+" @*$oo$*# ",
+" &*. o*% ",
+" %*. o*& ",
+" @*$..$*@ ",
+" .&****&X ",
+" X#&&#X ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm
new file mode 100644
index 0000000..05c6ac4
--- /dev/null
+++ b/xfwm4/stick-toggled-active.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char *stick_toggled_active[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 11 1 ",
+" c #2D2D2D2D2D2D",
+". c #314F314F314F",
+"X c #484848484848",
+"o c #568356835683",
+"O c #5AA65AA65AA6",
+"+ c #88CF88CF88CF",
+"@ c #8AA58AA58AA5",
+"# c #C780C780C780",
+"$ c #CBA3CBA3CBA3",
+"% c #CD03CD03CD03",
+"& c gainsboro",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" .@##@ ",
+" @&&&&@ ",
+" $&OO&$ ",
+" $&oo&$ ",
+" @&&&&@ ",
+" .@%$@. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm
new file mode 100644
index 0000000..c5a4754
--- /dev/null
+++ b/xfwm4/stick-toggled-inactive.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static char *stick_toggled_inactive[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 8 1 ",
+" c #2D2D2D2D2D2D",
+". c #393939393939",
+"X c #439143914391",
+"o c #44D244D244D2",
+"O c #5E055E055E05",
+"+ c #7EDC7EDC7EDC",
+"@ c #804B804B804B",
+"# c #888888888888",
+/* pixels */
+"......................",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" O++O ",
+" O####O ",
+" +#oo#+ ",
+" +#XX#+ ",
+" O####O ",
+" O@@O ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm
new file mode 100644
index 0000000..60d8f59
--- /dev/null
+++ b/xfwm4/stick-toggled-prelight.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char *stick_toggled_prelight[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 12 1 ",
+" c #2D2D2D2D2D2D",
+". c #312B2DD62D69",
+"X c #566D34032F9E",
+"o c #591634732FC6",
+"O c #484848484848",
+"+ c #85AA3BD63269",
+"@ c #87A93C2B3288",
+"# c #88543C473292",
+"$ c #C23645DE35FF",
+"% c #C5DF467A3636",
+"& c #C8DD46F83663",
+"* c #D6D649493737",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" .@$$@ ",
+" @****@ ",
+" %*Xo*% ",
+" %*XX*% ",
+" #****@ ",
+" .#%%@. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm
new file mode 100644
index 0000000..50a94b5
--- /dev/null
+++ b/xfwm4/stick-toggled-pressed.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char *stick_toggled_pressed[] = {
+/* columns rows colors chars-per-pixel */
+"22 25 11 1 ",
+" c #2D2D2D2D2D2D",
+". c #305D2DB22D5D",
+"X c #4E6532972F25",
+"o c #504132E42F41",
+"O c #73DD38B2315D",
+"+ c #757538F43176",
+"@ c #484848484848",
+"# c #A43A4094343B",
+"$ c #A76B4119346B",
+"% c #A87B4145347C",
+"& c #B4B443433535",
+/* pixels */
+"@@@@@@@@@@@@@@@@@@@@@@",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" .+##+ ",
+" +&&&&O ",
+" #&Xo&% ",
+" %&XX&# ",
+" +&&&&+ ",
+" .+%%+. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
diff --git a/xfwm4/themerc b/xfwm4/themerc
index 0bbcd94..e345ddd 100644
--- a/xfwm4/themerc
+++ b/xfwm4/themerc
@@ -4,12 +4,12 @@
active_text_color=#dcdcdc
inactive_text_color=#888888
-button_offset=6
-button_spacing=6
+button_offset=3
+button_spacing=0
show_app_icon=true
full_width_title=true
-maximized_offset=6
-title_horizontal_offset=6
+maximized_offset=0
+title_horizontal_offset=3
title_shadow_active=false
title_shadow_inactive=false
title_vertical_offset_active=0
From e836f9ae648a6f43e618277e42e25c3ec59d4262 Mon Sep 17 00:00:00 2001
From: Andrew Chadwick <a.t.chadwick@gmail.com>
Date: Mon, 10 Feb 2014 21:23:32 +0000
Subject: [PATCH 2/3] xfwm4: increase width of bottom edge
Increase the size of the bottom resize edge, and make the left-bottom and
right-bottom corners larger, and "L"-shaped, for easier gripping.
Rationale: Xfwm doesn't support magic window edges, so they need to be
larger in order to be clickable. 2px is too narrow for this.
---
xfwm4/bottom-active.xpm | 4 +++-
xfwm4/bottom-inactive.xpm | 4 +++-
xfwm4/bottom-left-active.xpm | 12 +++++++++---
xfwm4/bottom-left-inactive.xpm | 12 +++++++++---
xfwm4/bottom-right-active.xpm | 12 +++++++++---
xfwm4/bottom-right-inactive.xpm | 12 +++++++++---
6 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/xfwm4/bottom-active.xpm b/xfwm4/bottom-active.xpm
index 8ad96da..6512dc3 100644
--- a/xfwm4/bottom-active.xpm
+++ b/xfwm4/bottom-active.xpm
@@ -1,8 +1,10 @@
/* XPM */
static char * bottom_active_xpm[] = {
-"8 2 3 1",
+"8 4 3 1",
" c None",
". c #2D2D2D",
"+ c #484848",
"........",
+"........",
+"........",
"++++++++"};
diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm
index 69a8fe3..691d732 100644
--- a/xfwm4/bottom-inactive.xpm
+++ b/xfwm4/bottom-inactive.xpm
@@ -1,8 +1,10 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
-"8 2 3 1",
+"8 4 3 1",
" c None",
". c #2D2D2D",
"+ c #393939",
"........",
+"........",
+"........",
"++++++++"};
diff --git a/xfwm4/bottom-left-active.xpm b/xfwm4/bottom-left-active.xpm
index c6ebde9..6f1de4f 100644
--- a/xfwm4/bottom-left-active.xpm
+++ b/xfwm4/bottom-left-active.xpm
@@ -1,8 +1,14 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
+"16 8 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".+",
-".."};
+".+ ",
+".+ ",
+".+ ",
+".+ ",
+".+++++++++++++++",
+".+++++++++++++++",
+".+++++++++++++++",
+"................"};
diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm
index d38cacb..1adae65 100644
--- a/xfwm4/bottom-left-inactive.xpm
+++ b/xfwm4/bottom-left-inactive.xpm
@@ -1,8 +1,14 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
+"16 8 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".+",
-".."};
+".+ ",
+".+ ",
+".+ ",
+".+ ",
+".+++++++++++++++",
+".+++++++++++++++",
+".+++++++++++++++",
+"................"};
diff --git a/xfwm4/bottom-right-active.xpm b/xfwm4/bottom-right-active.xpm
index 42eefb1..34f8845 100644
--- a/xfwm4/bottom-right-active.xpm
+++ b/xfwm4/bottom-right-active.xpm
@@ -1,8 +1,14 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
+"16 8 3 1",
" c None",
". c #2D2D2D",
"+ c #484848",
-".+",
-"++"};
+" .+",
+" .+",
+" .+",
+" .+",
+"...............+",
+"...............+",
+"...............+",
+"++++++++++++++++"};
diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm
index 6c3ab6d..d584d7c 100644
--- a/xfwm4/bottom-right-inactive.xpm
+++ b/xfwm4/bottom-right-inactive.xpm
@@ -1,8 +1,14 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
+"16 8 3 1",
" c None",
". c #2D2D2D",
"+ c #393939",
-".+",
-"++"};
+" .+",
+" .+",
+" .+",
+" .+",
+"...............+",
+"...............+",
+"...............+",
+"++++++++++++++++"};
From 261ae31d64687628ab6009f6018978c2eef490cb Mon Sep 17 00:00:00 2001
From: Andrew Chadwick <a.t.chadwick@gmail.com>
Date: Mon, 10 Feb 2014 21:38:42 +0000
Subject: [PATCH 3/3] xfwm4: thicker window borders
The style looks more balanced and true to upstream with the 4px borders all
around.
---
xfwm4/bottom-left-active.xpm | 18 ++++++++----
xfwm4/bottom-left-inactive.xpm | 18 ++++++++----
xfwm4/bottom-right-active.xpm | 18 ++++++++----
xfwm4/bottom-right-inactive.xpm | 18 ++++++++----
xfwm4/left-active.xpm | 44 ++++++++++++++--------------
xfwm4/left-inactive.xpm | 44 ++++++++++++++--------------
xfwm4/right-active.xpm | 44 ++++++++++++++--------------
xfwm4/right-inactive.xpm | 44 ++++++++++++++--------------
xfwm4/top-left-active.xpm | 52 ++++++++++++++++-----------------
xfwm4/top-left-inactive.xpm | 52 ++++++++++++++++-----------------
xfwm4/top-right-active.xpm | 52 ++++++++++++++++-----------------
xfwm4/top-right-inactive.xpm | 52 ++++++++++++++++-----------------
12 files changed, 244 insertions(+), 212 deletions(-)
diff --git a/xfwm4/bottom-left-active.xpm b/xfwm4/bottom-left-active.xpm
index 6f1de4f..95fd10b 100644
--- a/xfwm4/bottom-left-active.xpm
+++ b/xfwm4/bottom-left-active.xpm
@@ -1,13 +1,21 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
-"16 8 3 1",
+"16 16 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".+ ",
-".+ ",
-".+ ",
-".+ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
".+++++++++++++++",
".+++++++++++++++",
".+++++++++++++++",
diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm
index 1adae65..05c6dfa 100644
--- a/xfwm4/bottom-left-inactive.xpm
+++ b/xfwm4/bottom-left-inactive.xpm
@@ -1,13 +1,21 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
-"16 8 3 1",
+"16 16 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".+ ",
-".+ ",
-".+ ",
-".+ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
+".+++ ",
".+++++++++++++++",
".+++++++++++++++",
".+++++++++++++++",
diff --git a/xfwm4/bottom-right-active.xpm b/xfwm4/bottom-right-active.xpm
index 34f8845..7256111 100644
--- a/xfwm4/bottom-right-active.xpm
+++ b/xfwm4/bottom-right-active.xpm
@@ -1,13 +1,21 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
-"16 8 3 1",
+"16 16 3 1",
" c None",
". c #2D2D2D",
"+ c #484848",
-" .+",
-" .+",
-" .+",
-" .+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
"...............+",
"...............+",
"...............+",
diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm
index d584d7c..8fcb2ae 100644
--- a/xfwm4/bottom-right-inactive.xpm
+++ b/xfwm4/bottom-right-inactive.xpm
@@ -1,13 +1,21 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
-"16 8 3 1",
+"16 16 3 1",
" c None",
". c #2D2D2D",
"+ c #393939",
-" .+",
-" .+",
-" .+",
-" .+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
+" ...+",
"...............+",
"...............+",
"...............+",
diff --git a/xfwm4/left-active.xpm b/xfwm4/left-active.xpm
index 77433da..8b766bb 100644
--- a/xfwm4/left-active.xpm
+++ b/xfwm4/left-active.xpm
@@ -1,27 +1,27 @@
/* XPM */
static char * left_active_xpm[] = {
-"2 21 3 1",
+"4 21 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++"};
diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm
index 2577ecf..1bec862 100644
--- a/xfwm4/left-inactive.xpm
+++ b/xfwm4/left-inactive.xpm
@@ -1,27 +1,27 @@
/* XPM */
static char * left_inactive_xpm[] = {
-"2 21 3 1",
+"4 21 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++"};
diff --git a/xfwm4/right-active.xpm b/xfwm4/right-active.xpm
index d299d16..617f8ce 100644
--- a/xfwm4/right-active.xpm
+++ b/xfwm4/right-active.xpm
@@ -1,27 +1,27 @@
/* XPM */
static char * right_active_xpm[] = {
-"2 21 3 1",
+"4 21 3 1",
" c None",
". c #2D2D2D",
"+ c #484848",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+"};
diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm
index 239d0d5..4f81b89 100644
--- a/xfwm4/right-inactive.xpm
+++ b/xfwm4/right-inactive.xpm
@@ -1,27 +1,27 @@
/* XPM */
static char * right_inactive_xpm[] = {
-"2 21 3 1",
+"4 21 3 1",
" c None",
". c #2D2D2D",
"+ c #393939",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+",
+"...+"};
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 2d98285..dd5b2f4 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"2 25 3 1",
+"4 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-" .",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+" ...",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++"};
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index a4cfd1c..56b9021 100644
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"2 25 3 1",
+"4 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-" .",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+" ...",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++",
+".+++"};
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index 071710e..df652ff 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"2 25 3 1",
+"4 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-". ",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+."};
+"... ",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++."};
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index 95e48e1..3dfbc97 100644
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"2 25 3 1",
+"4 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-". ",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+."};
+"... ",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++.",
+"+++."};