← Back to branch summary

~ubuntu-branches/ubuntu/trusty/htop/trusty-proposed

« back to all changes in this revision

Viewing changes to CRT.c

  • Committer: Bazaar Package Importer
  • Author(s): Eugene V. Lyubimkin
  • Date: 2009-04-05 11:51:34 UTC
  • mfrom: (1.1.13 upstream) (7.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090405115134-xyuzxp308k5qos0k
Tags: 0.8.1+svn149-1
http://bugs.debian.org/521861
* New upstream development snapshot:
  - Allow building withough PLPA support. (Closes: #521861)
* debian/patches:
  - 010-make-desktop-file-valid.patch: deleted, merged upstream.
  - 100-upstream-sort-by-processor-and-session.patch: deleted, merged
    upstream.
  - 110-upstream-fix-page-size-on-BSD.patch: deleted, merged upstream.
  - 120-upstream-explain-cpu-bars-in-monochrome-mode.patch: deleted, merged
    upstream.
  - 200-filter-non-printable-characters.patch: deleted, upstream has own
    version of this patch.
  - 610-rename-veid-to-ctid.patch: deleted, merged upstream.
  - 600-openvz-veid-on-kernels-gt-2.6.18.patch: refreshed.
  - 800-tree-view-without-userland-threads.patch: deleted, merged upstream.
  - 700-ltrace-support.patch: refreshed, added the description.
* debian/rules:
  - Deal more robustly with config.{sub,guess} files, thanks to Roger Leigh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CRT.c
100
100
   CPU_IOWAIT,
101
101
   CPU_IRQ,
102
102
   CPU_SOFTIRQ,
 
103
   HOSTNAME,
103
104
   LAST_COLORELEMENT
104
105
} ColorElements;
105
106
 
264
265
      CRT_colors[CPU_IOWAIT] = A_NORMAL;
265
266
      CRT_colors[CPU_IRQ] = A_BOLD;
266
267
      CRT_colors[CPU_SOFTIRQ] = A_BOLD;
 
268
      CRT_colors[HOSTNAME] = A_BOLD;
267
269
   } else if (CRT_colorScheme == COLORSCHEME_BLACKONWHITE) {
268
270
      CRT_colors[RESET_COLOR] = ColorPair(Black,White);
269
271
      CRT_colors[DEFAULT_COLOR] = ColorPair(Black,White);
322
324
      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
323
325
      CRT_colors[CPU_IRQ] = ColorPair(Blue,White);
324
326
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,White);
 
327
      CRT_colors[HOSTNAME] = ColorPair(Black,White);
325
328
   } else if (CRT_colorScheme == COLORSCHEME_BLACKONWHITE2) {
326
329
      CRT_colors[RESET_COLOR] = ColorPair(Black,Black);
327
330
      CRT_colors[DEFAULT_COLOR] = ColorPair(Black,Black);
380
383
      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
381
384
      CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black);
382
385
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
 
386
      CRT_colors[HOSTNAME] = ColorPair(White,Black);
383
387
   } else if (CRT_colorScheme == COLORSCHEME_MIDNIGHT) {
384
388
      CRT_colors[RESET_COLOR] = ColorPair(White,Blue);
385
389
      CRT_colors[DEFAULT_COLOR] = ColorPair(White,Blue);
438
442
      CRT_colors[CPU_IOWAIT] = ColorPair(Yellow,Blue);
439
443
      CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Black,Blue);
440
444
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Black,Blue);
 
445
      CRT_colors[HOSTNAME] = ColorPair(White,Blue);
441
446
   } else if (CRT_colorScheme == COLORSCHEME_BLACKNIGHT) {
442
447
      CRT_colors[RESET_COLOR] = ColorPair(Cyan,Black);
443
448
      CRT_colors[DEFAULT_COLOR] = ColorPair(Cyan,Black);
496
501
      CRT_colors[CPU_IOWAIT] = ColorPair(Yellow,Black);
497
502
      CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black);
498
503
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
 
504
      CRT_colors[HOSTNAME] = ColorPair(Green,Black);
499
505
   } else {
500
506
      /* Default */
501
507
      CRT_colors[RESET_COLOR] = ColorPair(White,Black);
555
561
      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
556
562
      CRT_colors[CPU_IRQ] = ColorPair(Yellow,Black);
557
563
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Magenta,Black);
 
564
      CRT_colors[HOSTNAME] = A_BOLD;
558
565
   }
559
566
}