ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.57 by root, Mon Jun 21 22:24:07 2004 UTC vs.
Revision 1.70 by root, Fri Aug 13 03:47:09 2004 UTC

… …
68 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 72#ifdef TTY_256COLOR
73 "rgb:00/00/00", /* default 16-255 color table */ 73 "rgbi:0/0/0", /* default 16-255 color table */
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8",
74 "rgb:00/00/2a", 78 "rgbi:0/0/1",
75 "rgb:00/00/55",
76 "rgb:00/00/7f",
77 "rgb:00/00/aa",
78 "rgb:00/00/d4",
79 "rgb:00/2a/00", 79 "rgbi:0/.2/0",
80 "rgb:00/2a/2a", 80 "rgbi:0/.2/.2",
81 "rgb:00/2a/55",
82 "rgb:00/2a/7f",
83 "rgb:00/2a/aa",
84 "rgb:00/2a/d4", 81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
85 "rgb:00/55/00", 84 "rgbi:0/.2/1",
86 "rgb:00/55/2a",
87 "rgb:00/55/55",
88 "rgb:00/55/7f",
89 "rgb:00/55/aa",
90 "rgb:00/55/d4",
91 "rgb:00/7f/00",
92 "rgb:00/7f/2a",
93 "rgb:00/7f/55",
94 "rgb:00/7f/7f",
95 "rgb:00/7f/aa",
96 "rgb:00/7f/d4",
97 "rgb:00/aa/00",
98 "rgb:00/aa/2a",
99 "rgb:00/aa/55",
100 "rgb:00/aa/7f",
101 "rgb:00/aa/aa",
102 "rgb:00/aa/d4",
103 "rgb:00/d4/00", 85 "rgbi:0/.4/0",
104 "rgb:00/d4/2a", 86 "rgbi:0/.4/.2",
105 "rgb:00/d4/55",
106 "rgb:00/d4/7f",
107 "rgb:00/d4/aa",
108 "rgb:00/d4/d4", 87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8",
102 "rgbi:0/.8/1",
103 "rgbi:0/1/0",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8",
108 "rgbi:0/1/1",
109 "rgb:2a/00/00", 109 "rgbi:.2/0/0",
110 "rgb:2a/00/2a", 110 "rgbi:.2/0/.2",
111 "rgb:2a/00/55",
112 "rgb:2a/00/7f",
113 "rgb:2a/00/aa",
114 "rgb:2a/00/d4", 111 "rgbi:.2/0/.4",
112 "rgbi:.2/0/.6",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgb:2a/2a/00", 115 "rgbi:.2/.2/0",
116 "rgb:2a/2a/2a", 116 "rgbi:.2/.2/.2",
117 "rgb:2a/2a/55",
118 "rgb:2a/2a/7f",
119 "rgb:2a/2a/aa",
120 "rgb:2a/2a/d4", 117 "rgbi:.2/.2/.4",
121 "rgb:2a/55/00", 118 "rgbi:.2/.2/.6",
122 "rgb:2a/55/2a", 119 "rgbi:.2/.2/.8",
123 "rgb:2a/55/55", 120 "rgbi:.2/.2/1",
124 "rgb:2a/55/7f",
125 "rgb:2a/55/aa",
126 "rgb:2a/55/d4",
127 "rgb:2a/7f/00",
128 "rgb:2a/7f/2a",
129 "rgb:2a/7f/55",
130 "rgb:2a/7f/7f",
131 "rgb:2a/7f/aa",
132 "rgb:2a/7f/d4",
133 "rgb:2a/aa/00",
134 "rgb:2a/aa/2a",
135 "rgb:2a/aa/55",
136 "rgb:2a/aa/7f",
137 "rgb:2a/aa/aa",
138 "rgb:2a/aa/d4",
139 "rgb:2a/d4/00", 121 "rgbi:.2/.4/0",
140 "rgb:2a/d4/2a", 122 "rgbi:.2/.4/.2",
141 "rgb:2a/d4/55",
142 "rgb:2a/d4/7f",
143 "rgb:2a/d4/aa",
144 "rgb:2a/d4/d4", 123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
145 "rgb:55/00/00", 139 "rgbi:.2/1/0",
146 "rgb:55/00/2a", 140 "rgbi:.2/1/.2",
147 "rgb:55/00/55", 141 "rgbi:.2/1/.4",
148 "rgb:55/00/7f", 142 "rgbi:.2/1/.6",
149 "rgb:55/00/aa", 143 "rgbi:.2/1/.8",
150 "rgb:55/00/d4", 144 "rgbi:.2/1/1",
151 "rgb:55/2a/00",
152 "rgb:55/2a/2a",
153 "rgb:55/2a/55",
154 "rgb:55/2a/7f",
155 "rgb:55/2a/aa",
156 "rgb:55/2a/d4",
157 "rgb:55/55/00",
158 "rgb:55/55/2a",
159 "rgb:55/55/55",
160 "rgb:55/55/7f",
161 "rgb:55/55/aa",
162 "rgb:55/55/d4",
163 "rgb:55/7f/00",
164 "rgb:55/7f/2a",
165 "rgb:55/7f/55",
166 "rgb:55/7f/7f",
167 "rgb:55/7f/aa",
168 "rgb:55/7f/d4",
169 "rgb:55/aa/00",
170 "rgb:55/aa/2a",
171 "rgb:55/aa/55",
172 "rgb:55/aa/7f",
173 "rgb:55/aa/aa",
174 "rgb:55/aa/d4",
175 "rgb:55/d4/00",
176 "rgb:55/d4/2a",
177 "rgb:55/d4/55",
178 "rgb:55/d4/7f",
179 "rgb:55/d4/aa",
180 "rgb:55/d4/d4",
181 "rgb:7f/00/00",
182 "rgb:7f/00/2a",
183 "rgb:7f/00/55",
184 "rgb:7f/00/7f",
185 "rgb:7f/00/aa",
186 "rgb:7f/00/d4",
187 "rgb:7f/2a/00",
188 "rgb:7f/2a/2a",
189 "rgb:7f/2a/55",
190 "rgb:7f/2a/7f",
191 "rgb:7f/2a/aa",
192 "rgb:7f/2a/d4",
193 "rgb:7f/55/00",
194 "rgb:7f/55/2a",
195 "rgb:7f/55/55",
196 "rgb:7f/55/7f",
197 "rgb:7f/55/aa",
198 "rgb:7f/55/d4",
199 "rgb:7f/7f/00",
200 "rgb:7f/7f/2a",
201 "rgb:7f/7f/55",
202 "rgb:7f/7f/7f",
203 "rgb:7f/7f/aa",
204 "rgb:7f/7f/d4",
205 "rgb:7f/aa/00",
206 "rgb:7f/aa/2a",
207 "rgb:7f/aa/55",
208 "rgb:7f/aa/7f",
209 "rgb:7f/aa/aa",
210 "rgb:7f/aa/d4",
211 "rgb:7f/d4/00",
212 "rgb:7f/d4/2a",
213 "rgb:7f/d4/55",
214 "rgb:7f/d4/7f",
215 "rgb:7f/d4/aa",
216 "rgb:7f/d4/d4",
217 "rgb:aa/00/00",
218 "rgb:aa/00/2a",
219 "rgb:aa/00/55",
220 "rgb:aa/00/7f",
221 "rgb:aa/00/aa",
222 "rgb:aa/00/d4",
223 "rgb:aa/2a/00",
224 "rgb:aa/2a/2a",
225 "rgb:aa/2a/55",
226 "rgb:aa/2a/7f",
227 "rgb:aa/2a/aa",
228 "rgb:aa/2a/d4",
229 "rgb:aa/55/00",
230 "rgb:aa/55/2a",
231 "rgb:aa/55/55",
232 "rgb:aa/55/7f",
233 "rgb:aa/55/aa",
234 "rgb:aa/55/d4",
235 "rgb:aa/7f/00",
236 "rgb:aa/7f/2a",
237 "rgb:aa/7f/55",
238 "rgb:aa/7f/7f",
239 "rgb:aa/7f/aa",
240 "rgb:aa/7f/d4",
241 "rgb:aa/aa/00",
242 "rgb:aa/aa/2a",
243 "rgb:aa/aa/55",
244 "rgb:aa/aa/7f",
245 "rgb:aa/aa/aa",
246 "rgb:aa/aa/d4",
247 "rgb:aa/d4/00",
248 "rgb:aa/d4/2a",
249 "rgb:aa/d4/55",
250 "rgb:aa/d4/7f",
251 "rgb:aa/d4/aa",
252 "rgb:aa/d4/d4",
253 "rgb:d4/00/00", 145 "rgbi:.4/0/0",
254 "rgb:d4/00/2a", 146 "rgbi:.4/0/.2",
255 "rgb:d4/00/55",
256 "rgb:d4/00/7f",
257 "rgb:d4/00/aa",
258 "rgb:d4/00/d4", 147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
259 "rgb:d4/2a/00", 151 "rgbi:.4/.2/0",
260 "rgb:d4/2a/2a", 152 "rgbi:.4/.2/.2",
261 "rgb:d4/2a/55",
262 "rgb:d4/2a/7f",
263 "rgb:d4/2a/aa",
264 "rgb:d4/2a/d4", 153 "rgbi:.4/.2/.4",
265 "rgb:d4/55/00", 154 "rgbi:.4/.2/.6",
266 "rgb:d4/55/2a", 155 "rgbi:.4/.2/.8",
267 "rgb:d4/55/55", 156 "rgbi:.4/.2/1",
268 "rgb:d4/55/7f",
269 "rgb:d4/55/aa",
270 "rgb:d4/55/d4",
271 "rgb:d4/7f/00",
272 "rgb:d4/7f/2a",
273 "rgb:d4/7f/55",
274 "rgb:d4/7f/7f",
275 "rgb:d4/7f/aa",
276 "rgb:d4/7f/d4",
277 "rgb:d4/aa/00",
278 "rgb:d4/aa/2a",
279 "rgb:d4/aa/55",
280 "rgb:d4/aa/7f",
281 "rgb:d4/aa/aa",
282 "rgb:d4/aa/d4",
283 "rgb:d4/d4/00", 157 "rgbi:.4/.4/0",
284 "rgb:d4/d4/2a", 158 "rgbi:.4/.4/.2",
285 "rgb:d4/d4/55",
286 "rgb:d4/d4/7f",
287 "rgb:d4/d4/aa",
288 "rgb:d4/d4/d4", 159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8",
222 "rgbi:.8/0/1",
223 "rgbi:.8/.2/0",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 289 "rgb:08/08/08",
290 "rgb:12/12/12", 290 "rgb:12/12/12",
291 "rgb:1c/1c/1c", 291 "rgb:1c/1c/1c",
292 "rgb:26/26/26", 292 "rgb:26/26/26",
293 "rgb:30/30/30", 293 "rgb:30/30/30",
… …
357 }; 357 };
358 358
359bool 359bool
360rxvt_term::init_vars () 360rxvt_term::init_vars ()
361{ 361{
362 PixColors = new rxvt_color [TOTAL_COLORS]; 362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused;
367
363 if (PixColors == NULL) 368 if (PixColors == NULL)
364 return false; 369 return false;
365 370
366#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
367 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
863#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
864 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
865 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
866#endif 871#endif
867 872
868 if ((cmd_fd = run_command (argv)) < 0) 873 run_command (argv);
869 rxvt_fatal ("failure while running command, aborting");
870} 874}
871 875
872/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
873void 877void
874rxvt_term::Get_Colours () 878rxvt_term::Get_Colours ()
875{ 879{
876 int i; 880 int i;
877 881
882#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused;
884#endif
885
878 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
879 { 887 {
880 rxvt_color xcol; 888 rxvt_color xcol;
881 889
882 if (!rs[Rs_color + i]) 890 if (!rs[Rs_color + i])
883 continue; 891 continue;
… …
918 } 926 }
919 } 927 }
920 } 928 }
921 929
922 PixColors[i] = xcol; 930 PixColors[i] = xcol;
931#ifdef OFF_FOCUS_FADING
932 if (rs[Rs_fade])
933 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
934#endif
923 SET_PIXCOLOR (i); 935 SET_PIXCOLOR (i);
924 } 936 }
925 937
926 if (XDEPTH <= 2) 938 if (display->depth <= 2)
927 { 939 {
928 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
929 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
930 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
931 } 943 }
… …
936 * The calculations of topShadow/bottomShadow values are adapted 948 * The calculations of topShadow/bottomShadow values are adapted
937 * from the fvwm window manager. 949 * from the fvwm window manager.
938 */ 950 */
939#ifdef KEEP_SCROLLCOLOR 951#ifdef KEEP_SCROLLCOLOR
940 952
941 if (XDEPTH <= 2) 953 if (display->depth <= 2)
942 { /* Monochrome */ 954 { /* Monochrome */
943 PixColors[Color_scroll] = PixColors[Color_fg]; 955 PixColors[Color_scroll] = PixColors[Color_fg];
944 PixColors[Color_topShadow] = PixColors[Color_bg]; 956 PixColors[Color_topShadow] = PixColors[Color_bg];
945 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 957 PixColors[Color_bottomShadow] = PixColors[Color_bg];
946 } 958 }
947 else 959 else
948 { 960 {
949 rxvt_color xcol[3]; 961 rxvt_color xcol[2];
950 /* xcol[0] == white 962 /* xcol[0] == white
951 * xcol[1] == top shadow 963 * xcol[1] == top shadow
952 * xcol[2] == bot shadow */ 964 * xcol[2] == bot shadow */
953 965
954 xcol[1] = PixColors[Color_scroll]; 966 xcol[1] = PixColors[Color_scroll];
955# ifdef PREFER_24BIT
956 xcol[0].set (display, 65535, 65535, 65535); 967 xcol[0].set (display, 65535, 65535, 65535);
957 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
958# else
959 xcol[0].set (display, WhitePixel (display->display, display->screen));
960# endif
961 968
962 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
963 970
964 xcol[0].get (display, pr0, pg0, pb0); 971 xcol[0].get (display, pr0, pg0, pb0);
965 xcol[1].get (display, pr1, pg1, pb1); 972 xcol[1].get (display, pr1, pg1, pb1);
966 973
967 /* bottomShadowColor */
968 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
969 xcol[2] = PixColors[Color_Black];
970
971 PixColors[Color_bottomShadow] = xcol[2]; 974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
972 975
973 /* topShadowColor */ 976 /* topShadowColor */
974 if (!xcol[1].set (display, 977 if (!xcol[1].set (display,
975 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 978 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
976 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 979 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1082void 1085void
1083rxvt_term::create_windows (int argc, const char *const *argv) 1086rxvt_term::create_windows (int argc, const char *const *argv)
1084{ 1087{
1085 XClassHint classHint; 1088 XClassHint classHint;
1086 XWMHints wmHint; 1089 XWMHints wmHint;
1090#ifndef NO_FRILLS
1091 Atom prop = None;
1092 MWMHints mwmhints;
1093#endif
1087 XGCValues gcvalue; 1094 XGCValues gcvalue;
1088 long vt_emask; 1095 long vt_emask;
1089 XSetWindowAttributes attributes; 1096 XSetWindowAttributes attributes;
1090 XWindowAttributes gattr; 1097 XWindowAttributes gattr;
1091 1098
1092 if (Options & Opt_transparent) 1099 if (Options & Opt_transparent)
1093 { 1100 {
1094 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1095 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1096 } 1103 }
1104
1105#ifndef NO_FRILLS
1106 if (Options & Opt_borderLess)
1107 {
1108 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1109 if (prop == None)
1110 {
1111 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1112#ifdef PREFER_24BIT
1113 attributes.override_redirect = TRUE;
1114#endif
1115 mwmhints.flags = 0;
1116 }
1117 else
1118 {
1119 mwmhints.flags = MWM_HINTS_DECORATIONS;
1120 mwmhints.decorations = 0;
1121 }
1122 }
1123 else
1124 {
1125 mwmhints.flags = 0;
1126 }
1127#endif
1097 1128
1098 /* grab colors before netscape does */ 1129 /* grab colors before netscape does */
1099 Get_Colours (); 1130 Get_Colours ();
1100 1131
1101 if (!change_font (rs[Rs_font])) 1132 if (!change_font (rs[Rs_font]))
… …
1151 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1152 PropModeReplace, (unsigned char *)&pid, 1); 1183 PropModeReplace, (unsigned char *)&pid, 1);
1153#endif 1184#endif
1154 1185
1155 XSelectInput (display->display, TermWin.parent[0], 1186 XSelectInput (display->display, TermWin.parent[0],
1156 KeyPressMask 1187 KeyPressMask
1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1158 | KeyReleaseMask 1189 | KeyReleaseMask
1159#endif 1190#endif
1160 | FocusChangeMask | VisibilityChangeMask 1191 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask
1161 | StructureNotifyMask); 1193 | StructureNotifyMask);
1162 termwin_ev.start (display, TermWin.parent[0]); 1194 termwin_ev.start (display, TermWin.parent[0]);
1195
1196#ifndef NO_FRILLS
1197 if (mwmhints.flags)
1198 {
1199 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1200 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201 }
1202#endif
1163 1203
1164 /* vt cursor: Black-on-White is standard, but this is more popular */ 1204 /* vt cursor: Black-on-White is standard, but this is more popular */
1165 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1166 1206
1167#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1207#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1189 TermWin_TotalWidth (), 1229 TermWin_TotalWidth (),
1190 TermWin_TotalHeight (), 1230 TermWin_TotalHeight (),
1191 0, 1231 0,
1192 PixColors[Color_fg], 1232 PixColors[Color_fg],
1193 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1194
1195#ifdef DEBUG_X 1234#ifdef DEBUG_X
1196 XStoreName (display->display, TermWin.vt, "vt window"); 1235 XStoreName (display->display, TermWin.vt, "vt window");
1197#endif 1236#endif
1198 1237
1199 attributes.bit_gravity = NorthWestGravity; 1238 attributes.bit_gravity = NorthWestGravity;
1200 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1239 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1201 1240
1202 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1203 1242
1243 pointer_unblank ();
1244
1204#ifdef POINTER_BLANK 1245#ifdef POINTER_BLANK
1205 pointer_unblank ();
1206
1207 if (Options & Opt_pointerBlank) 1246 if (Options & Opt_pointerBlank)
1208 vt_emask |= PointerMotionMask; 1247 vt_emask |= PointerMotionMask;
1209 else 1248 else
1210#endif 1249#endif
1211 vt_emask |= Button1MotionMask | Button3MotionMask; 1250 vt_emask |= Button1MotionMask | Button3MotionMask;
… …
1242 1281
1243#ifdef XPM_BACKGROUND 1282#ifdef XPM_BACKGROUND
1244 if (rs[Rs_backgroundPixmap] != NULL 1283 if (rs[Rs_backgroundPixmap] != NULL
1245 && ! (Options & Opt_transparent)) 1284 && ! (Options & Opt_transparent))
1246 { 1285 {
1247 const char *p = rs[Rs_backgroundPixmap]; 1286 const char *p = rs[Rs_backgroundPixmap];
1248 1287
1249 if ((p = STRCHR (p, ';')) != NULL) 1288 if ((p = STRCHR (p, ';')) != NULL)
1250 { 1289 {
1251 p++; 1290 p++;
1252 scale_pixmap (p); 1291 scale_pixmap (p);
… …
1269#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1270 gcvalue.foreground = PixColors[Color_topShadow]; 1309 gcvalue.foreground = PixColors[Color_topShadow];
1271 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1272 gcvalue.foreground = PixColors[Color_bottomShadow]; 1311 gcvalue.foreground = PixColors[Color_bottomShadow];
1273 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1274 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1275 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1315#endif
1316
1317#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state
1319 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused;
1276#endif 1321#endif
1277} 1322}
1278 1323
1279/*----------------------------------------------------------------------*/ 1324/*----------------------------------------------------------------------*/
1280/* 1325/*
1281 * Run the command in a subprocess and return a file descriptor for the 1326 * Run the command in a subprocess and return a file descriptor for the
1282 * master end of the pseudo-teletype pair with the command talking to 1327 * master end of the pseudo-teletype pair with the command talking to
1283 * the slave. 1328 * the slave.
1284 */ 1329 */
1285int 1330void
1286rxvt_term::run_command (const char *const *argv) 1331rxvt_term::run_command (const char *const *argv)
1287{ 1332{
1288 int cfd, er; 1333 int er;
1289 1334
1290 /* get master (pty) */ 1335 /* get master (pty) */
1291 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1292 rxvt_fatal ("can't open pseudo-tty"); 1337 rxvt_fatal ("can't open pseudo-tty");
1293 1338
1294 fcntl (cfd, F_SETFL, O_NONBLOCK); 1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1295 1340
1296 /* get slave (tty) */ 1341 /* get slave (tty) */
1297 if (tty_fd < 0) 1342 if (tty_fd < 0)
1298 { 1343 {
1299#ifndef NO_SETOWNER_TTYDEV 1344#ifndef NO_SETOWNER_TTYDEV
1300 privileged_ttydev (SAVE); 1345 privileged_ttydev (SAVE);
1301#endif 1346#endif
1302 1347
1303 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1304 { 1349 {
1305 close (cfd); 1350 close (cmd_fd);
1351 cmd_fd = -1;
1306 rxvt_fatal ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1307 } 1353 }
1308 } 1354 }
1355
1309#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1310 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1311 er = key_backspace[0]; 1358 er = key_backspace[0];
1312 else if (STRCMP (key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1313 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1314 else 1361 else
1315#endif 1362#endif
1316
1317 er = -1; 1363 er = -1;
1318 1364
1319 rxvt_get_ttymode (& (tio), er); 1365 rxvt_get_ttymode (&tio, er);
1320 1366
1321#ifndef __QNX__ 1367#ifndef __QNX__
1322 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1323 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1324 { 1370 {
1325 case -1: 1371 case -1:
1326 rxvt_fatal ("can't fork"); 1372 rxvt_fatal ("can't fork");
1327 case 0: 1373 case 0:
1328 close (cfd); /* only keep tty_fd and STDERR open */
1329
1330 init_env (); 1374 init_env ();
1331 1375
1332 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1333 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1334 else 1378 else
… …
1336 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1337 dup2 (tty_fd, STDIN_FILENO); 1381 dup2 (tty_fd, STDIN_FILENO);
1338 dup2 (tty_fd, STDOUT_FILENO); 1382 dup2 (tty_fd, STDOUT_FILENO);
1339 dup2 (tty_fd, STDERR_FILENO); 1383 dup2 (tty_fd, STDERR_FILENO);
1340 1384
1341 if (tty_fd > 2) 1385 // close all our file handles that we do no longer need
1342 close (tty_fd); 1386 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1387 {
1388 if ((*t)->cmd_fd > 2) close ((*t)->cmd_fd);
1389 if ((*t)->tty_fd > 2) close ((*t)->tty_fd);
1390 }
1343 1391
1344 run_child (argv); 1392 run_child (argv);
1345 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1346 } 1394 }
1347 1395
… …
1371 break; 1419 break;
1372 } 1420 }
1373#else /* __QNX__ uses qnxspawn () */ 1421#else /* __QNX__ uses qnxspawn () */
1374 fchmod (tty_fd, 0622); 1422 fchmod (tty_fd, 0622);
1375 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1376 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1377 1425
1378 if (run_child (argv) == -1) 1426 if (run_child (argv) == -1)
1379 exit (EXIT_FAILURE); 1427 exit (EXIT_FAILURE);
1380#endif 1428#endif
1381
1382 return cfd;
1383} 1429}
1384 1430
1385/* ------------------------------------------------------------------------- * 1431/* ------------------------------------------------------------------------- *
1386 * CHILD PROCESS OPERATIONS * 1432 * CHILD PROCESS OPERATIONS *
1387 * ------------------------------------------------------------------------- */ 1433 * ------------------------------------------------------------------------- */
… …
1405#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1406 int fd; 1452 int fd;
1407 1453
1408 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1455 if (fd >= 0)
1410 {
1411 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1412 close (fd); 1457 close (fd);
1413 }
1414#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1415 1459
1416 } 1460 }
1417 1461
1418 /* reset signals and spin off the command interpreter */ 1462 /* reset signals and spin off the command interpreter */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines