awesome: move set_wallpaper to tags.lua and call it on screen connect

This should fix the issue where the wallpaper was not set on starting
awesome or changing the number of screens.

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b7def3e1a9557060f88bb48673f5d6206bfa4f49..9a113241b474b5b3b69779f730258741d4ed0171 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -42,22 +42,6 @@ terminal = "urxvtc"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
--- Wallpaper {{{1
-local function set_wallpaper(s)
-    -- Wallpaper
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then
-            wallpaper = wallpaper(s)
-        end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
 -- Require files {{{1
 require("bindings")
 require("tags")

diff --git a/awesome/tags.lua b/awesome/tags.lua
index bce442393fd199594fb0a625eeaa6cd1501f5bf6..f79c9d19ee4c00c19acf0b8301717fd7bb8b9a4c 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -65,11 +65,30 @@ mytags[2][2] = {
     { name = "9", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = path.."/cutiemarks/bon_bon.png"},
 }
 
+-- Wallpaper {{{2
+local function set_wallpaper(s)
+    -- Wallpaper
+    if beautiful.wallpaper then
+        local wallpaper = beautiful.wallpaper
+        -- If wallpaper is a function, call it with the screen
+        if type(wallpaper) == "function" then
+            wallpaper = wallpaper(s)
+        end
+        gears.wallpaper.maximized(wallpaper, s, true)
+    end
+end
+
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+
 -- Tags {{{2
 tags = {}
 local sc = screen.count()
-awful.screen.connect_for_each_screen(function(screen)
-    local s = screen.index
+awful.screen.connect_for_each_screen(function(s)
+    -- Wallpaper
+    set_wallpaper(s)
+
+    local s = s.index
     tags[s] = {}
     for i,p in ipairs(mytags[sc][s]) do
         local props = {}