gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

style file updates, gradiented clip arrows

Browse Source
This commit is contained in:
kojima
1999-04-14 00:22:38 +00:00
parent fad6a286d8
commit 4cc21af228
36 changed files with 458 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ Changes since version 0.52.0:
- applied windoze cycle patch from Paul Warren <pdw@ferret.lmh.ox.ac.uk> - applied windoze cycle patch from Paul Warren <pdw@ferret.lmh.ox.ac.uk>
- changed initscript and exitscript execution from fork()/exec() to system() - changed initscript and exitscript execution from fork()/exec() to system()
- added ResizebarBack and added appropriate backwards compat. hacks in setstyle - added ResizebarBack and added appropriate backwards compat. hacks in setstyle
- applied ]d's patch to allow DEMATERIALIZE_ICON over windows
- made clip arrows gradiented
Changes since version 0.51.2: Changes since version 0.51.2:
............................. .............................

2
WindowMaker/Defaults/WindowMaker.in
View File

@@ -1,5 +1,5 @@
{ {
WindozeCycling = YES; WindozeCycling = NO;
PopupSwitchMenu = NO; PopupSwitchMenu = NO;
MenuStyle = normal; MenuStyle = normal;
DisableMiniwindows = NO; DisableMiniwindows = NO;

9
WindowMaker/Styles/Autumn.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
TitleJustify = center; ClipTitleColor = white;
CClipTitleColor = gray20;
FTitleColor = white; FTitleColor = white;
PTitleColor = gray; PTitleColor = gray;
UTitleColor = white; UTitleColor = white;
FTitleBack = (hgradient, darkred, black); FTitleBack = (hgradient, darkred, black);
PTitleBack = (hgradient, indianred, black); PTitleBack = (hgradient, indianred, black);
UTitleBack = (hgradient, peru, black); UTitleBack = (hgradient, peru, black);
ResizebarBack = (hgradient, peru, black);
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = gray80; MenuDisabledColor = gray80;
MenuTitleBack = (hgradient, firebrick, black); MenuTitleBack = (hgradient, firebrick, black);
MenuTextBack = (hgradient, peru, black); MenuTextBack = (hgradient, peru, black);
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#8b0000";
MenuStyle = normal;
} }

2
WindowMaker/Styles/Black.style
View File

@@ -16,4 +16,6 @@
MenuTitleBack = (hgradient, "rgb:30/32/3e", black); MenuTitleBack = (hgradient, "rgb:30/32/3e", black);
MenuTextBack = (hgradient, "rgb:50/5a/5e", "rgb:20/2a/2e"); MenuTextBack = (hgradient, "rgb:50/5a/5e", "rgb:20/2a/2e");
IconBack = (mdgradient, gray40, "rgb:50/5a/5e", "rgb:30/32/3e", "rgb:20/2a/2e"); IconBack = (mdgradient, gray40, "rgb:50/5a/5e", "rgb:30/32/3e", "rgb:20/2a/2e");
IconTitleColor = white;
IconTitleBack = "#20202e";
} }

16
WindowMaker/Styles/BlackTexture.style
View File

@@ -7,13 +7,17 @@
FTitleColor = white; FTitleColor = white;
PTitleColor = white; PTitleColor = white;
UTitleColor = gray20; UTitleColor = gray20;
FTitleBack = (thgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black); FTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
PTitleBack = (thgradient,"BlueImage.jpeg",140,"rgb:70/72/7e","rgb:45/47/4e"); PTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:70/72/7e", "rgb:45/47/4e");
UTitleBack = (thgradient,"BlueImage.jpeg", 100,white,"rgb:9e/94/80"); UTitleBack = (thgradient, BlueImage.jpeg, 100, white, "rgb:9e/94/80");
ResizebarBack = (thgradient, BlueImage.jpeg, 100, white, "rgb:9e/94/80");
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = gray60; MenuDisabledColor = gray60;
MenuTitleBack = (thgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black); MenuTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
MenuTextBack = (thgradient,"BlueImage.jpeg",140,"rgb:50/5a/5e","rgb:20/2a/2e"); MenuTextBack = (thgradient, BlueImage.jpeg, 140, "rgb:50/5a/5e", "rgb:20/2a/2e");
IconBack = (tdgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black); IconBack = (tdgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
IconTitleColor = white;
IconTitleBack = "#20202e";
MenuStyle = normal;
} }

34
WindowMaker/Styles/Blue.style
View File

@@ -1,15 +1,23 @@
{ {
FTitleColor = "white"; TitleJustify = center;
PTitleColor = "white"; HighlightColor = white;
UTitleColor = "gray20"; HighlightTextColor = black;
MenuTitleColor = "white"; ClipTitleColor = white;
MenuDisabledColor = "gray40"; CClipTitleColor = gray20;
MenuTextColor = "black"; FTitleColor = white;
FTitleBack = (hgradient, "rgb:00/00/10", "rgb:20/20/70"); PTitleColor = white;
UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0"); UTitleColor = gray20;
PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80"); FTitleBack = (hgradient, "rgb:00/00/10", "rgb:20/20/70");
MenuTitleBack = (hgradient, "rgb:20/20/70", "rgb:00/00/20"); PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90"); UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
IconTitleBack = "#101040"; ResizebarBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
IconTitleColor = white; MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (hgradient, "rgb:20/20/70", "rgb:00/00/20");
MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#101040";
MenuStyle = normal;
} }

11
WindowMaker/Styles/BlueDawn.style
View File

@@ -24,6 +24,14 @@
"rgb:28/3c/49", "rgb:28/3c/49",
"rgb:28/45/50" "rgb:28/45/50"
); );
ResizebarBack = (
mhgradient,
"rgb:18/2c/41",
"rgb:18/2c/41",
"rgb:08/18/38",
"rgb:28/3c/49",
"rgb:28/45/50"
);
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = black; MenuTextColor = black;
MenuDisabledColor = gray; MenuDisabledColor = gray;
@@ -42,4 +50,7 @@
"rgb:96/d7/e7" "rgb:96/d7/e7"
); );
IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20"); IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
IconTitleColor = white;
IconTitleBack = "rgb:18/2c/70";
MenuStyle = normal;
} }

7
WindowMaker/Styles/BlueishGreen.style
View File

@@ -2,15 +2,22 @@
TitleJustify = center; TitleJustify = center;
HighlightColor = lightgoldenrod1; HighlightColor = lightgoldenrod1;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = "rgb:79/96/cf";
CClipTitleColor = "rgb:61/61/61";
FTitleColor = white; FTitleColor = white;
PTitleColor = gray; PTitleColor = gray;
UTitleColor = white; UTitleColor = white;
FTitleBack = (hgradient, darkturquoise, "rgb:00/41/42"); FTitleBack = (hgradient, darkturquoise, "rgb:00/41/42");
PTitleBack = (hgradient, deepskyblue2, deepskyblue4); PTitleBack = (hgradient, deepskyblue2, deepskyblue4);
UTitleBack = (hgradient, deepskyblue4, black); UTitleBack = (hgradient, deepskyblue4, black);
ResizebarBack = (hgradient, deepskyblue4, black);
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = black; MenuTextColor = black;
MenuDisabledColor = gray30; MenuDisabledColor = gray30;
MenuTitleBack = (hgradient, deepskyblue4, black); MenuTitleBack = (hgradient, deepskyblue4, black);
MenuTextBack = (hgradient, darkturquoise, "rgb:00/41/42"); MenuTextBack = (hgradient, darkturquoise, "rgb:00/41/42");
IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
IconTitleColor = white;
IconTitleBack = "#00888a";
MenuStyle = normal;
} }

31
WindowMaker/Styles/Brown.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = "rgb:79/96/cf";
FTitleColor = "white"; CClipTitleColor = "rgb:61/61/61";
PTitleColor = "gray"; FTitleColor = white;
UTitleColor = "gray"; PTitleColor = gray;
MenuTitleColor = "white"; UTitleColor = gray;
MenuDisabledColor = "gray60"; FTitleBack = (vgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
MenuTextColor = "white"; PTitleBack = (vgradient, "rgb:76/61/76", "rgb:20/0a/20");
FTitleBack = (vgradient, "rgb:ae/9e/a6", "rgb:61/51/59"); UTitleBack = (vgradient, "rgb:51/61/76", "rgb:0a/0a/20");
UTitleBack = (vgradient, "rgb:51/61/76", "rgb:0a/0a/20"); ResizebarBack = (solid, "#2d354b");
PTitleBack = (vgradient, "rgb:76/61/76", "rgb:20/0a/20"); MenuTitleColor = white;
MenuTitleBack = (hgradient, "rgb:ae/9e/a6", "rgb:61/51/59"); MenuTextColor = white;
MenuTextBack = (hgradient, "rgb:49/71/86", "rgb:08/10/30"); MenuDisabledColor = gray60;
MenuTitleBack = (hgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
MenuTextBack = (hgradient, "rgb:49/71/86", "rgb:08/10/30");
IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
IconTitleColor = white;
IconTitleBack = "#88777f";
MenuStyle = normal;
} }

31
WindowMaker/Styles/Chumbo.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = "rgb:79/96/cf";
FTitleColor = "white"; CClipTitleColor = "rgb:61/61/61";
PTitleColor = "white"; FTitleColor = white;
UTitleColor = "gray"; PTitleColor = white;
MenuTitleColor = "white"; UTitleColor = gray;
MenuDisabledColor = "gray60"; FTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
MenuTextColor = "white"; PTitleBack = (hgradient, "rgb:70/82/af", "rgb:00/00/00");
FTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41"); UTitleBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
UTitleBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00"); ResizebarBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
PTitleBack = (hgradient, "rgb:70/82/af", "rgb:00/00/00"); MenuTitleColor = white;
MenuTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41"); MenuTextColor = white;
MenuTextBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00"); MenuDisabledColor = gray60;
MenuTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
MenuTextBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
IconTitleColor = white;
IconTitleBack = "#4c6b88";
MenuStyle = normal;
} }

31
WindowMaker/Styles/Copper.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = "rgb:79/96/cf";
FTitleColor = "white"; CClipTitleColor = "rgb:61/61/61";
PTitleColor = "white"; FTitleColor = white;
UTitleColor = "gray"; PTitleColor = white;
MenuTitleColor = "white"; UTitleColor = gray;
MenuDisabledColor = "gray60"; FTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
MenuTextColor = "white"; PTitleBack = (dgradient, "rgb:50/29/4e", "rgb:00/00/00");
FTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00"); UTitleBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00");
UTitleBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00"); ResizebarBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00");
PTitleBack = (dgradient, "rgb:50/29/4e", "rgb:00/00/00"); MenuTitleColor = white;
MenuTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00"); MenuTextColor = white;
MenuTextBack = (dgradient, "rgb:38/10/10", "rgb:8e/59/7e"); MenuDisabledColor = gray60;
MenuTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
MenuTextBack = (dgradient, "rgb:38/10/10", "rgb:8e/59/7e");
IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
IconTitleColor = white;
IconTitleBack = "#543447";
MenuStyle = normal;
} }

6
WindowMaker/Styles/DarkBlue.style
View File

@@ -9,11 +9,15 @@
UTitleColor = gray60; UTitleColor = gray60;
FTitleBack = (hgradient, "rgb:18/38/59", black); FTitleBack = (hgradient, "rgb:18/38/59", black);
PTitleBack = (hgradient, "rgb:18/38/59", black); PTitleBack = (hgradient, "rgb:18/38/59", black);
UTitleBack = (hgradient, "rgb:38/58/79", "rgb:30/40/50"); UTitleBack = (hgradient, "rgb:38/58/79", "rgb:26/36/46");
ResizebarBack = (hgradient, "rgb:38/58/79", "rgb:26/36/46");
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = "rgb:61/61/61"; MenuDisabledColor = "rgb:61/61/61";
MenuTitleBack = (hgradient, "rgb:08/24/38", black); MenuTitleBack = (hgradient, "rgb:08/24/38", black);
MenuTextBack = (hgradient, "rgb:18/38/59", "rgb:00/14/28"); MenuTextBack = (hgradient, "rgb:18/38/59", "rgb:00/14/28");
IconBack = (mdgradient, "rgb:61/51/59", "rgb:38/58/79", black, "rgb:18/38/59"); IconBack = (mdgradient, "rgb:61/51/59", "rgb:38/58/79", black, "rgb:18/38/59");
IconTitleColor = white;
IconTitleBack = "#0c1c2c";
MenuStyle = normal;
} }

32
WindowMaker/Styles/DarkRed.style
View File

@@ -1,13 +1,23 @@
{ {
FTitleColor = "white"; TitleJustify = center;
PTitleColor = "white"; HighlightColor = white;
UTitleColor = "gray20"; HighlightTextColor = black;
MenuTitleColor = "white"; ClipTitleColor = white;
MenuDisabledColor = "gray40"; CClipTitleColor = gray40;
MenuTextColor = "black"; FTitleColor = white;
FTitleBack = (dgradient, "rgb:21/00/05", "rgb:90/00/30"); PTitleColor = white;
UTitleBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0"); UTitleColor = gray20;
PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80"); FTitleBack = (dgradient, "rgb:21/00/05", "rgb:90/00/30");
MenuTitleBack = (dgradient, "rgb:90/00/30", "rgb:21/00/05"); PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80");
MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:60/60/60"); UTitleBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
ResizebarBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (dgradient, "rgb:90/00/30", "rgb:21/00/05");
MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:60/60/60");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = white;
MenuStyle = normal;
} }

8
WindowMaker/Styles/Fire.style
View File

@@ -1,6 +1,9 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = white;
CClipTitleColor = gray20;
FTitleColor = black; FTitleColor = black;
PTitleColor = white; PTitleColor = white;
UTitleColor = gray20; UTitleColor = gray20;
@@ -27,6 +30,7 @@
); );
PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80"); PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
UTitleBack = (hgradient, "rgb:90/90/90", "rgb:d0/d0/d0"); UTitleBack = (hgradient, "rgb:90/90/90", "rgb:d0/d0/d0");
ResizebarBack = (solid, "#b0b0b0");
MenuTitleColor = black; MenuTitleColor = black;
MenuTextColor = black; MenuTextColor = black;
MenuDisabledColor = gray40; MenuDisabledColor = gray40;
@@ -52,4 +56,8 @@
white white
); );
MenuTextBack = (hgradient, "rgb:d0/d0/d0", "rgb:80/80/80"); MenuTextBack = (hgradient, "rgb:d0/d0/d0", "rgb:80/80/80");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = black;
IconTitleBack = white;
MenuStyle = normal;
} }

30
WindowMaker/Styles/Food.style
View File

@@ -1,15 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
FTitleColor = "gray30"; ClipTitleColor = white;
PTitleColor = "white"; CClipTitleColor = gray20;
UTitleColor = "gray"; FTitleColor = gray30;
MenuTitleColor = "gray30"; PTitleColor = white;
MenuDisabledColor = "gray60"; UTitleColor = gray;
MenuTextColor = "white"; FTitleBack = (hgradient, orange2, orange4);
FTitleBack = (hgradient, "orange2", "orange4"); PTitleBack = (hgradient, lightsalmon2, lightsalmon4);
UTitleBack = (hgradient, "salmon2", "salmon4"); UTitleBack = (hgradient, salmon2, salmon4);
PTitleBack = (hgradient, "lightsalmon2", "lightsalmon4"); ResizebarBack = (hgradient, salmon2, salmon4);
MenuTitleBack = (hgradient, "orange2", "orange4"); MenuTitleColor = gray30;
MenuTextBack = (hgradient, "tomato2", "tomato4"); MenuTextColor = white;
MenuDisabledColor = gray60;
MenuTitleBack = (hgradient, orange2, orange4);
MenuTextBack = (hgradient, tomato2, tomato4);
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = gray30;
IconTitleBack = "#bd7a00";
MenuStyle = normal;
} }

4
WindowMaker/Styles/Golden.style
View File

@@ -16,10 +16,14 @@
); );
PTitleBack = (dgradient, "rgb:64/42/20", "rgb:ca/a8/86"); PTitleBack = (dgradient, "rgb:64/42/20", "rgb:ca/a8/86");
UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b0"); UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b0");
ResizebarBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b0");
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = black; MenuTextColor = black;
MenuDisabledColor = gray40; MenuDisabledColor = gray40;
MenuTitleBack = (dgradient, "rgb:ba/98/76", "rgb:54/32/10"); MenuTitleBack = (dgradient, "rgb:ba/98/76", "rgb:54/32/10");
MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70"); MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "rgb:ba/98/76";
MenuStyle = normal;
} }

4
WindowMaker/Styles/Green.style
View File

@@ -10,10 +10,14 @@
FTitleBack = (dgradient, "rgb:28/48/48", "rgb:08/20/20"); FTitleBack = (dgradient, "rgb:28/48/48", "rgb:08/20/20");
PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80"); PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b5"); UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b5");
ResizebarBack = (solid, "#a0a0a3");
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = black; MenuTextColor = black;
MenuDisabledColor = gray40; MenuDisabledColor = gray40;
MenuTitleBack = (hgradient, "rgb:28/48/48", "rgb:08/20/20"); MenuTitleBack = (hgradient, "rgb:28/48/48", "rgb:08/20/20");
MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70"); MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#183434";
MenuStyle = normal;
} }

32
WindowMaker/Styles/GreyBlue.style
View File

@@ -1,13 +1,23 @@
{ {
FTitleColor = "white"; TitleJustify = center;
PTitleColor = "white"; HighlightColor = white;
UTitleColor = "gray20"; HighlightTextColor = black;
MenuTitleColor = "white"; ClipTitleColor = white;
MenuDisabledColor = "gray40"; CClipTitleColor = gray20;
MenuTextColor = "black"; FTitleColor = white;
MenuTitleBack = (dgradient, "rgb:00/00/10", "rgb:20/20/70"); PTitleColor = white;
UTitleBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0"); UTitleColor = gray20;
PTitleBack = (dgradient, "rgb:50/50/50", "rgb:80/80/80"); FTitleBack = (dgradient, "rgb:20/20/70", "rgb:00/00/20");
FTitleBack = (dgradient, "rgb:20/20/70", "rgb:00/00/20"); PTitleBack = (dgradient, "rgb:50/50/50", "rgb:80/80/80");
MenuTextBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0"); UTitleBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
ResizebarBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (dgradient, "rgb:00/00/10", "rgb:20/20/70");
MenuTextBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#101048";
MenuStyle = normal;
} }

33
WindowMaker/Styles/Gtk.style
View File

@@ -1,14 +1,23 @@
{ {
HighlightColor = blue; TitleJustify = center;
HighlightTextColor = white; HighlightColor = blue;
FTitleColor = white; HighlightTextColor = white;
PTitleColor = black; ClipTitleColor = white;
UTitleColor = darkblue; CClipTitleColor = gray20;
FTitleBack = (solid, darkblue); FTitleColor = white;
PTitleBack = (solid, "rgb:d5/d6/d5"); PTitleColor = black;
UTitleBack = (solid, "rgb:d5/d6/d5"); UTitleColor = darkblue;
MenuTitleBack = (solid, darkblue); FTitleBack = (solid, darkblue);
MenuTextBack = (solid, "rgb:d5/d6/d5"); PTitleBack = (solid, "rgb:d5/d6/d5");
MenuTextColor = black; UTitleBack = (solid, "rgb:d5/d6/d5");
MenuTitleColor = white; ResizebarBack = (solid, "rgb:d5/d6/d5");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (solid, darkblue);
MenuTextBack = (solid, "rgb:d5/d6/d5");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = darkblue;
MenuStyle = normal;
} }

30
WindowMaker/Styles/LightBlue.style
View File

@@ -1,15 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
FTitleColor = white; ClipTitleColor = white;
PTitleColor = "white"; CClipTitleColor = gray20;
UTitleColor = "black"; FTitleColor = white;
MenuTitleColor = white; PTitleColor = white;
MenuDisabledColor = "gray40"; UTitleColor = black;
MenuTextColor = "black"; FTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
FTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e"); PTitleBack = (hgradient, "rgb:41/eb/ef", "rgb:28/92/79");
UTitleBack = (hgradient, lightskyblue1, lightskyblue4); UTitleBack = (hgradient, lightskyblue1, lightskyblue4);
PTitleBack = (hgradient, "rgb:41/eb/ef", "rgb:28/92/79"); ResizebarBack = (hgradient, lightskyblue1, lightskyblue4);
MenuTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e"); MenuTitleColor = white;
MenuTextBack = (hgradient, lightskyblue1, lightskyblue4); MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
MenuTextBack = (hgradient, lightskyblue1, lightskyblue4);
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#3069bf";
MenuStyle = normal;
} }

30
WindowMaker/Styles/Pastel.style
View File

@@ -1,15 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
FTitleColor = "gray30"; ClipTitleColor = white;
PTitleColor = "white"; CClipTitleColor = gray20;
UTitleColor = "gray30"; FTitleColor = gray30;
MenuTitleColor = "gray30"; PTitleColor = white;
MenuDisabledColor = "gray50"; UTitleColor = gray30;
MenuTextColor = "gray30"; FTitleBack = (hgradient, PaleTurquoise3, PaleTurquoise4);
FTitleBack = (hgradient, "PaleTurquoise3", "PaleTurquoise4"); PTitleBack = (hgradient, pink, pink4);
UTitleBack = (hgradient, "cornsilk2", "cornsilk4"); UTitleBack = (hgradient, cornsilk2, cornsilk4);
PTitleBack = (hgradient, "slategray2", "slategray4"); ResizebarBack = (hgradient, cornsilk2, cornsilk4);
MenuTitleBack = (hgradient, "lightyellow2", "lightyellow4"); MenuTitleColor = gray30;
MenuTextBack = (hgradient, "slategray2", "slategray4"); MenuTextColor = gray30;
MenuDisabledColor = gray50;
MenuTitleBack = (hgradient, lightyellow2, lightyellow4);
MenuTextBack = (hgradient, slategray2, slategray4);
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = gray30;
IconTitleBack = "#7eacac";
MenuStyle = normal;
} }

30
WindowMaker/Styles/Purple.style
View File

@@ -1,15 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
FTitleColor = "white"; ClipTitleColor = white;
PTitleColor = "gray"; CClipTitleColor = gray20;
UTitleColor = "gray"; FTitleColor = white;
MenuTitleColor = "white"; PTitleColor = gray;
MenuDisabledColor = "gray60"; UTitleColor = gray;
MenuTextColor = "white"; FTitleBack = (hgradient, mediumpurple2, "rgb:43/33/64");
FTitleBack = (hgradient, "mediumpurple2", "rgb:43/33/64"); PTitleBack = (hgradient, mediumpurple3, mediumpurple4);
UTitleBack = (hgradient, "mediumpurple4", "black"); UTitleBack = (hgradient, mediumpurple4, black);
PTitleBack = (hgradient, "mediumpurple3", mediumpurple4); ResizebarBack = (hgradient, mediumpurple4, black);
MenuTitleBack = (hgradient, "mediumpurple2", "rgb:43/33/64"); MenuTitleColor = white;
MenuTextBack = (hgradient, "mediumpurple4", "black"); MenuTextColor = white;
MenuDisabledColor = gray60;
MenuTitleBack = (hgradient, mediumpurple2, "rgb:43/33/64");
MenuTextBack = (hgradient, mediumpurple4, black);
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#7156a9";
MenuStyle = normal;
} }

32
WindowMaker/Styles/Red.style
View File

@@ -1,13 +1,23 @@
{ {
FTitleColor = "white"; TitleJustify = center;
PTitleColor = "white"; HighlightColor = white;
UTitleColor = "black"; HighlightTextColor = black;
MenuTitleColor = "white"; ClipTitleColor = white;
MenuDisabledColor = "gray40"; CClipTitleColor = gray20;
MenuTextColor = "black"; FTitleColor = white;
FTitleBack = (hgradient, "rgb:21/00/05", "rgb:90/00/30"); PTitleColor = white;
UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0"); UTitleColor = black;
PTitleBack = (hgradient, "rgb:51/50/55", "rgb:80/80/80"); FTitleBack = (hgradient, "rgb:21/00/05", "rgb:90/00/30");
MenuTitleBack = (hgradient, "rgb:90/00/30", "rgb:21/00/05"); PTitleBack = (hgradient, "rgb:51/50/55", "rgb:80/80/80");
MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90"); UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
ResizebarBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray40;
MenuTitleBack = (hgradient, "rgb:90/00/30", "rgb:21/00/05");
MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#58001a";
MenuStyle = normal;
} }

8
WindowMaker/Styles/RednBlue.style
View File

@@ -1,15 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
ClipTitleColor = white;
CClipTitleColor = gray20;
FTitleColor = white; FTitleColor = white;
PTitleColor = white; PTitleColor = white;
UTitleColor = gray; UTitleColor = gray;
FTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10"); FTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10");
PTitleBack = (hgradient, "rgb:49/71/86", "rgb:19/41/56"); PTitleBack = (hgradient, "rgb:49/71/86", "rgb:19/41/56");
UTitleBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00"); UTitleBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
ResizebarBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = "rgb:61/61/61"; MenuDisabledColor = "rgb:61/61/61";
MenuTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10"); MenuTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10");
MenuTextBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00"); MenuTextBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white;
IconTitleBack = "#63122c";
MenuStyle = normal;
} }

9
WindowMaker/Styles/Summer.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center;
HighlightColor = white; HighlightColor = white;
HighlightTextColor = black; HighlightTextColor = black;
TitleJustify = center; ClipTitleColor = white;
CClipTitleColor = gray20;
FTitleColor = "rgb:83/83/56"; FTitleColor = "rgb:83/83/56";
PTitleColor = white; PTitleColor = white;
UTitleColor = white; UTitleColor = white;
FTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69"); FTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69");
PTitleBack = (hgradient, seagreen2, seagreen4); PTitleBack = (hgradient, seagreen2, seagreen4);
UTitleBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99"); UTitleBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
ResizebarBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
MenuTitleColor = "rgb:83/83/56"; MenuTitleColor = "rgb:83/83/56";
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = gray30; MenuDisabledColor = gray30;
MenuTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69"); MenuTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69");
MenuTextBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99"); MenuTextBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = "rgb:83/83/56";
IconTitleBack = "#e3e378";
MenuStyle = normal;
} }

41
WindowMaker/Styles/Traditional.style
View File

@@ -1,22 +1,23 @@
{ {
FTitleColor = "white"; TitleJustify = center;
PTitleColor = "white"; HighlightColor = white;
UTitleColor = "black"; HighlightTextColor = black;
MenuTitleColor = "white"; ClipTitleColor = white;
MenuDisabledColor = "gray40"; CClipTitleColor = gray20;
MenuTextColor = "black"; FTitleColor = white;
MenuTextBack = (solid, "rgb:aa/aa/aa"); PTitleColor = white;
FTitleBack = (solid, black); UTitleColor = black;
UTitleBack = (solid, "rgb:aa/aa/aa"); FTitleBack = (solid, black);
PTitleBack = (solid, gray40); PTitleBack = (solid, gray40);
MenuTitleBack = (solid, black); UTitleBack = (solid, "rgb:aa/aa/aa");
MenuTextBack = (solid, "rgb:aa/aa/aa"); ResizebarBack = (solid, "rgb:aa/aa/aa");
HighlightColor = white; MenuTitleColor = white;
HighlightTextColor = black; MenuTextColor = black;
TitleJustify = center; MenuDisabledColor = gray40;
ClipTitleColor = white; MenuTitleBack = (solid, black);
CClipTitleColor = gray20; MenuTextBack = (solid, "rgb:aa/aa/aa");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
IconTitleColor = white; IconTitleColor = white;
IconTitleBack = black; IconTitleBack = black;
MenuStyle = normal;
} }

11
WindowMaker/Styles/VioletBlue.style
View File

@@ -1,16 +1,23 @@
{ {
TitleJustify = center; TitleJustify = center;
HighlightColor = white;
HighlightTextColor = black;
ClipTitleColor = white;
CClipTitleColor = gray20;
FTitleColor = white; FTitleColor = white;
PTitleColor = gray; PTitleColor = gray;
UTitleColor = white; UTitleColor = white;
FTitleBack = (dgradient, black, mediumorchid4); FTitleBack = (dgradient, black, mediumorchid4);
PTitleBack = (dgradient, mediumorchid4, dodgerblue3); PTitleBack = (dgradient, mediumorchid4, dodgerblue3);
UTitleBack = (dgradient, black, dodgerblue4); UTitleBack = (dgradient, black, dodgerblue4);
ResizebarBack = (dgradient, black, dodgerblue4);
MenuTitleColor = white; MenuTitleColor = white;
MenuTextColor = white; MenuTextColor = white;
MenuDisabledColor = gray60; MenuDisabledColor = gray60;
MenuTitleBack = (dgradient, black, mediumorchid4); MenuTitleBack = (dgradient, black, mediumorchid4);
MenuTextBack = (dgradient, black, dodgerblue4); MenuTextBack = (dgradient, black, dodgerblue4);
HighlightColor = white; IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
HighlightTextColor = black; IconTitleColor = white;
IconTitleBack = "#3d1b45";
MenuStyle = normal;
} }

56
src/defaults.c
View File

@@ -200,15 +200,14 @@ static int updateUsableArea();
#define REFRESH_MENU_TITLE_COLOR (1<<6) #define REFRESH_MENU_TITLE_COLOR (1<<6)
#define REFRESH_WINDOW_TITLE_COLOR (1<<7) #define REFRESH_WINDOW_TITLE_COLOR (1<<7)
#define REFRESH_WINDOW_FONT (1<<8) #define REFRESH_WINDOW_FONT (1<<8)
#define REFRESH_FORE_COLOR (1<<9) #define REFRESH_ICON_TILE (1<<9)
#define REFRESH_ICON_TILE (1<<10) #define REFRESH_ICON_FONT (1<<10)
#define REFRESH_ICON_FONT (1<<11) #define REFRESH_WORKSPACE_BACK (1<<11)
#define REFRESH_WORKSPACE_BACK (1<<12)
#define REFRESH_BUTTON_IMAGES (1<<13) #define REFRESH_BUTTON_IMAGES (1<<12)
#define REFRESH_ICON_TITLE_COLOR (1<<14) #define REFRESH_ICON_TITLE_COLOR (1<<13)
#define REFRESH_ICON_TITLE_BACK (1<<15) #define REFRESH_ICON_TITLE_BACK (1<<14)
@@ -2106,8 +2105,7 @@ static int
getColor(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, getColor(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr,
void **ret) void **ret)
{ {
static unsigned long pixel; static XColor color;
XColor color;
char *val; char *val;
int second_pass=0; int second_pass=0;
@@ -2127,14 +2125,15 @@ again:
} }
return False; return False;
} }
pixel = color.pixel;
if (ret) if (ret)
*ret = &pixel; *ret = &color;
assert(addr==NULL);
/*
if (addr) if (addr)
*(unsigned long*)addr = pixel; *(unsigned long*)addr = pixel;
*/
return True; return True;
} }
@@ -2281,7 +2280,7 @@ getRImages(WScreen *scr, WDefaultEntry *entry, proplist_t value,
static int static int
setJustify(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *foo) setJustify(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *foo)
{ {
return REFRESH_FORE_COLOR; return REFRESH_WINDOW_TITLE_COLOR;
} }
@@ -2515,7 +2514,7 @@ setHightlight(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
scr->select_pixel = color->pixel; scr->select_pixel = color->pixel;
return REFRESH_FORE_COLOR; return REFRESH_MENU_COLOR;
} }
@@ -2529,7 +2528,7 @@ setHightlightText(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
scr->select_text_pixel = color->pixel; scr->select_text_pixel = color->pixel;
return REFRESH_FORE_COLOR; return REFRESH_MENU_COLOR;
} }
@@ -2540,10 +2539,29 @@ setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index)
scr->clip_title_pixel[index]!=scr->black_pixel) { scr->clip_title_pixel[index]!=scr->black_pixel) {
wFreeColor(scr, scr->clip_title_pixel[index]); wFreeColor(scr, scr->clip_title_pixel[index]);
} }
scr->clip_title_pixel[index] = color->pixel; scr->clip_title_pixel[index] = color->pixel;
return REFRESH_FORE_COLOR; if (index == CLIP_NORMAL) {
RImage *image;
RColor color1, color2;
int pt = CLIP_BUTTON_SIZE*wPreferences.icon_size/64;
int as = pt - 15; /* 15 = 5+5+5 */
FREE_PIXMAP(scr->clip_arrow_gradient);
color1.red = (color->red >> 8)*6/10;
color1.green = (color->green >> 8)*6/10;
color1.blue = (color->blue >> 8)*6/10;
color2.red = WMIN((color->red >> 8)*20/10, 255);
color2.green = WMIN((color->green >> 8)*20/10, 255);
color2.blue = WMIN((color->blue >> 8)*20/10, 255);
image = RRenderGradient(as+1, as+1, &color1, &color2, RDiagonalGradient);
RConvertImage(scr->rcontext, image, &scr->clip_arrow_gradient);
RDestroyImage(image);
}
return REFRESH_ICON_TITLE_COLOR;
} }
@@ -2650,7 +2668,7 @@ setMenuDisabledColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *fo
} }
XChangeGC(dpy, scr->disabled_menu_entry_gc, gcm, &gcv); XChangeGC(dpy, scr->disabled_menu_entry_gc, gcm, &gcv);
return REFRESH_FORE_COLOR; return REFRESH_MENU_COLOR;
#undef gcm #undef gcm
} }

29
src/dock.c
View File

@@ -65,8 +65,6 @@
#define CLIP_IDLE 0 #define CLIP_IDLE 0
#define CLIP_FORWARD 2 #define CLIP_FORWARD 2
#define CLIP_BUTTON_SIZE 23
/**** Global variables ****/ /**** Global variables ****/
@@ -319,7 +317,8 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
int pt = CLIP_BUTTON_SIZE*ICON_SIZE/64; int pt = CLIP_BUTTON_SIZE*ICON_SIZE/64;
int tp = ICON_SIZE - pt; int tp = ICON_SIZE - pt;
int as = pt - 15; /* 15 = 5+5+5 */ int as = pt - 15; /* 15 = 5+5+5 */
GC gc;
Bool collapsed = clipIcon->dock->collapsed;
if (rpushed) { if (rpushed) {
p[0].x = tp+1; p[0].x = tp+1;
@@ -341,6 +340,14 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin); XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
XSetForeground(dpy, scr->draw_gc, scr->black_pixel); XSetForeground(dpy, scr->draw_gc, scr->black_pixel);
} }
if (collapsed) {
gc = scr->clip_title_gc;
} else {
XSetFillStyle(dpy, scr->copy_gc, FillTiled);
XSetTile(dpy, scr->copy_gc, scr->clip_arrow_gradient);
XSetClipMask(dpy, scr->copy_gc, None);
gc = scr->copy_gc;
}
p[0].x = p[3].x = ICON_SIZE-6-as; p[0].x = p[3].x = ICON_SIZE-6-as;
p[0].y = p[3].y = 5; p[0].y = p[3].y = 5;
@@ -352,8 +359,11 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin); XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin); XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
} else { } else {
XFillPolygon(dpy, win, scr->clip_title_gc, p,3,Convex,CoordModeOrigin); if (!collapsed)
XDrawLines(dpy, win, scr->clip_title_gc, p,4,CoordModeOrigin); XSetTSOrigin(dpy, gc, ICON_SIZE-6-as, 5);
XFillPolygon(dpy, win, gc, p,3,Convex,CoordModeOrigin);
XDrawLines(dpy, win, gc, p,4,CoordModeOrigin);
} }
p[0].x = p[3].x = 5; p[0].x = p[3].x = 5;
@@ -366,9 +376,14 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin); XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin); XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
} else { } else {
XFillPolygon(dpy, win, scr->clip_title_gc, p,3,Convex,CoordModeOrigin); if (!collapsed)
XDrawLines(dpy, win, scr->clip_title_gc, p,4,CoordModeOrigin); XSetTSOrigin(dpy, gc, 5, ICON_SIZE-6-as);
XFillPolygon(dpy, win, gc, p,3,Convex,CoordModeOrigin);
XDrawLines(dpy, win, gc, p,4,CoordModeOrigin);
} }
if (!collapsed)
XSetFillStyle(dpy, scr->copy_gc, FillSolid);
} }

8
src/framewin.c
View File

@@ -576,13 +576,13 @@ renderResizebarTexture(WScreen *scr, WTexture *texture, int width, int height,
ROperateLine(img, RSubtractOperation, 0, 0, width-1, 0, &dark); ROperateLine(img, RSubtractOperation, 0, 0, width-1, 0, &dark);
ROperateLine(img, RAddOperation, 0, 1, width-1, 1, &light); ROperateLine(img, RAddOperation, 0, 1, width-1, 1, &light);
ROperateLine(img, RSubtractOperation, cwidth, 2, cwidth, height, &dark); ROperateLine(img, RSubtractOperation, cwidth, 2, cwidth, height-1, &dark);
ROperateLine(img, RAddOperation, cwidth+1, 2, cwidth+1, height, &light); ROperateLine(img, RAddOperation, cwidth+1, 2, cwidth+1, height-1, &light);
ROperateLine(img, RSubtractOperation, width-cwidth-2, 2, width-cwidth-2, ROperateLine(img, RSubtractOperation, width-cwidth-2, 2, width-cwidth-2,
height, &dark); height-1, &dark);
ROperateLine(img, RAddOperation, width-cwidth-1, 2, width-cwidth-1, ROperateLine(img, RAddOperation, width-cwidth-1, 2, width-cwidth-1,
height, &light); height-1, &light);
if (!RConvertImage(scr->rcontext, img, pmap)) { if (!RConvertImage(scr->rcontext, img, pmap)) {
wwarning(_("error rendering image: %s"), RMessageForError(RErrorCode)); wwarning(_("error rendering image: %s"), RMessageForError(RErrorCode));

5
src/icon.c
View File

@@ -80,7 +80,8 @@ appearanceObserver(void *self, WMNotification *notif)
/* so that the appicon expose handlers will paint the appicon specific /* so that the appicon expose handlers will paint the appicon specific
* stuff */ * stuff */
XClearArea(dpy, icon->core->window, 0, 0, 1, 1, True); XClearArea(dpy, icon->core->window, 0, 0, icon->core->width,
icon->core->height, True);
} }
@@ -237,6 +238,8 @@ wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
wIconUpdate(icon); wIconUpdate(icon);
WMAddNotificationObserver(appearanceObserver, icon,
WNIconAppearanceSettingsChanged, icon);
WMAddNotificationObserver(tileObserver, icon, WMAddNotificationObserver(tileObserver, icon,
WNIconTileSettingsChanged, icon); WNIconTileSettingsChanged, icon);

6
src/screen.h
View File

@@ -236,8 +236,10 @@ typedef struct _WScreen {
unsigned int geometry_display_width; unsigned int geometry_display_width;
unsigned int geometry_display_height; unsigned int geometry_display_height;
int keymove_tick; int keymove_tick;
struct RContext *rcontext; Pixmap clip_arrow_gradient;
struct RContext *rcontext; /* wrlib context */
WMScreen *wmscreen; /* for widget library */ WMScreen *wmscreen; /* for widget library */

34
src/superfluous.c
View File

@@ -72,8 +72,11 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
RImage *image; RImage *image;
Pixmap pixmap; Pixmap pixmap;
XImage *ximage; XImage *ximage;
GC gc;
XGCValues gcv;
int i; int i;
int w, h; int w, h;
int run;
h = w = wPreferences.icon_size; h = w = wPreferences.icon_size;
if (x < 0 || x + w > scr->scr_width || y < 0 || y + h > scr->scr_height) if (x < 0 || x + w > scr->scr_width || y < 0 || y + h > scr->scr_height)
@@ -83,6 +86,7 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
if (!icon) if (!icon)
return; return;
XGrabServer(dpy);
XUnmapWindow(dpy, win); XUnmapWindow(dpy, win);
XSync(dpy, False); XSync(dpy, False);
@@ -94,27 +98,43 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
return; return;
} }
XSetClipMask(dpy, scr->copy_gc, None); gcv.foreground = scr->white_pixel;
gcv.background = scr->black_pixel;
gcv.graphics_exposures = False;
gcv.subwindow_mode = IncludeInferiors;
gc = XCreateGC(dpy, scr->w_win, GCForeground|GCBackground|GCSubwindowMode
|GCGraphicsExposures, &gcv);
for (i=0; i<DEMATERIALIZE_STEPS; i++) { /*
XSetClipMask(dpy, scr->copy_gc, None);
*/
for (i=0,run=0; i<DEMATERIALIZE_STEPS; i++) {
XEvent foo; XEvent foo;
if (XCheckTypedEvent(dpy, ButtonPress, &foo)) { if (!run && XCheckTypedEvent(dpy, ButtonPress, &foo)) {
run=1;
XPutBackEvent(dpy, &foo); XPutBackEvent(dpy, &foo);
XClearWindow(dpy, scr->root_win); /*
break; XClearWindow(dpy, scr->root_win);
break;
*/
} }
image = RCloneImage(back); image = RCloneImage(back);
RCombineImagesWithOpaqueness(image, icon, RCombineImagesWithOpaqueness(image, icon,
(DEMATERIALIZE_STEPS-1-i)*256/(DEMATERIALIZE_STEPS+2)); (DEMATERIALIZE_STEPS-1-i)*256/(DEMATERIALIZE_STEPS+2));
RConvertImage(scr->rcontext, image, &pixmap); RConvertImage(scr->rcontext, image, &pixmap);
XCopyArea(dpy, pixmap, scr->root_win, scr->copy_gc, 0, 0, w, h, x, y); XCopyArea(dpy, pixmap, scr->root_win, gc, 0, 0, w, h, x, y);
XFreePixmap(dpy, pixmap); XFreePixmap(dpy, pixmap);
XFlush(dpy); XFlush(dpy);
wusleep(1000); if(!run) wusleep(1000);
} }
/*
XClearArea(dpy, scr->root_win, x, y, w, h, False); XClearArea(dpy, scr->root_win, x, y, w, h, False);
*/
XFlush(dpy); XFlush(dpy);
XUngrabServer(dpy);
XFreeGC(dpy, gc);
RDestroyImage(icon); RDestroyImage(icon);
RDestroyImage(back); RDestroyImage(back);
} }

6
src/wconfig.h.in
View File

@@ -48,8 +48,9 @@
/* /*
* #define to enable WindozeCycling. Set WindozeCycling = YES in * #define to enable WindozeCycling. Set WindozeCycling = YES in
* your WindowMaker config file * your WindowMaker config file
* WARNING: this still has some bugs
*/ */
#define WEENDOZE_CYCLE #undef WEENDOZE_CYCLE
/* undefine ANIMATIONS if you don't want animations for iconification, /* undefine ANIMATIONS if you don't want animations for iconification,
@@ -423,6 +424,9 @@
/* Vicinity in which an icon can be attached to the clip */ /* Vicinity in which an icon can be attached to the clip */
#define CLIP_ATTACH_VICINITY 1 #define CLIP_ATTACH_VICINITY 1
#define CLIP_BUTTON_SIZE 23
/* The amount of space (in multiples of the icon size) /* The amount of space (in multiples of the icon size)
* a docked icon must be dragged out to detach it */ * a docked icon must be dragged out to detach it */
#define DOCK_DETTACH_THRESHOLD 3 #define DOCK_DETTACH_THRESHOLD 3

5
src/window.c
View File

@@ -137,7 +137,7 @@ appearanceObserver(void *self, WMNotification *notif)
WWindow *wwin = (WWindow*)self; WWindow *wwin = (WWindow*)self;
int flags = (int)WMGetNotificationClientData(notif); int flags = (int)WMGetNotificationClientData(notif);
if (!wwin->frame || !wwin->frame->titlebar) if (!wwin->frame || (!wwin->frame->titlebar && !wwin->frame->resizebar))
return; return;
if (flags & WFontSettings) { if (flags & WFontSettings) {
@@ -147,6 +147,9 @@ appearanceObserver(void *self, WMNotification *notif)
wwin->frame->flags.need_texture_remake = 1; wwin->frame->flags.need_texture_remake = 1;
} }
if (flags & (WTextureSettings | WColorSettings)) { if (flags & (WTextureSettings | WColorSettings)) {
if (wwin->frame->titlebar)
XClearWindow(dpy, wwin->frame->titlebar->window);
wFrameWindowPaint(wwin->frame); wFrameWindowPaint(wwin->frame);
} }
} }

10
util/setstyle.c
View File

@@ -168,12 +168,12 @@ getColor(proplist_t texture)
XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)), XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)),
PLGetString(c1), &color1); PLGetString(c1), &color1);
XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)), XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)),
PLGetString(c1), &color2); PLGetString(c2), &color2);
sprintf(buffer, "#%02x%02x%02x", sprintf(buffer, "#%02x%02x%02x",
(color1.red+color2.red)>>3, (color1.red+color2.red)>>9,
(color1.green+color2.green)>>3, (color1.green+color2.green)>>9,
(color1.blue+color2.blue)>>3); (color1.blue+color2.blue)>>9);
value = PLMakeString(buffer); value = PLMakeString(buffer);
} }
} else if (strcasecmp(str, "mdgradient")==0 } else if (strcasecmp(str, "mdgradient")==0