diff -Nur a/linux/cpumeter.cc b/linux/cpumeter.cc --- a/linux/cpumeter.cc 2004-06-01 06:21:54.000000000 +0200 +++ b/linux/cpumeter.cc 2004-09-07 22:22:06.056054000 +0200 @@ -19,10 +19,10 @@ #define MAX_PROCSTAT_LENGTH 4096 CPUMeter::CPUMeter(XOSView *parent, const char *cpuID) -: FieldMeterGraph( parent, 4, toUpper(cpuID), "USR/NICE/SYS/FREE" ) { +: FieldMeterGraph( parent, 7, toUpper(cpuID), "US/NI/SY/ID/WA/HI/SI" ) { _lineNum = findLine(cpuID); for ( int i = 0 ; i < 2 ; i++ ) - for ( int j = 0 ; j < 4 ; j++ ) + for ( int j = 0 ; j < 7 ; j++ ) cputime_[i][j] = 0; cpuindex_ = 0; @@ -38,6 +38,9 @@ setfieldcolor( 1, parent_->getResource( "cpuNiceColor" ) ); setfieldcolor( 2, parent_->getResource( "cpuSystemColor" ) ); setfieldcolor( 3, parent_->getResource( "cpuFreeColor" ) ); + setfieldcolor( 4, parent_->getResource( "cpuWaitColor" ) ); + setfieldcolor( 5, parent_->getResource( "cpuInterruptColor" ) ); + setfieldcolor( 6, parent_->getResource( "cpuSoftIntColor" ) ); priority_ = atoi (parent_->getResource( "cpuPriority" ) ); dodecay_ = parent_->isResourceTrue( "cpuDecay" ); useGraph_ = parent_->isResourceTrue( "cpuGraph" ); @@ -69,10 +72,13 @@ stats >>tmp >>cputime_[cpuindex_][0] >>cputime_[cpuindex_][1] >>cputime_[cpuindex_][2] - >>cputime_[cpuindex_][3]; + >>cputime_[cpuindex_][3] + >>cputime_[cpuindex_][4] + >>cputime_[cpuindex_][5] + >>cputime_[cpuindex_][6]; int oldindex = (cpuindex_+1)%2; - for ( int i = 0 ; i < 4 ; i++ ){ + for ( int i = 0 ; i < 7 ; i++ ){ fields_[i] = cputime_[cpuindex_][i] - cputime_[oldindex][i]; total_ += fields_[i]; } diff -Nur a/linux/cpumeter.h b/linux/cpumeter.h --- a/linux/cpumeter.h 2004-05-22 08:24:15.000000000 +0200 +++ b/linux/cpumeter.h 2004-09-07 22:19:07.845146176 +0200 @@ -25,7 +25,7 @@ static const char *cpuStr(int num); protected: int _lineNum; - long cputime_[2][4]; + long cputime_[2][7]; int cpuindex_; void getcputime(void); diff -Nur a/Xdefaults.in b/Xdefaults.in --- a/Xdefaults.in 2004-06-15 18:37:09.000000000 +0200 +++ b/Xdefaults.in 2004-09-07 22:19:07.860143896 +0200 @@ -69,6 +69,7 @@ xosview*cpuNiceColor: yellow xosview*cpuSystemColor: orange xosview*cpuInterruptColor: red +xosview*cpuSoftIntColor: red xosview*cpuWaitColor: lightblue xosview*cpuFreeColor: aquamarine xosview*cpuPriority: 1