From ed61cf54bfb0e545eb19d11394b549a291f88e27 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 22 Jun 2018 12:22:40 +0200 Subject: Make variables local. --- workspace.lua | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'workspace.lua') diff --git a/workspace.lua b/workspace.lua index a711586..d6ef061 100644 --- a/workspace.lua +++ b/workspace.lua @@ -18,24 +18,24 @@ function Workspace:rename_desktop(idx, name) end function Workspace:_apply_state() - orig_focus = mouse.screen + local orig_focus = mouse.screen 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] + local desk = self.screen_state[s].desktop + local page = self.desktops[desk].pages[self.screen_state[s].page] page.screen = s end end for s in screen do - state = self.screen_state[s] + local 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] + local desk_idx = state.desktop + local desk = self.desktops[desk_idx] + local page_idx = state.page + local page = desk.pages[page_idx] print("workspace displaying: " .. s.index .. " => " .. desk_idx .. "/" .. page_idx) page:view_only() @@ -50,7 +50,7 @@ end function Workspace:view(screen, desktop, page_idx) print("workspace: " .. screen.index .. ": view " .. desktop .. "/" .. (page_idx or "nil")) -- the page currently displayed on the target screen - old = {} + local old = {} if self.screen_state[screen] then old.desk = self.screen_state[screen].desktop old.page_idx = self.screen_state[screen].page @@ -61,11 +61,11 @@ function Workspace:view(screen, desktop, page_idx) -- the page to display on the target screen page_idx = self.desktops[desktop]:show(screen, page_idx) if page_idx then - page_new = self.desktops[desktop].pages[page_idx] + local page_new = self.desktops[desktop].pages[page_idx] end -- the screen on which the new page is currently displayed (if any) - screen_cur = nil + local screen_cur = nil if page_new and page_new.selected then screen_cur = page_new.screen print("page " .. page_idx .. " now displayed on " .. screen_cur.index) @@ -78,7 +78,7 @@ function Workspace:view(screen, desktop, page_idx) end if screen_cur then - desk_prev = self.screen_state[screen_cur].desktop + local desk_prev = self.screen_state[screen_cur].desktop old.page_idx = self.desktops[old.desk]:show(screen_cur, old.page_idx) self.screen_state[screen_cur] = { page = old.page_idx, desktop = old.desk } @@ -96,11 +96,11 @@ function Workspace:view_relative(offset, screen) screen = screen or mouse.screen print("view relative " .. offset .. " on " .. screen.index) - state = self.screen_state[screen] + local state = self.screen_state[screen] if state then - desk = state.desktop + local desk = state.desktop print("state " .. state.page .. " res " .. (state.page + offset) % 10) - page = 1 + ((state.page - 1 + offset) % #self.desktops[desk].pages) + local page = 1 + ((state.page - 1 + offset) % #self.desktops[desk].pages) print("desk " .. desk .. " " .. #self.desktops[desk].pages) print("view relative switch to " .. page) -- cgit v1.2.3