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.50 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.79 by root, Sun Aug 15 22:09:24 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",
… …
324 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
326#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL, 327 NULL,
328#endif 328#endif
329#if TINTING
330 NULL,
331#endif
332#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
333 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
334 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
335#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
336 333#if TINTING
334 NULL,
335#endif
337 }; 336 };
338 337
339const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
340 { 339 {
341 "TEXT", 340 "TEXT",
… …
358 }; 357 };
359 358
360bool 359bool
361rxvt_term::init_vars () 360rxvt_term::init_vars ()
362{ 361{
363 PixColors = new rxvt_color [TOTAL_COLORS]; 362 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 pix_colors = pix_colors_focused;
367
364 if (PixColors == NULL) 368 if (pix_colors == NULL)
365 return false; 369 return false;
366 370
367#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
368 TermWin.pixmap = None; 372 TermWin.pixmap = None;
369#endif 373#endif
370#ifdef UTMP_SUPPORT
371 next_utmp_action = SAVE;
372#endif
373#ifndef NO_SETOWNER_TTYDEV
374 next_tty_action = SAVE;
375#endif
376 374
377 MEvent.time = CurrentTime; 375 MEvent.time = CurrentTime;
378 MEvent.button = AnyButton; 376 MEvent.button = AnyButton;
379 Options = DEFAULT_OPTIONS; 377 options = DEFAULT_OPTIONS;
380 want_refresh = 1; 378 want_refresh = 1;
381 cmd_pid = -1; 379 cmd_pid = -1;
382 cmd_fd = tty_fd = -1; 380 pty.pty = pty.tty = -1;
383 PrivateModes = SavedModes = PrivMode_Default; 381 priv_modes = SavedModes = PrivMode_Default;
384 TermWin.focus = 0; 382 TermWin.focus = 0;
385 TermWin.ncol = 80; 383 TermWin.ncol = 80;
386 TermWin.nrow = 24; 384 TermWin.nrow = 24;
387 TermWin.int_bwidth = INTERNALBORDERWIDTH; 385 TermWin.int_bwidth = INTERNALBORDERWIDTH;
388 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 386 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
389 TermWin.lineSpace = LINESPACE; 387 TermWin.lineSpace = LINESPACE;
390 TermWin.saveLines = SAVELINES; 388 TermWin.saveLines = SAVELINES;
391 numPixColors = TOTAL_COLORS; 389 numpix_colors = TOTAL_COLORS;
392 390
393#ifndef NO_BRIGHTCOLOR 391#ifndef NO_BRIGHTCOLOR
394 colorfgbg = DEFAULT_RSTYLE; 392 colorfgbg = DEFAULT_RSTYLE;
395#endif 393#endif
396 394
… …
419 417
420void 418void
421rxvt_term::init_secondary () 419rxvt_term::init_secondary ()
422{ 420{
423 int i; 421 int i;
424#ifdef TTY_GID_SUPPORT
425 struct group *gr = getgrnam ("tty");
426
427 if (gr)
428 { /* change group ownership of tty to "tty" */
429 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
430 ttygid = gr->gr_gid;
431 }
432 else
433#endif /* TTY_GID_SUPPORT */
434
435 {
436 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
437 ttygid = getgid ();
438 }
439 422
440 /* 423 /*
441 * Close all unused file descriptors 424 * Close all unused file descriptors
442 * We don't want them, we don't need them. 425 * We don't want them, we don't need them.
443 */ 426 */
… …
476 459
477 /* 460 /*
478 * Look for -exec option. Find => split and make cmd_argv[] of command args 461 * Look for -exec option. Find => split and make cmd_argv[] of command args
479 */ 462 */
480 for (r_argc = 0; r_argc < argc; r_argc++) 463 for (r_argc = 0; r_argc < argc; r_argc++)
481 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 464 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
482 break; 465 break;
483 466
484 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 467 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
485 468
486 for (i = 0; i < r_argc; i++) 469 for (i = 0; i < r_argc; i++)
… …
512 free (r_argv); 495 free (r_argv);
513 496
514#ifdef LOCAL_X_IS_UNIX 497#ifdef LOCAL_X_IS_UNIX
515 if (rs[Rs_display_name][0] == ':') 498 if (rs[Rs_display_name][0] == ':')
516 { 499 {
517 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 500 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
518 STRCPY (val, "unix"); 501 strcpy (val, "unix");
519 STRCAT (val, rs[Rs_display_name]); 502 strcat (val, rs[Rs_display_name]);
520 display = displays.get (val); 503 display = displays.get (val);
521 free (val); 504 free (val);
522 } 505 }
523#endif 506#endif
524 507
525 if (!display 508 if (!display
526 && ! (display = displays.get (rs[Rs_display_name]))) 509 && ! (display = displays.get (rs[Rs_display_name])))
527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 510 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
528 511
529 extract_resources (display->display, rs[Rs_name]); 512 extract_resources (display->display, rs[Rs_name]);
530 513
531 /* 514 /*
532 * set any defaults not already set 515 * set any defaults not already set
… …
547 } 530 }
548 531
549 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 532 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
550 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 533 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
551 534
552#ifndef NO_FRILLS 535#if ENABLE_FRILLS
553 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 536 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
554 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 537 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
555 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 538 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
556 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 539 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
557#endif 540#endif
… …
568 pointerBlankDelay = 2; 551 pointerBlankDelay = 2;
569#endif 552#endif
570 553
571 /* no point having a scrollbar without having any scrollback! */ 554 /* no point having a scrollbar without having any scrollback! */
572 if (!TermWin.saveLines) 555 if (!TermWin.saveLines)
573 Options &= ~Opt_scrollBar; 556 options &= ~Opt_scrollBar;
574 557
575#ifdef PRINTPIPE 558#ifdef PRINTPIPE
576 if (!rs[Rs_print_pipe]) 559 if (!rs[Rs_print_pipe])
577 rs[Rs_print_pipe] = PRINTPIPE; 560 rs[Rs_print_pipe] = PRINTPIPE;
578#endif 561#endif
… …
587# else 570# else
588 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 571 key_backspace = "DEC"; /* can toggle between \010 or \177 */
589# endif 572# endif
590 else 573 else
591 { 574 {
592 val = STRDUP (rs[Rs_backspace_key]); 575 val = strdup (rs[Rs_backspace_key]);
593 rxvt_Str_trim (val); 576 rxvt_Str_trim (val);
594 rxvt_Str_escaped (val); 577 rxvt_Str_escaped (val);
595 key_backspace = val; 578 key_backspace = val;
596 } 579 }
597#endif 580#endif
… …
603# else 586# else
604 key_delete = "\033[3~"; 587 key_delete = "\033[3~";
605# endif 588# endif
606 else 589 else
607 { 590 {
608 val = STRDUP (rs[Rs_delete_key]); 591 val = strdup (rs[Rs_delete_key]);
609 rxvt_Str_trim (val); 592 rxvt_Str_trim (val);
610 rxvt_Str_escaped (val); 593 rxvt_Str_escaped (val);
611 key_delete = val; 594 key_delete = val;
612 } 595 }
613#endif 596#endif
… …
622 rs[Rs_scrollBar_thickness]); 605 rs[Rs_scrollBar_thickness]);
623#endif 606#endif
624 607
625#ifdef XTERM_REVERSE_VIDEO 608#ifdef XTERM_REVERSE_VIDEO
626 /* this is how xterm implements reverseVideo */ 609 /* this is how xterm implements reverseVideo */
627 if (Options & Opt_reverseVideo) 610 if (options & Opt_reverseVideo)
628 { 611 {
629 if (!rs[Rs_color + Color_fg]) 612 if (!rs[Rs_color + Color_fg])
630 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 613 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
631 if (!rs[Rs_color + Color_bg]) 614 if (!rs[Rs_color + Color_bg])
632 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 615 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
637 if (!rs[Rs_color + i]) 620 if (!rs[Rs_color + i])
638 rs[Rs_color + i] = def_colorName[i]; 621 rs[Rs_color + i] = def_colorName[i];
639 622
640#ifndef XTERM_REVERSE_VIDEO 623#ifndef XTERM_REVERSE_VIDEO
641 /* this is how we implement reverseVideo */ 624 /* this is how we implement reverseVideo */
642 if (Options & Opt_reverseVideo) 625 if (options & Opt_reverseVideo)
643 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 626 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
644#endif 627#endif
645 628
646 /* convenient aliases for setting fg/bg to colors */ 629 /* convenient aliases for setting fg/bg to colors */
647 color_aliases (Color_fg); 630 color_aliases (Color_fg);
… …
689 val = XDisplayString (display->display); 672 val = XDisplayString (display->display);
690 673
691 if (rs[Rs_display_name] == NULL) 674 if (rs[Rs_display_name] == NULL)
692 rs[Rs_display_name] = val; /* use broken `:0' value */ 675 rs[Rs_display_name] = val; /* use broken `:0' value */
693 676
694 i = STRLEN (val); 677 i = strlen (val);
695 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 678 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
696 679
697 sprintf (env_display, "DISPLAY=%s", val); 680 sprintf (env_display, "DISPLAY=%s", val);
698 681
699 /* avoiding the math library: 682 /* avoiding the math library:
… …
728 else 711 else
729 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
730 713
731 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
732 { 715 {
733 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
734 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
735 putenv (env_term); 718 putenv (env_term);
736 } 719 }
737 else 720 else
738 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
753void 736void
754rxvt_term::set_locale (const char *locale) 737rxvt_term::set_locale (const char *locale)
755{ 738{
756#if HAVE_XSETLOCALE || HAVE_SETLOCALE 739#if HAVE_XSETLOCALE || HAVE_SETLOCALE
757 free (this->locale); 740 free (this->locale);
758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 741 this->locale = setlocale (LC_CTYPE, locale);
742
743 if (!this->locale)
744 {
745 if (*locale)
746 {
747 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
748 setlocale (LC_CTYPE, "");
749 }
750 else
751 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
752
753 this->locale = "";
754 }
755
756
757 this->locale = rxvt_strdup (this->locale);
759 SET_LOCALE (this->locale); 758 SET_LOCALE (this->locale);
760 mbstate.reset (); 759 mbstate.reset ();
761#endif 760#endif
762#if 0 761#if 0
763#if HAVE_NL_LANGINFO 762#if HAVE_NL_LANGINFO
764 free (codeset); 763 free (codeset);
765 codeset = strdup (nl_langinfo (CODESET)); 764 codeset = strdup (nl_langinfo (CODESET));
766 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 765 enc_utf8 = !strcasecmp (codeset, "UTF-8")
767 || !STRCASECMP (codeset, "UTF8"); 766 || !strcasecmp (codeset, "UTF8");
768#else 767#else
769 enc_utf8 = 1; 768 enc_utf8 = 1;
770#endif 769#endif
771#endif 770#endif
772} 771}
… …
782 Atom wmlocale; 781 Atom wmlocale;
783 782
784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 783 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
785 XChangeProperty (display->display, TermWin.parent[0], wmlocale, 784 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
786 XA_STRING, 8, PropModeReplace, 785 XA_STRING, 8, PropModeReplace,
787 (unsigned char *)locale, STRLEN (locale)); 786 (unsigned char *)locale, strlen (locale));
788 787
789 if (!XSupportsLocale ()) 788 if (!XSupportsLocale ())
790 { 789 {
791 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 790 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
792 return; 791 return;
… …
821 /* enable W11 callbacks */ 820 /* enable W11 callbacks */
822 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 821 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
823#endif 822#endif
824 823
825#ifdef META8_OPTION 824#ifdef META8_OPTION
826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 825 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
827#endif 826#endif
828 827
829 get_ourmods (); 828 get_ourmods ();
830 829
831 if (! (Options & Opt_scrollTtyOutput)) 830 if (!(options & Opt_scrollTtyOutput))
832 PrivateModes |= PrivMode_TtyOutputInh; 831 priv_modes |= PrivMode_TtyOutputInh;
833 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
834 PrivateModes |= PrivMode_Keypress; 833 priv_modes |= PrivMode_Keypress;
835 if (! (Options & Opt_jumpScroll)) 834 if (!(options & Opt_jumpScroll))
836 PrivateModes |= PrivMode_smoothScroll; 835 priv_modes |= PrivMode_smoothScroll;
837 836
838#ifndef NO_BACKSPACE_KEY 837#ifndef NO_BACKSPACE_KEY
839 if (STRCMP (key_backspace, "DEC") == 0) 838 if (strcmp (key_backspace, "DEC") == 0)
840 PrivateModes |= PrivMode_HaveBackSpace; 839 priv_modes |= PrivMode_HaveBackSpace;
841#endif 840#endif
842 841
843 /* add value for scrollBar */ 842 /* add value for scrollBar */
844 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
845 { 844 {
846 PrivateModes |= PrivMode_scrollBar; 845 priv_modes |= PrivMode_scrollBar;
847 SavedModes |= PrivMode_scrollBar; 846 SavedModes |= PrivMode_scrollBar;
848 } 847 }
849 if (menubar_visible ()) 848 if (menubar_visible ())
850 { 849 {
851 PrivateModes |= PrivMode_menuBar; 850 priv_modes |= PrivMode_menuBar;
852 SavedModes |= PrivMode_menuBar; 851 SavedModes |= PrivMode_menuBar;
853 } 852 }
854 853
855#ifdef CURSOR_BLINK 854#ifdef CURSOR_BLINK
856 if (Options & Opt_cursorBlink) 855 if (options & Opt_cursorBlink)
857 (void)gettimeofday (&lastcursorchange, NULL); 856 (void)gettimeofday (&lastcursorchange, NULL);
858#endif 857#endif
859 858
860 if ((cmd_fd = run_command (argv)) < 0) 859 run_command (argv);
861 rxvt_fatal ("failure while running command, aborting");
862} 860}
863 861
864/*----------------------------------------------------------------------*/ 862/*----------------------------------------------------------------------*/
865void 863void
866rxvt_term::Get_Colours () 864rxvt_term::Get_Colours ()
867{ 865{
868 int i; 866 int i;
869 867
868#ifdef OFF_FOCUS_FADING
869 pix_colors = pix_colors_focused;
870#endif
871
870 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 872 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
871 { 873 {
872 rxvt_color xcol; 874 rxvt_color xcol;
873 875
874 if (!rs[Rs_color + i]) 876 if (!rs[Rs_color + i])
875 continue; 877 continue;
876 878
877 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 879 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
878 { 880 {
879#ifndef XTERM_REVERSE_VIDEO 881#ifndef XTERM_REVERSE_VIDEO
880 if (i < 2 && (Options & Opt_reverseVideo)) 882 if (i < 2 && (options & Opt_reverseVideo))
881 rs[Rs_color + i] = def_colorName[!i]; 883 rs[Rs_color + i] = def_colorName[!i];
882 else 884 else
883#endif 885#endif
884 rs[Rs_color + i] = def_colorName[i]; 886 rs[Rs_color + i] = def_colorName[i];
885 887
… …
891 switch (i) 893 switch (i)
892 { 894 {
893 case Color_fg: 895 case Color_fg:
894 case Color_bg: 896 case Color_bg:
895 /* fatal: need bg/fg color */ 897 /* fatal: need bg/fg color */
896 rxvt_fatal ("unable to get foreground/background colour, aborting"); 898 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
897 /* NOTREACHED */ 899 /* NOTREACHED */
898 break; 900 break;
899#ifndef NO_CURSORCOLOR 901#ifndef NO_CURSORCOLOR
900 case Color_cursor2: 902 case Color_cursor2:
901 xcol = PixColors[Color_fg]; 903 xcol = pix_colors[Color_fg];
902 break; 904 break;
903#endif /* ! NO_CURSORCOLOR */ 905#endif /* ! NO_CURSORCOLOR */
904 case Color_pointer_fg: 906 case Color_pointer_fg:
905 xcol = PixColors[Color_fg]; 907 xcol = pix_colors[Color_fg];
906 break; 908 break;
907 default: 909 default:
908 xcol = PixColors[Color_bg]; /* None */ 910 xcol = pix_colors[Color_bg]; /* None */
909 break; 911 break;
910 } 912 }
911 } 913 }
912 } 914 }
913 915
914 PixColors[i] = xcol; 916 pix_colors[i] = xcol;
917#ifdef OFF_FOCUS_FADING
918 if (rs[Rs_fade])
919 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
920#endif
915 SET_PIXCOLOR (i); 921 SET_PIXCOLOR (i);
916 } 922 }
917 923
918 if (XDEPTH <= 2) 924 if (display->depth <= 2)
919 { 925 {
920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 926 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
921 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 927 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
922 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 928 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
923 } 929 }
924 930
925 /* 931 /*
926 * get scrollBar/menuBar shadow colors 932 * get scrollBar/menuBar shadow colors
927 * 933 *
928 * The calculations of topShadow/bottomShadow values are adapted 934 * The calculations of topShadow/bottomShadow values are adapted
929 * from the fvwm window manager. 935 * from the fvwm window manager.
930 */ 936 */
931#ifdef KEEP_SCROLLCOLOR 937#ifdef KEEP_SCROLLCOLOR
932 938
933 if (XDEPTH <= 2) 939 if (display->depth <= 2)
934 { /* Monochrome */ 940 { /* Monochrome */
935 PixColors[Color_scroll] = PixColors[Color_fg]; 941 pix_colors[Color_scroll] = pix_colors[Color_fg];
936 PixColors[Color_topShadow] = PixColors[Color_bg]; 942 pix_colors[Color_topShadow] = pix_colors[Color_bg];
937 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 943 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
938 } 944 }
939 else 945 else
940 { 946 {
941 rxvt_color xcol[3]; 947 rxvt_color xcol[2];
942 /* xcol[0] == white 948 /* xcol[0] == white
943 * xcol[1] == top shadow 949 * xcol[1] == top shadow
944 * xcol[2] == bot shadow */ 950 * xcol[2] == bot shadow */
945 951
946 xcol[1] = PixColors[Color_scroll]; 952 xcol[1] = pix_colors[Color_scroll];
947# ifdef PREFER_24BIT
948 xcol[0].set (display, 65535, 65535, 65535); 953 xcol[0].set (display, 65535, 65535, 65535);
949 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
950# else
951 xcol[0].set (display, WhitePixel (display->display, display->screen));
952# endif
953 954
954 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 955 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
955 956
956 xcol[0].get (display, pr0, pg0, pb0); 957 xcol[0].get (display, pr0, pg0, pb0);
957 xcol[1].get (display, pr1, pg1, pb1); 958 xcol[1].get (display, pr1, pg1, pb1);
958 959
959 /* bottomShadowColor */
960 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
961 xcol[2] = PixColors[Color_Black];
962
963 PixColors[Color_bottomShadow] = xcol[2]; 960 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
964 961
965 /* topShadowColor */ 962 /* topShadowColor */
966 if (!xcol[1].set (display, 963 if (!xcol[1].set (display,
967 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 964 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
968 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 965 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
969 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 966 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
970 xcol[1] = PixColors[Color_White]; 967 xcol[1] = pix_colors[Color_White];
971 968
972 PixColors[Color_topShadow] = xcol[1]; 969 pix_colors[Color_topShadow] = xcol[1];
973 } 970 }
974#endif /* KEEP_SCROLLCOLOR */ 971#endif /* KEEP_SCROLLCOLOR */
975} 972}
976 973
977/*----------------------------------------------------------------------*/ 974/*----------------------------------------------------------------------*/
… …
1017 }; 1014 };
1018 1015
1019 requestedmeta = realmeta = realalt = 0; 1016 requestedmeta = realmeta = realalt = 0;
1020 rsmod = rs[Rs_modifier]; 1017 rsmod = rs[Rs_modifier];
1021 if (rsmod 1018 if (rsmod
1022 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 1019 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1023 requestedmeta = rsmod[3] - '0'; 1020 requestedmeta = rsmod[3] - '0';
1024 1021
1025 map = XGetModifierMapping (display->display); 1022 map = XGetModifierMapping (display->display);
1026 kc = map->modifiermap; 1023 kc = map->modifiermap;
1027 for (i = 1; i < 6; i++) 1024 for (i = 1; i < 6; i++)
… …
1055 case XK_Hyper_L: 1052 case XK_Hyper_L:
1056 case XK_Hyper_R: 1053 case XK_Hyper_R:
1057 cm = "hyper"; 1054 cm = "hyper";
1058 break; 1055 break;
1059 } 1056 }
1060 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 1057 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1061 requestedmeta = i; 1058 requestedmeta = i;
1062 } 1059 }
1063 } 1060 }
1064 XFreeModifiermap (map); 1061 XFreeModifiermap (map);
1065 i = (requestedmeta ? requestedmeta 1062 i = (requestedmeta ? requestedmeta
… …
1072/*----------------------------------------------------------------------*/ 1069/*----------------------------------------------------------------------*/
1073/* rxvt_Create_Windows () - Open and map the window */ 1070/* rxvt_Create_Windows () - Open and map the window */
1074void 1071void
1075rxvt_term::create_windows (int argc, const char *const *argv) 1072rxvt_term::create_windows (int argc, const char *const *argv)
1076{ 1073{
1077 XClassHint classHint; 1074 XClassHint classHint;
1078 XWMHints wmHint; 1075 XWMHints wmHint;
1076#if ENABLE_FRILLS
1077 Atom prop = None;
1078 MWMHints mwmhints;
1079#endif
1079 XGCValues gcvalue; 1080 XGCValues gcvalue;
1080 long vt_emask; 1081 long vt_emask;
1081 1082 XSetWindowAttributes attributes;
1082 XWindowAttributes gattr; 1083 XWindowAttributes gattr;
1083 1084
1084 if (Options & Opt_transparent) 1085 if (options & Opt_transparent)
1085 { 1086 {
1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1087 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1087 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1088 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1088 } 1089 }
1090
1091#if ENABLE_FRILLS
1092 if (options & Opt_borderLess)
1093 {
1094 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1095 if (prop == None)
1096 {
1097 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1098#ifdef PREFER_24BIT
1099 attributes.override_redirect = TRUE;
1100#endif
1101 mwmhints.flags = 0;
1102 }
1103 else
1104 {
1105 mwmhints.flags = MWM_HINTS_DECORATIONS;
1106 mwmhints.decorations = 0;
1107 }
1108 }
1109 else
1110 {
1111 mwmhints.flags = 0;
1112 }
1113#endif
1089 1114
1090 /* grab colors before netscape does */ 1115 /* grab colors before netscape does */
1091 Get_Colours (); 1116 Get_Colours ();
1092 1117
1093 if (!change_font (rs[Rs_font])) 1118 if (!change_font (rs[Rs_font]))
… …
1099 1124
1100 window_calc (0, 0); 1125 window_calc (0, 0);
1101 old_width = szHint.width; 1126 old_width = szHint.width;
1102 old_height = szHint.height; 1127 old_height = szHint.height;
1103 1128
1104 /* parent window - reverse video so we can see placement errors
1105 * sub-window placement & size in rxvt_resize_subwindows () 1129 /* sub-window placement & size in rxvt_resize_subwindows () */
1106 */
1107 1130
1108#ifdef PREFER_24BIT 1131#ifdef PREFER_24BIT
1109 XSetWindowAttributes attributes;
1110
1111 attributes.background_pixel = PixColors[Color_fg]; 1132 attributes.background_pixel = pix_colors[Color_bg];
1112 attributes.border_pixel = PixColors[Color_border]; 1133 attributes.border_pixel = pix_colors[Color_border];
1113 attributes.colormap = display->cmap; 1134 attributes.colormap = display->cmap;
1114 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1135 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1115 szHint.x, szHint.y, 1136 szHint.x, szHint.y,
1116 szHint.width, szHint.height, 1137 szHint.width, szHint.height,
1117 TermWin.ext_bwidth, 1138 TermWin.ext_bwidth,
1118 display->depth, InputOutput, 1139 display->depth, InputOutput,
1119 display->visual, 1140 display->visual,
1120 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1141 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1121#else 1142#else
1122 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1143 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1123 szHint.x, szHint.y, 1144 szHint.x, szHint.y,
1124 szHint.width, 1145 szHint.width, szHint.height,
1125 szHint.height,
1126 TermWin.ext_bwidth, 1146 TermWin.ext_bwidth,
1127 PixColors[Color_border], 1147 pix_colors[Color_border],
1128 PixColors[Color_fg]); 1148 pix_colors[Color_bg]);
1129#endif 1149#endif
1130 1150
1131 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1151 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1132 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1152 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1133 1153
1134 classHint.res_name = (char *)rs[Rs_name]; 1154 classHint.res_name = (char *)rs[Rs_name];
1135 classHint.res_class = (char *)RESCLASS; 1155 classHint.res_class = (char *)RESCLASS;
1136 1156
1137 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1157 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1138 wmHint.input = True; 1158 wmHint.input = True;
1139 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1159 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1140 : NormalState);
1141 wmHint.window_group = TermWin.parent[0]; 1160 wmHint.window_group = TermWin.parent[0];
1142 1161
1143 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1162 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1144 (char **)argv, argc, &szHint, &wmHint, &classHint); 1163 (char **)argv, argc, &szHint, &wmHint, &classHint);
1145 1164
1146#ifndef NO_FRILLS 1165#if ENABLE_FRILLS
1147 long pid = getpid (); 1166 long pid = getpid ();
1148 XChangeProperty (display->display, TermWin.parent[0], 1167 XChangeProperty (display->display, TermWin.parent[0],
1149 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1168 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1150 PropModeReplace, (unsigned char *)&pid, 1); 1169 PropModeReplace, (unsigned char *)&pid, 1);
1151#endif 1170#endif
1152 1171
1153 XSelectInput (display->display, TermWin.parent[0], 1172 XSelectInput (display->display, TermWin.parent[0],
1154 KeyPressMask 1173 KeyPressMask
1155#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1156 | KeyReleaseMask 1175 | KeyReleaseMask
1157#endif 1176#endif
1158 | FocusChangeMask | VisibilityChangeMask 1177 | FocusChangeMask | VisibilityChangeMask
1178 | ExposureMask
1159 | StructureNotifyMask); 1179 | StructureNotifyMask);
1160 termwin_ev.start (display, TermWin.parent[0]); 1180 termwin_ev.start (display, TermWin.parent[0]);
1181
1182#if ENABLE_FRILLS
1183 if (mwmhints.flags)
1184 {
1185 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1186 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1187 }
1188#endif
1161 1189
1162 /* vt cursor: Black-on-White is standard, but this is more popular */ 1190 /* vt cursor: Black-on-White is standard, but this is more popular */
1163 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1191 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1164 1192
1165#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1193#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1180 } 1208 }
1181#endif 1209#endif
1182 1210
1183 /* the vt window */ 1211 /* the vt window */
1184 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1212 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1185 window_vt_x, window_vt_y, 1213 window_vt_x,
1214 window_vt_y,
1186 TermWin_TotalWidth (), 1215 TermWin_TotalWidth (),
1187 TermWin_TotalHeight (), 1216 TermWin_TotalHeight (),
1188 0, 1217 0,
1189 PixColors[Color_fg], 1218 pix_colors[Color_fg],
1190 PixColors[Color_bg]); 1219 pix_colors[Color_bg]);
1191
1192#ifdef DEBUG_X 1220#ifdef DEBUG_X
1193 XStoreName (display->display, TermWin.vt, "vt window"); 1221 XStoreName (display->display, TermWin.vt, "vt window");
1194#endif 1222#endif
1195 1223
1224 attributes.bit_gravity = NorthWestGravity;
1225 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1226
1196 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1227 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1197 | PropertyChangeMask); 1228
1229 pointer_unblank ();
1198 1230
1199#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1200 pointer_unblank ();
1201
1202 if ((Options & Opt_pointerBlank)) 1232 if (options & Opt_pointerBlank)
1203 vt_emask |= PointerMotionMask; 1233 vt_emask |= PointerMotionMask;
1204 else 1234 else
1205#endif 1235#endif
1206 vt_emask |= (Button1MotionMask | Button3MotionMask); 1236 vt_emask |= Button1MotionMask | Button3MotionMask;
1207 1237
1208 XSelectInput (display->display, TermWin.vt, vt_emask); 1238 XSelectInput (display->display, TermWin.vt, vt_emask);
1209 vt_ev.start (display, TermWin.vt); 1239 vt_ev.start (display, TermWin.vt);
1210 1240
1211#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1241#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1214 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1215 window_vt_x, 0, 1245 window_vt_x, 0,
1216 TermWin_TotalWidth (), 1246 TermWin_TotalWidth (),
1217 menuBar_TotalHeight (), 1247 menuBar_TotalHeight (),
1218 0, 1248 0,
1219 PixColors[Color_fg], 1249 pix_colors[Color_fg],
1220 PixColors[Color_scroll]); 1250 pix_colors[Color_scroll]);
1221 1251
1222#ifdef DEBUG_X 1252#ifdef DEBUG_X
1223 XStoreName (display->display, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1224#endif 1254#endif
1225 1255
… …
1235 } 1265 }
1236#endif 1266#endif
1237 1267
1238#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1239 if (rs[Rs_backgroundPixmap] != NULL 1269 if (rs[Rs_backgroundPixmap] != NULL
1240 && ! (Options & Opt_transparent)) 1270 && ! (options & Opt_transparent))
1241 { 1271 {
1242 const char *p = rs[Rs_backgroundPixmap]; 1272 const char *p = rs[Rs_backgroundPixmap];
1243 1273
1244 if ((p = STRCHR (p, ';')) != NULL) 1274 if ((p = strchr (p, ';')) != NULL)
1245 { 1275 {
1246 p++; 1276 p++;
1247 scale_pixmap (p); 1277 scale_pixmap (p);
1248 } 1278 }
1249 set_bgPixmap (rs[Rs_backgroundPixmap]); 1279 set_bgPixmap (rs[Rs_backgroundPixmap]);
1250 scr_touch (True); 1280 scr_touch (True);
1251 } 1281 }
1252#endif 1282#endif
1253 1283
1254 /* graphics context for the vt window */ 1284 /* graphics context for the vt window */
1255 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = pix_colors[Color_fg];
1256 gcvalue.background = PixColors[Color_bg]; 1286 gcvalue.background = pix_colors[Color_bg];
1257 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1258 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1259 GCForeground | GCBackground | GCGraphicsExposures, 1289 GCForeground | GCBackground | GCGraphicsExposures,
1260 &gcvalue); 1290 &gcvalue);
1261 1291
1262 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1263 1293
1264#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1265 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = pix_colors[Color_topShadow];
1266 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1267 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = pix_colors[Color_bottomShadow];
1268 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1269 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1299 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1270 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1271#endif 1301#endif
1272}
1273 1302
1274/*----------------------------------------------------------------------*/ 1303#ifdef OFF_FOCUS_FADING
1275/* 1304 // initially we are in unfocused state
1276 * Run the command in a subprocess and return a file descriptor for the 1305 if (rs[Rs_fade])
1277 * master end of the pseudo-teletype pair with the command talking to 1306 pix_colors = pix_colors_unfocused;
1278 * the slave.
1279 */
1280int
1281rxvt_term::run_command (const char *const *argv)
1282{
1283 int cfd, er;
1284
1285 /* get master (pty) */
1286 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1287 rxvt_fatal ("can't open pseudo-tty");
1288
1289 fcntl (cfd, F_SETFL, O_NONBLOCK);
1290
1291 /* get slave (tty) */
1292 if (tty_fd < 0)
1293 {
1294#ifndef NO_SETOWNER_TTYDEV
1295 privileged_ttydev (SAVE);
1296#endif
1297
1298 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1299 {
1300 close (cfd);
1301 rxvt_fatal ("can't open slave tty %s", ttydev);
1302 }
1303 }
1304#ifndef NO_BACKSPACE_KEY
1305 if (key_backspace[0] && !key_backspace[1])
1306 er = key_backspace[0];
1307 else if (STRCMP (key_backspace, "DEC") == 0)
1308 er = '\177'; /* the initial state anyway */
1309 else
1310#endif
1311
1312 er = -1;
1313
1314 rxvt_get_ttymode (& (tio), er);
1315
1316#ifndef __QNX__
1317 /* spin off the command interpreter */
1318 switch (cmd_pid = fork ())
1319 {
1320 case -1:
1321 rxvt_fatal ("can't fork");
1322 case 0:
1323 close (cfd); /* only keep tty_fd and STDERR open */
1324
1325 init_env ();
1326
1327 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1328 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1329 else
1330 {
1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1332 dup2 (tty_fd, STDIN_FILENO);
1333 dup2 (tty_fd, STDOUT_FILENO);
1334 dup2 (tty_fd, STDERR_FILENO);
1335
1336 if (tty_fd > 2)
1337 close (tty_fd);
1338
1339 run_child (argv);
1340 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1341 }
1342
1343 _exit (EXIT_FAILURE);
1344
1345 default:
1346 {
1347#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1348 int fdstdin;
1349
1350 fdstdin = dup (STDIN_FILENO);
1351 dup2 (tty_fd, STDIN_FILENO);
1352#endif
1353
1354#ifdef UTMP_SUPPORT
1355 privileged_utmp (SAVE);
1356#endif
1357
1358#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1359
1360 dup2 (fdstdin, STDIN_FILENO);
1361 close (fdstdin);
1362#endif
1363 }
1364
1365 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1366 break;
1367 }
1368#else /* __QNX__ uses qnxspawn () */
1369 fchmod (tty_fd, 0622);
1370 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1371 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1372
1373 if (run_child (argv) == -1)
1374 exit (EXIT_FAILURE);
1375#endif
1376
1377 return cfd;
1378}
1379
1380/* ------------------------------------------------------------------------- *
1381 * CHILD PROCESS OPERATIONS *
1382 * ------------------------------------------------------------------------- */
1383/*
1384 * The only open file descriptor is the slave tty - so no error messages.
1385 * returns are fatal
1386 */
1387int
1388rxvt_term::run_child (const char *const *argv)
1389{
1390 char *login;
1391
1392 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1393
1394 if (Options & Opt_console)
1395 { /* be virtual console, fail silently */
1396#ifdef TIOCCONS
1397 unsigned int on = 1;
1398
1399 ioctl (STDIN_FILENO, TIOCCONS, &on);
1400#elif defined (SRIOCSREDIR)
1401 int fd;
1402
1403 fd = open (CONSOLE, O_WRONLY, 0);
1404 if (fd >= 0)
1405 {
1406 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1407 close (fd);
1408 }
1409#endif /* SRIOCSREDIR */
1410
1411 }
1412
1413 /* reset signals and spin off the command interpreter */
1414 signal (SIGINT, SIG_DFL);
1415 signal (SIGQUIT, SIG_DFL);
1416 signal (SIGCHLD, SIG_DFL);
1417 /*
1418 * mimick login's behavior by disabling the job control signals
1419 * a shell that wants them can turn them back on
1420 */
1421#ifdef SIGTSTP
1422 signal (SIGTSTP, SIG_IGN);
1423 signal (SIGTTIN, SIG_IGN);
1424 signal (SIGTTOU, SIG_IGN);
1425#endif /* SIGTSTP */
1426
1427 /* set window size */
1428 struct winsize ws;
1429
1430 ws.ws_col = TermWin.ncol;
1431 ws.ws_row = TermWin.nrow;
1432 ws.ws_xpixel = ws.ws_ypixel = 0;
1433 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1434
1435 // unblock signals (signals are blocked by iom.C
1436 sigset_t ss;
1437 sigemptyset (&ss);
1438 sigprocmask (SIG_SETMASK, &ss, 0);
1439
1440#ifndef __QNX__
1441 /* command interpreter path */
1442 if (argv != NULL)
1443 {
1444# ifdef DEBUG_CMD
1445 int i;
1446
1447 for (i = 0; argv[i]; i++)
1448 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1449# endif 1307#endif
1450
1451 execvp (argv[0], (char *const *)argv);
1452 /* no error message: STDERR is closed! */
1453 }
1454 else
1455 {
1456 const char *argv0, *shell;
1457
1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1459 shell = "/bin/sh";
1460
1461 argv0 = (const char *)rxvt_r_basename (shell);
1462 if (Options & Opt_loginShell)
1463 {
1464 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1465
1466 login[0] = '-';
1467 STRCPY (&login[1], argv0);
1468 argv0 = login;
1469 }
1470 execlp (shell, argv0, NULL);
1471 /* no error message: STDERR is closed! */
1472 }
1473
1474#else /* __QNX__ uses qnxspawn () */
1475
1476 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1477 char *command = NULL, fullcommand[_MAX_PATH];
1478 char **arg_v, *arg_a[2] = { NULL, NULL };
1479
1480 if (argv != NULL)
1481 {
1482 if (access (argv[0], X_OK) == -1)
1483 {
1484 if (STRCHR (argv[0], '/') == NULL)
1485 {
1486 searchenv (argv[0], "PATH", fullcommand);
1487 if (fullcommand[0] != '\0')
1488 command = fullcommand;
1489 }
1490 if (access (command, X_OK) == -1)
1491 return -1;
1492 }
1493 else
1494 command = argv[0];
1495 arg_v = argv;
1496 }
1497 else
1498 {
1499 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1500 command = "/bin/sh";
1501
1502 arg_a[0] = my_basename (command);
1503 if (Options & Opt_loginShell)
1504 {
1505 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1506
1507 login[0] = '-';
1508 STRCPY (&login[1], arg_a[0]);
1509 arg_a[0] = login;
1510 }
1511 arg_v = arg_a;
1512 }
1513 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1514 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1515 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1516 command, arg_v, environ, iov_a, 0);
1517 if (login)
1518 free (login);
1519
1520 close (tty_fd);
1521 return cmd_fd;
1522
1523#endif
1524 return -1;
1525} 1308}
1526 1309
1527/* ------------------------------------------------------------------------- * 1310/* ------------------------------------------------------------------------- *
1528 * GET TTY CURRENT STATE * 1311 * GET TTY CURRENT STATE *
1529 * ------------------------------------------------------------------------- */ 1312 * ------------------------------------------------------------------------- */
1530/* rxvt_get_ttymode () */
1531/* EXTPROTO */
1532void 1313void
1533rxvt_get_ttymode (ttymode_t *tio, int erase) 1314rxvt_get_ttymode (ttymode_t *tio, int erase)
1534{ 1315{
1535#ifdef HAVE_TERMIOS_H 1316#ifdef HAVE_TERMIOS_H
1536 /* 1317 /*
… …
1751# undef FOO 1532# undef FOO
1752# endif /* HAVE_TERMIOS_H */ 1533# endif /* HAVE_TERMIOS_H */
1753#endif /* DEBUG_TTYMODE */ 1534#endif /* DEBUG_TTYMODE */
1754} 1535}
1755 1536
1537/*----------------------------------------------------------------------*/
1538/*
1539 * Run the command in a subprocess and return a file descriptor for the
1540 * master end of the pseudo-teletype pair with the command talking to
1541 * the slave.
1542 */
1543void
1544rxvt_term::run_command (const char *const *argv)
1545{
1546 int er;
1547
1548 if (!pty.get ())
1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550
1551#ifndef NO_BACKSPACE_KEY
1552 if (key_backspace[0] && !key_backspace[1])
1553 er = key_backspace[0];
1554 else if (strcmp (key_backspace, "DEC") == 0)
1555 er = '\177'; /* the initial state anyway */
1556 else
1557#endif
1558 er = -1;
1559
1560 rxvt_get_ttymode (&tio, er);
1561
1562 /* set initial window size */
1563 tt_winch ();
1564
1565#ifndef __QNX__
1566 /* spin off the command interpreter */
1567 switch (cmd_pid = fork ())
1568 {
1569 case -1:
1570 rxvt_fatal ("can't fork, aborting.\n");
1571 case 0:
1572 init_env ();
1573
1574 if (!pty.make_controlling_tty ())
1575 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1576 else
1577 {
1578 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1579 dup2 (pty.tty, STDIN_FILENO);
1580 dup2 (pty.tty, STDOUT_FILENO);
1581 dup2 (pty.tty, STDERR_FILENO);
1582
1583 // close all our file handles that we do no longer need
1584 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1585 {
1586 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1587 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1588 }
1589
1590 run_child (argv);
1591 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1592 }
1593
1594 _exit (EXIT_FAILURE);
1595
1596 default:
1597 {
1598#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1599 int fdstdin;
1600
1601 fdstdin = dup (STDIN_FILENO);
1602 dup2 (pty.tty, STDIN_FILENO);
1603#endif
1604
1605#ifdef UTMP_SUPPORT
1606 privileged_utmp (SAVE);
1607#endif
1608
1609#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1610
1611 dup2 (fdstdin, STDIN_FILENO);
1612 close (fdstdin);
1613#endif
1614 }
1615
1616 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1617 break;
1618 }
1619#else /* __QNX__ uses qnxspawn () */
1620 fchmod (pty.tty, 0622);
1621 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1622 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1623
1624 if (run_child (argv) == -1)
1625 exit (EXIT_FAILURE);
1626#endif
1627}
1628
1629/* ------------------------------------------------------------------------- *
1630 * CHILD PROCESS OPERATIONS *
1631 * ------------------------------------------------------------------------- */
1632/*
1633 * The only open file descriptor is the slave tty - so no error messages.
1634 * returns are fatal
1635 */
1636int
1637rxvt_term::run_child (const char *const *argv)
1638{
1639 char *login;
1640
1641 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1642
1643 if (options & Opt_console)
1644 { /* be virtual console, fail silently */
1645#ifdef TIOCCONS
1646 unsigned int on = 1;
1647
1648 ioctl (STDIN_FILENO, TIOCCONS, &on);
1649#elif defined (SRIOCSREDIR)
1650 int fd;
1651
1652 fd = open (CONSOLE, O_WRONLY, 0);
1653 if (fd >= 0)
1654 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1655 close (fd);
1656#endif /* SRIOCSREDIR */
1657 }
1658
1659 /* reset signals and spin off the command interpreter */
1660 signal (SIGINT, SIG_DFL);
1661 signal (SIGQUIT, SIG_DFL);
1662 signal (SIGCHLD, SIG_DFL);
1663 signal (SIGHUP, SIG_DFL);
1664 signal (SIGPIPE, SIG_DFL);
1665 /*
1666 * mimick login's behavior by disabling the job control signals
1667 * a shell that wants them can turn them back on
1668 */
1669#ifdef SIGTSTP
1670 signal (SIGTSTP, SIG_IGN);
1671 signal (SIGTTIN, SIG_IGN);
1672 signal (SIGTTOU, SIG_IGN);
1673#endif /* SIGTSTP */
1674
1675 // unblock signals (signals are blocked by iom.C
1676 sigset_t ss;
1677 sigemptyset (&ss);
1678 sigprocmask (SIG_SETMASK, &ss, 0);
1679
1680#ifndef __QNX__
1681 /* command interpreter path */
1682 if (argv != NULL)
1683 {
1684# ifdef DEBUG_CMD
1685 int i;
1686
1687 for (i = 0; argv[i]; i++)
1688 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1689# endif
1690
1691 execvp (argv[0], (char *const *)argv);
1692 /* no error message: STDERR is closed! */
1693 }
1694 else
1695 {
1696 const char *argv0, *shell;
1697
1698 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1699 shell = "/bin/sh";
1700
1701 argv0 = (const char *)rxvt_r_basename (shell);
1702
1703 if (options & Opt_loginShell)
1704 {
1705 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1706
1707 login[0] = '-';
1708 strcpy (&login[1], argv0);
1709 argv0 = login;
1710 }
1711 execlp (shell, argv0, NULL);
1712 /* no error message: STDERR is closed! */
1713 }
1714
1715#else /* __QNX__ uses qnxspawn () */
1716
1717 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1718 char *command = NULL, fullcommand[_MAX_PATH];
1719 char **arg_v, *arg_a[2] = { NULL, NULL };
1720
1721 if (argv != NULL)
1722 {
1723 if (access (argv[0], X_OK) == -1)
1724 {
1725 if (strchr (argv[0], '/') == NULL)
1726 {
1727 searchenv (argv[0], "PATH", fullcommand);
1728
1729 if (fullcommand[0] != '\0')
1730 command = fullcommand;
1731 }
1732
1733 if (access (command, X_OK) == -1)
1734 return -1;
1735 }
1736 else
1737 command = argv[0];
1738
1739 arg_v = argv;
1740 }
1741 else
1742 {
1743 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1744 command = "/bin/sh";
1745
1746 arg_a[0] = my_basename (command);
1747
1748 if (options & Opt_loginShell)
1749 {
1750 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1751
1752 login[0] = '-';
1753 strcpy (&login[1], arg_a[0]);
1754 arg_a[0] = login;
1755 }
1756
1757 arg_v = arg_a;
1758 }
1759
1760 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1761 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1762 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1763 command, arg_v, environ, iov_a, 0);
1764 if (login)
1765 free (login);
1766
1767 pty.close_tty ();
1768 return pty.pty;
1769#endif
1770
1771 return -1;
1772}
1773
1756/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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