Add $nodename_short.

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index b08df7c..d1f1c89 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -269,9 +269,6 @@ static void print_version(void)
 #ifdef IMLIB2
                   "  * Imlib2\n"
 #endif /* IMLIB2 */
-#ifdef MIXER_IS_ALSA
-                  "  * ALSA mixer support\n"
-#endif /* MIXER_IS_ALSA */
 #ifdef APCUPSD
                   "  * apcupsd\n"
 #endif /* APCUPSD */
@@ -463,7 +460,7 @@ int check_contains(char *f, char *s)
                }
                fclose(where);
        } else {
-               NORM_ERR("Could not open the file");
+               NORM_ERR("Could not open the file '%s'", f);
        }
        return ret;
 }
@@ -1330,7 +1327,7 @@ void generate_text_internal(char *p, int p_max_size,
                                        DO_JUMP;
                                } else if (spc) {
                                        *spc = '\0';
-                                       if (check_contains(obj->data.s, spc + 1))
+                                       if (!check_contains(obj->data.s, spc + 1))
                                                DO_JUMP;
                                        *spc = ' ';
                                }
@@ -1503,6 +1500,15 @@ void generate_text_internal(char *p, int p_max_size,
                        OBJ(nodename) {
                                snprintf(p, p_max_size, "%s", cur->uname_s.nodename);
                        }
+                       OBJ(nodename_short) {
+                               char *pos;
+                               pos = strstr(cur->uname_s.nodename, ".");
+                               if(pos != NULL) {
+                                       snprintf(p, MIN(pos-cur->uname_s.nodename+1, p_max_size), "%s", cur->uname_s.nodename);
+                               } else {
+                                       snprintf(p, p_max_size, "%s", cur->uname_s.nodename);
+                               }
+                       }
                        OBJ(outlinecolor) {
                                new_outline(p, obj->data.l);
                        }
@@ -3119,36 +3125,49 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
                                                if (seconds != 0) {
                                                        timeunits = seconds / 86400; seconds %= 86400;
                                                        if (timeunits > 0) {
-                                                               asprintf(&tmp_day_str, "%dd", timeunits);
+                                                               if (asprintf(&tmp_day_str, "%dd", timeunits) < 0) {
+                                                                       tmp_day_str = 0;
+                                                               }
                                                        } else {
                                                                tmp_day_str = strdup("");
                                                        }
                                                        timeunits = seconds / 3600; seconds %= 3600;
                                                        if (timeunits > 0) {
-                                                               asprintf(&tmp_hour_str, "%dh", timeunits);
+                                                               if (asprintf(&tmp_hour_str, "%dh", timeunits) < 0) {
+                                                                       tmp_day_str = 0;
+                                                               }
                                                        } else {
                                                                tmp_hour_str = strdup("");
                                                        }
                                                        timeunits = seconds / 60; seconds %= 60;
                                                        if (timeunits > 0) {
-                                                               asprintf(&tmp_min_str, "%dm", timeunits);
+                                                               if (asprintf(&tmp_min_str, "%dm", timeunits) < 0) {
+                                                                       tmp_min_str = 0;
+                                                               }
                                                        } else {
                                                                tmp_min_str = strdup("");
                                                        }
                                                        if (seconds > 0) {
-                                                               asprintf(&tmp_sec_str, "%ds", seconds);
+                                                               if (asprintf(&tmp_sec_str, "%ds", seconds) < 0) {
+                                                                       tmp_sec_str = 0;
+                                                               }
                                                        } else {
                                                                tmp_sec_str = strdup("");
                                                        }
-                                                       asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str);
-                                                       free(tmp_day_str); free(tmp_hour_str); free(tmp_min_str); free(tmp_sec_str);
+                                                       if (asprintf(&tmp_str, "%s%s%s%s", tmp_day_str,
+                                                                               tmp_hour_str, tmp_min_str, tmp_sec_str) < 0) {
+                                                               tmp_str = 0;
+                                                       }
+#define FREE(a) if ((a)) free((a));
+                                                       FREE(tmp_day_str); FREE(tmp_hour_str); FREE(tmp_min_str); FREE(tmp_sec_str);
                                                } else {
-                                                       asprintf(&tmp_str, "Range not possible"); // should never happen, but better safe then sorry
+                                                       tmp_str = strdup("Range not possible"); /* should never happen, but better safe then sorry */
                                                }
                                                cur_x += (w / 2) - (font_ascent() * (strlen(tmp_str) / 2));
                                                cur_y += font_h / 2;
                                                draw_string(tmp_str);
-                                               free(tmp_str);
+                                               FREE(tmp_str);
+#undef FREE
                                                cur_x = tmp_x;
                                                cur_y = tmp_y;
                                        }
@@ -4252,6 +4271,9 @@ static void set_default_configurations(void)
        output_methods = TO_STDOUT;
 #endif
 #ifdef X11
+#ifdef BUILD_XFT
+       use_xft = 0;
+#endif
        show_graph_scale = 0;
        show_graph_range = 0;
        draw_shades = 1;
@@ -4282,11 +4304,11 @@ static void set_default_configurations(void)
        text_alignment = BOTTOM_LEFT;
        info.x11.monitor.number = 1;
        info.x11.monitor.current = 0;
-       info.x11.desktop.current = 1; 
+       info.x11.desktop.current = 1;
        info.x11.desktop.number = 1;
        info.x11.desktop.nitems = 0;
-       info.x11.desktop.all_names = NULL; 
-       info.x11.desktop.name = NULL; 
+       info.x11.desktop.all_names = NULL;
+       info.x11.desktop.name = NULL;
 #endif /* X11 */
 
        free_templates();
@@ -4508,7 +4530,7 @@ static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **va
 }
 
 #ifdef X11
-void setalignment(int* text_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
+void setalignment(int* ltext_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
 #ifdef OWN_WINDOW
        if (windowtype == TYPE_DOCK) {
                NORM_ERR("alignment is disabled when own_window_type is dock");
@@ -4518,13 +4540,13 @@ void setalignment(int* text_alignment, unsigned int windowtype, const char* valu
                int a = string_to_alignment(value);
 
                if (a <= 0) {
-                       if(setbyconffile == true) {
+                       if (setbyconffile) {
                                CONF_ERR;
                        } else NORM_ERR("'%s' is not a alignment setting", value);
                } else {
-                       *text_alignment = a;
+                       *ltext_alignment = a;
                }
-       } else if(setbyconffile == true) {
+       } else if (setbyconffile) {
                CONF_ERR;
        }
 }
@@ -4573,7 +4595,7 @@ char load_config_file(const char *f)
                        }
                }
                CONF("alignment") {
-                       setalignment(&text_alignment, window.type, value, f, line, true);
+                       setalignment(&text_alignment, window.type, value, f, line, 1);
                }
                CONF("background") {
                        fork_to_background = string_to_bool(value);
@@ -4609,7 +4631,7 @@ char load_config_file(const char *f)
                CONF("border_width") {
                        if (value) {
                                window.border_width = strtol(value, 0, 0);
-                               if (window.border_width < 0) window.border_width = 0;
+                               if (window.border_width < 1) window.border_width = 1;
                        } else {
                                CONF_ERR;
                        }
@@ -5587,7 +5609,9 @@ static const struct option longopts[] = {
        { 0, 0, 0, 0 }
 };
 
-void set_current_config() {
+void set_current_config(void);
+void set_current_config(void)
+{
        /* check if specified config file is valid */
        if (current_config) {
                struct stat sb;
@@ -5694,7 +5718,7 @@ void initialisation(int argc, char **argv) {
                                set_first_font(optarg);
                                break;
                        case 'a':
-                               setalignment(&text_alignment, window.type, optarg, NULL, 0, false);
+                               setalignment(&text_alignment, window.type, optarg, NULL, 0, 0);
                                break;
 
 #ifdef OWN_WINDOW
@@ -5893,7 +5917,9 @@ int main(int argc, char **argv)
                                current_config = strndup(optarg, max_user_text);
                                break;
                        case 'q':
-                               freopen("/dev/null", "w", stderr);
+                               if (!freopen("/dev/null", "w", stderr)) {
+                                       NORM_ERR("unable to redirect stderr to /dev/null");
+                               }
                                break;
                        case 'h':
                                print_help(argv[0]);
@@ -5927,7 +5953,13 @@ int main(int argc, char **argv)
 #endif /* XOAP */
 
 #ifdef HAVE_SYS_INOTIFY_H
-       inotify_fd = inotify_init1(IN_NONBLOCK);
+       inotify_fd = inotify_init();
+       if(inotify_fd != -1) {
+               int fl;
+
+               fl = fcntl(inotify_fd, F_GETFL);
+               fcntl(inotify_fd, F_SETFL, fl | O_NONBLOCK);
+       }
 #endif /* HAVE_SYS_INOTIFY_H */
 
        initialisation(argc, argv);