diff options
author | Daniel Lange <DLange@git.local> | 2021-09-21 08:35:20 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2021-09-21 08:35:20 +0200 |
commit | a2b6942d15d220bb0518003d4f818a922d88e9f9 (patch) | |
tree | 7f60a44dec34af24da75b8d5b68c88eca94b9f6a /Header.h | |
parent | 37d8824862a2f6b9375022e1c45ba4548162650f (diff) | |
parent | 69f439eff387a6ecb52734e400b297a3c85f2285 (diff) | |
download | debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.tar.gz debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.tar.bz2 debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.zip |
Update upstream source from tag 'upstream/3.1.0'
Update to upstream version '3.1.0'
with Debian dir d4ecdd99a38d7105de46689cebcb051bf0046a76
Diffstat (limited to 'Header.h')
-rw-r--r-- | Header.h | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -7,44 +7,42 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "HeaderLayout.h" #include "Meter.h" #include "ProcessList.h" #include "Settings.h" #include "Vector.h" + typedef struct Header_ { Vector** columns; Settings* settings; ProcessList* pl; - int nrColumns; + HeaderLayout headerLayout; int pad; int height; } Header; -#define Header_forEachColumn(this_, i_) for (int (i_)=0; (i_) < (this_)->nrColumns; ++(i_)) +#define Header_forEachColumn(this_, i_) for (size_t (i_)=0, H_fEC_numColumns_ = HeaderLayout_getColumns((this_)->headerLayout); (i_) < H_fEC_numColumns_; ++(i_)) -Header* Header_new(ProcessList* pl, Settings* settings, int nrColumns); +Header* Header_new(ProcessList* pl, Settings* settings, HeaderLayout hLayout); void Header_delete(Header* this); +void Header_setLayout(Header* this, HeaderLayout hLayout); + void Header_populateFromSettings(Header* this); void Header_writeBackToSettings(const Header* this); -MeterModeId Header_addMeterByName(Header* this, char* name, int column); - -void Header_setMode(Header* this, int i, MeterModeId mode, int column); - -Meter* Header_addMeterByClass(Header* this, const MeterClass* type, int param, int column); - -int Header_size(Header* this, int column); - -MeterModeId Header_readMeterMode(Header* this, int i, int column); +Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column); void Header_reinit(Header* this); void Header_draw(const Header* this); +void Header_updateData(Header* this); + int Header_calculateHeight(Header* this); #endif |