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

gears.wallpaper: Free wallpaper from memory when done 

Wallpapers are usually big images that use up a lot of memory. This commit makes
gears.wallpaper call :finish() on all involved surface to make them free their
memory.

This is a lot faster than waiting for the garbage collector to collect these
surfaces. Due to the large size of wallpapers, such a special case makes sense
for this code.

Hopefully-helps: https://github.com/awesomeWM/awesome/issues/368
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-02-28 17:24:24 +01:00
parent 2ad147d740
commit b05b699129
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/gears/wallpaper.lua
View File

@ -61,6 +61,7 @@ function wallpaper.prepare_context(s)
local paper = pending_wallpaper local paper = pending_wallpaper
pending_wallpaper = nil pending_wallpaper = nil
wallpaper.set(paper) wallpaper.set(paper)
paper:finish()
end) end)
else else
-- Draw to the already-pending wallpaper -- Draw to the already-pending wallpaper
@ -99,7 +100,7 @@ end
-- gears.color. The default is black. -- gears.color. The default is black.
function wallpaper.centered(surf, s, background) function wallpaper.centered(surf, s, background)
local geom, cr = wallpaper.prepare_context(s) local geom, cr = wallpaper.prepare_context(s)
surf = surface(surf) surf = surface.load_uncached(surf)
background = color(background) background = color(background)
-- Fill the area with the background -- Fill the area with the background
@ -114,6 +115,7 @@ function wallpaper.centered(surf, s, background)
cr:clip() cr:clip()
cr:set_source_surface(surf, 0, 0) cr:set_source_surface(surf, 0, 0)
cr:paint() cr:paint()
surf:finish()
end end
--- Set a tiled wallpaper. --- Set a tiled wallpaper.
@ -128,11 +130,13 @@ function wallpaper.tiled(surf, s, offset)
cr:translate(offset.x, offset.y) cr:translate(offset.x, offset.y)
end end
local pattern = cairo.Pattern.create_for_surface(surface(surf)) surf = surface.load_uncached(surf)
local pattern = cairo.Pattern.create_for_surface(surf)
pattern.extend = cairo.Extend.REPEAT pattern.extend = cairo.Extend.REPEAT
cr.source = pattern cr.source = pattern
cr.operator = cairo.Operator.SOURCE cr.operator = cairo.Operator.SOURCE
cr:paint() cr:paint()
surf:finish()
end end
--- Set a maximized wallpaper. --- Set a maximized wallpaper.
@ -144,7 +148,7 @@ end
-- @param offset This can be set to a table with entries x and y. -- @param offset This can be set to a table with entries x and y.
function wallpaper.maximized(surf, s, ignore_aspect, offset) function wallpaper.maximized(surf, s, ignore_aspect, offset)
local geom, cr = wallpaper.prepare_context(s) local geom, cr = wallpaper.prepare_context(s)
surf = surface(surf) surf = surface.load_uncached(surf)
local w, h = surface.get_size(surf) local w, h = surface.get_size(surf)
local aspect_w = geom.width / w local aspect_w = geom.width / w
local aspect_h = geom.height / h local aspect_h = geom.height / h
@ -166,6 +170,7 @@ function wallpaper.maximized(surf, s, ignore_aspect, offset)
cr:set_source_surface(surf, 0, 0) cr:set_source_surface(surf, 0, 0)
cr.operator = cairo.Operator.SOURCE cr.operator = cairo.Operator.SOURCE
cr:paint() cr:paint()
surf:finish()
end end
--- Set a fitting wallpaper. --- Set a fitting wallpaper.
@ -176,7 +181,7 @@ end
-- gears.color. The default is black. -- gears.color. The default is black.
function wallpaper.fit(surf, s, background) function wallpaper.fit(surf, s, background)
local geom, cr = wallpaper.prepare_context(s) local geom, cr = wallpaper.prepare_context(s)
surf = surface(surf) surf = surface.load_uncached(surf)
background = color(background) background = color(background)
-- Fill the area with the background -- Fill the area with the background
@ -196,6 +201,7 @@ function wallpaper.fit(surf, s, background)
cr:scale(scale, scale) cr:scale(scale, scale)
cr:set_source_surface(surf, 0, 0) cr:set_source_surface(surf, 0, 0)
cr:paint() cr:paint()
surf:finish()
end end
return wallpaper return wallpaper