Makefile: fix PREFIX usage

[i3/i3status] / src / output.c

diff --git a/src/output.c b/src/output.c
index 379710e3ab063067dc13dc3cedb9e9421d794e09..c0c1480bcbed785bf6f0ee03ac9327379df7b9a4 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
@@ -10,148 +11,38 @@
 #include "i3status.h"
 
 /*
- * Writes an errormessage to statusbar
- *
- */
-void write_error_to_statusbar(const char *message) {
-        cleanup_rbar_dir();
-        create_file("error");
-        write_to_statusbar("error", message, true);
-}
-
-/*
- * Returns the correct color format for dzen (^fg(color)) or wmii (color <normcolors>)
+ * Returns the correct color format for dzen (^fg(color)) or xmobar (<fc=color>)
  *
  */
 char *color(const char *colorstr) {
         static char colorbuf[32];
-#ifdef DZEN
-        (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr);
-#else
-        (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors);
-#endif
-        return colorbuf;
-}
-
-/*
- * Cleans wmii's /rbar directory by deleting all regular files
- *
- */
-void cleanup_rbar_dir() {
-#ifdef DZEN
-        return;
-#endif
-        struct dirent *ent;
-        DIR *dir;
-        char pathbuf[strlen(wmii_path)+256+1];
-
-        if ((dir = opendir(wmii_path)) == NULL)
-                exit(EXIT_FAILURE);
-
-        while ((ent = readdir(dir)) != NULL) {
-                if (ent->d_type == DT_REG) {
-                        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, ent->d_name);
-                        if (unlink(pathbuf) == -1)
-                                exit(EXIT_FAILURE);
-                }
+        if (!cfg_getbool(cfg_general, "colors")) {
+                colorbuf[0] = '\0';
+                return colorbuf;
         }
+        if (output_format == O_DZEN2)
+                (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", cfg_getstr(cfg_general, colorstr));
+        else if (output_format == O_XMOBAR)
+                (void)snprintf(colorbuf, sizeof(colorbuf), "<fc=%s>", cfg_getstr(cfg_general, colorstr));
 
-        (void)closedir(dir);
-}
-
-/*
- * Creates the specified file in wmii's /rbar directory with
- * correct modes and initializes colors if colormode is enabled
- *
- */
-void create_file(const char *name) {
-#ifdef DZEN
-        return;
-#endif
-        char pathbuf[strlen(wmii_path)+256+1];
-        int fd;
-        int flags = O_CREAT | O_WRONLY;
-        struct stat statbuf;
-
-        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name);
-
-        /* Overwrite file's contents if it exists */
-        if (stat(pathbuf, &statbuf) >= 0)
-                flags |= O_TRUNC;
-
-        if ((fd = open(pathbuf, flags, S_IRUSR | S_IWUSR)) < 0)
-                exit(EXIT_FAILURE);
-        if (use_colors) {
-                char *tmp = color("#888888");
-                if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp))
-                        exit(EXIT_FAILURE);
-        }
-        (void)close(fd);
+        return colorbuf;
 }
 
 /*
- * Waits until wmii_path/rbar exists (= the filesystem gets mounted),
- * cleans up all files and creates the needed files
+ * Some color formats (xmobar) require to terminate colors again
  *
  */
-void setup(void) {
-        unsigned int i;
-        char pathbuf[512];
-
-#ifndef DZEN
-        struct stat statbuf;
-        /* Wait until wmii_path/rbar exists */
-        for (; stat(wmii_path, &statbuf) < 0; sleep(interval));
-#endif
-
-        cleanup_rbar_dir();
-        if (wlan_interface)
-                create_file(concat(order[ORDER_WLAN],"wlan"));
-        if (eth_interface)
-                create_file(concat(order[ORDER_ETH],"eth"));
-        if (get_cpu_temperature)
-                create_file(concat(order[ORDER_CPU_TEMPERATURE], "cpu_temperature"));
-        create_file(concat(order[ORDER_LOAD],"load"));
-        if (time_format)
-                create_file(concat(order[ORDER_TIME],"time"));
-        for (i = 0; i < num_run_watches; i += 2) {
-                snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]);
-                create_file(pathbuf);
-        }
+char *endcolor() {
+        if (output_format == O_XMOBAR)
+                return "</fc>";
+        else return "";
 }
 
-/*
- * Writes the given message in the corresponding file in wmii's /rbar directory
- *
- */
-void write_to_statusbar(const char *name, const char *message, bool final_entry) {
-#ifdef DZEN
-        if (final_entry) {
-                if (printf("%s^p(6)\n", message) < 0) {
-                        perror("printf");
-                        exit(1);
-                }
-
-                fflush(stdout);
-                return;
-        }
-        if (printf("%s" BAR, message) < 0) {
-                perror("printf");
-                exit(1);
-        }
-        return;
-#endif
-
-        char pathbuf[strlen(wmii_path)+256+1];
-        int fd;
-
-        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name);
-        if ((fd = open(pathbuf, O_RDWR)) == -1) {
-                /* Try to re-setup stuff and just continue */
-                setup();
-                return;
-        }
-        if (write(fd, message, strlen(message)) != (ssize_t)strlen(message))
-                exit(EXIT_FAILURE);
-        (void)close(fd);
+void print_seperator() {
+        if (output_format == O_DZEN2)
+                printf("^fg(%s)^p(5;-2)^ro(2)^p()^fg()^p(5)", cfg_getstr(cfg_general, "color_separator"));
+        else if (output_format == O_XMOBAR)
+                printf("<fc=%s> | </fc>", cfg_getstr(cfg_general, "color_separator"));
+        else if (output_format == O_NONE)
+                printf(" | ");
 }