Refactor main and add print mode

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index c10ea67135d785c86882d3d72cefa13d7e024018..bf518ffdd7201ce9219be3ecc1868365788ad677 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,26 +15,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 
 #include "util.h"
+#include "args.h"
 #include "conf.h"
 #include "date.h"
 #include "cal.h"
 #include "view.h"
+#include "print.h"
 
 /* Config parser */
 static void on_config(const char *group, const char *name, const char *key, const char *value)
 {
-       view_config(group, name, key, value);
+       date_config(group, name, key, value);
        cal_config(group, name, key, value);
+       view_config(group, name, key, value);
 }
 
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
 {
-       view_exit();
+       if (PRINT)
+               print_exit();
+       else
+               view_exit();
        exit(0);
 }
 
@@ -45,18 +52,29 @@ int main(int argc, char **argv)
        signal(SIGINT, on_sigint);
 
        /* Configuration */
-       conf_setup(argc, argv, ".lackeyrc", on_config);
+       args_setup(argc, argv);
+       conf_setup(".lackeyrc", on_config);
 
        /* Initialize */
        util_init();
-       conf_init();
        date_init();
        cal_init();
 
-       /* Run view main */
-       view_init();
-       view_main();
-       view_exit();
+       /* Common main */
+       args_start();
+       conf_start();
+
+       /* Mode main */
+       if (PRINT) {
+               print_init();
+               print_main();
+               print_exit();
+       }
+       else {
+               view_init();
+               view_main();
+               view_exit();
+       }
 
        return 0;
 }