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.36 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.70 by root, Fri Aug 13 03:47:09 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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",
… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
327#endif 328#endif
328#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
332 333#if TINTING
334 NULL,
335#endif
333 }; 336 };
334 337
335const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
336 { 339 {
337 "TEXT", 340 "TEXT",
… …
354 }; 357 };
355 358
356bool 359bool
357rxvt_term::init_vars () 360rxvt_term::init_vars ()
358{ 361{
359 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
360 if (PixColors == NULL) 368 if (PixColors == NULL)
361 return false; 369 return false;
362 370
363#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
364 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 393 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 394 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 395 numPixColors = TOTAL_COLORS;
388 396
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 397#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 398 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif 399#endif
403 400
404 refresh_limit = 1; 401 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 402 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 403 prev_nrow = prev_ncol = 0;
… …
505 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
506 503
507 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
508 } 505 }
509 506
510 /* clear all resources */
511 for (i = 0; i < NUM_RESOURCES;)
512 rs[i++] = NULL;
513
514 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
515 508
516 /* 509 /*
517 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
518 */ 511 */
… …
533 } 526 }
534#endif 527#endif
535 528
536 if (!display 529 if (!display
537 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
538 {
539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
540 exit (EXIT_FAILURE);
541 }
542 532
543 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
544 534
545 /* 535 /*
546 * set any defaults not already set 536 * set any defaults not already set
… …
591 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
592#endif 582#endif
593 583
594 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
595 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
596
597#ifdef ACS_ASCII
598 if (!rs[Rs_acs_chars])
599 rs[Rs_acs_chars] = ACS_CHARS;
600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
601 {
602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
603 for (; i < 0x20; )
604 val[i] = ' ';
605 rs[Rs_acs_chars] = val;
606 }
607#endif
608 586
609#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
610 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
611# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
612 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
… …
639#endif 617#endif
640 if (rs[Rs_answerbackstring]) 618 if (rs[Rs_answerbackstring])
641 { 619 {
642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
644 }
645
646 if (rs[Rs_selectstyle])
647 {
648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
649 selection_style = OLD_WORD_SELECT;
650#ifndef NO_OLD_SELECTION
651
652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
653 selection_style = OLD_SELECT;
654#endif
655
656 } 622 }
657 623
658#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
660 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
… …
686 color_aliases (Color_bg); 652 color_aliases (Color_bg);
687#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
688 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
689 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
690#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
691 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
692 color_aliases (Color_border); 659 color_aliases (Color_border);
693#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
694 color_aliases (Color_BD); 661 color_aliases (Color_BD);
695 color_aliases (Color_UL); 662 color_aliases (Color_UL);
696 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
790void 757void
791rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
792{ 759{
793#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
794 free (this->locale); 761 free (this->locale);
795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 762 this->locale = setlocale (LC_CTYPE, locale);
763
764 if (!this->locale)
765 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, "");
768 this->locale = "";
769 }
770
771 this->locale = rxvt_strdup (this->locale);
796 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
797 mbstate.reset (); 773 mbstate.reset ();
798#endif 774#endif
775#if 0
799#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
800 free (codeset); 777 free (codeset);
801 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
802 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
803 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
804#else 781#else
805 enc_utf8 = 1; 782 enc_utf8 = 1;
806#endif 783#endif
784#endif
807} 785}
808 786
809void 787void
810rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
811{ 789{
812#ifdef USE_XIM 790#ifdef USE_XIM
813 if (!locale) 791 if (!locale)
814 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
815 else 793 else
816 { 794 {
817 Atom wmlocale; 795 Atom wmlocale;
818 796
819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
821 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
822 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
823 801
824 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
825 { 803 {
826 rxvt_print_error ("The locale is not supported by Xlib"); 804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
827 return; 805 return;
828 } 806 }
829 807
830 im_ev.start (display); 808 im_ev.start (display);
831 809
… …
861 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
862#endif 840#endif
863 841
864 get_ourmods (); 842 get_ourmods ();
865 843
866 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
867 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
868 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
869 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
870 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
871 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
872 850
873#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
874 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
875 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
890#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
891 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
892 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
893#endif 871#endif
894 872
895 if ((cmd_fd = run_command (argv)) < 0) 873 run_command (argv);
896 {
897 rxvt_print_error ("aborting");
898 exit (EXIT_FAILURE);
899 }
900} 874}
901 875
902/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
903void 877void
904rxvt_term::Get_Colours () 878rxvt_term::Get_Colours ()
905{ 879{
906 int i; 880 int i;
907 881
882#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused;
884#endif
885
908 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
909 { 887 {
910 rxvt_color xcol; 888 rxvt_color xcol;
911 889
912 if (!rs[Rs_color + i]) 890 if (!rs[Rs_color + i])
913 continue; 891 continue;
… …
929 switch (i) 907 switch (i)
930 { 908 {
931 case Color_fg: 909 case Color_fg:
932 case Color_bg: 910 case Color_bg:
933 /* fatal: need bg/fg color */ 911 /* fatal: need bg/fg color */
934 rxvt_print_error ("aborting"); 912 rxvt_fatal ("unable to get foreground/background colour, aborting");
935 exit (EXIT_FAILURE);
936 /* NOTREACHED */ 913 /* NOTREACHED */
937 break; 914 break;
938#ifndef NO_CURSORCOLOR 915#ifndef NO_CURSORCOLOR
939 case Color_cursor2: 916 case Color_cursor2:
940 xcol = PixColors[Color_fg]; 917 xcol = PixColors[Color_fg];
941 break; 918 break;
942#endif /* ! NO_CURSORCOLOR */ 919#endif /* ! NO_CURSORCOLOR */
943 case Color_pointer: 920 case Color_pointer_fg:
944 xcol = PixColors[Color_fg]; 921 xcol = PixColors[Color_fg];
945 break; 922 break;
946 default: 923 default:
947 xcol = PixColors[Color_bg]; /* None */ 924 xcol = PixColors[Color_bg]; /* None */
948 break; 925 break;
949 } 926 }
950 } 927 }
951 } 928 }
952 929
953 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
954 SET_PIXCOLOR (i); 935 SET_PIXCOLOR (i);
955 } 936 }
956 937
957 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 938 if (display->depth <= 2)
958 PixColors[Color_pointer] = PixColors[Color_fg]; 939 {
959 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
960 PixColors[Color_border] = PixColors[Color_fg]; 941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
943 }
961 944
962 /* 945 /*
963 * get scrollBar/menuBar shadow colors 946 * get scrollBar/menuBar shadow colors
964 * 947 *
965 * The calculations of topShadow/bottomShadow values are adapted 948 * The calculations of topShadow/bottomShadow values are adapted
966 * from the fvwm window manager. 949 * from the fvwm window manager.
967 */ 950 */
968#ifdef KEEP_SCROLLCOLOR 951#ifdef KEEP_SCROLLCOLOR
969 952
970 if (XDEPTH <= 2) 953 if (display->depth <= 2)
971 { /* Monochrome */ 954 { /* Monochrome */
972 PixColors[Color_scroll] = PixColors[Color_fg]; 955 PixColors[Color_scroll] = PixColors[Color_fg];
973 PixColors[Color_topShadow] = PixColors[Color_bg]; 956 PixColors[Color_topShadow] = PixColors[Color_bg];
974 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 957 PixColors[Color_bottomShadow] = PixColors[Color_bg];
975 } 958 }
976 else 959 else
977 { 960 {
978 rxvt_color xcol[3]; 961 rxvt_color xcol[2];
979 /* xcol[0] == white 962 /* xcol[0] == white
980 * xcol[1] == top shadow 963 * xcol[1] == top shadow
981 * xcol[2] == bot shadow */ 964 * xcol[2] == bot shadow */
982 965
983 xcol[1] = PixColors[Color_scroll]; 966 xcol[1] = PixColors[Color_scroll];
984# ifdef PREFER_24BIT
985 xcol[0].set (display, 65535, 65535, 65535); 967 xcol[0].set (display, 65535, 65535, 65535);
986 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
987# else
988 xcol[0].set (display, WhitePixel (display->display, display->screen));
989# endif
990 968
991 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
992 970
993 xcol[0].get (display, pr0, pg0, pb0); 971 xcol[0].get (display, pr0, pg0, pb0);
994 xcol[1].get (display, pr1, pg1, pb1); 972 xcol[1].get (display, pr1, pg1, pb1);
995 973
996 /* bottomShadowColor */
997 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
998 xcol[2] = PixColors[Color_Black];
999
1000 PixColors[Color_bottomShadow] = xcol[2]; 974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1001 975
1002 /* topShadowColor */ 976 /* topShadowColor */
1003 if (!xcol[1].set (display, 977 if (!xcol[1].set (display,
1004 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 978 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1005 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 979 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1109/*----------------------------------------------------------------------*/ 1083/*----------------------------------------------------------------------*/
1110/* rxvt_Create_Windows () - Open and map the window */ 1084/* rxvt_Create_Windows () - Open and map the window */
1111void 1085void
1112rxvt_term::create_windows (int argc, const char *const *argv) 1086rxvt_term::create_windows (int argc, const char *const *argv)
1113{ 1087{
1114 XClassHint classHint; 1088 XClassHint classHint;
1115 XWMHints wmHint; 1089 XWMHints wmHint;
1090#ifndef NO_FRILLS
1091 Atom prop = None;
1092 MWMHints mwmhints;
1093#endif
1116 XGCValues gcvalue; 1094 XGCValues gcvalue;
1117 long vt_emask; 1095 long vt_emask;
1118 1096 XSetWindowAttributes attributes;
1119 XWindowAttributes gattr; 1097 XWindowAttributes gattr;
1120 1098
1121 if (Options & Opt_transparent) 1099 if (Options & Opt_transparent)
1122 { 1100 {
1123 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1124 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1125 } 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
1126 1128
1127 /* grab colors before netscape does */ 1129 /* grab colors before netscape does */
1128 Get_Colours (); 1130 Get_Colours ();
1129 1131
1130 if (!change_font (rs[Rs_font])) 1132 if (!change_font (rs[Rs_font]))
… …
1136 1138
1137 window_calc (0, 0); 1139 window_calc (0, 0);
1138 old_width = szHint.width; 1140 old_width = szHint.width;
1139 old_height = szHint.height; 1141 old_height = szHint.height;
1140 1142
1141 /* parent window - reverse video so we can see placement errors
1142 * sub-window placement & size in rxvt_resize_subwindows () 1143 /* sub-window placement & size in rxvt_resize_subwindows () */
1143 */
1144 1144
1145#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1146 XSetWindowAttributes attributes;
1147
1148 attributes.background_pixel = PixColors[Color_fg]; 1146 attributes.background_pixel = PixColors[Color_bg];
1149 attributes.border_pixel = PixColors[Color_border]; 1147 attributes.border_pixel = PixColors[Color_border];
1150 attributes.colormap = display->cmap; 1148 attributes.colormap = display->cmap;
1151 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1152 szHint.x, szHint.y, 1150 szHint.x, szHint.y,
1153 szHint.width, szHint.height, 1151 szHint.width, szHint.height,
1154 TermWin.ext_bwidth, 1152 TermWin.ext_bwidth,
1155 display->depth, InputOutput, 1153 display->depth, InputOutput,
1156 display->visual, 1154 display->visual,
1157 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1155 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1158#else 1156#else
1159 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1160 szHint.x, szHint.y, 1158 szHint.x, szHint.y,
1161 szHint.width, 1159 szHint.width, szHint.height,
1162 szHint.height,
1163 TermWin.ext_bwidth, 1160 TermWin.ext_bwidth,
1164 PixColors[Color_border], 1161 PixColors[Color_border],
1165 PixColors[Color_fg]); 1162 PixColors[Color_bg]);
1166#endif 1163#endif
1167 1164
1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1170 1167
1171 classHint.res_name = (char *)rs[Rs_name]; 1168 classHint.res_name = (char *)rs[Rs_name];
1172 classHint.res_class = (char *)APL_CLASS; 1169 classHint.res_class = (char *)RESCLASS;
1173 1170
1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1171 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1175 wmHint.input = True; 1172 wmHint.input = True;
1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1177 : NormalState);
1178 wmHint.window_group = TermWin.parent[0]; 1174 wmHint.window_group = TermWin.parent[0];
1179 1175
1180 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1181 (char **)argv, argc, &szHint, &wmHint, &classHint); 1177 (char **)argv, argc, &szHint, &wmHint, &classHint);
1178
1179#ifndef NO_FRILLS
1180 long pid = getpid ();
1181 XChangeProperty (display->display, TermWin.parent[0],
1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1183 PropModeReplace, (unsigned char *)&pid, 1);
1184#endif
1182 1185
1183 XSelectInput (display->display, TermWin.parent[0], 1186 XSelectInput (display->display, TermWin.parent[0],
1184 KeyPressMask 1187 KeyPressMask
1185#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1186 | KeyReleaseMask 1189 | KeyReleaseMask
1187#endif 1190#endif
1188 | FocusChangeMask | VisibilityChangeMask 1191 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask
1189 | StructureNotifyMask); 1193 | StructureNotifyMask);
1190 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
1191 1203
1192 /* 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 */
1193 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1194 1206
1195#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1207#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1210 } 1222 }
1211#endif 1223#endif
1212 1224
1213 /* the vt window */ 1225 /* the vt window */
1214 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1226 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1215 window_vt_x, window_vt_y, 1227 window_vt_x,
1228 window_vt_y,
1216 TermWin_TotalWidth (), 1229 TermWin_TotalWidth (),
1217 TermWin_TotalHeight (), 1230 TermWin_TotalHeight (),
1218 0, 1231 0,
1219 PixColors[Color_fg], 1232 PixColors[Color_fg],
1220 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1221
1222#ifdef DEBUG_X 1234#ifdef DEBUG_X
1223 XStoreName (display->display, TermWin.vt, "vt window"); 1235 XStoreName (display->display, TermWin.vt, "vt window");
1224#endif 1236#endif
1225 1237
1238 attributes.bit_gravity = NorthWestGravity;
1239 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1240
1226 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1227 | PropertyChangeMask); 1242
1243 pointer_unblank ();
1228 1244
1229#ifdef POINTER_BLANK 1245#ifdef POINTER_BLANK
1230 pointer_unblank ();
1231
1232 if ((Options & Opt_pointerBlank)) 1246 if (Options & Opt_pointerBlank)
1233 vt_emask |= PointerMotionMask; 1247 vt_emask |= PointerMotionMask;
1234 else 1248 else
1235#endif 1249#endif
1236 vt_emask |= (Button1MotionMask | Button3MotionMask); 1250 vt_emask |= Button1MotionMask | Button3MotionMask;
1237 1251
1238 XSelectInput (display->display, TermWin.vt, vt_emask); 1252 XSelectInput (display->display, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt); 1253 vt_ev.start (display, TermWin.vt);
1240 1254
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1255#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1256 if (menuBar_height ())
1243 { 1257 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1245 window_vt_x, 0, 1259 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1260 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1261 menuBar_TotalHeight (),
1248 0, 1262 0,
1249 PixColors[Color_fg], 1263 PixColors[Color_fg],
1250 PixColors[Color_scroll]); 1264 PixColors[Color_scroll]);
1251 1265
1252#ifdef DEBUG_X 1266#ifdef DEBUG_X
1253 XStoreName (display->display, menuBar.win, "menubar"); 1267 XStoreName (display->display, menuBar.win, "menubar");
1254#endif 1268#endif
1255 1269
… …
1267 1281
1268#ifdef XPM_BACKGROUND 1282#ifdef XPM_BACKGROUND
1269 if (rs[Rs_backgroundPixmap] != NULL 1283 if (rs[Rs_backgroundPixmap] != NULL
1270 && ! (Options & Opt_transparent)) 1284 && ! (Options & Opt_transparent))
1271 { 1285 {
1272 const char *p = rs[Rs_backgroundPixmap]; 1286 const char *p = rs[Rs_backgroundPixmap];
1273 1287
1274 if ((p = STRCHR (p, ';')) != NULL) 1288 if ((p = STRCHR (p, ';')) != NULL)
1275 { 1289 {
1276 p++; 1290 p++;
1277 scale_pixmap (p); 1291 scale_pixmap (p);
… …
1284 /* graphics context for the vt window */ 1298 /* graphics context for the vt window */
1285 gcvalue.foreground = PixColors[Color_fg]; 1299 gcvalue.foreground = PixColors[Color_fg];
1286 gcvalue.background = PixColors[Color_bg]; 1300 gcvalue.background = PixColors[Color_bg];
1287 gcvalue.graphics_exposures = 1; 1301 gcvalue.graphics_exposures = 1;
1288 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1302 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1289 GCForeground | GCBackground 1303 GCForeground | GCBackground | GCGraphicsExposures,
1290 | GCGraphicsExposures, &gcvalue); 1304 &gcvalue);
1291 1305
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1307
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1309 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 gcvalue.foreground = PixColors[Color_bottomShadow]; 1311 gcvalue.foreground = PixColors[Color_bottomShadow];
1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1300 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;
1301#endif 1321#endif
1302} 1322}
1303 1323
1304/*----------------------------------------------------------------------*/ 1324/*----------------------------------------------------------------------*/
1305/* 1325/*
1306 * 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
1307 * 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
1308 * the slave. 1328 * the slave.
1309 */ 1329 */
1310int 1330void
1311rxvt_term::run_command (const char *const *argv) 1331rxvt_term::run_command (const char *const *argv)
1312{ 1332{
1313 int cfd, er; 1333 int er;
1314 1334
1315 /* get master (pty) */ 1335 /* get master (pty) */
1316 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1317 {
1318 rxvt_print_error ("can't open pseudo-tty"); 1337 rxvt_fatal ("can't open pseudo-tty");
1319 return -1;
1320 }
1321 1338
1322 fcntl (cfd, F_SETFL, O_NONBLOCK); 1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1323 1340
1324 /* get slave (tty) */ 1341 /* get slave (tty) */
1325 if (tty_fd < 0) 1342 if (tty_fd < 0)
1326 { 1343 {
1327#ifndef NO_SETOWNER_TTYDEV 1344#ifndef NO_SETOWNER_TTYDEV
1328 privileged_ttydev (SAVE); 1345 privileged_ttydev (SAVE);
1329#endif 1346#endif
1330 1347
1331 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1332 { 1349 {
1333 close (cfd); 1350 close (cmd_fd);
1351 cmd_fd = -1;
1334 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1335 return -1;
1336 } 1353 }
1337 } 1354 }
1355
1338#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1339 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1340 er = key_backspace[0]; 1358 er = key_backspace[0];
1341 else if (STRCMP (key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1343 else 1361 else
1344#endif 1362#endif
1345
1346 er = -1; 1363 er = -1;
1347 1364
1348 rxvt_get_ttymode (& (tio), er); 1365 rxvt_get_ttymode (&tio, er);
1349 1366
1350#ifndef __QNX__ 1367#ifndef __QNX__
1351 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1352 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1353 { 1370 {
1354 case -1: 1371 case -1:
1355 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1356 return -1;
1357 case 0: 1373 case 0:
1358 close (cfd); /* only keep tty_fd and STDERR open */
1359
1360 init_env (); 1374 init_env ();
1361 1375
1362 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1363 rxvt_print_error ("could not obtain control of tty"); 1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1364 else 1378 else
1365 { 1379 {
1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1367 dup2 (tty_fd, STDIN_FILENO); 1381 dup2 (tty_fd, STDIN_FILENO);
1368 dup2 (tty_fd, STDOUT_FILENO); 1382 dup2 (tty_fd, STDOUT_FILENO);
1369 dup2 (tty_fd, STDERR_FILENO); 1383 dup2 (tty_fd, STDERR_FILENO);
1370 1384
1371 if (tty_fd > 2) 1385 // close all our file handles that we do no longer need
1372 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 }
1373 1391
1374 run_child (argv); 1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1375 } 1394 }
1395
1376 exit (EXIT_FAILURE); 1396 _exit (EXIT_FAILURE);
1377 /* NOTREACHED */ 1397
1378 default: 1398 default:
1379 { 1399 {
1380#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1381 int fdstdin; 1401 int fdstdin;
1382 1402
… …
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 1412
1393 dup2 (fdstdin, STDIN_FILENO); 1413 dup2 (fdstdin, STDIN_FILENO);
1394 close (fdstdin); 1414 close (fdstdin);
1395#endif 1415#endif
1396
1397 } 1416 }
1417
1398 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1399 break; 1419 break;
1400 } 1420 }
1401#else /* __QNX__ uses qnxspawn () */ 1421#else /* __QNX__ uses qnxspawn () */
1402 fchmod (tty_fd, 0622); 1422 fchmod (tty_fd, 0622);
1403 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1404 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1405 1425
1406 if (run_child (argv) == -1) 1426 if (run_child (argv) == -1)
1407 exit (EXIT_FAILURE); 1427 exit (EXIT_FAILURE);
1408#endif 1428#endif
1409
1410 return cfd;
1411} 1429}
1412 1430
1413/* ------------------------------------------------------------------------- * 1431/* ------------------------------------------------------------------------- *
1414 * CHILD PROCESS OPERATIONS * 1432 * CHILD PROCESS OPERATIONS *
1415 * ------------------------------------------------------------------------- */ 1433 * ------------------------------------------------------------------------- */
… …
1433#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1434 int fd; 1452 int fd;
1435 1453
1436 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1437 if (fd >= 0) 1455 if (fd >= 0)
1438 {
1439 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1440 close (fd); 1457 close (fd);
1441 }
1442#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1443 1459
1444 } 1460 }
1445 1461
1446 /* 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