diff options
author | Adrian C. (anrxc) <anrxc@sysphere.org> | 2010-03-14 01:55:33 +0100 |
---|---|---|
committer | Adrian C. (anrxc) <anrxc@sysphere.org> | 2010-03-14 01:55:33 +0100 |
commit | 237470c8f45190b213e3a173ce6ae1a74b3e11fe (patch) | |
tree | 7f53c8144761947d4bde20715bcad34f4be0d6c0 | |
parent | 9a82d4113a8271b7dfc7506f2b07379e3ede89a8 (diff) | |
download | vicious-legacy-237470c8f45190b213e3a173ce6ae1a74b3e11fe.tar.xz |
API: transform widgets namespace table to a directory
-rw-r--r-- | init.lua | 54 | ||||
-rw-r--r-- | widgets/bat.lua (renamed from bat.lua) | 2 | ||||
-rw-r--r-- | widgets/cpu.lua (renamed from cpu.lua) | 2 | ||||
-rw-r--r-- | widgets/cpufreq.lua (renamed from cpufreq.lua) | 2 | ||||
-rw-r--r-- | widgets/cpuinf.lua (renamed from cpuinf.lua) | 2 | ||||
-rw-r--r-- | widgets/date.lua (renamed from date.lua) | 2 | ||||
-rw-r--r-- | widgets/dio.lua (renamed from dio.lua) | 2 | ||||
-rw-r--r-- | widgets/entropy.lua (renamed from entropy.lua) | 2 | ||||
-rw-r--r-- | widgets/fs.lua (renamed from fs.lua) | 2 | ||||
-rw-r--r-- | widgets/gmail.lua (renamed from gmail.lua) | 2 | ||||
-rw-r--r-- | widgets/hddtemp.lua (renamed from hddtemp.lua) | 2 | ||||
-rw-r--r-- | widgets/init.lua | 36 | ||||
-rw-r--r-- | widgets/mbox.lua (renamed from mbox.lua) | 2 | ||||
-rw-r--r-- | widgets/mboxc.lua (renamed from mboxc.lua) | 2 | ||||
-rw-r--r-- | widgets/mdir.lua (renamed from mdir.lua) | 2 | ||||
-rw-r--r-- | widgets/mem.lua (renamed from mem.lua) | 2 | ||||
-rw-r--r-- | widgets/mpd.lua (renamed from mpd.lua) | 2 | ||||
-rw-r--r-- | widgets/net.lua (renamed from net.lua) | 2 | ||||
-rw-r--r-- | widgets/org.lua (renamed from org.lua) | 2 | ||||
-rw-r--r-- | widgets/os.lua (renamed from os.lua) | 2 | ||||
-rw-r--r-- | widgets/pkg.lua (renamed from pkg.lua) | 2 | ||||
-rw-r--r-- | widgets/thermal.lua (renamed from thermal.lua) | 2 | ||||
-rw-r--r-- | widgets/uptime.lua (renamed from uptime.lua) | 2 | ||||
-rw-r--r-- | widgets/volume.lua (renamed from volume.lua) | 2 | ||||
-rw-r--r-- | widgets/weather.lua (renamed from weather.lua) | 2 | ||||
-rw-r--r-- | widgets/wifi.lua (renamed from wifi.lua) | 2 |
26 files changed, 65 insertions, 73 deletions
@@ -6,71 +6,27 @@ -- * (c) 2009, Lucas de Vries <lucas@glacicle.com> --------------------------------------------------- --- {{{ Grab environment +-- {{{ Setup environment local type = type local pairs = pairs local tonumber = tonumber -local helpers = require("vicious.helpers") local capi = { timer = timer } local os = { time = os.time } local table = { insert = table.insert, remove = table.remove } --- }}} - - --- {{{ Configure widgets -require("vicious.cpu") -require("vicious.cpuinf") -require("vicious.cpufreq") -require("vicious.thermal") -require("vicious.uptime") -require("vicious.bat") -require("vicious.mem") -require("vicious.os") -require("vicious.fs") -require("vicious.dio") -require("vicious.hddtemp") -require("vicious.net") -require("vicious.wifi") -require("vicious.mbox") -require("vicious.mboxc") -require("vicious.mdir") -require("vicious.gmail") -require("vicious.entropy") -require("vicious.org") -require("vicious.pkg") -require("vicious.mpd") -require("vicious.volume") -require("vicious.weather") -require("vicious.date") --- }}} +require("vicious.helpers") +require("vicious.widgets") -- Vicious: widgets for the awesome window manager module("vicious") --- {{{ Initialize tables +-- Initialize tables local timers = {} local registered = {} local widget_cache = {} - --- Initialize the function table -widgets = {} --- }}} - --- {{{ Widget types -for i, w in pairs(_M) do - -- Ensure we don't call ourselves - if w and w ~= _M and type(w) == "table" then - -- Ignore the function table and helpers - if i ~= "widgets" and i ~= "helpers" then - -- Place widgets in the namespace table - widgets[i] = w - end - end -end -- }}} @@ -173,7 +129,7 @@ end -- }}} --- {{{ Exposed functions +-- {{{ Global functions -- {{{ Register a widget function register(widget, wtype, format, timer, warg) local reg = {} diff --git a/bat.lua b/widgets/bat.lua index e728155..d6e3e6b 100644 --- a/bat.lua +++ b/widgets/bat.lua @@ -16,7 +16,7 @@ local math = { -- Batsys: provides state, charge, and remaining time for a requested battery -module("vicious.bat") +module("vicious.widgets.bat") -- {{{ Battery widget type diff --git a/cpu.lua b/widgets/cpu.lua index 7c4907c..3dfc22f 100644 --- a/cpu.lua +++ b/widgets/cpu.lua @@ -18,7 +18,7 @@ local string = { -- Cpu: provides CPU usage for all available CPUs/cores -module("vicious.cpu") +module("vicious.widgets.cpu") -- Initialise function tables diff --git a/cpufreq.lua b/widgets/cpufreq.lua index aa36151..7f60f5a 100644 --- a/cpufreq.lua +++ b/widgets/cpufreq.lua @@ -12,7 +12,7 @@ local helpers = require("vicious.helpers") -- Cpufreq: provides freq, voltage and governor info for a requested CPU -module("vicious.cpufreq") +module("vicious.widgets.cpufreq") -- {{{ CPU frequency widget type diff --git a/cpuinf.lua b/widgets/cpuinf.lua index f9df451..8bee530 100644 --- a/cpuinf.lua +++ b/widgets/cpuinf.lua @@ -12,7 +12,7 @@ local string = { gmatch = string.gmatch } -- Cpuinf: provides speed and cache information for all available CPUs/cores -module("vicious.cpuinf") +module("vicious.widgets.cpuinf") -- {{{ CPU Information widget type diff --git a/date.lua b/widgets/date.lua index f6295ec..68a803d 100644 --- a/date.lua +++ b/widgets/date.lua @@ -11,7 +11,7 @@ local setmetatable = setmetatable -- Date: provides access to os.date with optional custom formatting -module("vicious.date") +module("vicious.widgets.date") -- {{{ Date widget type diff --git a/dio.lua b/widgets/dio.lua index 33f1f34..9731d57 100644 --- a/dio.lua +++ b/widgets/dio.lua @@ -13,7 +13,7 @@ local helpers = require("vicious.helpers") -- Disk I/O: provides I/O statistics for requested storage devices -module("vicious.dio") +module("vicious.widgets.dio") -- Initialise function tables diff --git a/entropy.lua b/widgets/entropy.lua index 8ca0c30..395d5d9 100644 --- a/entropy.lua +++ b/widgets/entropy.lua @@ -12,7 +12,7 @@ local helpers = require("vicious.helpers") -- Entropy: provides available system entropy -module("vicious.entropy") +module("vicious.widgets.entropy") -- {{{ Entropy widget type @@ -14,7 +14,7 @@ local helpers = require("vicious.helpers") -- FS: provides file system disk space usage -module("vicious.fs") +module("vicious.widgets.fs") -- Variable definitions diff --git a/gmail.lua b/widgets/gmail.lua index b4bd081..b2f0d8c 100644 --- a/gmail.lua +++ b/widgets/gmail.lua @@ -17,7 +17,7 @@ local string = { -- Gmail: provides count of new and subject of last e-mail on Gmail -module("vicious.gmail") +module("vicious.widgets.gmail") -- {{{ Variable definitions diff --git a/hddtemp.lua b/widgets/hddtemp.lua index 7c1e1e0..6fcd05f 100644 --- a/hddtemp.lua +++ b/widgets/hddtemp.lua @@ -12,7 +12,7 @@ local string = { gmatch = string.gmatch } -- Hddtemp: provides hard drive temperatures using the hddtemp daemon -module("vicious.hddtemp") +module("vicious.widgets.hddtemp") -- {{{ HDD Temperature widget type diff --git a/widgets/init.lua b/widgets/init.lua new file mode 100644 index 0000000..5b8ae04 --- /dev/null +++ b/widgets/init.lua @@ -0,0 +1,36 @@ +--------------------------------------------------- +-- Vicious widgets for the awesome window manager +--------------------------------------------------- +-- Licensed under the GNU General Public License v2 +-- * (c) 2010, Adrian C. <anrxc@sysphere.org> +--------------------------------------------------- + +-- {{{ Configure widgets +require("vicious.widgets.cpu") +require("vicious.widgets.cpuinf") +require("vicious.widgets.cpufreq") +require("vicious.widgets.thermal") +require("vicious.widgets.uptime") +require("vicious.widgets.bat") +require("vicious.widgets.mem") +require("vicious.widgets.os") +require("vicious.widgets.fs") +require("vicious.widgets.dio") +require("vicious.widgets.hddtemp") +require("vicious.widgets.net") +require("vicious.widgets.wifi") +require("vicious.widgets.mbox") +require("vicious.widgets.mboxc") +require("vicious.widgets.mdir") +require("vicious.widgets.gmail") +require("vicious.widgets.entropy") +require("vicious.widgets.org") +require("vicious.widgets.pkg") +require("vicious.widgets.mpd") +require("vicious.widgets.volume") +require("vicious.widgets.weather") +require("vicious.widgets.date") +-- }}} + +-- Vicious: widgets for the awesome window manager +module("vicious.widgets") diff --git a/mbox.lua b/widgets/mbox.lua index bc815ae..eca5403 100644 --- a/mbox.lua +++ b/widgets/mbox.lua @@ -13,7 +13,7 @@ local helpers = require("vicious.helpers") -- Mbox: provides the subject of last e-mail in a mbox file -module("vicious.mbox") +module("vicious.widgets.mbox") -- {{{ Mailbox widget type diff --git a/mboxc.lua b/widgets/mboxc.lua index ff8ff65..c5f694c 100644 --- a/mboxc.lua +++ b/widgets/mboxc.lua @@ -11,7 +11,7 @@ local string = { find = string.find } -- Mboxc: provides the count of total, old and new messages in mbox files -module("vicious.mboxc") +module("vicious.widgets.mboxc") -- {{{ Mbox count widget type diff --git a/mdir.lua b/widgets/mdir.lua index 0e0b27b..858a9b1 100644 --- a/mdir.lua +++ b/widgets/mdir.lua @@ -11,7 +11,7 @@ local setmetatable = setmetatable -- Mdir: provides the number of new and unread messages in Maildir structures/dirs -module("vicious.mdir") +module("vicious.widgets.mdir") -- {{{ Maildir widget type diff --git a/mem.lua b/widgets/mem.lua index 7c18c89..c2f5886 100644 --- a/mem.lua +++ b/widgets/mem.lua @@ -13,7 +13,7 @@ local string = { gmatch = string.gmatch } -- Mem: provides RAM and Swap usage statistics -module("vicious.mem") +module("vicious.widgets.mem") -- {{{ Memory widget type diff --git a/mpd.lua b/widgets/mpd.lua index 0764e53..009ae7d 100644 --- a/mpd.lua +++ b/widgets/mpd.lua @@ -13,7 +13,7 @@ local helpers = require("vicious.helpers") -- Mpd: provides Music Player Daemon information -module("vicious.mpd") +module("vicious.widgets.mpd") -- {{{ MPD widget type diff --git a/net.lua b/widgets/net.lua index 0550557..9fd221f 100644 --- a/net.lua +++ b/widgets/net.lua @@ -15,7 +15,7 @@ local helpers = require("vicious.helpers") -- Net: provides usage statistics for all network interfaces -module("vicious.net") +module("vicious.widgets.net") -- Initialise function tables diff --git a/org.lua b/widgets/org.lua index 6b034cc..8764e3a 100644 --- a/org.lua +++ b/widgets/org.lua @@ -16,7 +16,7 @@ local os = { -- Org: provides agenda statistics for Emacs org-mode -module("vicious.org") +module("vicious.widgets.org") -- {{{ OrgMode widget type @@ -17,7 +17,7 @@ local string = { -- OS: provides operating system information -module("vicious.os") +module("vicious.widgets.os") -- {{{ Operating system widget type diff --git a/pkg.lua b/widgets/pkg.lua index 014bb86..fa2375b 100644 --- a/pkg.lua +++ b/widgets/pkg.lua @@ -11,7 +11,7 @@ local setmetatable = setmetatable -- Pkg: provides number of pending updates on GNU/Linux -module("vicious.pkg") +module("vicious.widgets.pkg") -- {{{ Packages widget type diff --git a/thermal.lua b/widgets/thermal.lua index d7e98fc..9768c57 100644 --- a/thermal.lua +++ b/widgets/thermal.lua @@ -13,7 +13,7 @@ local helpers = require("vicious.helpers") -- Thermal: provides temperature levels of ACPI and coretemp thermal zones -module("vicious.thermal") +module("vicious.widgets.thermal") -- {{{ Thermal widget type diff --git a/uptime.lua b/widgets/uptime.lua index fdf45ea..ebc5af8 100644 --- a/uptime.lua +++ b/widgets/uptime.lua @@ -13,7 +13,7 @@ local helpers = require("vicious.helpers") -- Uptime: provides system uptime and load information -module("vicious.uptime") +module("vicious.widgets.uptime") -- {{{ Uptime widget type diff --git a/volume.lua b/widgets/volume.lua index 070f3bf..42f72e4 100644 --- a/volume.lua +++ b/widgets/volume.lua @@ -12,7 +12,7 @@ local string = { match = string.match } -- Volume: provides volume levels and state of requested ALSA mixers -module("vicious.volume") +module("vicious.widgets.volume") -- {{{ Volume widget type diff --git a/weather.lua b/widgets/weather.lua index 8e78e8b..effa138 100644 --- a/weather.lua +++ b/widgets/weather.lua @@ -14,7 +14,7 @@ local helpers = require("vicious.helpers") -- Weather: provides weather information for a requested station -module("vicious.weather") +module("vicious.widgets.weather") -- {{{ Weather widget type diff --git a/wifi.lua b/widgets/wifi.lua index fc3d52e..65ffb79 100644 --- a/wifi.lua +++ b/widgets/wifi.lua @@ -18,7 +18,7 @@ local string = { -- Wifi: provides wireless information for a requested interface -module("vicious.wifi") +module("vicious.widgets.wifi") -- {{{ Wireless widget type |