From 6f803cf3b3b975c0a26b1ce62b04fa4f80c78bd1 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 6 Mar 2017 17:11:05 +0100 Subject: [PATCH 1/4] Fix code using awful.util.round This gets rid of lots of deprecation warnings Signed-off-by: Uli Schlachter --- lib/awful/titlebar.lua | 3 ++- lib/menubar/init.lua | 3 ++- lib/wibox/layout/flex.lua | 5 +++-- lib/wibox/layout/ratio.lua | 9 +++++---- tests/test-awful-rules.lua | 3 ++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/awful/titlebar.lua b/lib/awful/titlebar.lua index 81a5ba415..a25ad7a62 100644 --- a/lib/awful/titlebar.lua +++ b/lib/awful/titlebar.lua @@ -8,6 +8,7 @@ local error = error local type = type +local gmath = require("gears.math") local util = require("awful.util") local abutton = require("awful.button") local aclient = require("awful.client") @@ -464,7 +465,7 @@ end local function new(c, args) args = args or {} local position = args.position or "top" - local size = args.size or util.round(beautiful.get_font_height(args.font) * 1.5) + local size = args.size or gmath.round(beautiful.get_font_height(args.font) * 1.5) local d = get_titlebar_function(c, position)(c, size) -- Make sure that there is never more than one titlebar for any given client diff --git a/lib/menubar/init.lua b/lib/menubar/init.lua index eb9f06656..5b538f5a6 100644 --- a/lib/menubar/init.lua +++ b/lib/menubar/init.lua @@ -25,6 +25,7 @@ local capi = { mouse = mouse, screen = screen } +local gmath = require("gears.math") local awful = require("awful") local common = require("awful.widget.common") local theme = require("beautiful") @@ -417,7 +418,7 @@ function menubar.show(scr) local geometry = menubar.geometry instance.geometry = {x = geometry.x or scrgeom.x, y = geometry.y or scrgeom.y, - height = geometry.height or awful.util.round(theme.get_font_height() * 1.5), + height = geometry.height or gmath.round(theme.get_font_height() * 1.5), width = geometry.width or scrgeom.width} instance.wibox:geometry(instance.geometry) diff --git a/lib/wibox/layout/flex.lua b/lib/wibox/layout/flex.lua index 51f773dbc..4318a9f4f 100644 --- a/lib/wibox/layout/flex.lua +++ b/lib/wibox/layout/flex.lua @@ -11,6 +11,7 @@ local fixed = require("wibox.layout.fixed") local table = table local pairs = pairs local floor = math.floor +local gmath = require("gears.math") local util = require("awful.util") local flex = {} @@ -69,10 +70,10 @@ function flex:layout(_, width, height) for _, v in pairs(self._private.widgets) do local x, y, w, h if self._private.dir == "y" then - x, y = 0, util.round(pos) + x, y = 0, gmath.round(pos) w, h = width, floor(space_per_item) else - x, y = util.round(pos), 0 + x, y = gmath.round(pos), 0 w, h = floor(space_per_item), height end diff --git a/lib/wibox/layout/ratio.lua b/lib/wibox/layout/ratio.lua index 2750467ba..f2817b542 100644 --- a/lib/wibox/layout/ratio.lua +++ b/lib/wibox/layout/ratio.lua @@ -14,6 +14,7 @@ local flex = require("wibox.layout.flex" ) local table = table local pairs = pairs local floor = math.floor +local gmath = require("gears.math") local util = require("awful.util") local ratio = {} @@ -87,11 +88,11 @@ function ratio:layout(_, width, height) if self._private.dir == "y" then space = height * self._private.ratios[k] - x, y = 0, util.round(pos) + x, y = 0, gmath.round(pos) w, h = width, floor(space) else space = width * self._private.ratios[k] - x, y = util.round(pos), 0 + x, y = gmath.round(pos), 0 w, h = floor(space), height end @@ -101,8 +102,8 @@ function ratio:layout(_, width, height) -- Make sure all widgets fit in the layout, if they aren't, something -- went wrong - if (self._private.dir == "y" and util.round(pos) >= height) or - (self._private.dir ~= "y" and util.round(pos) >= width) then + if (self._private.dir == "y" and gmath.round(pos) >= height) or + (self._private.dir ~= "y" and gmath.round(pos) >= width) then break end end diff --git a/tests/test-awful-rules.lua b/tests/test-awful-rules.lua index 6391dc6ed..be258fc10 100644 --- a/tests/test-awful-rules.lua +++ b/tests/test-awful-rules.lua @@ -1,4 +1,5 @@ local awful = require("awful") +local gears = require("gears") local beautiful = require("beautiful") local test_client = require("_client") local unpack = unpack or table.unpack -- luacheck: globals unpack (compatibility with Lua 5.1) @@ -8,7 +9,7 @@ local callback_called = false -- Magic table to store tests local tests = {} -local tb_height = awful.util.round(beautiful.get_font_height() * 1.5) +local tb_height = gears.math.round(beautiful.get_font_height() * 1.5) -- local border_width = beautiful.border_width -- Detect "manage" race conditions From ad113fa3aae7238267d8ff0cfaf17a3263555018 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 6 Mar 2017 17:15:40 +0100 Subject: [PATCH 2/4] Fix code using awful.util.cycle This gets rid of lots of deprecation warnings. Signed-off-by: Uli Schlachter --- lib/awful/client.lua | 5 +++-- lib/awful/layout/init.lua | 3 ++- lib/awful/mouse/drag_to_tag.lua | 6 +++--- lib/awful/screen.lua | 3 ++- lib/awful/tag.lua | 3 ++- lib/awful/util.lua | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/awful/client.lua b/lib/awful/client.lua index f8318bcce..3a1767f04 100644 --- a/lib/awful/client.lua +++ b/lib/awful/client.lua @@ -12,6 +12,7 @@ local spawn = require("awful.spawn") local set_shape = require("awful.client.shape").update.all local object = require("gears.object") local grect = require("gears.geometry").rectangle +local gmath = require("gears.math") local pairs = pairs local type = type local ipairs = ipairs @@ -178,7 +179,7 @@ function client.next(i, sel, stacked) for idx, c in ipairs(cls) do if c == sel then -- Cycle - return cls[util.cycle(#cls, idx + i)] + return cls[gmath.cycle(#cls, idx + i)] end end end @@ -1090,7 +1091,7 @@ end function client.run_or_raise(cmd, matcher, merge) local clients = capi.client.get() local findex = util.table.hasitem(clients, capi.client.focus) or 1 - local start = util.cycle(#clients, findex + 1) + local start = gmath.cycle(#clients, findex + 1) local c = client.iterate(matcher, start)() if c then diff --git a/lib/awful/layout/init.lua b/lib/awful/layout/init.lua index dfce56291..a7a414aaa 100644 --- a/lib/awful/layout/init.lua +++ b/lib/awful/layout/init.lua @@ -21,6 +21,7 @@ local tag = require("awful.tag") local client = require("awful.client") local ascreen = require("awful.screen") local timer = require("gears.timer") +local gmath = require("gears.math") local function get_screen(s) return s and capi.screen[s] @@ -121,7 +122,7 @@ function layout.inc(i, s, layouts) end end if curindex then - local newindex = util.cycle(#layouts, curindex + i) + local newindex = gmath.cycle(#layouts, curindex + i) layout.set(layouts[newindex], t) end end diff --git a/lib/awful/mouse/drag_to_tag.lua b/lib/awful/mouse/drag_to_tag.lua index e8e836d95..9d4febf49 100644 --- a/lib/awful/mouse/drag_to_tag.lua +++ b/lib/awful/mouse/drag_to_tag.lua @@ -8,7 +8,7 @@ --------------------------------------------------------------------------- local capi = {screen = screen, mouse = mouse} -local util = require("awful.util") +local gmath = require("gears.math") local tag = require("awful.tag") local resize = require("awful.mouse.resize") @@ -38,11 +38,11 @@ function module.drag_to_tag(c) if dir then if dir == "right" then - local newtag = tags[util.cycle(#tags, idx + 1)] + local newtag = tags[gmath.cycle(#tags, idx + 1)] c:move_to_tag(newtag) tag.viewnext() elseif dir == "left" then - local newtag = tags[util.cycle(#tags, idx - 1)] + local newtag = tags[gmath.cycle(#tags, idx - 1)] c:move_to_tag(newtag) tag.viewprev() end diff --git a/lib/awful/screen.lua b/lib/awful/screen.lua index 3627df9b5..2fdb322d5 100644 --- a/lib/awful/screen.lua +++ b/lib/awful/screen.lua @@ -15,6 +15,7 @@ local capi = awesome = awesome, } local util = require("awful.util") +local gmath = require("gears.math") local object = require("gears.object") local grect = require("gears.geometry").rectangle @@ -169,7 +170,7 @@ end -- @tparam int offset Value to add to the current focused screen index. 1 to -- focus the next one, -1 to focus the previous one. function screen.focus_relative(offset) - return screen.focus(util.cycle(capi.screen.count(), + return screen.focus(gmath.cycle(capi.screen.count(), screen.focused().index + offset)) end diff --git a/lib/awful/tag.lua b/lib/awful/tag.lua index b481f421a..b4ba50a8f 100644 --- a/lib/awful/tag.lua +++ b/lib/awful/tag.lua @@ -10,6 +10,7 @@ local util = require("awful.util") local ascreen = require("awful.screen") local beautiful = require("beautiful") +local gmath = require("gears.math") local object = require("gears.object") local timer = require("gears.timer") local pairs = pairs @@ -1198,7 +1199,7 @@ function tag.viewidx(i, screen) tag.viewnone(screen) for k, t in ipairs(showntags) do if t == sel then - showntags[util.cycle(#showntags, k + i)].selected = true + showntags[gmath.cycle(#showntags, k + i)].selected = true end end screen:emit_signal("tag::history::update") diff --git a/lib/awful/util.lua b/lib/awful/util.lua index 3f237b758..b92f41fa2 100644 --- a/lib/awful/util.lua +++ b/lib/awful/util.lua @@ -512,7 +512,7 @@ function util.table.iterate(t, filter, start) return function () while count < length do local item = t[index] - index = util.cycle(#t, index + 1) + index = gmath.cycle(#t, index + 1) count = count + 1 if filter(item) then return item end end From dde71265c54b28224ded28633c7b14bf51ec54aa Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 6 Mar 2017 17:28:08 +0100 Subject: [PATCH 3/4] fixup! Fix code using awful.util.cycle --- lib/awful/layout/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/awful/layout/init.lua b/lib/awful/layout/init.lua index a7a414aaa..b8100bbce 100644 --- a/lib/awful/layout/init.lua +++ b/lib/awful/layout/init.lua @@ -9,7 +9,6 @@ -- Grab environment we need local ipairs = ipairs local type = type -local util = require("awful.util") local capi = { screen = screen, mouse = mouse, From 675b05ff341f65fcccc4593061b1529bda8ba172 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 6 Mar 2017 17:28:31 +0100 Subject: [PATCH 4/4] fixup! Fix code using awful.util.round --- lib/awful/titlebar.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/awful/titlebar.lua b/lib/awful/titlebar.lua index a25ad7a62..ca9ce240c 100644 --- a/lib/awful/titlebar.lua +++ b/lib/awful/titlebar.lua @@ -9,7 +9,6 @@ local error = error local type = type local gmath = require("gears.math") -local util = require("awful.util") local abutton = require("awful.button") local aclient = require("awful.client") local atooltip = require("awful.tooltip")