mirror of https://github.com/xzeldon/htop.git
command screen: fill current line when scanning
This commit is contained in:
parent
9ee72568dc
commit
214c742ae1
|
@ -12,33 +12,33 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
|
||||||
static void CommandScreen_addLine(InfoScreen* this, char* line, const char* p, int line_offset, int len) {
|
|
||||||
memcpy(line, p - line_offset, len);
|
|
||||||
line[len] = '\0';
|
|
||||||
InfoScreen_addLine(this, line);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void CommandScreen_scan(InfoScreen* this) {
|
static void CommandScreen_scan(InfoScreen* this) {
|
||||||
Panel* panel = this->display;
|
Panel* panel = this->display;
|
||||||
int idx = MAXIMUM(Panel_getSelectedIndex(panel), 0);
|
int idx = MAXIMUM(Panel_getSelectedIndex(panel), 0);
|
||||||
|
|
||||||
Panel_prune(panel);
|
Panel_prune(panel);
|
||||||
|
|
||||||
const char* p = this->process->comm;
|
const char* p = this->process->comm;
|
||||||
char* line = xMalloc(COLS + 1);
|
char* line = xMalloc(COLS + 1);
|
||||||
int line_offset = 0, last_spc = -1, len;
|
int line_offset = 0, last_spc = -1, len;
|
||||||
for (; *p != '\0'; p++, line_offset++) {
|
for (; *p != '\0'; p++, line_offset++) {
|
||||||
|
line[line_offset] = *p;
|
||||||
if (*p == ' ') last_spc = line_offset;
|
if (*p == ' ') last_spc = line_offset;
|
||||||
|
|
||||||
if (line_offset == COLS) {
|
if (line_offset == COLS) {
|
||||||
len = (last_spc == -1) ? line_offset : last_spc;
|
len = (last_spc == -1) ? line_offset : last_spc;
|
||||||
CommandScreen_addLine(this, line, p, line_offset, len);
|
line[len] = '\0';
|
||||||
|
InfoScreen_addLine(this, line);
|
||||||
|
|
||||||
line_offset -= len;
|
line_offset -= len;
|
||||||
last_spc = -1;
|
last_spc = -1;
|
||||||
|
memcpy(line, p - line_offset, line_offset + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line_offset > 0) CommandScreen_addLine(this, line, p, line_offset, line_offset);
|
if (line_offset > 0) {
|
||||||
|
line[line_offset] = '\0';
|
||||||
|
InfoScreen_addLine(this, line);
|
||||||
|
}
|
||||||
|
|
||||||
free(line);
|
free(line);
|
||||||
Panel_setSelected(panel, idx);
|
Panel_setSelected(panel, idx);
|
||||||
|
|
Loading…
Reference in New Issue