WIP: Somewm migration
This commit is contained in:
parent
f5caff6684
commit
ce56320097
17 changed files with 342 additions and 238 deletions
80
tags.lua
80
tags.lua
|
|
@ -1,11 +1,12 @@
|
|||
-- tags
|
||||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
local conf = require("localconf")
|
||||
local modkey = conf.modkey or "Mod4"
|
||||
|
||||
local tags={}
|
||||
local tags = {}
|
||||
|
||||
awful.layout.layouts = {
|
||||
awful.layout.append_default_layouts({
|
||||
awful.layout.suit.fair,
|
||||
awful.layout.suit.fair.horizontal,
|
||||
awful.layout.suit.tile,
|
||||
|
|
@ -13,16 +14,10 @@ awful.layout.layouts = {
|
|||
awful.layout.suit.max,
|
||||
awful.layout.suit.max.fullscreen,
|
||||
awful.layout.suit.floating,
|
||||
-- awful.layout.suit.magnifier,
|
||||
-- awful.layout.suit.corner.nw,
|
||||
-- awful.layout.suit.corner.ne,
|
||||
-- awful.layout.suit.corner.sw,
|
||||
-- awful.layout.suit.corner.se,
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
local function getfunc_viewonly(i)
|
||||
return function ()
|
||||
return function()
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[i]
|
||||
if tag then
|
||||
|
|
@ -32,7 +27,7 @@ local function getfunc_viewonly(i)
|
|||
end
|
||||
|
||||
local function getfunc_viewtoggle(i)
|
||||
return function ()
|
||||
return function()
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[i]
|
||||
if tag then
|
||||
|
|
@ -42,7 +37,7 @@ local function getfunc_viewtoggle(i)
|
|||
end
|
||||
|
||||
local function getfunc_moveto(i)
|
||||
return function ()
|
||||
return function()
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[i]
|
||||
if tag then
|
||||
|
|
@ -53,7 +48,7 @@ local function getfunc_moveto(i)
|
|||
end
|
||||
|
||||
local function getfunc_clienttoggle(i)
|
||||
return function ()
|
||||
return function()
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[i]
|
||||
if tag then
|
||||
|
|
@ -64,20 +59,20 @@ local function getfunc_clienttoggle(i)
|
|||
end
|
||||
|
||||
local tagdef = {
|
||||
{"1"},
|
||||
{"2", { layout = awful.layout.suit.max }},
|
||||
{"3"},
|
||||
{"4", { layout = awful.layout.suit.max }},
|
||||
{"5"},
|
||||
{"6"},
|
||||
{"7"},
|
||||
{"8"},
|
||||
{"9"},
|
||||
{"0"},
|
||||
{"F1", { layout = awful.layout.suit.max }},
|
||||
{"F2"},
|
||||
{"F3"},
|
||||
{"F4", { layout = awful.layout.suit.max }},
|
||||
{ "1" },
|
||||
{ "2", { layout = awful.layout.suit.max } },
|
||||
{ "3" },
|
||||
{ "4", { layout = awful.layout.suit.max } },
|
||||
{ "5" },
|
||||
{ "6" },
|
||||
{ "7" },
|
||||
{ "8" },
|
||||
{ "9" },
|
||||
{ "0" },
|
||||
{ "F1", { layout = awful.layout.suit.max } },
|
||||
{ "F2" },
|
||||
{ "F3" },
|
||||
{ "F4", { layout = awful.layout.suit.max } },
|
||||
}
|
||||
|
||||
local function defaultlayout(s)
|
||||
|
|
@ -90,11 +85,8 @@ end
|
|||
|
||||
function tags.setup()
|
||||
awful.screen.connect_for_each_screen(function(s)
|
||||
for _,t in ipairs(tagdef) do
|
||||
awful.tag.add(t[1], awful.util.table.join(
|
||||
{screen = s},
|
||||
t[2] or { layout = defaultlayout(s) }
|
||||
))
|
||||
for _, t in ipairs(tagdef) do
|
||||
awful.tag.add(t[1], gears.table.join({ screen = s }, t[2] or { layout = defaultlayout(s) }))
|
||||
end
|
||||
s.tags[1]:view_only()
|
||||
end)
|
||||
|
|
@ -113,22 +105,24 @@ function tags.create_bindings()
|
|||
else --if i > 10 then
|
||||
k = "F" .. i - 10 -- F keys
|
||||
end
|
||||
tagkeys = awful.util.table.join(tagkeys,
|
||||
awful.key( { modkey }, k, getfunc_viewonly(i)),
|
||||
awful.key( { modkey, "Control" }, k, getfunc_viewtoggle(i)),
|
||||
awful.key( { modkey, "Shift" }, k, getfunc_moveto(i)),
|
||||
awful.key( { modkey, "Control", "Shift" }, k, getfunc_clienttoggle(i))
|
||||
tagkeys = gears.table.join(
|
||||
tagkeys,
|
||||
awful.key({ modkey }, k, getfunc_viewonly(i)),
|
||||
awful.key({ modkey, "Control" }, k, getfunc_viewtoggle(i)),
|
||||
awful.key({ modkey, "Shift" }, k, getfunc_moveto(i)),
|
||||
awful.key({ modkey, "Control", "Shift" }, k, getfunc_clienttoggle(i))
|
||||
)
|
||||
end
|
||||
|
||||
-- keys for all tags
|
||||
tagkeys = awful.util.table.join(tagkeys,
|
||||
awful.key({ modkey }, "u", awful.client.urgent.jumpto),
|
||||
awful.key({ modkey }, "Left", awful.tag.viewprev ),
|
||||
awful.key({ modkey }, "Right", awful.tag.viewnext ),
|
||||
awful.key({ modkey }, "Escape", awful.tag.history.restore)
|
||||
tagkeys = gears.table.join(
|
||||
tagkeys,
|
||||
awful.key({ modkey }, "u", awful.client.urgent.jumpto),
|
||||
awful.key({ modkey }, "Left", awful.tag.viewprev),
|
||||
awful.key({ modkey }, "Right", awful.tag.viewnext),
|
||||
awful.key({ modkey }, "Escape", awful.tag.history.restore)
|
||||
)
|
||||
return tagkeys;
|
||||
return tagkeys
|
||||
end
|
||||
|
||||
return tags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue