zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2024-12-23 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

RichString: refactor writing limited amount of columns

Browse Source 
Closes: #468
This commit is contained in:
Christian Göttsche 2021-01-14 09:59:11 +01:00 committed by cgzones
parent ceee96dcba
commit 08ac22ddb9
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Process.c
View File

@ -245,8 +245,9 @@ void Process_outputRate(RichString* str, char* buffer, size_t n, double rate, in
}
void Process_printLeftAlignedField(RichString* str, int attr, const char* content, unsigned int width) {
int c = RichString_appendnWide(str, attr, content, MINIMUM(width, strlen(content)));
RichString_appendChr(str, attr, ' ', width + 1 - c);
int columns = width;
RichString_appendnWideColumns(str, attr, content, strlen(content), &columns);
RichString_appendChr(str, attr, ' ', width + 1 - columns);
}
void Process_writeField(const Process* this, RichString* str, ProcessField field) {

38
RichString.c
View File

@ -60,7 +60,37 @@ static inline int RichString_writeFromWide(RichString* this, int attrs, const ch
this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (iswprint(data[j]) ? data[j] : '?') } };
}
return wcswidth(data, len);
return len;
}
int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
wchar_t data[len + 1];
len = mbstowcs(data, data_c, len);
if (len <= 0)
return 0;
int from = this->chlen;
int newLen = from + len;
RichString_setLen(this, newLen);
int columnsWritten = 0;
int pos = from;
for (int j = 0; j < len; j++) {
wchar_t c = iswprint(data[j]) ? data[j] : '?';
int cwidth = wcwidth(c);
if (cwidth > *columns)
break;
*columns -= cwidth;
columnsWritten += cwidth;
this->chptr[pos] = (CharType) { .attr = attrs & 0xffffff, .chars = { c, '\0' } };
pos++;
}
RichString_setLen(this, pos);
*columns = columnsWritten;
return pos - from;
}
static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data, int from, int len) {
@ -113,6 +143,12 @@ static inline int RichString_writeFromWide(RichString* this, int attrs, const ch
return len;
}
int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
int written = RichString_writeFromWide(this, attrs, data_c, this->chlen, MINIMUM(len, *columns));
*columns = written;
return written;
}
static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data_c, int from, int len) {
return RichString_writeFromWide(this, attrs, data_c, from, len);
}

5
RichString.h
View File

@ -52,10 +52,15 @@ void RichString_setAttr(RichString* this, int attrs);
void RichString_appendChr(RichString* this, int attrs, char c, int count);
/* All appending and writing functions return the number of written characters (not columns). */
int RichString_appendWide(RichString* this, int attrs, const char* data);
int RichString_appendnWide(RichString* this, int attrs, const char* data, int len);
/* columns takes the maximum number of columns to write and contains on return the number of columns written. */
int RichString_appendnWideColumns(RichString* this, int attrs, const char* data, int len, int* columns);
int RichString_writeWide(RichString* this, int attrs, const char* data);
int RichString_appendAscii(RichString* this, int attrs, const char* data);