awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1690 from Veratil/fix-awesomerc-deprecated-call 

Fix some deprecated calls in code and docs
This commit is contained in:
Emmanuel Lepage Vallée 2017-03-30 22:39:03 -04:00 committed by GitHub
parent b81b2149f6 6cb2e0fa82
commit 39dca5220c
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awesomerc.lua
View File

@ -43,7 +43,7 @@ end
-- {{{ Variable definitions -- {{{ Variable definitions
-- @DOC_LOAD_THEME@ -- @DOC_LOAD_THEME@
-- Themes define colours, icons, font and wallpapers. -- Themes define colours, icons, font and wallpapers.
beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua") beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
-- @DOC_DEFAULT_APPLICATIONS@ -- @DOC_DEFAULT_APPLICATIONS@
-- This is used later as the default terminal and editor to run. -- This is used later as the default terminal and editor to run.

16
docs/90-FAQ.md
View File

@ -176,16 +176,16 @@ You can ensure no application ever starts maximized in the first rule of your
### How to move and resize floaters with the keyboard? ### How to move and resize floaters with the keyboard?
You can use the `awful.client.moveresize` function. The following `clientkeys` You can use the `client:relative_move` function. The following `clientkeys`
example will move floaters with "Mod4 + Arrow keys" and resize them with "Mod4 + example will move floaters with "Mod4 + Arrow keys" and resize them with "Mod4 +
PgUP/DN" keys: PgUP/DN" keys:
awful.key({ modkey }, "Next", function () awful.client.moveresize( 20, 20, -40, -40) end), awful.key({ modkey }, "Next", function (c) c:relative_move( 20, 20, -40, -40) end),
awful.key({ modkey }, "Prior", function () awful.client.moveresize(-20, -20, 40, 40) end), awful.key({ modkey }, "Prior", function (c) c:relative_move(-20, -20, 40, 40) end),
awful.key({ modkey }, "Down", function () awful.client.moveresize( 0, 20, 0, 0) end), awful.key({ modkey }, "Down", function (c) c:relative_move( 0, 20, 0, 0) end),
awful.key({ modkey }, "Up", function () awful.client.moveresize( 0, -20, 0, 0) end), awful.key({ modkey }, "Up", function (c) c:relative_move( 0, -20, 0, 0) end),
awful.key({ modkey }, "Left", function () awful.client.moveresize(-20, 0, 0, 0) end), awful.key({ modkey }, "Left", function (c) c:relative_move(-20, 0, 0, 0) end),
awful.key({ modkey }, "Right", function () awful.client.moveresize( 20, 0, 0, 0) end), awful.key({ modkey }, "Right", function (c) c:relative_move( 20, 0, 0, 0) end),
#### How to resize tiled clients? #### How to resize tiled clients?
@ -247,7 +247,7 @@ You can use the format `#XYZ` for keycodes in your bindings. The following
example shows a mapped multimedia/extra key, that's why the modifier is not example shows a mapped multimedia/extra key, that's why the modifier is not
present (but it could be): present (but it could be):
awful.key({}, "#160", function () awful.util.spawn("kscreenlocker --forcelock") end), awful.key({}, "#160", function () awful.spawn("kscreenlocker --forcelock") end),
### How to add a keyboard layout switcher? ### How to add a keyboard layout switcher?

8
keygrabber.c
View File

@ -126,10 +126,10 @@ keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
* keygrabber.run(function(mod, key, event) * keygrabber.run(function(mod, key, event)
* if event == "release" then return end * if event == "release" then return end
* *
* if key == 'Up' then awful.client.moveresize(0, 0, 0, 5, c) * if key == 'Up' then c:relative_move(0, 0, 0, 5)
* elseif key == 'Down' then awful.client.moveresize(0, 0, 0, -5, c) * elseif key == 'Down' then c:relative_move(0, 0, 0, -5)
* elseif key == 'Right' then awful.client.moveresize(0, 0, 5, 0, c) * elseif key == 'Right' then c:relative_move(0, 0, 5, 0)
* elseif key == 'Left' then awful.client.moveresize(0, 0, -5, 0, c) * elseif key == 'Left' then c:relative_move(0, 0, -5, 0)
* else keygrabber.stop() * else keygrabber.stop()
* end * end
* end) * end)

8
lib/awful/keygrabber.lua
View File

@ -70,10 +70,10 @@ end
-- local grabber = awful.keygrabber.run(function(mod, key, event) -- local grabber = awful.keygrabber.run(function(mod, key, event)
-- if event == "release" then return end -- if event == "release" then return end
-- --
-- if key == 'Up' then awful.client.moveresize(0, 0, 0, 5, c) -- if key == 'Up' then c:relative_move(0, 0, 0, 5)
-- elseif key == 'Down' then awful.client.moveresize(0, 0, 0, -5, c) -- elseif key == 'Down' then c:relative_move(0, 0, 0, -5)
-- elseif key == 'Right' then awful.client.moveresize(0, 0, 5, 0, c) -- elseif key == 'Right' then c:relative_move(0, 0, 5, 0)
-- elseif key == 'Left' then awful.client.moveresize(0, 0, -5, 0, c) -- elseif key == 'Left' then c:relative_move(0, 0, -5, 0)
-- else awful.keygrabber.stop(grabber) -- else awful.keygrabber.stop(grabber)
-- end -- end
-- end) -- end)

2
tests/_runner.lua
View File

@ -71,7 +71,7 @@ runner.run_steps = function(steps)
end end
elseif result == false then elseif result == false then
io.stderr:write("Step "..step_as_string.." failed (returned false).") io.stderr:write("Step "..step_as_string.." failed (returned false).\n")
if not runner.quit_awesome_on_error then if not runner.quit_awesome_on_error then
io.stderr:write("Keeping awesome open...\n") io.stderr:write("Keeping awesome open...\n")
return return