Skip to content

Fix Home, End, and repeated page navigation #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BuildScript (buildscript-dev) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Home, End, and repeated page navigation #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions src/display/screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ void Screen::run()
ProcmonConfiguration * config = configPtr.get();
auto storageEngine = config->GetStorage();
MEVENT mouseEvent;
int scrollCount = 0;
std::chrono::_V2::steady_clock::time_point previousTime = std::chrono::steady_clock::now();
std::chrono::_V2::steady_clock::time_point currentTime;
int nonRefreshCount = 0;
Expand Down Expand Up @@ -367,21 +366,13 @@ void Screen::run()
break;

case KEY_PPAGE:
if (scrollCount < MAX_CONTINUOUS_SCROLL || prevInput != KEY_PPAGE)
{
pageUp();
(KEY_PPAGE == prevInput) ? scrollCount++ : scrollCount = 0;
if(detailViewActive) closeDetailView();
}
pageUp();
if(detailViewActive) closeDetailView();
break;

case KEY_NPAGE:
if (scrollCount < MAX_CONTINUOUS_SCROLL || prevInput != KEY_NPAGE)
{
pageDown();
(KEY_NPAGE == prevInput) ? scrollCount++ : scrollCount = 0;
if(detailViewActive) closeDetailView();
}
pageDown();
if(detailViewActive) closeDetailView();
break;

// ncurses key_enter or ascii value 10 for enter key
Expand Down Expand Up @@ -471,7 +462,8 @@ void Screen::run()
if(detailViewActive) showDetailView();
break;

// CTRL + END
// END or CTRL + END
case KEY_END:
case 530:
// if the number of events is evenly divisible then the last "page" has nothing to visualize
if (storageEngine->Size() % totalLines == 0)
Expand All @@ -489,7 +481,8 @@ void Screen::run()
displayEvents(eventList);
break;

// CTRL + HOME
// HOME or CTRL + HOME
case KEY_HOME:
case 535:
currentPage = 0;

Expand Down Expand Up @@ -1447,19 +1440,19 @@ void Screen::showHelpView()
y+=2;

// print column labels
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "Arrows: scroll event list", "Enter: Display event properties");
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "Arrows/PgUp/PgDn: scroll events", "Home/End: first/last page");
y++;

windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F2: Sort by column", "F3: Search event list");
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "Enter: Display event properties", "F2: Sort by column");
y++;

windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F4: Filter event list", "F5: Suspend/resume event collection");
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F3: Search event list", "F4: Filter event list");
y++;

windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F6: Export event list to file", "F8: Show stat of top syscalls");
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F5: Suspend/resume event collection", "F6: Export event list to file");
y++;

windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s", "F9: Quit");
windowPrintFill(helpWin, LINE_COLOR, 1, y, " %-35s %-15s", "F8: Show stat of top syscalls", "F9/Q: Quit");
y++;

box(helpWin, '|', '_');
Expand Down
1 change: 0 additions & 1 deletion src/display/screen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

#define FOOTER_X 0

#define MAX_CONTINUOUS_SCROLL 10
#define MAX_REFRESH_ATTEMPTS 5

// column view constants
Expand Down