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

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

perf ui gtk: Implement helpline_fns 



Add helpline API implementation to GTK front-end.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@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/1345104894-14205-3-git-send-email-namhyung@kernel.org


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

tools/perf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ else 
		LIB_OBJS += $(OUTPUT)ui/gtk/browser.o

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

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

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

		# Make sure that it'd be included only once.

		ifneq ($(findstring -DNO_NEWT_SUPPORT,$(BASIC_CFLAGS)),)

			LIB_OBJS += $(OUTPUT)ui/setup.o

tools/perf/ui/gtk/gtk.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 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);



void perf_gtk__init_helpline(void);



#ifndef HAVE_GTK_INFO_BAR

static inline GtkWidget *perf_gtk__setup_info_bar(void)

{

tools/perf/ui/gtk/helpline.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#include "gtk.h"

#include "../helpline.h"



static void gtk_helpline_pop(void)

{

	if (!perf_gtk__is_active_context(pgctx))

		return;



	gtk_statusbar_pop(GTK_STATUSBAR(pgctx->statbar),

			  pgctx->statbar_ctx_id);

}



static void gtk_helpline_push(const char *msg)

{

	if (!perf_gtk__is_active_context(pgctx))

		return;



	gtk_statusbar_push(GTK_STATUSBAR(pgctx->statbar),

			   pgctx->statbar_ctx_id, msg);

}



static struct ui_helpline gtk_helpline_fns = {

	.pop	= gtk_helpline_pop,

	.push	= gtk_helpline_push,

};



void perf_gtk__init_helpline(void)

{

	helpline_fns = &gtk_helpline_fns;

}

tools/perf/ui/gtk/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ extern struct perf_error_ops perf_gtk_eops; 
int perf_gtk__init(void)

{

	perf_error__register(&perf_gtk_eops);

	perf_gtk__init_helpline();

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

}