~ubuntu-branches/ubuntu/karmic/htop/karmic

« back to all changes in this revision

Viewing changes to Meter.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2008-11-11 04:15:57 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20081111041557-jwylxzcj2p11rcfo
Tags: 0.8.1-0ubuntu1
New upstream release (LP: #273943)

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
#include "TasksMeter.h"
97
97
#include "LoadAverageMeter.h"
98
98
#include "UptimeMeter.h"
 
99
#include "BatteryMeter.h"
99
100
#include "ClockMeter.h"
100
101
 
 
102
 
101
103
#ifndef MIN
102
104
#define MIN(a,b) ((a)<(b)?(a):(b))
103
105
#endif
120
122
   &SwapMeter,
121
123
   &TasksMeter,
122
124
   &UptimeMeter,
 
125
   &BatteryMeter,
123
126
   &AllCPUsMeter,
124
127
   NULL
125
128
};
242
245
 
243
246
   w -= 2;
244
247
   attrset(CRT_colors[METER_TEXT]);
245
 
   mvaddstr(y, x, this->caption);
246
 
   int captionLen = strlen(this->caption);
 
248
   int captionLen = 3;
 
249
   mvaddnstr(y, x, this->caption, captionLen);
247
250
   x += captionLen;
248
251
   w -= captionLen;
249
252
   attrset(CRT_colors[BAR_BORDER]);