]>
Commit | Line | Data |
---|---|---|
cd1a2927 MT |
1 | diff -ruN newt-0.50.17.old/newt.c newt-0.50.17/newt.c |
2 | --- newt-0.50.17.old/newt.c Wed Dec 3 10:37:02 2003 | |
3 | +++ newt-0.50.17/newt.c Wed Dec 3 10:38:00 2003 | |
4 | @@ -65,31 +65,31 @@ | |
5 | " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" | |
6 | ; | |
7 | ||
8 | -const struct newtColors newtDefaultColorPalette = { | |
9 | - "white", "blue", /* root fg, bg */ | |
10 | - "black", "lightgray", /* border fg, bg */ | |
11 | - "black", "lightgray", /* window fg, bg */ | |
12 | - "white", "black", /* shadow fg, bg */ | |
13 | - "red", "lightgray", /* title fg, bg */ | |
14 | - "black", "lightgray", /* button fg, bg */ | |
15 | - "red", "lightgray", /* active button fg, bg */ | |
16 | - "yellow", "blue", /* checkbox fg, bg */ | |
17 | - "blue", "brown", /* active checkbox fg, bg */ | |
18 | - "yellow", "blue", /* entry box fg, bg */ | |
19 | - "blue", "lightgray", /* label fg, bg */ | |
20 | - "black", "lightgray", /* listbox fg, bg */ | |
21 | - "black", "lightgray", /* active listbox fg, bg */ | |
22 | - "black", "lightgray", /* textbox fg, bg */ | |
23 | - "lightgray", "black", /* active textbox fg, bg */ | |
24 | - "white", "blue", /* help line */ | |
25 | - "yellow", "blue", /* root text */ | |
26 | - "blue", /* scale empty */ | |
27 | - "yellow", /* scale full */ | |
28 | - "blue", "lightgray", /* disabled entry fg, bg */ | |
29 | - "white", "blue", /* compact button fg, bg */ | |
30 | - "yellow", "red", /* active & sel listbox */ | |
31 | - "yellow", "blue", /* selected listbox */ | |
32 | - "white", "lightgray" /* 3D box */ | |
33 | +const struct newtColors newtDefaultColorPalette = { | |
34 | + "white", "blue", /* root fg, bg */ | |
35 | + "black", "lightgray", /* border fg, bg */ | |
36 | + "black", "lightgray", /* window fg, bg */ | |
37 | + "white", "black", /* shadow fg, bg */ | |
38 | + "red", "lightgray", /* title fg, bg */ | |
39 | + "lightgray", "red", /* button fg, bg */ | |
40 | + "red", "lightgray", /* active button fg, bg */ | |
41 | + "yellow", "blue", /* checkbox fg, bg */ | |
42 | + "blue", "brown", /* active checkbox fg, bg */ | |
43 | + "yellow", "blue", /* entry box fg, bg */ | |
44 | + "blue", "lightgray", /* label fg, bg */ | |
45 | + "black", "lightgray", /* listbox fg, bg */ | |
46 | + "black", "lightgray", /* active listbox fg, bg */ | |
47 | + "black", "lightgray", /* textbox fg, bg */ | |
48 | + "lightgray", "black", /* active textbox fg, bg */ | |
49 | + "white", "blue", /* help line */ | |
50 | + "yellow", "blue", /* root text */ | |
51 | + "blue", /* scale empty */ | |
52 | + "red", /* scale full */ | |
53 | + "blue", "lightgray", /* disabled entry fg, bg */ | |
54 | + "white", "blue", /* compact button fg, bg */ | |
55 | + "yellow", "blue", /* active & sel listbox */ | |
56 | + "yellow", "blue", /* selected listbox */ | |
57 | + "white", "lightgray" /* 3D box */ | |
58 | }; | |
59 | ||
60 | static const int color_to_mono[NEWT_COLORSET_MAX+1] = { | |
61 | diff -ruN newt-0.50.17.old/scrollbar.c newt-0.50.17/scrollbar.c | |
62 | --- newt-0.50.17.old/scrollbar.c Wed Dec 3 10:37:02 2003 | |
63 | +++ newt-0.50.17/scrollbar.c Wed Dec 3 10:38:00 2003 | |
64 | @@ -48,7 +48,7 @@ | |
65 | co->data = sb; | |
66 | ||
67 | if (!strcmp(getenv("TERM"), "linux") && height >= 2) { | |
68 | - sb->arrows = 1; | |
69 | + sb->arrows = 0; | |
70 | sb->curr = 1; | |
71 | } else { | |
72 | sb->arrows = 0; | |
73 | @@ -79,17 +79,17 @@ | |
74 | SLsmg_set_char_set(1); | |
75 | if (sb->arrows) { | |
76 | newtGotorc(co->top, co->left); | |
77 | - SLsmg_write_char('\x2d'); | |
78 | + SLsmg_write_char(SLSMG_UARROW_CHAR); | |
79 | for (i = 1; i < co->height - 1; i++) { | |
80 | newtGotorc(i + co->top, co->left); | |
81 | - SLsmg_write_char('\x61'); | |
82 | + SLsmg_write_char(SLSMG_CKBRD_CHAR); | |
83 | } | |
84 | newtGotorc(co->top + co->height - 1, co->left); | |
85 | - SLsmg_write_char('\x2e'); | |
86 | + SLsmg_write_char(SLSMG_DARROW_CHAR); | |
87 | } else { | |
88 | for (i = 0; i < co->height; i++) { | |
89 | newtGotorc(i + co->top, co->left); | |
90 | - SLsmg_write_char('\x61'); | |
91 | + SLsmg_write_char(SLSMG_CKBRD_CHAR); | |
92 | } | |
93 | } | |
94 | ||
95 | @@ -100,7 +100,7 @@ | |
96 | ||
97 | static void sbDrawThumb(newtComponent co, int isOn) { | |
98 | struct scrollbar * sb = co->data; | |
99 | - char ch = isOn ? '#' : '\x61'; | |
100 | + char ch = isOn ? '#' : SLSMG_CKBRD_CHAR; | |
101 | ||
102 | if (!co->isMapped) return; | |
103 |