Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
htop
Commits
c148907e
Commit
c148907e
authored
Feb 02, 2016
by
Hisham
Browse files
Try to make threads less confusing.
parent
820c079b
Changes
4
Show whitespace changes
Inline
Side-by-side
Action.c
View file @
c148907e
...
@@ -388,7 +388,7 @@ static struct { const char* key; const char* info; } helpLeft[] = {
...
@@ -388,7 +388,7 @@ static struct { const char* key; const char* info; } helpLeft[] = {
{
.
key
=
" F4
\\
: "
,.
info
=
"incremental name filtering"
},
{
.
key
=
" F4
\\
: "
,.
info
=
"incremental name filtering"
},
{
.
key
=
" F5 t: "
,
.
info
=
"tree view"
},
{
.
key
=
" F5 t: "
,
.
info
=
"tree view"
},
{
.
key
=
" u: "
,
.
info
=
"show processes of a single user"
},
{
.
key
=
" u: "
,
.
info
=
"show processes of a single user"
},
{
.
key
=
" H: "
,
.
info
=
"hide/show user threads"
},
{
.
key
=
" H: "
,
.
info
=
"hide/show user
process
threads"
},
{
.
key
=
" K: "
,
.
info
=
"hide/show kernel threads"
},
{
.
key
=
" K: "
,
.
info
=
"hide/show kernel threads"
},
{
.
key
=
" F: "
,
.
info
=
"cursor follows process"
},
{
.
key
=
" F: "
,
.
info
=
"cursor follows process"
},
{
.
key
=
" F6 + -: "
,
.
info
=
"expand/collapse tree"
},
{
.
key
=
" F6 + -: "
,
.
info
=
"expand/collapse tree"
},
...
@@ -478,6 +478,10 @@ static Htop_Reaction actionHelp(State* st) {
...
@@ -478,6 +478,10 @@ static Htop_Reaction actionHelp(State* st) {
attrset
(
CRT_colors
[
HELP_BOLD
]);
attrset
(
CRT_colors
[
HELP_BOLD
]);
for
(
int
i
=
0
;
helpLeft
[
i
].
key
;
i
++
)
{
mvaddstr
(
9
+
i
,
0
,
helpLeft
[
i
].
key
);
}
for
(
int
i
=
0
;
helpLeft
[
i
].
key
;
i
++
)
{
mvaddstr
(
9
+
i
,
0
,
helpLeft
[
i
].
key
);
}
for
(
int
i
=
0
;
helpRight
[
i
].
key
;
i
++
)
{
mvaddstr
(
9
+
i
,
40
,
helpRight
[
i
].
key
);
}
for
(
int
i
=
0
;
helpRight
[
i
].
key
;
i
++
)
{
mvaddstr
(
9
+
i
,
40
,
helpRight
[
i
].
key
);
}
attrset
(
CRT_colors
[
PROCESS_THREAD
]);
mvaddstr
(
15
,
32
,
"threads"
);
mvaddstr
(
16
,
26
,
"threads"
);
attrset
(
CRT_colors
[
DEFAULT_COLOR
]);
attrset
(
CRT_colors
[
HELP_BOLD
]);
attrset
(
CRT_colors
[
HELP_BOLD
]);
mvaddstr
(
23
,
0
,
"Press any key to return."
);
mvaddstr
(
23
,
0
,
"Press any key to return."
);
...
...
ChangeLog
View file @
c148907e
What's new in version
1
.0.
4
What's new in version
2
.0.
0
* Platform abstraction layer
* Platform abstraction layer
* Initial FreeBSD support
* Initial FreeBSD support
...
...
DisplayOptionsPanel.c
View file @
c148907e
...
@@ -86,7 +86,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
...
@@ -86,7 +86,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Tree view"
),
&
(
settings
->
treeView
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Tree view"
),
&
(
settings
->
treeView
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Shadow other users' processes"
),
&
(
settings
->
shadowOtherUsers
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Shadow other users' processes"
),
&
(
settings
->
shadowOtherUsers
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Hide kernel threads"
),
&
(
settings
->
hideKernelThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Hide kernel threads"
),
&
(
settings
->
hideKernelThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Hide userland threads"
),
&
(
settings
->
hideUserlandThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Hide userland
process
threads"
),
&
(
settings
->
hideUserlandThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Display threads in a different color"
),
&
(
settings
->
highlightThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Display threads in a different color"
),
&
(
settings
->
highlightThreads
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Show custom thread names"
),
&
(
settings
->
showThreadNames
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Show custom thread names"
),
&
(
settings
->
showThreadNames
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Show program path"
),
&
(
settings
->
showProgramPath
)));
Panel_add
(
super
,
(
Object
*
)
CheckItem_newByRef
(
xStrdup
(
"Show program path"
),
&
(
settings
->
showProgramPath
)));
...
...
configure.ac
View file @
c148907e
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.65)
AC_PREREQ(2.65)
AC_INIT([htop],[
1
.0.
3
],[hisham@gobolinux.org])
AC_INIT([htop],[
2
.0.
0
],[hisham@gobolinux.org])
year=$(date +%Y)
year=$(date +%Y)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment