pomo

commit bf41fc8e6c0b01735e1f3e546a30d08e17af5913
parent 8c0cb46576a96b43d2c039aff433a49e2f24f8fa
Author: Ivan Tham <pickfire@riseup.net>
Date:   Tue,  2 Feb 2016 23:07:13 +0800

Better keyword (timer->timers)

    - sizeof(a)[0]->sizeof(a[0]) thanks to ekleog
    - Add more work to TODO

Diffstat:
M
TODO
 | 
9
+++++----
M
config.def.h
 | 
22
+++++++++++-----------
M
spt.c
 | 
10
+++++-----

3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/TODO b/TODO
@@ -1,8 +1,9 @@
-major
------
- - Add options to start and stop spt with only one process
+1. Show remaining time to the next timer (using SIGUSR1)
+2. Add #ifdef to make libnotify an optional dependency
+3. Add more support for non-libnotify such as echo(1)
+4. Pause and continue the timer
 
-misc
+Misc
 ----
     $ grep -n 'TODO' spt.c
 
diff --git a/config.def.h b/config.def.h
@@ -8,15 +8,15 @@ static char *notifyext = ""; /* Notify with extra command (eg. play an alarm) */
  * This is the array which defines all the timer that will be used.
  * It will be repeated after all of it is executed.
  */
-static Timer timer[] = {
-	/* timer            comment */
-	{  1500,            "Time to start working!"},
-	{   300,            "Time to start resting!"},
-	{  1500,            "Time to start working!"},
-	{   300,            "Time to start resting!"},
-	{  1500,            "Time to start working!"},
-	{   300,            "Time to start resting!"},
-	{  1500,            "Time to start working!"},
-	{   300,            "Time to start resting!"},
-	{   900,            "Time to take some nap!"},
+static Timers timers[] = {
+	/* timer(s)  comment */
+	{     1500,  "Time to start working!"},
+	{      300,  "Time to start resting!"},
+	{     1500,  "Time to start working!"},
+	{      300,  "Time to start resting!"},
+	{     1500,  "Time to start working!"},
+	{      300,  "Time to start resting!"},
+	{     1500,  "Time to start working!"},
+	{      300,  "Time to start resting!"},
+	{      900,  "Time to take some nap!"},
 };
diff --git a/spt.c b/spt.c
@@ -12,12 +12,12 @@
 char *argv0;
 
 /* macros */
-#define LEN(a)        (sizeof(a) / sizeof(a)[0])
+#define LEN(a)        (sizeof(a) / sizeof(a[0]))
 
 typedef struct {
 	unsigned int tmr;
 	char *cmt;
-} Timer;
+} Timers;
 
 #include "config.h"
 
@@ -102,9 +102,9 @@ main(int argc, char *argv[])
 	} ARGEND;
 
 run:
-	notify_send(timer[i].cmt);
-	sleep(timer[i].tmr);
-	i + 1 >= LEN(timer) ? i = 0 : i++; /* i infinal loop */
+	notify_send(timers[i].cmt);
+	sleep(timers[i].tmr);
+	i + 1 >= LEN(timers) ? i = 0 : i++; /* i infinal loop */
 	goto run;
 
 	return 0;