diff options
Diffstat (limited to 'Header.c')
| -rw-r--r-- | Header.c | 236 |
1 files changed, 148 insertions, 88 deletions
@@ -1,13 +1,18 @@ /* htop - Header.c (C) 2004-2011 Hisham H. Muhammad -Released under the GNU GPLv2, see the COPYING file +Released under the GNU GPLv2+, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "Header.h" +#include <assert.h> +#include <math.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -19,18 +24,20 @@ in the source distribution for its full text. #include "Object.h" #include "Platform.h" #include "ProvideCurses.h" +#include "Settings.h" #include "XUtils.h" -Header* Header_new(ProcessList* pl, Settings* settings, int nrColumns) { +Header* Header_new(Machine* host, HeaderLayout hLayout) { Header* this = xCalloc(1, sizeof(Header)); - this->columns = xCalloc(nrColumns, sizeof(Vector*)); - this->settings = settings; - this->pl = pl; - this->nrColumns = nrColumns; + this->columns = xMallocArray(HeaderLayout_getColumns(hLayout), sizeof(Vector*)); + this->headerLayout = hLayout; + this->host = host; + Header_forEachColumn(this, i) { this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE); } + return this; } @@ -38,44 +45,119 @@ void Header_delete(Header* this) { Header_forEachColumn(this, i) { Vector_delete(this->columns[i]); } + free(this->columns); free(this); } -void Header_populateFromSettings(Header* this) { - Header_forEachColumn(this, col) { - const MeterColumnSettings* colSettings = &this->settings->columns[col]; - for (int i = 0; i < colSettings->len; i++) { - if (!Header_addMeterByName(this, colSettings->names[i], col)) { - continue; +void Header_setLayout(Header* this, HeaderLayout hLayout) { + size_t oldColumns = HeaderLayout_getColumns(this->headerLayout); + size_t newColumns = HeaderLayout_getColumns(hLayout); + + this->headerLayout = hLayout; + + if (newColumns == oldColumns) + return; + + if (newColumns > oldColumns) { + this->columns = xReallocArray(this->columns, newColumns, sizeof(Vector*)); + for (size_t i = oldColumns; i < newColumns; i++) + this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE); + } else { + // move meters from to-be-deleted columns into last one + for (size_t i = newColumns; i < oldColumns; i++) { + for (int j = this->columns[i]->items - 1; j >= 0; j--) { + Vector_add(this->columns[newColumns - 1], Vector_take(this->columns[i], j)); } - if (colSettings->modes[i] != 0) { - Header_setMode(this, i, colSettings->modes[i], col); + Vector_delete(this->columns[i]); + } + this->columns = xReallocArray(this->columns, newColumns, sizeof(Vector*)); + } + + Header_calculateHeight(this); +} + +static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, unsigned int column) { + assert(column < HeaderLayout_getColumns(this->headerLayout)); + + Vector* meters = this->columns[column]; + + const char* paren = strchr(name, '('); + unsigned int param = 0; + size_t nameLen; + if (paren) { + if (sscanf(paren, "(%10u)", ¶m) != 1) { // not CPUMeter + char dynamic[32] = {0}; + if (sscanf(paren, "(%30s)", dynamic) == 1) { // DynamicMeter + char* end; + if ((end = strrchr(dynamic, ')')) == NULL) + return; // htoprc parse failure + *end = '\0'; + const Settings* settings = this->host->settings; + if (!DynamicMeter_search(settings->dynamicMeters, dynamic, ¶m)) + return; // name lookup failure + } else { + param = 0; + } + } + nameLen = paren - name; + } else { + nameLen = strlen(name); + } + + for (const MeterClass* const* type = Platform_meterTypes; *type; type++) { + if (0 == strncmp(name, (*type)->name, nameLen) && (*type)->name[nameLen] == '\0') { + Meter* meter = Meter_new(this->host, param, *type); + if (mode != 0) { + Meter_setMode(meter, mode); } + Vector_add(meters, meter); + break; + } + } +} + +void Header_populateFromSettings(Header* this) { + const Settings* settings = this->host->settings; + Header_setLayout(this, settings->hLayout); + + Header_forEachColumn(this, col) { + const MeterColumnSetting* colSettings = &settings->hColumns[col]; + Vector_prune(this->columns[col]); + for (size_t i = 0; i < colSettings->len; i++) { + Header_addMeterByName(this, colSettings->names[i], colSettings->modes[i], col); } } + Header_calculateHeight(this); } void Header_writeBackToSettings(const Header* this) { + Settings* settings = this->host->settings; + Settings_setHeaderLayout(settings, this->headerLayout); + Header_forEachColumn(this, col) { - MeterColumnSettings* colSettings = &this->settings->columns[col]; + MeterColumnSetting* colSettings = &settings->hColumns[col]; - String_freeArray(colSettings->names); + if (colSettings->names) { + for (size_t j = 0; j < colSettings->len; j++) + free(colSettings->names[j]); + free(colSettings->names); + } free(colSettings->modes); const Vector* vec = this->columns[col]; int len = Vector_size(vec); - colSettings->names = xCalloc(len + 1, sizeof(char*)); - colSettings->modes = xCalloc(len, sizeof(int)); + colSettings->names = len ? xCalloc(len + 1, sizeof(*colSettings->names)) : NULL; + colSettings->modes = len ? xCalloc(len, sizeof(*colSettings->modes)) : NULL; colSettings->len = len; for (int i = 0; i < len; i++) { const Meter* meter = (Meter*) Vector_get(vec, i); char* name; if (meter->param && As_Meter(meter) == &DynamicMeter_class) { - const char* dynamic = DynamicMeter_lookup(this->pl->dynamicMeters, meter->param); + const char* dynamic = DynamicMeter_lookup(settings->dynamicMeters, meter->param); xAsprintf(&name, "%s(%s)", As_Meter(meter)->name, dynamic); } else if (meter->param && As_Meter(meter) == &CPUMeter_class) { xAsprintf(&name, "%s(%u)", As_Meter(meter)->name, meter->param); @@ -88,69 +170,16 @@ void Header_writeBackToSettings(const Header* this) { } } -bool Header_addMeterByName(Header* this, const char* name, int column) { - Vector* meters = this->columns[column]; +Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column) { + assert(column < HeaderLayout_getColumns(this->headerLayout)); - char* paren = strchr(name, '('); - unsigned int param = 0; - if (paren) { - char* end, dynamic[32] = {0}; - int ok = sscanf(paren, "(%10u)", ¶m); // CPUMeter - if (!ok) { - if (sscanf(paren, "(%30s)", dynamic)) { // DynamicMeter - if ((end = strrchr(dynamic, ')')) == NULL) - return false; // indicate htoprc parse failure - *end = '\0'; - if (!DynamicMeter_search(this->pl->dynamicMeters, dynamic, ¶m)) - return false; // indicates name lookup failure - } - } - *paren = '\0'; - } - for (const MeterClass* const* type = Platform_meterTypes; *type; type++) { - if (String_eq(name, (*type)->name)) { - Meter* meter = Meter_new(this->pl, param, *type); - Vector_add(meters, meter); - break; - } - } - - if (paren) - *paren = '('; - - return true; -} - -void Header_setMode(Header* this, int i, MeterModeId mode, int column) { Vector* meters = this->columns[column]; - if (i >= Vector_size(meters)) - return; - - Meter* meter = (Meter*) Vector_get(meters, i); - Meter_setMode(meter, mode); -} - -Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, int column) { - Vector* meters = this->columns[column]; - - Meter* meter = Meter_new(this->pl, param, type); + Meter* meter = Meter_new(this->host, param, type); Vector_add(meters, meter); return meter; } -int Header_size(const Header* this, int column) { - const Vector* meters = this->columns[column]; - return Vector_size(meters); -} - -MeterModeId Header_readMeterMode(const Header* this, int i, int column) { - const Vector* meters = this->columns[column]; - - const Meter* meter = (const Meter*) Vector_get(meters, i); - return meter->mode; -} - void Header_reinit(Header* this) { Header_forEachColumn(this, col) { for (int i = 0; i < Vector_size(this->columns[col]); i++) { @@ -169,24 +198,42 @@ void Header_draw(const Header* this) { for (int y = 0; y < height; y++) { mvhline(y, 0, ' ', COLS); } - const int width = COLS / this->nrColumns - pad; + const int numCols = HeaderLayout_getColumns(this->headerLayout); + const int width = COLS - 2 * pad - (numCols - 1); int x = pad; + float roundingLoss = 0.0F; Header_forEachColumn(this, col) { Vector* meters = this->columns[col]; + float colWidth = (float)width * HeaderLayout_layouts[this->headerLayout].widths[col] / 100.0F; + + roundingLoss += colWidth - floorf(colWidth); + if (roundingLoss >= 1.0F) { + colWidth += 1.0F; + roundingLoss -= 1.0F; + } + for (int y = (pad / 2), i = 0; i < Vector_size(meters); i++) { Meter* meter = (Meter*) Vector_get(meters, i); - int actualWidth; - if (meter->mode == TEXT_METERMODE) - actualWidth = meter->columnWidthCount * width + (meter->columnWidthCount - 1) * (2 * pad + 1); - else - actualWidth = width; + float actualWidth = colWidth; + + /* Let meters in text mode expand to the right on empty neighbors; + except for multi column meters. */ + if (meter->mode == TEXT_METERMODE && !Meter_isMultiColumn(meter)) { + for (int j = 1; j < meter->columnWidthCount; j++) { + actualWidth++; /* separator column */ + actualWidth += (float)width * HeaderLayout_layouts[this->headerLayout].widths[col + j] / 100.0F; + } + } - meter->draw(meter, x, y, actualWidth); + assert(meter->draw); + meter->draw(meter, x, y, floorf(actualWidth)); y += meter->h; } - x += width + pad; + + x += floorf(colWidth); + x++; /* separator column */ } } @@ -206,8 +253,8 @@ void Header_updateData(Header* this) { * by counting how many columns to the right are empty or contain a BlankMeter. * Returns the number of columns to span, i.e. if the direct neighbor is occupied 1. */ -static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const int curColumn, const int curHeight) { - for (int i = curColumn + 1; i < this->nrColumns; i++) { +static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const unsigned int curColumn, const int curHeight) { + for (size_t i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) { const Vector* meters = this->columns[i]; int height = pad; @@ -226,11 +273,12 @@ static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const } } - return this->nrColumns - curColumn; + return HeaderLayout_getColumns(this->headerLayout) - curColumn; } int Header_calculateHeight(Header* this) { - const int pad = this->settings->headerMargin ? 2 : 0; + const Settings* settings = this->host->settings; + const int pad = settings->headerMargin ? 2 : 0; int maxHeight = pad; Header_forEachColumn(this, col) { @@ -243,7 +291,19 @@ int Header_calculateHeight(Header* this) { } maxHeight = MAXIMUM(maxHeight, height); } + + if (maxHeight == pad) { + maxHeight = 0; + this->pad = 0; + } else { + this->pad = pad; + } + + if (settings->screenTabs) { + maxHeight++; + } + this->height = maxHeight; - this->pad = pad; + return maxHeight; } |