License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 14:07:57 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2011-10-13 11:52:46 +00:00
|
|
|
#include "../util.h"
|
2017-04-17 19:51:59 +00:00
|
|
|
#include "../string2.h"
|
2016-06-23 08:55:17 +00:00
|
|
|
#include "../config.h"
|
2011-10-13 11:52:46 +00:00
|
|
|
#include "../../perf.h"
|
2010-08-11 17:51:47 +00:00
|
|
|
#include "libslang.h"
|
2011-02-09 13:38:43 +00:00
|
|
|
#include "ui.h"
|
2011-10-25 15:45:16 +00:00
|
|
|
#include "util.h"
|
2010-08-11 17:51:47 +00:00
|
|
|
#include <linux/compiler.h>
|
2010-08-06 20:35:02 +00:00
|
|
|
#include <linux/list.h>
|
|
|
|
|
#include <linux/rbtree.h>
|
2017-07-20 18:27:39 +00:00
|
|
|
#include <linux/string.h>
|
2010-08-06 20:35:02 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <sys/ttydefaults.h>
|
|
|
|
|
#include "browser.h"
|
2010-08-10 18:44:20 +00:00
|
|
|
#include "helpline.h"
|
2011-10-20 18:59:15 +00:00
|
|
|
#include "keysyms.h"
|
2010-08-06 20:35:02 +00:00
|
|
|
#include "../color.h"
|
tools perf: Move from sane_ctype.h obtained from git to the Linux's original
We got the sane_ctype.h headers from git and kept using it so far, but
since that code originally came from the kernel sources to the git
sources, perhaps its better to just use the one in the kernel, so that
we can leverage tools/perf/check_headers.sh to be notified when our copy
gets out of sync, i.e. when fixes or goodies are added to the code we've
copied.
This will help with things like tools/lib/string.c where we want to have
more things in common with the kernel, such as strim(), skip_spaces(),
etc so as to go on removing the things that we have in tools/perf/util/
and instead using the code in the kernel, indirectly and removing things
like EXPORT_SYMBOL(), etc, getting notified when fixes and improvements
are made to the original code.
Hopefully this also should help with reducing the difference of code
hosted in tools/ to the one in the kernel proper.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7k9868l713wqtgo01xxygn12@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-06-25 20:27:31 +00:00
|
|
|
#include <linux/ctype.h>
|
2011-10-13 11:52:46 +00:00
|
|
|
|
2011-10-18 16:31:35 +00:00
|
|
|
static int ui_browser__percent_color(struct ui_browser *browser,
|
|
|
|
|
double percent, bool current)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2011-10-18 16:31:35 +00:00
|
|
|
if (current && (!browser->use_navkeypressed || browser->navkeypressed))
|
2010-08-06 20:35:02 +00:00
|
|
|
return HE_COLORSET_SELECTED;
|
|
|
|
|
if (percent >= MIN_RED)
|
|
|
|
|
return HE_COLORSET_TOP;
|
|
|
|
|
if (percent >= MIN_GREEN)
|
|
|
|
|
return HE_COLORSET_MEDIUM;
|
|
|
|
|
return HE_COLORSET_NORMAL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-02 15:48:56 +00:00
|
|
|
int ui_browser__set_color(struct ui_browser *browser, int color)
|
2010-08-11 17:51:47 +00:00
|
|
|
{
|
2012-04-02 15:48:56 +00:00
|
|
|
int ret = browser->current_color;
|
|
|
|
|
browser->current_color = color;
|
2010-08-11 17:51:47 +00:00
|
|
|
SLsmg_set_color(color);
|
2012-04-02 15:48:56 +00:00
|
|
|
return ret;
|
2010-08-11 17:51:47 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
void ui_browser__set_percent_color(struct ui_browser *browser,
|
2010-08-11 17:51:47 +00:00
|
|
|
double percent, bool current)
|
|
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
int color = ui_browser__percent_color(browser, percent, current);
|
|
|
|
|
ui_browser__set_color(browser, color);
|
2010-08-11 17:51:47 +00:00
|
|
|
}
|
|
|
|
|
|
2018-04-02 18:48:18 +00:00
|
|
|
void ui_browser__gotorc_title(struct ui_browser *browser, int y, int x)
|
2010-08-11 17:51:47 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
SLsmg_gotorc(browser->y + y, browser->x + x);
|
2010-08-11 17:51:47 +00:00
|
|
|
}
|
|
|
|
|
|
2018-04-02 18:48:18 +00:00
|
|
|
void ui_browser__gotorc(struct ui_browser *browser, int y, int x)
|
|
|
|
|
{
|
|
|
|
|
SLsmg_gotorc(browser->y + y + browser->extra_title_lines, browser->x + x);
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-11 15:24:27 +00:00
|
|
|
void ui_browser__write_nstring(struct ui_browser *browser __maybe_unused, const char *msg,
|
|
|
|
|
unsigned int width)
|
|
|
|
|
{
|
|
|
|
|
slsmg_write_nstring(msg, width);
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-15 20:52:53 +00:00
|
|
|
void ui_browser__vprintf(struct ui_browser *browser __maybe_unused, const char *fmt, va_list args)
|
|
|
|
|
{
|
|
|
|
|
slsmg_vprintf(fmt, args);
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-11 15:50:55 +00:00
|
|
|
void ui_browser__printf(struct ui_browser *browser __maybe_unused, const char *fmt, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
2018-03-15 20:52:53 +00:00
|
|
|
ui_browser__vprintf(browser, fmt, args);
|
2015-08-11 15:50:55 +00:00
|
|
|
va_end(args);
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-14 15:27:54 +00:00
|
|
|
static struct list_head *
|
|
|
|
|
ui_browser__list_head_filter_entries(struct ui_browser *browser,
|
|
|
|
|
struct list_head *pos)
|
|
|
|
|
{
|
|
|
|
|
do {
|
|
|
|
|
if (!browser->filter || !browser->filter(browser, pos))
|
|
|
|
|
return pos;
|
|
|
|
|
pos = pos->next;
|
|
|
|
|
} while (pos != browser->entries);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct list_head *
|
|
|
|
|
ui_browser__list_head_filter_prev_entries(struct ui_browser *browser,
|
|
|
|
|
struct list_head *pos)
|
|
|
|
|
{
|
|
|
|
|
do {
|
|
|
|
|
if (!browser->filter || !browser->filter(browser, pos))
|
|
|
|
|
return pos;
|
|
|
|
|
pos = pos->prev;
|
|
|
|
|
} while (pos != browser->entries);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
void ui_browser__list_head_seek(struct ui_browser *browser, off_t offset, int whence)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
struct list_head *head = browser->entries;
|
2010-08-06 20:35:02 +00:00
|
|
|
struct list_head *pos;
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->nr_entries == 0)
|
2011-10-14 15:27:54 +00:00
|
|
|
return;
|
|
|
|
|
|
2010-08-06 20:35:02 +00:00
|
|
|
switch (whence) {
|
|
|
|
|
case SEEK_SET:
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = ui_browser__list_head_filter_entries(browser, head->next);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
case SEEK_CUR:
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = browser->top;
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
case SEEK_END:
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = ui_browser__list_head_filter_prev_entries(browser, head->prev);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-14 15:27:54 +00:00
|
|
|
assert(pos != NULL);
|
|
|
|
|
|
2010-08-06 20:35:02 +00:00
|
|
|
if (offset > 0) {
|
|
|
|
|
while (offset-- != 0)
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = ui_browser__list_head_filter_entries(browser, pos->next);
|
2010-08-06 20:35:02 +00:00
|
|
|
} else {
|
|
|
|
|
while (offset++ != 0)
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = ui_browser__list_head_filter_prev_entries(browser, pos->prev);
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->top = pos;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
void ui_browser__rb_tree_seek(struct ui_browser *browser, off_t offset, int whence)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
struct rb_root *root = browser->entries;
|
2010-08-06 20:35:02 +00:00
|
|
|
struct rb_node *nd;
|
|
|
|
|
|
|
|
|
|
switch (whence) {
|
|
|
|
|
case SEEK_SET:
|
|
|
|
|
nd = rb_first(root);
|
|
|
|
|
break;
|
|
|
|
|
case SEEK_CUR:
|
2012-05-30 01:42:18 +00:00
|
|
|
nd = browser->top;
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
case SEEK_END:
|
|
|
|
|
nd = rb_last(root);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (offset > 0) {
|
|
|
|
|
while (offset-- != 0)
|
|
|
|
|
nd = rb_next(nd);
|
|
|
|
|
} else {
|
|
|
|
|
while (offset++ != 0)
|
|
|
|
|
nd = rb_prev(nd);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->top = nd;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
|
|
|
|
struct rb_node *nd;
|
|
|
|
|
int row = 0;
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->top == NULL)
|
|
|
|
|
browser->top = rb_first(browser->entries);
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
nd = browser->top;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
|
|
|
|
while (nd != NULL) {
|
2012-05-30 01:42:18 +00:00
|
|
|
ui_browser__gotorc(browser, row, 0);
|
|
|
|
|
browser->write(browser, nd, row);
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (++row == browser->rows)
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
nd = rb_next(nd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return row;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
return browser->top_idx + row == browser->index;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
void ui_browser__refresh_dimensions(struct ui_browser *browser)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->width = SLtt_Screen_Cols - 1;
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
browser->height = browser->rows = SLtt_Screen_Rows - 2;
|
2018-04-02 18:48:18 +00:00
|
|
|
browser->rows -= browser->extra_title_lines;
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->y = 1;
|
|
|
|
|
browser->x = 0;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2011-10-26 14:04:37 +00:00
|
|
|
void ui_browser__handle_resize(struct ui_browser *browser)
|
|
|
|
|
{
|
|
|
|
|
ui__refresh_dimensions(false);
|
|
|
|
|
ui_browser__show(browser, browser->title, ui_helpline__current);
|
|
|
|
|
ui_browser__refresh(browser);
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-29 14:15:04 +00:00
|
|
|
int ui_browser__warning(struct ui_browser *browser, int timeout,
|
|
|
|
|
const char *format, ...)
|
2011-10-26 14:04:37 +00:00
|
|
|
{
|
|
|
|
|
va_list args;
|
2011-10-29 14:15:04 +00:00
|
|
|
char *text;
|
|
|
|
|
int key = 0, err;
|
2011-10-26 14:04:37 +00:00
|
|
|
|
|
|
|
|
va_start(args, format);
|
2011-10-29 14:15:04 +00:00
|
|
|
err = vasprintf(&text, format, args);
|
2011-10-26 14:04:37 +00:00
|
|
|
va_end(args);
|
|
|
|
|
|
2011-10-29 14:15:04 +00:00
|
|
|
if (err < 0) {
|
|
|
|
|
va_start(args, format);
|
|
|
|
|
ui_helpline__vpush(format, args);
|
|
|
|
|
va_end(args);
|
|
|
|
|
} else {
|
2014-05-30 00:53:58 +00:00
|
|
|
while ((key = ui__question_window("Warning!", text,
|
2011-10-29 14:15:04 +00:00
|
|
|
"Press any key...",
|
|
|
|
|
timeout)) == K_RESIZE)
|
|
|
|
|
ui_browser__handle_resize(browser);
|
|
|
|
|
free(text);
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-26 14:04:37 +00:00
|
|
|
return key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int ui_browser__help_window(struct ui_browser *browser, const char *text)
|
|
|
|
|
{
|
|
|
|
|
int key;
|
|
|
|
|
|
|
|
|
|
while ((key = ui__help_window(text)) == K_RESIZE)
|
|
|
|
|
ui_browser__handle_resize(browser);
|
|
|
|
|
|
|
|
|
|
return key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool ui_browser__dialog_yesno(struct ui_browser *browser, const char *text)
|
|
|
|
|
{
|
|
|
|
|
int key;
|
|
|
|
|
|
|
|
|
|
while ((key = ui__dialog_yesno(text)) == K_RESIZE)
|
|
|
|
|
ui_browser__handle_resize(browser);
|
|
|
|
|
|
|
|
|
|
return key == K_ENTER || toupper(key) == 'Y';
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
void ui_browser__reset_index(struct ui_browser *browser)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->index = browser->top_idx = 0;
|
|
|
|
|
browser->seek(browser, 0, SEEK_SET);
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2011-02-25 14:33:31 +00:00
|
|
|
void __ui_browser__show_title(struct ui_browser *browser, const char *title)
|
|
|
|
|
{
|
|
|
|
|
SLsmg_gotorc(0, 0);
|
2013-03-28 14:34:10 +00:00
|
|
|
ui_browser__set_color(browser, HE_COLORSET_ROOT);
|
2015-08-11 15:24:27 +00:00
|
|
|
ui_browser__write_nstring(browser, title, browser->width + 1);
|
2011-02-25 14:33:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ui_browser__show_title(struct ui_browser *browser, const char *title)
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_lock(&ui__lock);
|
|
|
|
|
__ui_browser__show_title(browser, title);
|
|
|
|
|
pthread_mutex_unlock(&ui__lock);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
int ui_browser__show(struct ui_browser *browser, const char *title,
|
2010-08-10 18:44:20 +00:00
|
|
|
const char *helpline, ...)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2011-10-13 11:52:46 +00:00
|
|
|
int err;
|
2010-08-10 18:44:20 +00:00
|
|
|
va_list ap;
|
|
|
|
|
|
2014-07-01 19:34:42 +00:00
|
|
|
if (browser->refresh_dimensions == NULL)
|
|
|
|
|
browser->refresh_dimensions = ui_browser__refresh_dimensions;
|
|
|
|
|
|
|
|
|
|
browser->refresh_dimensions(browser);
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_lock(&ui__lock);
|
2012-05-30 01:42:18 +00:00
|
|
|
__ui_browser__show_title(browser, title);
|
2010-09-13 13:25:04 +00:00
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->title = title;
|
2013-12-26 20:41:15 +00:00
|
|
|
zfree(&browser->helpline);
|
2010-08-10 18:44:20 +00:00
|
|
|
|
|
|
|
|
va_start(ap, helpline);
|
2012-05-30 01:42:18 +00:00
|
|
|
err = vasprintf(&browser->helpline, helpline, ap);
|
2010-08-10 18:44:20 +00:00
|
|
|
va_end(ap);
|
2011-10-13 11:52:46 +00:00
|
|
|
if (err > 0)
|
2012-05-30 01:42:18 +00:00
|
|
|
ui_helpline__push(browser->helpline);
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_unlock(&ui__lock);
|
2011-10-13 11:52:46 +00:00
|
|
|
return err ? 0 : -1;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2013-12-19 19:25:17 +00:00
|
|
|
void ui_browser__hide(struct ui_browser *browser)
|
2010-08-10 18:44:20 +00:00
|
|
|
{
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_lock(&ui__lock);
|
2010-08-10 18:44:20 +00:00
|
|
|
ui_helpline__pop();
|
2013-12-26 20:41:15 +00:00
|
|
|
zfree(&browser->helpline);
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_unlock(&ui__lock);
|
2010-08-10 18:44:20 +00:00
|
|
|
}
|
|
|
|
|
|
2011-10-13 11:52:46 +00:00
|
|
|
static void ui_browser__scrollbar_set(struct ui_browser *browser)
|
|
|
|
|
{
|
|
|
|
|
int height = browser->height, h = 0, pct = 0,
|
|
|
|
|
col = browser->width,
|
2014-06-19 11:41:14 +00:00
|
|
|
row = 0;
|
2011-10-13 11:52:46 +00:00
|
|
|
|
|
|
|
|
if (browser->nr_entries > 1) {
|
|
|
|
|
pct = ((browser->index * (browser->height - 1)) /
|
|
|
|
|
(browser->nr_entries - 1));
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-26 10:19:05 +00:00
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
|
2011-10-13 11:52:46 +00:00
|
|
|
while (h < height) {
|
|
|
|
|
ui_browser__gotorc(browser, row++, col);
|
2011-10-26 10:19:05 +00:00
|
|
|
SLsmg_write_char(h == pct ? SLSMG_DIAMOND_CHAR : SLSMG_CKBRD_CHAR);
|
2011-10-13 11:52:46 +00:00
|
|
|
++h;
|
|
|
|
|
}
|
2011-10-26 10:19:05 +00:00
|
|
|
|
|
|
|
|
SLsmg_set_char_set(0);
|
2011-10-13 11:52:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __ui_browser__refresh(struct ui_browser *browser)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
|
|
|
|
int row;
|
2011-10-18 16:31:35 +00:00
|
|
|
int width = browser->width;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2011-10-13 11:52:46 +00:00
|
|
|
row = browser->refresh(browser);
|
|
|
|
|
ui_browser__set_color(browser, HE_COLORSET_NORMAL);
|
2011-10-18 16:31:35 +00:00
|
|
|
|
|
|
|
|
if (!browser->use_navkeypressed || browser->navkeypressed)
|
|
|
|
|
ui_browser__scrollbar_set(browser);
|
|
|
|
|
else
|
|
|
|
|
width += 1;
|
|
|
|
|
|
2018-04-05 14:43:38 +00:00
|
|
|
SLsmg_fill_region(browser->y + row + browser->extra_title_lines, browser->x,
|
|
|
|
|
browser->rows - row, width, ' ');
|
2011-10-13 11:52:46 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int ui_browser__refresh(struct ui_browser *browser)
|
|
|
|
|
{
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_lock(&ui__lock);
|
2011-10-13 11:52:46 +00:00
|
|
|
__ui_browser__refresh(browser);
|
2011-02-09 13:38:43 +00:00
|
|
|
pthread_mutex_unlock(&ui__lock);
|
2010-08-06 20:35:02 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-11 19:15:39 +00:00
|
|
|
/*
|
|
|
|
|
* Here we're updating nr_entries _after_ we started browsing, i.e. we have to
|
|
|
|
|
* forget about any reference to any entry in the underlying data structure,
|
|
|
|
|
* that is why we do a SEEK_SET. Think about 'perf top' in the hists browser
|
|
|
|
|
* after an output_resort and hist decay.
|
|
|
|
|
*/
|
|
|
|
|
void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries)
|
|
|
|
|
{
|
|
|
|
|
off_t offset = nr_entries - browser->nr_entries;
|
|
|
|
|
|
|
|
|
|
browser->nr_entries = nr_entries;
|
|
|
|
|
|
|
|
|
|
if (offset < 0) {
|
|
|
|
|
if (browser->top_idx < (u64)-offset)
|
|
|
|
|
offset = -browser->top_idx;
|
|
|
|
|
|
|
|
|
|
browser->index += offset;
|
|
|
|
|
browser->top_idx += offset;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-14 12:31:53 +00:00
|
|
|
browser->top = NULL;
|
2011-10-11 19:15:39 +00:00
|
|
|
browser->seek(browser, browser->top_idx, SEEK_SET);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
int ui_browser__run(struct ui_browser *browser, int delay_secs)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
2011-10-13 11:52:46 +00:00
|
|
|
int err, key;
|
2010-08-11 13:07:43 +00:00
|
|
|
|
2010-08-06 20:35:02 +00:00
|
|
|
while (1) {
|
|
|
|
|
off_t offset;
|
|
|
|
|
|
2011-10-13 11:52:46 +00:00
|
|
|
pthread_mutex_lock(&ui__lock);
|
2012-05-30 01:42:18 +00:00
|
|
|
err = __ui_browser__refresh(browser);
|
2011-10-13 11:52:46 +00:00
|
|
|
SLsmg_refresh();
|
|
|
|
|
pthread_mutex_unlock(&ui__lock);
|
|
|
|
|
if (err < 0)
|
|
|
|
|
break;
|
|
|
|
|
|
2011-10-20 18:59:15 +00:00
|
|
|
key = ui__getch(delay_secs);
|
2011-10-13 11:52:46 +00:00
|
|
|
|
2011-10-20 18:59:15 +00:00
|
|
|
if (key == K_RESIZE) {
|
2011-10-25 15:45:16 +00:00
|
|
|
ui__refresh_dimensions(false);
|
2014-07-01 19:34:42 +00:00
|
|
|
browser->refresh_dimensions(browser);
|
2012-05-30 01:42:18 +00:00
|
|
|
__ui_browser__show_title(browser, browser->title);
|
|
|
|
|
ui_helpline__puts(browser->helpline);
|
2011-10-13 11:52:46 +00:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->use_navkeypressed && !browser->navkeypressed) {
|
2011-10-20 18:59:15 +00:00
|
|
|
if (key == K_DOWN || key == K_UP ||
|
2015-08-11 20:14:40 +00:00
|
|
|
(browser->columns && (key == K_LEFT || key == K_RIGHT)) ||
|
2011-10-20 18:59:15 +00:00
|
|
|
key == K_PGDN || key == K_PGUP ||
|
|
|
|
|
key == K_HOME || key == K_END ||
|
2011-10-18 16:31:35 +00:00
|
|
|
key == ' ') {
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->navkeypressed = true;
|
2011-10-18 16:31:35 +00:00
|
|
|
continue;
|
|
|
|
|
} else
|
|
|
|
|
return key;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-13 11:52:46 +00:00
|
|
|
switch (key) {
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_DOWN:
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->index == browser->nr_entries - 1)
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
2012-05-30 01:42:18 +00:00
|
|
|
++browser->index;
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (browser->index == browser->top_idx + browser->rows) {
|
2012-05-30 01:42:18 +00:00
|
|
|
++browser->top_idx;
|
|
|
|
|
browser->seek(browser, +1, SEEK_CUR);
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_UP:
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->index == 0)
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
2012-05-30 01:42:18 +00:00
|
|
|
--browser->index;
|
|
|
|
|
if (browser->index < browser->top_idx) {
|
|
|
|
|
--browser->top_idx;
|
|
|
|
|
browser->seek(browser, -1, SEEK_CUR);
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2015-08-11 20:14:40 +00:00
|
|
|
case K_RIGHT:
|
|
|
|
|
if (!browser->columns)
|
|
|
|
|
goto out;
|
|
|
|
|
if (browser->horiz_scroll < browser->columns - 1)
|
|
|
|
|
++browser->horiz_scroll;
|
|
|
|
|
break;
|
|
|
|
|
case K_LEFT:
|
|
|
|
|
if (!browser->columns)
|
|
|
|
|
goto out;
|
|
|
|
|
if (browser->horiz_scroll != 0)
|
|
|
|
|
--browser->horiz_scroll;
|
|
|
|
|
break;
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_PGDN:
|
2010-08-06 20:35:02 +00:00
|
|
|
case ' ':
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (browser->top_idx + browser->rows > browser->nr_entries - 1)
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
offset = browser->rows;
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->index + offset > browser->nr_entries - 1)
|
|
|
|
|
offset = browser->nr_entries - 1 - browser->index;
|
|
|
|
|
browser->index += offset;
|
|
|
|
|
browser->top_idx += offset;
|
|
|
|
|
browser->seek(browser, +offset, SEEK_CUR);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_PGUP:
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->top_idx == 0)
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (browser->top_idx < browser->rows)
|
2012-05-30 01:42:18 +00:00
|
|
|
offset = browser->top_idx;
|
2010-08-06 20:35:02 +00:00
|
|
|
else
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
offset = browser->rows;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->index -= offset;
|
|
|
|
|
browser->top_idx -= offset;
|
|
|
|
|
browser->seek(browser, -offset, SEEK_CUR);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_HOME:
|
2012-05-30 01:42:18 +00:00
|
|
|
ui_browser__reset_index(browser);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
2011-10-20 18:59:15 +00:00
|
|
|
case K_END:
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
offset = browser->rows - 1;
|
2012-05-30 01:42:18 +00:00
|
|
|
if (offset >= browser->nr_entries)
|
|
|
|
|
offset = browser->nr_entries - 1;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
browser->index = browser->nr_entries - 1;
|
|
|
|
|
browser->top_idx = browser->index - offset;
|
|
|
|
|
browser->seek(browser, -offset, SEEK_END);
|
2010-08-06 20:35:02 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
2015-08-11 20:14:40 +00:00
|
|
|
out:
|
2011-10-13 11:52:46 +00:00
|
|
|
return key;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
}
|
2010-08-11 13:07:43 +00:00
|
|
|
return -1;
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
unsigned int ui_browser__list_head_refresh(struct ui_browser *browser)
|
2010-08-06 20:35:02 +00:00
|
|
|
{
|
|
|
|
|
struct list_head *pos;
|
2012-05-30 01:42:18 +00:00
|
|
|
struct list_head *head = browser->entries;
|
2010-08-06 20:35:02 +00:00
|
|
|
int row = 0;
|
|
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
if (browser->top == NULL || browser->top == browser->entries)
|
|
|
|
|
browser->top = ui_browser__list_head_filter_entries(browser, head->next);
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2012-05-30 01:42:18 +00:00
|
|
|
pos = browser->top;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
|
|
|
|
list_for_each_from(pos, head) {
|
2012-05-30 01:42:18 +00:00
|
|
|
if (!browser->filter || !browser->filter(browser, pos)) {
|
|
|
|
|
ui_browser__gotorc(browser, row, 0);
|
|
|
|
|
browser->write(browser, pos, row);
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (++row == browser->rows)
|
2011-10-14 15:27:54 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return row;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-18 19:55:52 +00:00
|
|
|
static struct ui_browser_colorset {
|
2011-10-18 17:50:51 +00:00
|
|
|
const char *name, *fg, *bg;
|
|
|
|
|
int colorset;
|
|
|
|
|
} ui_browser__colorsets[] = {
|
|
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_TOP,
|
|
|
|
|
.name = "top",
|
|
|
|
|
.fg = "red",
|
2011-10-19 02:30:32 +00:00
|
|
|
.bg = "default",
|
2011-10-18 17:50:51 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_MEDIUM,
|
|
|
|
|
.name = "medium",
|
|
|
|
|
.fg = "green",
|
2011-10-19 02:30:32 +00:00
|
|
|
.bg = "default",
|
2011-10-18 17:50:51 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_NORMAL,
|
|
|
|
|
.name = "normal",
|
2011-10-19 02:30:32 +00:00
|
|
|
.fg = "default",
|
|
|
|
|
.bg = "default",
|
2011-10-18 17:50:51 +00:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_SELECTED,
|
|
|
|
|
.name = "selected",
|
|
|
|
|
.fg = "black",
|
2015-03-05 10:32:13 +00:00
|
|
|
.bg = "yellow",
|
2011-10-18 17:50:51 +00:00
|
|
|
},
|
|
|
|
|
{
|
2016-01-08 08:16:11 +00:00
|
|
|
.colorset = HE_COLORSET_JUMP_ARROWS,
|
|
|
|
|
.name = "jump_arrows",
|
2011-10-18 17:50:51 +00:00
|
|
|
.fg = "blue",
|
2011-10-19 02:30:32 +00:00
|
|
|
.bg = "default",
|
2011-10-18 17:50:51 +00:00
|
|
|
},
|
2012-04-02 15:59:01 +00:00
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_ADDR,
|
|
|
|
|
.name = "addr",
|
|
|
|
|
.fg = "magenta",
|
|
|
|
|
.bg = "default",
|
|
|
|
|
},
|
2013-03-28 14:34:10 +00:00
|
|
|
{
|
|
|
|
|
.colorset = HE_COLORSET_ROOT,
|
|
|
|
|
.name = "root",
|
|
|
|
|
.fg = "white",
|
|
|
|
|
.bg = "blue",
|
|
|
|
|
},
|
2011-10-18 17:50:51 +00:00
|
|
|
{
|
|
|
|
|
.name = NULL,
|
|
|
|
|
}
|
2010-08-06 20:35:02 +00:00
|
|
|
};
|
|
|
|
|
|
2011-10-18 17:50:51 +00:00
|
|
|
|
|
|
|
|
static int ui_browser__color_config(const char *var, const char *value,
|
2012-09-10 22:15:03 +00:00
|
|
|
void *data __maybe_unused)
|
2011-10-18 17:50:51 +00:00
|
|
|
{
|
|
|
|
|
char *fg = NULL, *bg;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* same dir for all commands */
|
2017-07-20 18:27:39 +00:00
|
|
|
if (!strstarts(var, "colors.") != 0)
|
2011-10-18 17:50:51 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; ui_browser__colorsets[i].name != NULL; ++i) {
|
|
|
|
|
const char *name = var + 7;
|
|
|
|
|
|
|
|
|
|
if (strcmp(ui_browser__colorsets[i].name, name) != 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
fg = strdup(value);
|
|
|
|
|
if (fg == NULL)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
bg = strchr(fg, ',');
|
|
|
|
|
if (bg == NULL)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
*bg = '\0';
|
2017-04-07 14:24:19 +00:00
|
|
|
bg = ltrim(++bg);
|
2011-10-18 17:50:51 +00:00
|
|
|
ui_browser__colorsets[i].bg = bg;
|
|
|
|
|
ui_browser__colorsets[i].fg = fg;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free(fg);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-26 09:11:03 +00:00
|
|
|
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:
|
2019-03-11 14:45:02 +00:00
|
|
|
browser->top = (char **)browser->top + offset;
|
2011-10-26 09:11:03 +00:00
|
|
|
break;
|
|
|
|
|
case SEEK_END:
|
2019-03-11 14:45:02 +00:00
|
|
|
browser->top = (char **)browser->entries + browser->nr_entries - 1 + offset;
|
2011-10-26 09:11:03 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
}
|
2019-03-11 14:45:02 +00:00
|
|
|
assert((char **)browser->top < (char **)browser->entries + browser->nr_entries);
|
|
|
|
|
assert((char **)browser->top >= (char **)browser->entries);
|
2011-10-26 09:11:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
2019-03-11 14:45:02 +00:00
|
|
|
while (idx < browser->nr_entries &&
|
|
|
|
|
row < (unsigned)SLtt_Screen_Rows - 1) {
|
|
|
|
|
assert(pos < (char **)browser->entries + browser->nr_entries);
|
2011-10-26 09:11:03 +00:00
|
|
|
if (!browser->filter || !browser->filter(browser, *pos)) {
|
|
|
|
|
ui_browser__gotorc(browser, row, 0);
|
|
|
|
|
browser->write(browser, pos, row);
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (++row == browser->rows)
|
2011-10-26 09:11:03 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++idx;
|
|
|
|
|
++pos;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return row;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-03 16:07:05 +00:00
|
|
|
void __ui_browser__vline(struct ui_browser *browser, unsigned int column,
|
|
|
|
|
u16 start, u16 end)
|
|
|
|
|
{
|
|
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
ui_browser__gotorc(browser, start, column);
|
|
|
|
|
SLsmg_draw_vline(end - start + 1);
|
|
|
|
|
SLsmg_set_char_set(0);
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-10 22:15:03 +00:00
|
|
|
void ui_browser__write_graph(struct ui_browser *browser __maybe_unused,
|
|
|
|
|
int graph)
|
2012-04-20 19:26:14 +00:00
|
|
|
{
|
|
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
SLsmg_write_char(graph);
|
|
|
|
|
SLsmg_set_char_set(0);
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-27 19:27:52 +00:00
|
|
|
static void __ui_browser__line_arrow_up(struct ui_browser *browser,
|
|
|
|
|
unsigned int column,
|
2012-05-03 16:12:49 +00:00
|
|
|
u64 start, u64 end)
|
2012-04-24 17:24:28 +00:00
|
|
|
{
|
|
|
|
|
unsigned int row, end_row;
|
|
|
|
|
|
|
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (start < browser->top_idx + browser->rows) {
|
2012-04-24 17:24:28 +00:00
|
|
|
row = start - browser->top_idx;
|
|
|
|
|
ui_browser__gotorc(browser, row, column);
|
|
|
|
|
SLsmg_write_char(SLSMG_LLCORN_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, row, column + 1);
|
2012-05-03 16:12:49 +00:00
|
|
|
SLsmg_draw_hline(2);
|
2012-04-24 17:24:28 +00:00
|
|
|
|
|
|
|
|
if (row-- == 0)
|
|
|
|
|
goto out;
|
|
|
|
|
} else
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
row = browser->rows - 1;
|
2012-04-24 17:24:28 +00:00
|
|
|
|
|
|
|
|
if (end > browser->top_idx)
|
|
|
|
|
end_row = end - browser->top_idx;
|
|
|
|
|
else
|
|
|
|
|
end_row = 0;
|
|
|
|
|
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column);
|
|
|
|
|
SLsmg_draw_vline(row - end_row + 1);
|
|
|
|
|
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column);
|
|
|
|
|
if (end >= browser->top_idx) {
|
|
|
|
|
SLsmg_write_char(SLSMG_ULCORN_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column + 1);
|
|
|
|
|
SLsmg_write_char(SLSMG_HLINE_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column + 2);
|
|
|
|
|
SLsmg_write_char(SLSMG_RARROW_CHAR);
|
|
|
|
|
}
|
|
|
|
|
out:
|
|
|
|
|
SLsmg_set_char_set(0);
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-27 19:27:52 +00:00
|
|
|
static void __ui_browser__line_arrow_down(struct ui_browser *browser,
|
|
|
|
|
unsigned int column,
|
2012-05-03 16:12:49 +00:00
|
|
|
u64 start, u64 end)
|
2012-04-27 19:27:52 +00:00
|
|
|
{
|
|
|
|
|
unsigned int row, end_row;
|
|
|
|
|
|
|
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
|
|
|
|
|
if (start >= browser->top_idx) {
|
|
|
|
|
row = start - browser->top_idx;
|
|
|
|
|
ui_browser__gotorc(browser, row, column);
|
|
|
|
|
SLsmg_write_char(SLSMG_ULCORN_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, row, column + 1);
|
2012-05-03 16:12:49 +00:00
|
|
|
SLsmg_draw_hline(2);
|
2012-04-27 19:27:52 +00:00
|
|
|
|
perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
When the jump instruction is displayed at the row 0 in annotate view,
the arrow is broken. An example:
16.86 │ ┌──je 82
0.01 │ movsd (%rsp),%xmm0
│ movsd 0x8(%rsp),%xmm4
│ movsd 0x8(%rsp),%xmm1
│ movsd (%rsp),%xmm3
│ divsd %xmm4,%xmm0
│ divsd %xmm3,%xmm1
│ movsd (%rsp),%xmm2
│ addsd %xmm1,%xmm0
│ addsd %xmm2,%xmm0
│ movsd %xmm0,(%rsp)
│82: sub $0x1,%ebx
83.03 │ ↑ jne 38
│ add $0x10,%rsp
│ xor %eax,%eax
│ pop %rbx
│ ← retq
The patch increments the row number before checking with 0.
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Fixes: 944e1abed9e1 ("perf ui browser: Add method to draw up/down arrow line")
Link: http://lkml.kernel.org/r/1496901704-30275-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-06-08 06:01:44 +00:00
|
|
|
if (++row == 0)
|
2012-04-27 19:27:52 +00:00
|
|
|
goto out;
|
|
|
|
|
} else
|
|
|
|
|
row = 0;
|
|
|
|
|
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (end >= browser->top_idx + browser->rows)
|
|
|
|
|
end_row = browser->rows - 1;
|
2012-04-27 19:27:52 +00:00
|
|
|
else
|
2013-11-13 06:24:24 +00:00
|
|
|
end_row = end - browser->top_idx;
|
2012-04-27 19:27:52 +00:00
|
|
|
|
|
|
|
|
ui_browser__gotorc(browser, row, column);
|
|
|
|
|
SLsmg_draw_vline(end_row - row + 1);
|
|
|
|
|
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column);
|
perf ui browser: Add ->rows to disambiguate from ->height
The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.
Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.
Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.
This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-07-01 14:07:54 +00:00
|
|
|
if (end < browser->top_idx + browser->rows) {
|
2012-04-27 19:27:52 +00:00
|
|
|
SLsmg_write_char(SLSMG_LLCORN_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column + 1);
|
|
|
|
|
SLsmg_write_char(SLSMG_HLINE_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column + 2);
|
|
|
|
|
SLsmg_write_char(SLSMG_RARROW_CHAR);
|
|
|
|
|
}
|
|
|
|
|
out:
|
|
|
|
|
SLsmg_set_char_set(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
|
2012-05-03 16:12:49 +00:00
|
|
|
u64 start, u64 end)
|
2012-04-27 19:27:52 +00:00
|
|
|
{
|
|
|
|
|
if (start > end)
|
2012-05-03 16:12:49 +00:00
|
|
|
__ui_browser__line_arrow_up(browser, column, start, end);
|
2012-04-27 19:27:52 +00:00
|
|
|
else
|
2012-05-03 16:12:49 +00:00
|
|
|
__ui_browser__line_arrow_down(browser, column, start, end);
|
2012-04-27 19:27:52 +00:00
|
|
|
}
|
|
|
|
|
|
2017-07-07 05:06:35 +00:00
|
|
|
void ui_browser__mark_fused(struct ui_browser *browser, unsigned int column,
|
|
|
|
|
unsigned int row, bool arrow_down)
|
|
|
|
|
{
|
|
|
|
|
unsigned int end_row;
|
|
|
|
|
|
|
|
|
|
if (row >= browser->top_idx)
|
|
|
|
|
end_row = row - browser->top_idx;
|
|
|
|
|
else
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
SLsmg_set_char_set(1);
|
|
|
|
|
|
|
|
|
|
if (arrow_down) {
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column - 1);
|
|
|
|
|
SLsmg_write_char(SLSMG_ULCORN_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column);
|
|
|
|
|
SLsmg_draw_hline(2);
|
|
|
|
|
ui_browser__gotorc(browser, end_row + 1, column - 1);
|
|
|
|
|
SLsmg_write_char(SLSMG_LTEE_CHAR);
|
|
|
|
|
} else {
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column - 1);
|
|
|
|
|
SLsmg_write_char(SLSMG_LTEE_CHAR);
|
|
|
|
|
ui_browser__gotorc(browser, end_row, column);
|
|
|
|
|
SLsmg_draw_hline(2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SLsmg_set_char_set(0);
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-06 20:35:02 +00:00
|
|
|
void ui_browser__init(void)
|
|
|
|
|
{
|
2011-10-18 17:50:51 +00:00
|
|
|
int i = 0;
|
2010-08-06 20:35:02 +00:00
|
|
|
|
2011-10-18 17:50:51 +00:00
|
|
|
perf_config(ui_browser__color_config, NULL);
|
|
|
|
|
|
|
|
|
|
while (ui_browser__colorsets[i].name) {
|
2013-01-18 19:55:52 +00:00
|
|
|
struct ui_browser_colorset *c = &ui_browser__colorsets[i++];
|
2011-10-18 17:50:51 +00:00
|
|
|
sltt_set_color(c->colorset, c->name, c->fg, c->bg);
|
|
|
|
|
}
|
2010-08-06 20:35:02 +00:00
|
|
|
}
|
