quake: skip_wibox -> overlap and default to false, followtag redefault to faluse...

[etc/awesome.git] / widgets / contrib / kbdlayout.lua

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index 64ea6b30fa83b93bd059d5c47f9ad1771abfc1da..23dc6e3cb975b15e34c7f93883ab045478559de3 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -19,7 +19,7 @@ local setmetatable = setmetatable
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout
 
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout
 

-local function worker (args)
+local function worker(args)

    local kbdlayout    = {}
    kbdlayout.widget   = wibox.widget.textbox('')
 
    local kbdlayout    = {}
    kbdlayout.widget   = wibox.widget.textbox('')
 


@@ -36,21 +36,21 @@ local function worker (args)
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 

-   local function run_settings (layout, variant)
+   local function run_settings(layout, variant)

       widget = kbdlayout.widget
       kbdlayout_now = { layout=string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
                        variant=variant }
       settings()
    end
 
       widget = kbdlayout.widget
       kbdlayout_now = { layout=string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
                        variant=variant }
       settings()
    end
 

-   function kbdlayout.update ()
+   function kbdlayout.update()

       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),
                    string.match(status, "variant:%s*([^\n]*)"))
    end
 
       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),
                    string.match(status, "variant:%s*([^\n]*)"))
    end
 

-   function kbdlayout.set (i)
+   function kbdlayout.set(i)

       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = 'setxkbmap ' .. layouts[idx].layout
 
       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = 'setxkbmap ' .. layouts[idx].layout
 


@@ -67,11 +67,11 @@ local function worker (args)
       end
    end
 
       end
    end
 

-   function kbdlayout.next ()
+   function kbdlayout.next()

       kbdlayout.set(idx + 1)
    end
 
       kbdlayout.set(idx + 1)
    end
 

-   function kbdlayout.prev ()
+   function kbdlayout.prev()

       kbdlayout.set(idx - 1)
    end
 
       kbdlayout.set(idx - 1)
    end