|
|
|
@ -39,6 +39,7 @@ static void printHelpFlag() { |
|
|
|
fputs("htop " VERSION " - " COPYRIGHT "\n" |
|
|
|
fputs("htop " VERSION " - " COPYRIGHT "\n" |
|
|
|
"Released under the GNU GPL.\n\n" |
|
|
|
"Released under the GNU GPL.\n\n" |
|
|
|
"-C --no-color Use a monochrome color scheme\n" |
|
|
|
"-C --no-color Use a monochrome color scheme\n" |
|
|
|
|
|
|
|
"-m --no-mouse Disable the mouse\n" |
|
|
|
"-d --delay=DELAY Set the delay between updates, in tenths of seconds\n" |
|
|
|
"-d --delay=DELAY Set the delay between updates, in tenths of seconds\n" |
|
|
|
"-h --help Print this help screen\n" |
|
|
|
"-h --help Print this help screen\n" |
|
|
|
"-s --sort-key=COLUMN Sort by COLUMN (try --sort-key=help for a list)\n" |
|
|
|
"-s --sort-key=COLUMN Sort by COLUMN (try --sort-key=help for a list)\n" |
|
|
|
@ -62,6 +63,7 @@ typedef struct CommandLineSettings_ { |
|
|
|
int sortKey; |
|
|
|
int sortKey; |
|
|
|
int delay; |
|
|
|
int delay; |
|
|
|
bool useColors; |
|
|
|
bool useColors; |
|
|
|
|
|
|
|
bool enableMouse; |
|
|
|
bool treeView; |
|
|
|
bool treeView; |
|
|
|
} CommandLineSettings; |
|
|
|
} CommandLineSettings; |
|
|
|
|
|
|
|
|
|
|
|
@ -73,6 +75,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) { |
|
|
|
.sortKey = 0, |
|
|
|
.sortKey = 0, |
|
|
|
.delay = -1, |
|
|
|
.delay = -1, |
|
|
|
.useColors = true, |
|
|
|
.useColors = true, |
|
|
|
|
|
|
|
.enableMouse = true, |
|
|
|
.treeView = false, |
|
|
|
.treeView = false, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -85,6 +88,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) { |
|
|
|
{"user", required_argument, 0, 'u'}, |
|
|
|
{"user", required_argument, 0, 'u'}, |
|
|
|
{"no-color", no_argument, 0, 'C'}, |
|
|
|
{"no-color", no_argument, 0, 'C'}, |
|
|
|
{"no-colour",no_argument, 0, 'C'}, |
|
|
|
{"no-colour",no_argument, 0, 'C'}, |
|
|
|
|
|
|
|
{"no-mouse", no_argument, 0, 'm'}, |
|
|
|
{"tree", no_argument, 0, 't'}, |
|
|
|
{"tree", no_argument, 0, 't'}, |
|
|
|
{"pid", required_argument, 0, 'p'}, |
|
|
|
{"pid", required_argument, 0, 'p'}, |
|
|
|
{0,0,0,0} |
|
|
|
{0,0,0,0} |
|
|
|
@ -92,7 +96,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) { |
|
|
|
|
|
|
|
|
|
|
|
int opt, opti=0; |
|
|
|
int opt, opti=0; |
|
|
|
/* Parse arguments */ |
|
|
|
/* Parse arguments */ |
|
|
|
while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:", long_opts, &opti))) { |
|
|
|
while ((opt = getopt_long(argc, argv, "hvmCs:td:u:p:", long_opts, &opti))) { |
|
|
|
if (opt == EOF) break; |
|
|
|
if (opt == EOF) break; |
|
|
|
switch (opt) { |
|
|
|
switch (opt) { |
|
|
|
case 'h': |
|
|
|
case 'h': |
|
|
|
@ -130,6 +134,9 @@ static CommandLineSettings parseArguments(int argc, char** argv) { |
|
|
|
case 'C': |
|
|
|
case 'C': |
|
|
|
flags.useColors = false; |
|
|
|
flags.useColors = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
case 'm': |
|
|
|
|
|
|
|
flags.enableMouse = false; |
|
|
|
|
|
|
|
break; |
|
|
|
case 't': |
|
|
|
case 't': |
|
|
|
flags.treeView = true; |
|
|
|
flags.treeView = true; |
|
|
|
break; |
|
|
|
break; |
|
|
|
@ -203,6 +210,8 @@ int main(int argc, char** argv) { |
|
|
|
settings->delay = flags.delay; |
|
|
|
settings->delay = flags.delay; |
|
|
|
if (!flags.useColors) |
|
|
|
if (!flags.useColors) |
|
|
|
settings->colorScheme = COLORSCHEME_MONOCHROME; |
|
|
|
settings->colorScheme = COLORSCHEME_MONOCHROME; |
|
|
|
|
|
|
|
if (!flags.enableMouse) |
|
|
|
|
|
|
|
settings->enableMouse = false; |
|
|
|
if (flags.treeView) |
|
|
|
if (flags.treeView) |
|
|
|
settings->treeView = true; |
|
|
|
settings->treeView = true; |
|
|
|
|
|
|
|
|
|
|
|
|