import debian/upstream rc.lua changes

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 60c913358f82d8f397e63e50bbdb721545d9dc0f..81f547672e06edd7ffe1d3a5f83edde63c86c974 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -12,11 +12,18 @@ local xrdb = beautiful.xresources
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget

+-- Enable hotkeys help widget for VIM and other apps
+-- when client with a matching name is opened:
+require("awful.hotkeys_popup.keys")
+
+-- Load Debian menu entries
+local debian = require("debian.menu")
+local has_fdo, freedesktop = pcall(require, "freedesktop")
+-- Other libraries

 local tblutils = require("tblutils")
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
 local tblutils = require("tblutils")
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")

-local freedesktop = require("freedesktop")

 local luatz = require("luatz")
 -- }}}
 
 local luatz = require("luatz")
 -- }}}
 


@@ -49,13 +56,13 @@ end
 --xrdb.set_dpi(95, screen[1])
 --xrdb.set_dpi(120, screen[2])
 
 --xrdb.set_dpi(95, screen[1])
 --xrdb.set_dpi(120, screen[2])
 

--- Themes define colours, icons, and wallpapers
-beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
+-- Themes define colours, icons, font and wallpapers.
+beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")

 beautiful.font = 'Sans 10'
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
 beautiful.font = 'Sans 10'
 
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"

-editor = "sensible-editor"
+editor = os.getenv("EDITOR") or "editor"

 editor_cmd = terminal .. " -e " .. editor
 
 -- Default modkey.
 editor_cmd = terminal .. " -e " .. editor
 
 -- Default modkey.


@@ -105,6 +112,18 @@ local function client_menu_toggle_fn()
     end
 end
 
     end
 end
 

+local function set_wallpaper(s)
+    -- Wallpaper
+    if beautiful.wallpaper then
+        local wallpaper = beautiful.wallpaper
+        -- If wallpaper is a function, call it with the screen
+        if type(wallpaper) == "function" then
+            wallpaper = wallpaper(s)
+        end
+        gears.wallpaper.maximized(wallpaper, s, true)
+    end
+end
+

 local lain_bat = lain.widget.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()
 local lain_bat = lain.widget.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()


@@ -146,7 +165,6 @@ local btc_widget = lain.widget.watch({
         widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ")
     end
 })
         widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ")
     end
 })

-

 -- }}}
 
 -- {{{ Menu
 -- }}}
 
 -- {{{ Menu


@@ -156,29 +174,42 @@ myawesomemenu = {
    { "manual", terminal .. " -e man awesome" },
    { "edit config", editor_cmd .. " " .. awesome.conffile },
    { "restart", awesome.restart },
    { "manual", terminal .. " -e man awesome" },
    { "edit config", editor_cmd .. " " .. awesome.conffile },
    { "restart", awesome.restart },

-   { "quit", awesome.quit }
+   { "quit", function() awesome.quit() end}

 }
 
 }
 

-mymainmenu = freedesktop.menu.build({
-    before = {
-        { "awesome", myawesomemenu, beautiful.awesome_icon },
-        { "terminal", terminal },
-    },
-    after = {
-    }
-})
+local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon }
+local menu_terminal = { "open terminal", terminal }
+
+if has_fdo then
+    mymainmenu = freedesktop.menu.build({
+        before = { menu_awesome },
+        after =  { menu_terminal }
+    })
+else
+    mymainmenu = awful.menu({
+        items = {
+                  menu_awesome,
+                  { "Debian", debian.menu.Debian_menu.Debian },
+                  menu_terminal,
+                }
+    })
+end
+

 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })

--- }}}

 
 

--- {{{ Menubar configuration
+-- Menubar configuration

 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
 
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
 

--- {{{ Wibox
+-- {{{ Wibar

 local spacer = wibox.widget.textbox()
 spacer:set_text(' │ ')
 local spacer = wibox.widget.textbox()
 spacer:set_text(' │ ')

+
+-- Keyboard map indicator and switcher
+mykeyboardlayout = awful.widget.keyboardlayout()
+

 -- Create a textclock widget
 clocks = { wibox.widget.textclock("%a %d %b %H:%M:%S %Z", 1) }
 
 -- Create a textclock widget
 clocks = { wibox.widget.textclock("%a %d %b %H:%M:%S %Z", 1) }
 


@@ -197,11 +228,7 @@ for c, tz in tblutils.sorted_pairs(ZONES) do
 end
 
 -- Create a wibox for each screen and add it
 end
 
 -- Create a wibox for each screen and add it

-mywibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
+local taglist_buttons = gears.table.join(

                     awful.button({ }, 1, function(t) t:view_only() end),
                     awful.button({ modkey }, 1, function(t)
                                               if client.focus then
                     awful.button({ }, 1, function(t) t:view_only() end),
                     awful.button({ modkey }, 1, function(t)
                                               if client.focus then


@@ -218,8 +245,7 @@ mytaglist.buttons = awful.util.table.join(
                     awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
                 )
 
                     awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
                 )
 

-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
+local tasklist_buttons = gears.table.join(

                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
                                                   -- I don't like click-minimising
                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
                                                   -- I don't like click-minimising


@@ -246,6 +272,9 @@ mytasklist.buttons = awful.util.table.join(
                                           end))
 -- }}}
 
                                           end))
 -- }}}
 

+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+

 -- {{{ Tags
 tags = {}
 tags.config = {}
 -- {{{ Tags
 tags = {}
 tags.config = {}


@@ -284,15 +313,6 @@ end
 awful.screen.connect_for_each_screen(function(s)
     -- local fontsize = math.floor(250 * xrdb.get_dpi(s)/s.geometry.width)
     -- beautiful.font = "Sans " .. tostring(fontsize)
 awful.screen.connect_for_each_screen(function(s)
     -- local fontsize = math.floor(250 * xrdb.get_dpi(s)/s.geometry.width)
     -- beautiful.font = "Sans " .. tostring(fontsize)

-    -- Wallpaper
-    --DISABLED--if beautiful.wallpaper then
-    --DISABLED--    local wallpaper = beautiful.wallpaper
-    --DISABLED--    -- If wallpaper is a function, call it with the screen
-    --DISABLED--    if type(wallpaper) == "function" then
-    --DISABLED--        wallpaper = wallpaper(s)
-    --DISABLED--    end
-    --DISABLED--    gears.wallpaper.maximized(wallpaper, s, true)
-    --DISABLED--end

 
     if not tags[s.index] then
         tags[s.index] = {}
 
     if not tags[s.index] then
         tags[s.index] = {}


@@ -352,7 +372,7 @@ end)
 -- }}}
 
 -- {{{ Mouse bindings
 -- }}}
 
 -- {{{ Mouse bindings

-root.buttons(awful.util.table.join(
+root.buttons(gears.table.join(

     awful.button({ }, 3, function () mymainmenu:toggle() end),
     awful.button({ }, 4, awful.tag.viewnext),
     awful.button({ }, 5, awful.tag.viewprev)
     awful.button({ }, 3, function () mymainmenu:toggle() end),
     awful.button({ }, 4, awful.tag.viewnext),
     awful.button({ }, 5, awful.tag.viewprev)


@@ -360,7 +380,7 @@ root.buttons(awful.util.table.join(
 -- }}}
 
 -- {{{ Key bindings
 -- }}}
 
 -- {{{ Key bindings

-globalkeys = awful.util.table.join(
+globalkeys = gears.table.join(

     awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
               {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
     awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
               {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,


@@ -442,15 +462,17 @@ globalkeys = awful.util.table.join(
               {description = "restore minimized", group = "client"}),
 
     -- Prompt
               {description = "restore minimized", group = "client"}),
 
     -- Prompt

-    awful.key({ modkey },            "r",     function () mypromptbox[awful.screen.focused()]:run() end,
+    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,

               {description = "run prompt", group = "launcher"}),
 
     awful.key({ modkey }, "x",
               function ()
               {description = "run prompt", group = "launcher"}),
 
     awful.key({ modkey }, "x",
               function ()

-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[awful.screen.focused()].widget,
-                  awful.util.eval, nil,
-                  awful.util.get_cache_dir() .. "/history_eval")
+                  awful.prompt.run {
+                    prompt       = "Run Lua code: ",
+                    textbox      = awful.screen.focused().mypromptbox.widget,
+                    exe_callback = awful.util.eval,
+                    history_path = awful.util.get_cache_dir() .. "/history_eval"
+                  }

               end,
               {description = "lua execute prompt", group = "awesome"}),
     -- Menubar
               end,
               {description = "lua execute prompt", group = "awesome"}),
     -- Menubar


@@ -458,7 +480,7 @@ globalkeys = awful.util.table.join(
               {description = "show the menubar", group = "launcher"})
 )
 
               {description = "show the menubar", group = "launcher"})
 )
 

-clientkeys = awful.util.table.join(
+clientkeys = gears.table.join(

     awful.key({ modkey,           }, "f",
         function (c)
             c.fullscreen = not c.fullscreen
     awful.key({ modkey,           }, "f",
         function (c)
             c.fullscreen = not c.fullscreen


@@ -489,14 +511,26 @@ clientkeys = awful.util.table.join(
             c.maximized_vertical = false
             c:raise()
         end ,
             c.maximized_vertical = false
             c:raise()
         end ,

-        {description = "maximize", group = "client"})
+        {description = "(un)maximize", group = "client"}),
+    awful.key({ modkey, "Control" }, "m",
+        function (c)
+            c.maximized_vertical = not c.maximized_vertical
+            c:raise()
+        end ,
+        {description = "(un)maximize vertically", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c:raise()
+        end ,
+        {description = "(un)maximize horizontally", group = "client"})

 )
 
 -- Bind all key numbers to tags.
 )
 
 -- Bind all key numbers to tags.

--- Be careful: we use keycodes to make it works on any keyboard layout.
+-- Be careful: we use keycodes to make it work on any keyboard layout.

 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do

-    globalkeys = awful.util.table.join(globalkeys,
+    globalkeys = gears.table.join(globalkeys,

         -- View tag only.
         awful.key({ modkey }, "#" .. i + 9,
                   function ()
         -- View tag only.
         awful.key({ modkey }, "#" .. i + 9,
                   function ()


@@ -507,7 +541,7 @@ for i = 1, 9 do
                         end
                   end,
                   {description = "view tag #"..i, group = "tag"}),
                         end
                   end,
                   {description = "view tag #"..i, group = "tag"}),

-        -- Toggle tag.
+        -- Toggle tag display.

         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
                       local screen = awful.screen.focused()
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
                       local screen = awful.screen.focused()


@@ -542,7 +576,7 @@ for i = 1, 9 do
     )
 end
 
     )
 end
 

-clientbuttons = awful.util.table.join(
+clientbuttons = gears.table.join(

     awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
     awful.button({ modkey }, 1, awful.mouse.client.move),
     awful.button({ modkey }, 3, awful.mouse.client.resize))
     awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
     awful.button({ modkey }, 1, awful.mouse.client.move),
     awful.button({ modkey }, 3, awful.mouse.client.resize))


@@ -711,7 +745,7 @@ end)
 -- Add a titlebar if titlebars_enabled is set to true in the rules.
 client.connect_signal("request::titlebars", function(c)
     -- buttons for the titlebar
 -- Add a titlebar if titlebars_enabled is set to true in the rules.
 client.connect_signal("request::titlebars", function(c)
     -- buttons for the titlebar

-    local buttons = awful.util.table.join(
+    local buttons = gears.table.join(

         awful.button({ }, 1, function()
             client.focus = c
             c:raise()
         awful.button({ }, 1, function()
             client.focus = c
             c:raise()


@@ -750,7 +784,7 @@ client.connect_signal("request::titlebars", function(c)
     }
 end)
 
     }
 end)
 

--- Enable sloppy focus
+-- Enable sloppy focus, so that focus follows mouse.

 client.connect_signal("mouse::enter", function(c)
     if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
         and awful.client.focus.filter(c) then
 client.connect_signal("mouse::enter", function(c)
     if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
         and awful.client.focus.filter(c) then