Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e078ba14 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf ui/gtk: Use struct perf_error_ops 



Define and use perf_gtk_eops to provide a GTK2 message dialog for error
reporting and a info_bar for warning.

As GtkInfoBar requires recent GTK+ libraries, provides a fallback
implementation using statusbar widget too.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1338265382-6872-8-git-send-email-namhyung@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a6b702c1

tools/perf/ui/gtk/setup.c

+5 −0
Original line number Diff line number Diff line 
#include "gtk.h"

#include "../../util/cache.h"

#include "../../util/debug.h"



extern struct perf_error_ops perf_gtk_eops;



int perf_gtk__init(void)

{

	perf_error__register(&perf_gtk_eops);

	return gtk_init_check(NULL, NULL) ? 0 : -1;

}



void perf_gtk__exit(bool wait_for_ok __used)

{

	perf_error__unregister(&perf_gtk_eops);

	gtk_main_quit();

}

tools/perf/ui/gtk/util.c

+86 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#include "../../util/debug.h"

#include "gtk.h"



#include <string.h>





struct perf_gtk_context *pgctx;
@@ -26,6 +28,90 @@ int perf_gtk__deactivate_context(struct perf_gtk_context **ctx) 
	return 0;

}



static int perf_gtk__error(const char *format, va_list args)

{

	char *msg;

	GtkWidget *dialog;



	if (!perf_gtk__is_active_context(pgctx) ||

	    vasprintf(&msg, format, args) < 0) {

		fprintf(stderr, "Error:\n");

		vfprintf(stderr, format, args);

		fprintf(stderr, "\n");

		return -1;

	}



	dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(pgctx->main_window),

					GTK_DIALOG_DESTROY_WITH_PARENT,

					GTK_MESSAGE_ERROR,

					GTK_BUTTONS_CLOSE,

					"<b>Error</b>\n\n%s", msg);

	gtk_dialog_run(GTK_DIALOG(dialog));



	gtk_widget_destroy(dialog);

	free(msg);

	return 0;

}



#ifdef HAVE_GTK_INFO_BAR

static int perf_gtk__warning_info_bar(const char *format, va_list args)

{

	char *msg;



	if (!perf_gtk__is_active_context(pgctx) ||

	    vasprintf(&msg, format, args) < 0) {

		fprintf(stderr, "Warning:\n");

		vfprintf(stderr, format, args);

		fprintf(stderr, "\n");

		return -1;

	}



	gtk_label_set_text(GTK_LABEL(pgctx->message_label), msg);

	gtk_info_bar_set_message_type(GTK_INFO_BAR(pgctx->info_bar),

				      GTK_MESSAGE_WARNING);

	gtk_widget_show(pgctx->info_bar);



	free(msg);

	return 0;

}

#else

static int perf_gtk__warning_statusbar(const char *format, va_list args)

{

	char *msg, *p;



	if (!perf_gtk__is_active_context(pgctx) ||

	    vasprintf(&msg, format, args) < 0) {

		fprintf(stderr, "Warning:\n");

		vfprintf(stderr, format, args);

		fprintf(stderr, "\n");

		return -1;

	}



	gtk_statusbar_pop(GTK_STATUSBAR(pgctx->statbar),

			  pgctx->statbar_ctx_id);



	/* Only first line can be displayed */

	p = strchr(msg, '\n');

	if (p)

		*p = '\0';



	gtk_statusbar_push(GTK_STATUSBAR(pgctx->statbar),

			   pgctx->statbar_ctx_id, msg);



	free(msg);

	return 0;

}

#endif



struct perf_error_ops perf_gtk_eops = {

	.error		= perf_gtk__error,

#ifdef HAVE_GTK_INFO_BAR

	.warning	= perf_gtk__warning_info_bar,

#else

	.warning	= perf_gtk__warning_statusbar,

#endif

};



/*

 * FIXME: Functions below should be implemented properly.

 *        For now, just add stubs for NO_NEWT=1 build.