perf newt: Add 'Q', 'q' and Ctrl+C as ways to exit from forms

[safe/jmp/linux-2.6] / tools / perf / util / color.c

diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index e47fdeb..9da0191 100644 (file)
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -166,7 +166,7 @@ int perf_color_default_config(const char *var, const char *value, void *cb)
        return perf_default_config(var, value, cb);
 }
 
-static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
+static int __color_vfprintf(FILE *fp, const char *color, const char *fmt,
                va_list args, const char *trail)
 {
        int r = 0;
@@ -191,6 +191,10 @@ static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
        return r;
 }
 
+int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args)
+{
+       return __color_vfprintf(fp, color, fmt, args, NULL);
+}
 
 
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...)
@@ -199,7 +203,10 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...)
        int r;
 
        va_start(args, fmt);
-       r = color_vfprintf(fp, color, fmt, args, NULL);
+       if (use_browser)
+               r = vfprintf(fp, fmt, args);
+       else
+               r = color_vfprintf(fp, color, fmt, args);
        va_end(args);
        return r;
 }
@@ -209,7 +216,7 @@ int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...)
        va_list args;
        int r;
        va_start(args, fmt);
-       r = color_vfprintf(fp, color, fmt, args, "\n");
+       r = __color_vfprintf(fp, color, fmt, args, "\n");
        va_end(args);
        return r;
 }