added cflogprinter

5 files changed, 116 insertions, 13 deletions

diff --git a/inc/cflogprinter.h b/inc/cflogprinter.h
new file mode 100644
index 0000000..4d561b3
--- /dev/null
+++ b/inc/cflogprinter.h
@@ -0,0 +1,22 @@
+#ifndef CFLOGPRINTER_H
+#define CFLOGPRINTER_H
+
+#define RED         "\033[1;31m"
+#define GREEN       "\033[0;32m"
+#define YELLOW      "\033[0;33m"
+#define BLUE        "\033[0;34m"
+#define MAGENTA     "\033[0;35m"
+#define CYAN        "\033[0;36m"
+#define RESET       "\033[0m"
+
+#include <stdio.h>
+#include <stdarg.h>
+
+void cflp_good(char *msg, ...);
+void cflp_bad(char *msg, ...);
+void cflp_error(char *msg, ...);
+void cflp_warning(char *msg, ...);
+void cflp_info(char *msg, ...);
+void cflp_custom(char *color, char *msg, ...);
+
+#endif
diff --git a/meson.build b/meson.build
index f6449e4..8920c21 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,6 @@ protocols_headers=[
 lib_protocols=static_library('protocols',protocols_src+protocols_headers,dependencies: wl_client)
 protocols_dep=declare_dependency(link_with: lib_protocols,sources: protocols_headers)
 
-executable(meson.project_name(), ['src/main.c', 'src/paper.c', 'src/glad.c'],
+executable(meson.project_name(), ['src/main.c', 'src/paper.c', 'src/glad.c', 'src/cflogprinter.c'],
 include_directories : ['inc'],
 dependencies: [dl_dep, wl_client, wl_egl, egl, mpv, protocols_dep], install: true)
diff --git a/src/cflogprinter.c b/src/cflogprinter.c
new file mode 100644
index 0000000..db57214
--- /dev/null
+++ b/src/cflogprinter.c
@@ -0,0 +1,79 @@
+#include <cflogprinter.h>
+
+void cflp_good(char *msg, ...) {
+    printf("%s[+] ", GREEN);
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stdout, msg, arg);
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
+
+void cflp_bad(char *msg, ...) {
+    printf("%s[-] ", RED);
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stdout, msg, arg);
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
+
+void cflp_error(char *msg, ...) {
+    printf("%s[-] ", RED);
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stderr, msg, arg); //print to stderr instead of stdout!
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
+
+void cflp_warning(char *msg, ...) {
+    printf("%s[!] ", RED);
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stdout, msg, arg);
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
+
+void cflp_info(char *msg, ...) {
+    printf("[*] ");
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stdout, msg, arg);
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
+
+void cflp_custom(char *color, char *msg, ...) {
+    printf("%s", color);
+
+    va_list arg;
+
+    va_start (arg, msg);
+    vfprintf (stdout, msg, arg);
+    va_end (arg);
+
+    printf("%s\n", RESET);
+
+}
diff --git a/src/main.c b/src/main.c
index 0b2a49f..7c206fe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #include <paper.h>
+#include <cflogprinter.h>
 
 static void print_usage(char** argv) {
     char* slash = strrchr(argv[0], '/');
@@ -122,7 +123,7 @@ int main(int argc, char** argv) {
         }
 
         if(0 == system("pidof swaybg > /dev/null")) {
-            printf("Warning: swaybg is running. This may block mpvpaper from being seen. \n");
+            cflp_warning("Warning: swaybg is running. This may block mpvpaper from being seen.");
         }
 
         paper_init(argv[optind], argv[optind + 1], verbose, layer);
diff --git a/src/paper.c b/src/paper.c
index 0074e46..9360bfc 100644
--- a/src/paper.c
+++ b/src/paper.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <cflogprinter.h>
 #include <mpv/client.h>
 #include <mpv/render_gl.h>
 #include <wayland-egl.h>
@@ -126,11 +127,11 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     wl_display_roundtrip(wl);
 
     if(output == NULL) {
-        fprintf(stderr, ":/ sorry about this but we can't seem to find that output\n");
+        cflp_error(":/ sorry about this but we can't seem to find that output.");
         return 1;
     }
     else if (verbose) {
-        printf("Connected to output %s\n", monitor);
+        cflp_good("Connected to output %s", monitor);
     }
 
 
@@ -159,10 +160,10 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     }
     if (verbose) {
         if (layer_name == NULL) {
-            printf("Shell layer background set\n");
+            cflp_info("Shell layer background set");
         }
         else {
-            printf("Shell layer %s set\n", layer_name);
+            cflp_info("Shell layer %s set", layer_name);
         }
     }
 
@@ -209,13 +210,13 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
         egl_ctx = eglCreateContext(egl_display, config, EGL_NO_CONTEXT, ctx_attrib);
         if (egl_ctx) {
             if (verbose) {
-                printf("OpenGL %i.%i EGL context loaded\n", gl_versions[i].major, gl_versions[i].minor);
+                cflp_info("OpenGL %i.%i EGL context loaded", gl_versions[i].major, gl_versions[i].minor);
             }
             break;
         }
     }
     if (!egl_ctx) {
-        printf("Failed to create EGL context\n");
+        cflp_bad("Failed to create EGL context");
         return 1;
     }
 
@@ -229,7 +230,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     // Start mpv
     mpv_handle* mpv = mpv_create();
     if (!mpv) {
-        printf("Failed creating mpv context\n");
+        cflp_bad("Failed creating mpv context");
         return 1;
     }
 
@@ -238,7 +239,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     remove("/tmp/mpvpaper.conf");
 
     if (mpv_initialize(mpv) < 0) {
-         printf("mpv init failed");
+        cflp_error("mpv init failed");
     }
 
     // Have mpv render onto egl context
@@ -252,7 +253,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     };
     mpv_render_context *mpv_gl;
     if (mpv_render_context_create(&mpv_gl, mpv, params) < 0)
-        printf("Failed to initialize mpv GL context");
+        cflp_error("Failed to initialize mpv GL context");
 
     // Play this file.
     const char* cmd[] = {"loadfile", video_path, NULL};
@@ -262,7 +263,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
         event = mpv_wait_event(mpv, 1);
     }
     if (verbose) {
-        printf("Loaded %s\n", video_path);
+        cflp_info("Loaded %s", video_path);
     }
 
     mpv_render_param render_params[] = {
@@ -291,7 +292,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     }
 
     if (verbose) {
-        printf("Exiting\n");
+        cflp_info("Exiting mpvpaper");
     }
     mpv_render_context_free(mpv_gl);
     mpv_detach_destroy(mpv);