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

Commit 1056d3dd authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui: Reimplement ui__popup_menu using ui__browser 

Right now let it work just like the other browsers: in full screen, at
the top left corner. If people complain we can revisit, I found it OK
and the laziest/quickest approach at reusing the ui_browser ;-)

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-4bgeqizcxh04q0sk24cw43gk@git.kernel.org


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

tools/perf/util/ui/browser.c

+41 −0
Original line number Original line Diff line number Diff line
@@ -488,6 +488,47 @@ static int ui_browser__color_config(const char *var, const char *value, 
	return -1;

	return -1;

}

}





void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence)

{

	switch (whence) {

	case SEEK_SET:

		browser->top = browser->entries;

		break;

	case SEEK_CUR:

		browser->top = browser->top + browser->top_idx + offset;

		break;

	case SEEK_END:

		browser->top = browser->top + browser->nr_entries + offset;

		break;

	default:

		return;

	}

}



unsigned int ui_browser__argv_refresh(struct ui_browser *browser)

{

	unsigned int row = 0, idx = browser->top_idx;

	char **pos;



	if (browser->top == NULL)

		browser->top = browser->entries;



	pos = (char **)browser->top;

	while (idx < browser->nr_entries) {

		if (!browser->filter || !browser->filter(browser, *pos)) {

			ui_browser__gotorc(browser, row, 0);

			browser->write(browser, pos, row);

			if (++row == browser->height)

				break;

		}



		++idx;

		++pos;

	}



	return row;

}



void ui_browser__init(void)

void ui_browser__init(void)

{

{

	int i = 0;

	int i = 0;

tools/perf/util/ui/browser.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,9 @@ int ui_browser__refresh(struct ui_browser *self); 
int ui_browser__run(struct ui_browser *browser, int delay_secs);

int ui_browser__run(struct ui_browser *browser, int delay_secs);

void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries);

void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries);





void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence);

unsigned int ui_browser__argv_refresh(struct ui_browser *browser);



void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);

void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);

unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self);

unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self);

tools/perf/util/ui/util.c

+53 −30
Original line number Original line Diff line number Diff line
@@ -8,10 +8,54 @@ 
#include "../cache.h"

#include "../cache.h"

#include "../debug.h"

#include "../debug.h"

#include "browser.h"

#include "browser.h"

#include "keysyms.h"

#include "helpline.h"

#include "helpline.h"

#include "ui.h"

#include "ui.h"

#include "util.h"

#include "util.h"





static void ui_browser__argv_write(struct ui_browser *browser,

				   void *entry, int row)

{

	char **arg = entry;

	bool current_entry = ui_browser__is_current_entry(browser, row);



	ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :

						       HE_COLORSET_NORMAL);

	slsmg_write_nstring(*arg, browser->width);

}



static int popup_menu__run(struct ui_browser *menu)

{

	int key;



	if (ui_browser__show(menu, " ", "ESC: exit, ENTER|->: Select option") < 0)

		return -1;



	while (1) {

		key = ui_browser__run(menu, 0);



		switch (key) {

		case K_RIGHT:

		case K_ENTER:

			key = menu->index;

			break;

		case K_LEFT:

		case K_ESC:

		case 'q':

		case CTRL('c'):

			key = -1;

			break;

		default:

			continue;

		}



		break;

	}



	ui_browser__hide(menu);

	return key;

}



static void newt_form__set_exit_keys(newtComponent self)

static void newt_form__set_exit_keys(newtComponent self)

{

{

	newtFormAddHotKey(self, NEWT_KEY_LEFT);

	newtFormAddHotKey(self, NEWT_KEY_LEFT);
@@ -31,36 +75,15 @@ static newtComponent newt_form__new(void) 




int ui__popup_menu(int argc, char * const argv[])

int ui__popup_menu(int argc, char * const argv[])

{

{

	struct newtExitStruct es;

	struct ui_browser menu = {

	int i, rc = -1, max_len = 5;

		.entries    = (void *)argv,

	newtComponent listbox, form = newt_form__new();

		.refresh    = ui_browser__argv_refresh,



		.seek	    = ui_browser__argv_seek,

	if (form == NULL)

		.write	    = ui_browser__argv_write,

		return -1;

		.nr_entries = argc,



	};

	listbox = newtListbox(0, 0, argc, NEWT_FLAG_RETURNEXIT);



	if (listbox == NULL)

	return popup_menu__run(&menu);

		goto out_destroy_form;



	newtFormAddComponent(form, listbox);



	for (i = 0; i < argc; ++i) {

		int len = strlen(argv[i]);

		if (len > max_len)

			max_len = len;

		if (newtListboxAddEntry(listbox, argv[i], (void *)(long)i))

			goto out_destroy_form;

	}



	newtCenteredWindow(max_len, argc, NULL);

	newtFormRun(form, &es);

	rc = newtListboxGetCurrent(listbox) - NULL;

	if (es.reason == NEWT_EXIT_HOTKEY)

		rc = -1;

	newtPopWindow();

out_destroy_form:

	newtFormDestroy(form);

	return rc;

}

}





int ui__help_window(const char *text)

int ui__help_window(const char *text)