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

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

perf ui/gtk: Add GTK info_bar widget to browser window 



The GtkInfoBar is a modern UI component to display messages without
bothering the main window. It'll be used for showing a warning message.

As the GtkInfoBar requires 2.18 (or newer) version of GTK+ library, add
availability check to Makefile too.

Suggested-by: default avatarSunjin Yang <fan4326@gmail.com>
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-7-git-send-email-namhyung@gmail.com


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

tools/perf/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -523,6 +523,9 @@ else 
		msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);

		BASIC_CFLAGS += -DNO_GTK2_SUPPORT

	else

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y)

			BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR

		endif

		BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0)

		EXTLIBS += $(shell pkg-config --libs gtk+-2.0)

		LIB_OBJS += $(OUTPUT)ui/gtk/browser.o

tools/perf/config/feature-tests.mak

+13 −0
Original line number Diff line number Diff line
@@ -78,6 +78,19 @@ int main(int argc, char *argv[]) 
        return 0;

}

endef



define SOURCE_GTK2_INFOBAR

#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"

#include <gtk/gtk.h>

#pragma GCC diagnostic error \"-Wstrict-prototypes\"



int main(void)

{

	gtk_info_bar_new();



	return 0;

}

endef

endif



ifndef NO_LIBPERL

tools/perf/ui/gtk/browser.c

+33 −0
Original line number Diff line number Diff line
@@ -122,6 +122,34 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists) 
	gtk_container_add(GTK_CONTAINER(window), view);

}



#ifdef HAVE_GTK_INFO_BAR

static GtkWidget *perf_gtk__setup_info_bar(void)

{

	GtkWidget *info_bar;

	GtkWidget *label;

	GtkWidget *content_area;



	info_bar = gtk_info_bar_new();

	gtk_widget_set_no_show_all(info_bar, TRUE);



	label = gtk_label_new("");

	gtk_widget_show(label);



	content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(info_bar));

	gtk_container_add(GTK_CONTAINER(content_area), label);



	gtk_info_bar_add_button(GTK_INFO_BAR(info_bar), GTK_STOCK_OK,

				GTK_RESPONSE_OK);

	g_signal_connect(info_bar, "response",

			 G_CALLBACK(gtk_widget_hide), NULL);



	pgctx->info_bar = info_bar;

	pgctx->message_label = label;



	return info_bar;

}

#endif



static GtkWidget *perf_gtk__setup_statusbar(void)

{

	GtkWidget *stbar;
@@ -145,6 +173,7 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, 
	struct perf_evsel *pos;

	GtkWidget *vbox;

	GtkWidget *notebook;

	GtkWidget *info_bar;

	GtkWidget *statbar;

	GtkWidget *window;
@@ -189,6 +218,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, 


	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);



	info_bar = perf_gtk__setup_info_bar();

	if (info_bar)

		gtk_box_pack_start(GTK_BOX(vbox), info_bar, FALSE, FALSE, 0);



	statbar = perf_gtk__setup_statusbar();

	gtk_box_pack_start(GTK_BOX(vbox), statbar, FALSE, FALSE, 0);

tools/perf/ui/gtk/gtk.h

+12 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ 


struct perf_gtk_context {

	GtkWidget *main_window;



#ifdef HAVE_GTK_INFO_BAR

	GtkWidget *info_bar;

	GtkWidget *message_label;

#endif

	GtkWidget *statbar;

	guint statbar_ctx_id;

};
@@ -24,4 +29,11 @@ static inline bool perf_gtk__is_active_context(struct perf_gtk_context *ctx) 
struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window);

int perf_gtk__deactivate_context(struct perf_gtk_context **ctx);



#ifndef HAVE_GTK_INFO_BAR

static inline GtkWidget *perf_gtk__setup_info_bar(void)

{

	return NULL;

}

#endif



#endif /* _PERF_GTK_H_ */