awesome: rewrite pomodoro timer

3 files changed, 114 insertions, 26 deletions

diff --git a/.config/awesome/mcrute.lua b/.config/awesome/mcrute.lua
index b605cea..7bc2f07 100644
--- a/.config/awesome/mcrute.lua
+++ b/.config/awesome/mcrute.lua
@@ -20,6 +20,7 @@ local dpi = require("beautiful.xresources").apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
 local wibox = require("wibox")
+local pomodoro = require("pomodoro")
 
 -- Require this here because we customize it here but also so rc.lua can use it
 -- transitively through this module. It makes our local customizations to
@@ -475,35 +476,11 @@ function get_clock()
     return wibox.widget.textclock(" %a %b %d, %H:%M ", 60, timezone)
 end
 
--- pomodoro is a little pomodoro timer "app" that will show a notification on
--- all screens with a picture of a tomato after 25 minutes. It facilitates
--- using the pomodoro technique with nothing more than awesome.
-function pomodoro()
-    local positions = {"bottom_right", "bottom_left", "bottom_right"}
-
-    gears.timer {
-        timeout = 25 * 60,
-        autostart = true,
-        single_shot = true,
-        callback = function()
-            for s = 1, screen.count() do
-                naughty.notify({
-                    icon=gears.filesystem.get_dir("config") .. "icons/pomodoro.png",
-                    position=positions[s],
-                    timeout=30,
-                    screen=s,
-                    title = "Pomodoro Over",
-                })
-            end
-        end
-    }
-end
-
 -- default_display_handler configures an output to use it's default xrandr mode
 -- and position it to the right of the laptop built-in display. This should be
 -- good enough for most screens.
 function default_display_handler(card, edp_mode)
-    awful.util.spawn("xrandr --output eDP-1 --mode ".. edp_mode .. " --output " .. card .. " --auto --right-of eDP-1")
+    awful.util.spawn("xrandr --output eDP-1 --mode " .. edp_mode .. " --output " .. card .. " --auto --right-of eDP-1")
 end
 
 -- get_displays uses a shell script helper (~/bin/enumerate-displays) to
@@ -598,6 +575,7 @@ return {
     get_clock = get_clock,
     get_layouts = get_layouts,
     battery = battery,
+    pomodoro = pomodoro,
 
     -- Public functions that are occasionally useful
     split_screen_vertical = split_screen_vertical,
@@ -606,5 +584,4 @@ return {
     -- Public functions that are useful on import
     configure_displays = configure_displays,
     dump = dump,
-    pomodoro = pomodoro,
 }
diff --git a/.config/awesome/pomodoro.lua b/.config/awesome/pomodoro.lua
new file mode 100644
index 0000000..26ae2a0
--- /dev/null
+++ b/.config/awesome/pomodoro.lua
@@ -0,0 +1,107 @@
+local setmetatable = setmetatable
+local math = math
+local string = string
+local gears = require("gears")
+local naughty = require("naughty")
+local textbox = require("wibox.widget.textbox")
+local glib = require("lgi").GLib
+local DateTime = glib.DateTime
+local TimeZone = glib.TimeZone
+
+local pomodoro = { mt = {} }
+
+local work_time = 25 * 60
+local positions = {"bottom_right", "bottom_left", "bottom_right"}
+
+-- pomodoro is a little pomodoro timer "app" that will show a notification on
+-- all screens with a picture of a tomato after 25 minutes. It facilitates
+-- using the pomodoro technique with nothing more than awesome.
+
+function pomodoro:_timer_running()
+    return self._timer ~= nil and self._timer.data.source_id ~= nil
+end
+
+function pomodoro:_set_text(val)
+    self:set_markup("<span color='red' weight='bold'> " .. val .. " </span>")
+end
+
+function pomodoro:_clear_text()
+    self:set_markup("")
+end
+
+function pomodoro:stop()
+    self:_set_text("Pomodoro Stopped")
+    self._timer:stop()
+    self:_reset_text_later()
+end
+
+function pomodoro:_reset_text_later()
+    gears.timer {
+        timeout = 30,
+        autostart = true,
+        single_shot = true,
+        callback = function()
+            self:_clear_text()
+        end
+    }
+end
+
+function pomodoro:_notify_complete()
+    for s = 1, screen.count() do
+        naughty.notify({
+            icon=gears.filesystem.get_dir("config") .. "icons/pomodoro.png",
+            position=positions[s],
+            timeout=30,
+            screen=s,
+            title = "Pomodoro Over",
+        })
+    end
+
+    self:_set_text("Pomodoro Over")
+end
+
+function pomodoro:_update_callback()
+    local now = DateTime.new_now(TimeZone.new_local()):to_unix()
+
+    local time_left = work_time - (now - self._start_time)
+
+    local mins_left = math.floor(time_left / 60)
+    local secs_left = math.floor(time_left % 60)
+
+    if mins_left == 0 and secs_left == 0 then
+        self._timer:stop()
+        self:_notify_complete()
+        self:_reset_text_later()
+        return
+    end
+
+    self:_set_text(string.format("%02d:%02d", mins_left, secs_left))
+end
+
+function pomodoro:start()
+    if self:_timer_running() then
+        return
+    end
+
+    self._start_time = DateTime.new_now(TimeZone.new_local()):to_unix()
+
+    self._timer = gears.timer {
+        timeout = 1,
+        autostart = true,
+        callback = function()
+            return self:_update_callback()
+        end
+    }
+end
+
+local function new()
+    local w = textbox()
+    gears.table.crush(w, pomodoro, true)
+    return w
+end
+
+function pomodoro.mt.__call(...)
+    return new(...)
+end
+
+return setmetatable(pomodoro, pomodoro.mt)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index d56ddd6..029f4d4 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -80,6 +80,9 @@ mykeyboardlayout = awful.widget.keyboardlayout()
 -- Create a textclock widget
 mytextclock = mcrute.get_clock()
 
+-- Create pomodoro timer
+mypomodoro = mcrute.pomodoro()
+
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
                     awful.button({ }, 1, function(t) t:view_only() end),
@@ -178,6 +181,7 @@ awful.screen.connect_for_each_screen(function(s)
         s.mytasklist, -- Middle widget
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
+            mypomodoro,
             wibox.widget.systray(),
             mcrute.battery(),
             mytextclock,