X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=etc%2Flookcommon_emboss.lua;h=b15de6a0dc423fcd169681de556cedde1d28cc85;hb=7c392448b0d2efcc6bb959063dcaa8b2c5ea0964;hp=1d771c13dae7f15e8e4df08ddb7f261728fc9b74;hpb=471a5e5f9928e2d324b2e10422a420f458bd63ff;p=ion3.git

diff --git a/etc/lookcommon_emboss.lua b/etc/lookcommon_emboss.lua
index 1d771c1..b15de6a 100644
--- a/etc/lookcommon_emboss.lua
+++ b/etc/lookcommon_emboss.lua
@@ -1,34 +1,52 @@
--- Settings common to some styles.
+-- Common settings for the "emboss" styles
 
-de.defstyle("stdisp", {
-    based_on = "*",
-    shadow_pixels = 0,
-    highlight_pixels = 0,
-    text_align = "left",
-
-    de.substyle("important", {
-        foreground_colour = "green",
+de.defstyle("frame", {
+    background_colour = "#000000",
+    -- The special "inherit" value causes setting 'background_colour'
+    -- above not to set padding_colour, but this colour being inherited.
+    padding_colour = "inherit",
+    de.substyle("quasiactive", {
+        -- Something detached from the frame is active
+        padding_colour = "#901010",
     }),
-
-    de.substyle("critical", {
-        foreground_colour = "red",
+    de.substyle("userattr1", {
+        -- For user scripts
+        padding_colour = "#009010",
     }),
+    border_style = "ridge",
+    padding_pixels = 2,
+    highlight_pixels = 1,
+    shadow_pixels = 1,
+    spacing = 1,
+})
+
+de.defstyle("frame-tiled", {
+    border_style = "inlaid",
+    padding_pixels = 1,
+})
+
+de.defstyle("frame-tiled-alt", {
+    bar = "none",
+})
+
+de.defstyle("frame-floating", {
+    bar = "shaped",
+    spacing = 0,
+})
+
+de.defstyle("frame-transient", {
+    bar = "none",
+    spacing = 0,
 })
 
 de.defstyle("actnotify", {
-    based_on = "*",
     shadow_colour = "#600808",
     highlight_colour = "#c04040",
     background_colour = "#b03030",
     foreground_colour = "#ffffff",
 })
 
-de.defstyle("tab-frame", {
-    based_on = "tab",
-    -- TODO: some kind of amend option. It should not be necessary to 
-    -- duplicate this definition for both tab-frame and tab-menuentry,
-    -- or for each style, nor use more complex hacks to communicate
-    -- this stuff otherwise.
+de.defstyle("tab", {
     de.substyle("*-*-*-unselected-activity", {
         shadow_colour = "#600808",
         highlight_colour = "#c04040",
@@ -42,54 +60,48 @@ de.defstyle("tab-frame", {
         background_colour = "#b03030",
         foreground_colour = "#ffffff",
     }),
+    
+    de.substyle("*-*-*-tabnumber", {
+        background_colour = "black",
+        foreground_colour = "green",
+    }),
 })
 
-de.defstyle("tab-frame-tiled", {
-    based_on = "tab-frame",
-    spacing = 1,
-})
 
-de.defstyle("frame-tiled", {
-    based_on = "frame",
-    border_style = "inlaid",
-    padding_pixels = 1,
+de.defstyle("tab-frame", {
     spacing = 1,
 })
 
-de.defstyle("frame-floating", {
-    based_on = "frame",
-    border_style = "ridge",
-    bar = "shaped"
+de.defstyle("tab-frame-floating", {
+    spacing = 0,
 })
 
-de.defstyle("frame-tiled-alt", {
-    based_on = "frame-tiled",
-    bar = "none",
+de.defstyle("tab-frame-transient", {
+    spacing = 0,
 })
 
 de.defstyle("tab-menuentry", {
-    based_on = "tab",
     text_align = "left",
     highlight_pixels = 0,
     shadow_pixels = 0,
-    
-    de.substyle("*-*-*-unselected-activity", {
-        shadow_colour = "#600808",
-        highlight_colour = "#c04040",
-        background_colour = "#901010",
-        foreground_colour = "#eeeeee",
-    }),
-    
-    de.substyle("*-*-*-selected-activity", {
-        shadow_colour = "#600808",
-        highlight_colour = "#c04040",
-        background_colour = "#b03030",
-        foreground_colour = "#ffffff",
-    }),
 })
 
 de.defstyle("tab-menuentry-big", {
-    based_on = "tab-menuentry",
     font = "-*-helvetica-medium-r-normal-*-17-*-*-*-*-*-*-*",
     padding_pixels = 7,
 })
+
+
+de.defstyle("stdisp", {
+    shadow_pixels = 0,
+    highlight_pixels = 0,
+    text_align = "left",
+
+    de.substyle("important", {
+        foreground_colour = "green",
+    }),
+
+    de.substyle("critical", {
+        foreground_colour = "red",
+    }),
+})