Add $nodename_short.

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index 7e61f51..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);
                        }
@@ -4265,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;
@@ -4295,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();
@@ -4622,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;
                        }
@@ -5944,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);