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

awful.mouse: be smarter when moving between screens (FS#419) 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-02-07 15:40:50 +01:00
parent b294eb990e
commit a47d0d9924
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/awful/mouse.lua.in
View File

@ -114,9 +114,8 @@ end
function client.move(c, snap) function client.move(c, snap)
local c = c or capi.client.focus local c = c or capi.client.focus
if not c then return end if not c
or c.fullscreen
if c.fullscreen
or c.type == "desktop" or c.type == "desktop"
or c.type == "splash" or c.type == "splash"
or c.type == "dock" then or c.type == "dock" then
@ -133,15 +132,7 @@ function client.move(c, snap)
local fixed_x = c.maximized_horizontal local fixed_x = c.maximized_horizontal
local fixed_y = c.maximized_vertical local fixed_y = c.maximized_vertical
local function ug(c, prop)
if prop == "geometry" then
local g = c:geometry()
capi.mouse.coords({ x = g.x + dist_x, y = g.y + dist_y })
end
end
capi.mousegrabber.run(function (mouse) capi.mousegrabber.run(function (mouse)
hooks.property.unregister(ug)
for k, v in ipairs(mouse.buttons) do for k, v in ipairs(mouse.buttons) do
if v then if v then
local lay = layout.get(c.screen) local lay = layout.get(c.screen)
@ -149,11 +140,18 @@ function client.move(c, snap)
local x = mouse.x - dist_x local x = mouse.x - dist_x
local y = mouse.y - dist_y local y = mouse.y - dist_y
c:geometry(client.snap(c, snap, x, y, fixed_x, fixed_y)) c:geometry(client.snap(c, snap, x, y, fixed_x, fixed_y))
if layout.get(c.screen) ~= layout.suit.floating and not aclient.floating.get(c) then
hooks.property.register(ug)
end
elseif lay ~= layout.suit.magnifier then elseif lay ~= layout.suit.magnifier then
c.screen = capi.mouse.screen -- Only move the client to the mouse
-- screen if the target screen is not
-- floating.
-- Otherwise, we move if via geometry.
if layout.get(capi.mouse.screen) == layout.suit.floating then
local x = mouse.x - dist_x
local y = mouse.y - dist_y
c:geometry(client.snap(c, snap, x, y, fixed_x, fixed_y))
else
c.screen = capi.mouse.screen
end
if layout.get(c.screen) ~= layout.suit.floating then if layout.get(c.screen) ~= layout.suit.floating then
local c_u_m = client_under_pointer() local c_u_m = client_under_pointer()
if c_u_m and not aclient.floating.get(c_u_m) then if c_u_m and not aclient.floating.get(c_u_m) then
@ -161,8 +159,6 @@ function client.move(c, snap)
c:swap(c_u_m) c:swap(c_u_m)
end end
end end
else
hooks.property.register(ug)
end end
end end
return true return true