Skip to content

Commit

Permalink
Remove trailing whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
cgzones committed Aug 21, 2020
1 parent 3856bf5 commit b92f62f
Show file tree
Hide file tree
Showing 26 changed files with 64 additions and 86 deletions.
1 change: 0 additions & 1 deletion Action.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,4 +615,3 @@ void Action_setBindings(Htop_Action* keys) {
keys['c'] = actionTagAllChildren;
keys['e'] = actionShowEnvScreen;
}

3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ Donations
---------

If you like htop, feel free to [buy the author a
beer](http://hisham.hm/htop/index.php?page=donate). :-)

beer](http://hisham.hm/htop/index.php?page=donate). :-)
1 change: 0 additions & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,3 @@ Public License instead of this License.
applicable licenses of the version of PLPA used in your combined work,
provided that you include the source code of such version of PLPA when
and as the GNU GPL requires distribution of source code.

4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ What's new in version 1.0.2
What's new in version 1.0.1

* Move .htoprc to XDG-compliant path ~/.config/htop/htoprc,
respecting $XDG_CONFIG_HOME
respecting $XDG_CONFIG_HOME
(thanks to Hadzhimurad Ustarkhan for the suggestion.)
* Safer behavior on the kill screen, to make it harder to kill the wrong process.
* Fix for building in FreeBSD 8.2
Expand Down Expand Up @@ -607,7 +607,7 @@ What's new in version 0.3.1

What's new in version 0.3

* BUGFIX: no dirt left on screen on horizontal scrolling
* BUGFIX: no dirt left on screen on horizontal scrolling
* Signal selection on "kill" command
* Color-coding for users, nice and process status
* "Follow" function
Expand Down
1 change: 0 additions & 1 deletion ColumnsPanel.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,3 @@ void ColumnsPanel_update(Panel* super) {
}
this->settings->fields[size] = 0;
}

1 change: 0 additions & 1 deletion ListItem.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,3 @@ long ListItem_compare(const void* cast1, const void* cast2) {
ListItem* obj2 = (ListItem*) cast2;
return strcmp(obj1->value, obj2->value);
}

1 change: 0 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
See the commit history for news of the past.
See the bug tracker for news of the future.
Run the program for news of the present.

69 changes: 34 additions & 35 deletions TESTPLAN
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@ Main screen:
For all views, all modes:

Mouse click header - nothing happens.

Mouse click on ProcessList title bar - exit Tree view, update FunctionBar, title bar updates, sort by clicked field.
*** FAILING: wrong FB update depending on mode; does not change sort in wip branch
click on same entry - invert sort.
click on another entry - sort another field.

Mouse click on a process - select that process.

for each entry in FunctionBar:
Mouse click entry - perform action of associated key.

In Normal mode, Sorted view:

<+> or <-> - do nothing.

<F6> - enter SortBy screen.

In Normal mode, Tree view:

select process - update F6 in FunctionBar if subtree is collapsed or expanded.

<F6>, <+> or <-> - expand/collapse subtree.

In Normal mode, either Sorted or Tree view:

<F3>, </> - activate Search mode.

<F4>, <\> - activate Filter mode.

<F7>, <]> - as root only, decrease process NICE value.

<F8>, <[> - increase process NICE value.

<a> - enter Affinity screen.

<b> - do nothing.

<c> - select process and all its children.

<d>, <e>, <f>, <g> - do nothing.

<F1>, <h>, <?> - enter Help screen.

<i> - on Linux, enter IOPriority screen.
Expand All @@ -64,67 +64,67 @@ Main screen:
<s> - enter STrace screen.

<F5>, <t> - toggle between Tree and Sorted view, update F5 in FunctionBar, follow process

<u> - enter User screen.

<v>, <w>, <x>, <y>, <z> - do nothing.

<A>, <B> - do nothing.

<F2>, <C>, <S> - enter Setup screen.

<D>, <E> - do nothing.

<F> - follow process.

<G> - do nothing.

<H> - toggle show/hide userland threads.

<I> - invert sort order.

<J> - do nothing.

<K> - toggle show/hide kernel threads.

<L> - do nothing.

<M> - enter Sorted view, update function bar, sort by MEM%.

<N>, <O> - do nothing.

<P> - enter Sorted view, update function bar, sort by CPU%.

<Q>, <R> - do nothing.

<T> - enter Sorted view, update function bar, sort by TIME.

<U> - untag all processes.

<V>, <W>, <X>, <Y>, <Z> - do nothing.

<<>, <>>, <,>, <.> - enter SortBy screen.

space - tag current process, move down cursor.

numbers - incremental PID search.

In Search mode:

TODO

In Filter mode:

TODO

Setup screen:

TODO

SortBy screen:

TODO

User screen:

TODO
Expand All @@ -136,7 +136,7 @@ Kill screen:
Affinity screen:

TODO

Help screen:

any key - back to Main screen.
Expand All @@ -152,4 +152,3 @@ STrace screen:
LSOF screen:

TODO

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ else
HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
missing_libraries="$missing_libraries libncurses"
))))

AC_CHECK_HEADERS([curses.h],[:],
[AC_CHECK_HEADERS([ncurses/curses.h],[:],
[AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
Expand Down
1 change: 0 additions & 1 deletion darwin/Battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
CFRelease(power_sources);
}
}

1 change: 0 additions & 1 deletion darwin/DarwinCRT.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
#endif
abort();
}

1 change: 0 additions & 1 deletion dragonflybsd/DragonFlyBSDCRT.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
#endif
abort();
}

1 change: 0 additions & 1 deletion freebsd/FreeBSDCRT.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ void CRT_handleSIGSEGV(int sgn) {
fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
abort();
}

26 changes: 13 additions & 13 deletions htop.1.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
.SH "NAME"
htop \- interactive process viewer
.SH "SYNOPSIS"
.LP
.LP
.B htop
.RB [ \-dChpustv ]
.SH "DESCRIPTION"
.LP
.LP
.B htop
is a cross-platform ncurses-based process viewer.
.LP
Expand All @@ -20,11 +20,11 @@ multiple processes and acting on them all at once.
.LP
Tasks related to processes (killing, renicing) can be done without
entering their PIDs.
.br
.br
.SH "COMMAND-LINE OPTIONS"
.LP
Mandatory arguments to long options are mandatory for short options too.
.LP
.LP
.TP
\fB\-d \-\-delay=DELAY\fR
Delay between updates, in tenths of seconds. If the delay value is
Expand Down Expand Up @@ -54,10 +54,10 @@ Output version information and exit
\fB\-t \-\-tree
Show processes in tree view
.SH "INTERACTIVE COMMANDS"
.LP
.LP
The following commands are supported while in
.BR htop :
.LP
.LP
.TP 5
.B Up, Alt-k
Select (highlight) the previous process in the process list. Scroll the list
Expand Down Expand Up @@ -159,7 +159,7 @@ Quit
Invert the sort order: if sort order is increasing, switch to decreasing, and
vice-versa.
.TP
.B +, \-
.B +, \-
When in tree view mode, expand or collapse subtree. When a subtree is collapsed
a "+" sign shows to the left of the process name.
.TP
Expand Down Expand Up @@ -203,7 +203,7 @@ Refresh: redraw screen and recalculate values.
PID search: type in process ID and the selection highlight will be moved to it.
.PD
.SH "COLUMNS"
.LP
.LP
The following columns can display data about each process. A value of '\-' in
all the rows indicates that a column is unsupported on your system, or
currently unimplemented in
Expand All @@ -213,11 +213,11 @@ The names below are the ones used in the
shown in
.BR htop 's
main screen, it is shown below in parenthesis.
.LP
.LP
.TP 5
.B Command
The full command line of the process (i.e. program name and arguments).
.TP
.TP
.B PID
The process ID.
.TP
Expand All @@ -238,7 +238,7 @@ The process's group ID.
.TP
.B SESSION (SID)
The process's session ID.
.TP
.TP
.B TTY_NR (TTY)
The controlling terminal of the process.
.TP
Expand Down Expand Up @@ -401,7 +401,7 @@ The percentage of time spent swapping in pages. Requires CAP_NET_ADMIN.
.B All other flags
Currently unsupported (always displays '-').
.SH "CONFIG FILE"
.LP
.LP
By default
.B htop
reads its configuration from the XDG-compliant path
Expand Down Expand Up @@ -437,7 +437,7 @@ space and make memory size representations consistent throughout
and
.BR limits.conf (5).
.SH "AUTHORS"
.LP
.LP
.B htop
was originally developed by Hisham Muhammad.
Nowadays it is maintained by the community at <[email protected]>.
1 change: 0 additions & 1 deletion linux/IOPriority.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ typedef int IOPriority;
#define IOPriority_Idle IOPriority_tuple(IOPRIO_CLASS_IDLE, 7)
}*/

1 change: 0 additions & 1 deletion linux/IOPriorityPanel.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ Panel* IOPriorityPanel_new(IOPriority currPrio) {
IOPriority IOPriorityPanel_getIOPriority(Panel* this) {
return (IOPriority) ( ((ListItem*) Panel_getSelected(this))->key );
}

1 change: 0 additions & 1 deletion linux/LinuxProcess.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,4 +514,3 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
bool Process_isThread(Process* this) {
return (Process_isUserlandThread(this) || Process_isKernelThread(this));
}

1 change: 0 additions & 1 deletion openbsd/OpenBSDCRT.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ void CRT_handleSIGSEGV(int sgn) {
fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
abort();
}

1 change: 0 additions & 1 deletion openbsd/OpenBSDProcessList.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
OpenBSDProcessList_scanProcs(opl);
OpenBSDProcessList_scanCPUTime(opl);
}

1 change: 0 additions & 1 deletion solaris/Battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
*level = -1;
*isOnAC = AC_ERROR;
}

1 change: 0 additions & 1 deletion solaris/SolarisProcessList.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,4 +419,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
this->kernelThreads = 1;
proc_walk(&SolarisProcessList_walkproc, this, PR_WALK_LWP);
}

Loading

0 comments on commit b92f62f

Please sign in to comment.