From 812268c03f836d3e86307894bfd48472a7e2a083 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 10 Oct 2017 13:00:33 +0200
Subject: Update for awesome 4.

---
 workspace.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'workspace.lua')

diff --git a/workspace.lua b/workspace.lua
index 0ac91c3..0d7d12a 100644
--- a/workspace.lua
+++ b/workspace.lua
@@ -20,25 +20,25 @@ end
 function Workspace:_apply_state()
     orig_focus = mouse.screen
 
-    for s = 1, screen.count() do
+    for s in screen do
         if self.screen_state[s] then
             awful.tag.viewnone(s)
 
             desk = self.screen_state[s].desktop
             page = self.desktops[desk].pages[self.screen_state[s].page]
-            awful.tag.setscreen(page, s)
+            page.screen = s
         end
     end
-    for s = 1, screen.count() do
+    for s in screen do
         state = self.screen_state[s]
         if state then
             desk_idx = state.desktop
             desk     = self.desktops[desk_idx]
             page_idx = state.page
             page     = desk.pages[page_idx]
-            print("workspace displaying: " .. s .. " => " .. desk_idx .. "/" .. page_idx)
+            print("workspace displaying: " .. s.index .. " => " .. desk_idx .. "/" .. page_idx)
 
-            awful.tag.viewonly(page)
+            page:view_only()
 
             desk:emit_signal("page:view", s, page_idx)
         end
@@ -48,14 +48,14 @@ function Workspace:_apply_state()
 end
 
 function Workspace:view(screen, desktop, page_idx)
-    print("workspace: " .. screen .. ": view " .. desktop .. "/" .. (page_idx or "nil"))
+    print("workspace: " .. screen.index .. ": view " .. desktop .. "/" .. (page_idx or "nil"))
     -- the page currently displayed on the target screen
     old = {}
     if self.screen_state[screen] then
         old.desk     = self.screen_state[screen].desktop
         old.page_idx = self.screen_state[screen].page
         old.page     = self.desktops[old.desk].pages[page_old_idx]
-        print(screen .. " now showing " .. old.desk .. "/" .. old.page_idx)
+        print(screen.index .. " now showing " .. old.desk .. "/" .. old.page_idx)
     end
 
     -- the page to display on the target screen
@@ -67,8 +67,8 @@ function Workspace:view(screen, desktop, page_idx)
     -- the screen on which the new page is currently displayed (if any)
     screen_cur = nil
     if page_new and page_new.selected then
-        screen_cur = awful.tag.getscreen(page_new)
-        print("page " .. page_idx .. " now displayed on " .. screen_cur)
+        screen_cur = page_new.screen
+        print("page " .. page_idx .. " now displayed on " .. screen_cur.index)
     end
 
     if old.page ~= page_new or page_new == nil then
@@ -94,7 +94,7 @@ end
 
 function Workspace:view_relative(offset, screen)
     screen = screen or mouse.screen
-    print("view relative " .. offset .. " on " .. screen)
+    print("view relative " .. offset .. " on " .. screen.index)
 
     state = self.screen_state[screen]
     if state then
-- 
cgit v1.2.3