Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 469772 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +69 lines)
Line  Link Here
0
-- a/CRT.h
0
++ b/CRT.h
Lines 20-25 in the source distribution for its full text. Link Here
20
#define COLORSCHEME_BLACKONWHITE2 3
20
#define COLORSCHEME_BLACKONWHITE2 3
21
#define COLORSCHEME_MIDNIGHT 4
21
#define COLORSCHEME_MIDNIGHT 4
22
#define COLORSCHEME_BLACKNIGHT 5
22
#define COLORSCHEME_BLACKNIGHT 5
23
#define COLORSCHEME_SOLARIZED 6
23
24
24
#define Black COLOR_BLACK
25
#define Black COLOR_BLACK
25
#define Red COLOR_RED
26
#define Red COLOR_RED
26
-- a/CRT.c
27
++ b/CRT.c
Lines 27-32 in the source distribution for its full text. Link Here
27
#define COLORSCHEME_BLACKONWHITE2 3
27
#define COLORSCHEME_BLACKONWHITE2 3
28
#define COLORSCHEME_MIDNIGHT 4
28
#define COLORSCHEME_MIDNIGHT 4
29
#define COLORSCHEME_BLACKNIGHT 5
29
#define COLORSCHEME_BLACKNIGHT 5
30
#define COLORSCHEME_SOLARIZED 6
30
31
31
#define Black COLOR_BLACK
32
#define Black COLOR_BLACK
32
#define Red COLOR_RED
33
#define Red COLOR_RED
Lines 545-550 void CRT_setColors(int colorScheme) { Link Here
545
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
545
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
546
      CRT_colors[CPU_STEAL] = ColorPair(Cyan,Black);
546
      CRT_colors[CPU_STEAL] = ColorPair(Cyan,Black);
547
      CRT_colors[CPU_GUEST] = ColorPair(Cyan,Black);
547
      CRT_colors[CPU_GUEST] = ColorPair(Cyan,Black);
548
   } else if (CRT_colorScheme == COLORSCHEME_SOLARIZED) {
549
      CRT_colors[RESET_COLOR] = ColorPair(Cyan,Black);
550
      CRT_colors[DEFAULT_COLOR] = ColorPair(Cyan,Black);
551
      CRT_colors[FUNCTION_BAR] = ColorPair(Black,Green);
552
      CRT_colors[FUNCTION_KEY] = ColorPair(Cyan,Black);
553
      CRT_colors[PANEL_HEADER_FOCUS] = ColorPair(Black,Green);
554
      CRT_colors[PANEL_HEADER_UNFOCUS] = ColorPair(Black,Green);
555
      CRT_colors[PANEL_HIGHLIGHT_FOCUS] = ColorPair(Black,Cyan);
556
      CRT_colors[PANEL_HIGHLIGHT_UNFOCUS] = ColorPair(Black,White);
557
      CRT_colors[FAILED_SEARCH] = ColorPair(Red,Cyan);
558
      CRT_colors[UPTIME] = ColorPair(Green,Black);
559
      CRT_colors[BATTERY] = ColorPair(Green,Black);
560
      CRT_colors[LARGE_NUMBER] = A_BOLD | ColorPair(Red,Black);
561
      CRT_colors[METER_TEXT] = ColorPair(Cyan,Black);
562
      CRT_colors[METER_VALUE] = ColorPair(Green,Black);
563
      CRT_colors[LED_COLOR] = ColorPair(Green,Black);
564
      CRT_colors[TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black);
565
      CRT_colors[PROCESS] = ColorPair(Cyan,Black);
566
      CRT_colors[PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black);
567
      CRT_colors[PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black);
568
      CRT_colors[PROCESS_MEGABYTES] = A_BOLD | ColorPair(Green,Black);
569
      CRT_colors[PROCESS_BASENAME] = A_BOLD | ColorPair(Green,Black);
570
      CRT_colors[PROCESS_TREE] = ColorPair(Cyan,Black);
571
      CRT_colors[PROCESS_THREAD] = ColorPair(Green,Black);
572
      CRT_colors[PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue,Black);
573
      CRT_colors[PROCESS_R_STATE] = ColorPair(Green,Black);
574
      CRT_colors[PROCESS_HIGH_PRIORITY] = ColorPair(Red,Black);
575
      CRT_colors[PROCESS_LOW_PRIORITY] = ColorPair(Red,Black);
576
      CRT_colors[BAR_BORDER] = A_BOLD | ColorPair(Green,Black);
577
      CRT_colors[BAR_SHADOW] = ColorPair(Green,Black);
578
      CRT_colors[SWAP] = ColorPair(Red,Black);
579
      CRT_colors[GRAPH_1] = A_BOLD | ColorPair(Red,Black);
580
      CRT_colors[GRAPH_2] = ColorPair(Red,Black);
581
      CRT_colors[GRAPH_3] = A_BOLD | ColorPair(Yellow,Black);
582
      CRT_colors[GRAPH_4] = A_BOLD | ColorPair(Green,Black);
583
      CRT_colors[GRAPH_5] = ColorPair(Green,Black);
584
      CRT_colors[GRAPH_6] = ColorPair(Cyan,Black);
585
      CRT_colors[GRAPH_7] = A_BOLD | ColorPair(Blue,Black);
586
      CRT_colors[GRAPH_8] = ColorPair(Blue,Black);
587
      CRT_colors[GRAPH_9] = A_BOLD | ColorPair(Green,Black);
588
      CRT_colors[MEMORY_USED] = ColorPair(Green,Black);
589
      CRT_colors[MEMORY_BUFFERS] = ColorPair(Blue,Black);
590
      CRT_colors[MEMORY_CACHE] = ColorPair(Yellow,Black);
591
      CRT_colors[LOAD_AVERAGE_FIFTEEN] = ColorPair(Green,Black);
592
      CRT_colors[LOAD_AVERAGE_FIVE] = ColorPair(Green,Black);
593
      CRT_colors[LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(Green,Black);
594
      CRT_colors[LOAD] = A_BOLD;
595
      CRT_colors[HELP_BOLD] = A_BOLD | ColorPair(Cyan,Black);
596
      CRT_colors[CLOCK] = ColorPair(Green,Black);
597
      CRT_colors[CHECK_BOX] = ColorPair(Green,Black);
598
      CRT_colors[CHECK_MARK] = A_BOLD | ColorPair(Green,Black);
599
      CRT_colors[CHECK_TEXT] = ColorPair(Cyan,Black);
600
      CRT_colors[HOSTNAME] = ColorPair(Green,Black);
601
      CRT_colors[CPU_NICE] = ColorPair(Blue,Black);
602
      CRT_colors[CPU_NORMAL] = ColorPair(Green,Black);
603
      CRT_colors[CPU_KERNEL] = ColorPair(Red,Black);
604
      CRT_colors[CPU_IOWAIT] = ColorPair(Green,Black);
605
      CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black);
606
      CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
607
      CRT_colors[CPU_STEAL] = ColorPair(Cyan,Black);
608
      CRT_colors[CPU_GUEST] = ColorPair(Cyan,Black);
548
   } else {
609
   } else {
549
      /* Default */
610
      /* Default */
550
      CRT_colors[RESET_COLOR] = ColorPair(White,Black);
611
      CRT_colors[RESET_COLOR] = ColorPair(White,Black);
551
-- a/ColorsPanel.c
612
++ b/ColorsPanel.c
Lines 41-46 static const char* ColorSchemes[] = { Link Here
41
   "Light Terminal",
41
   "Light Terminal",
42
   "MC",
42
   "MC",
43
   "Black Night",
43
   "Black Night",
44
   "Solarized",
44
   NULL
45
   NULL
45
};
46
};
46
-- a/Settings.c
47
++ b/Settings.c
Lines 131-137 static bool Settings_read(Settings* this, char* fileName, int cpuCount) { Link Here
131
      } else if (String_eq(option[0], "color_scheme")) {
131
      } else if (String_eq(option[0], "color_scheme")) {
132
         this->colorScheme = atoi(option[1]);
132
         this->colorScheme = atoi(option[1]);
133
         if (this->colorScheme < 0) this->colorScheme = 0;
133
         if (this->colorScheme < 0) this->colorScheme = 0;
134
         if (this->colorScheme > 5) this->colorScheme = 5;
134
         if (this->colorScheme > 6) this->colorScheme = 6;
135
      } else if (String_eq(option[0], "left_meters")) {
135
      } else if (String_eq(option[0], "left_meters")) {
136
         Settings_readMeters(this, option[1], LEFT_HEADER);
136
         Settings_readMeters(this, option[1], LEFT_HEADER);
137
         readMeters = true;
137
         readMeters = true;

Return to bug 469772