Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

beautiful.xresources: Support screen objects 

This commit makes beautiful accept a screen object everywhere where a screen
index is accepted.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-02-26 18:19:24 +01:00
parent f02b75f826
commit 20e13602de
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/beautiful/xresources.lua
View File

@ -9,6 +9,7 @@
-- Grab environment -- Grab environment
local awesome = awesome local awesome = awesome
local screen = screen
local round = require("awful.util").round local round = require("awful.util").round
local gears_debug = require("gears.debug") local gears_debug = require("gears.debug")
@ -66,10 +67,15 @@ end
local dpi_per_screen = {} local dpi_per_screen = {}
local function get_screen(s)
return s and screen[s]
end
--- Get global or per-screen DPI value falling back to xrdb. --- Get global or per-screen DPI value falling back to xrdb.
-- @tparam[opt=focused] integer s The screen. -- @tparam[opt] integer|screen s The screen.
-- @treturn number DPI value. -- @treturn number DPI value.
function xresources.get_dpi(s) function xresources.get_dpi(s)
s = get_screen(s)
if dpi_per_screen[s] then if dpi_per_screen[s] then
return dpi_per_screen[s] return dpi_per_screen[s]
end end
@ -84,6 +90,7 @@ end
-- @tparam number dpi DPI value. -- @tparam number dpi DPI value.
-- @tparam[opt] integer s Screen. -- @tparam[opt] integer s Screen.
function xresources.set_dpi(dpi, s) function xresources.set_dpi(dpi, s)
s = get_screen(s)
if not s then if not s then
xresources.dpi = dpi xresources.dpi = dpi
else else
@ -94,7 +101,7 @@ end
--- Compute resulting size applying current DPI value (optionally per screen). --- Compute resulting size applying current DPI value (optionally per screen).
-- @tparam number size Size -- @tparam number size Size
-- @tparam[opt] integer s The screen. -- @tparam[opt] integer|screen s The screen.
-- @treturn integer Resulting size (rounded to integer). -- @treturn integer Resulting size (rounded to integer).
function xresources.apply_dpi(size, s) function xresources.apply_dpi(size, s)
return round(size / 96 * xresources.get_dpi(s)) return round(size / 96 * xresources.get_dpi(s))