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.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.265 by root, Sun May 23 00:02:52 2010 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
… …
154 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 162# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 164# endif
164 /* high-intensity colors */ 165 /* high-intensity colors */
165# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 178
179#if !USE_256_COLORS
178 // 88 xterm colours 180 // 88 xterm colours
179 "rgb:00/00/00", 181 "rgb:00/00/00",
180 "rgb:00/00/8b", 182 "rgb:00/00/8b",
181 "rgb:00/00/cd", 183 "rgb:00/00/cd",
182 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
250 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
251 496
252#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 503 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 510#if ENABLE_FRILLS
266 NULL, // Color_underline 511 NULL, // Color_underline
267#endif 512#endif
268#ifdef OPTION_HC 513#ifdef OPTION_HC
269 NULL, 514 NULL,
515 NULL,
270#endif 516#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 520#endif
275#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
276 NULL, 522 NULL,
277#endif 523#endif
278#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 525 "rgb:00/00/00",
280#endif 526#endif
281 }; 527 };
282 528
283bool 529void
284rxvt_term::init_vars () 530rxvt_term::init_vars ()
285{ 531{
286 pix_colors = // 532 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 533
293 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
295 want_refresh = 1; 536 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 538 ncol = 80;
298 nrow = 24; 539 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 544 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 545
305 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
306 547
307 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 549
310 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
319 560 set_option (Opt_buffered);
320 return true;
321} 561}
322 562
323void 563static void
324rxvt_term::init_secondary () 564init_secondary ()
325{ 565{
326 int i; 566 int i;
327 567
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 { 569 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
336 } 571 }
337 else if (i != STDIN_FILENO) 572 else if (i != STDIN_FILENO)
338 { 573 {
339 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
340 close (i); 575 close (i);
341 } 576 }
342 577
343 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 579}
356 580
357/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
358const char ** 582const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
… …
415#if XFT 639#if XFT
416 if (rs[Rs_depth]) 640 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 641 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 642#endif
419 643
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv); 644 free (r_argv);
424 645
425 for (int i = NUM_RESOURCES; i--; ) 646 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 647 if (rs [i] == resval_undef)
427 rs [i] = 0; 648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
428 654
429#if ENABLE_PERL 655#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1]) 656 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default"; 657 rs[Rs_perl_ext_1] = "default";
432 658
… …
444 */ 670 */
445 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
446 { 672 {
447 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
449 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
451 } 678 }
452 else 679 else
453 { 680 {
454 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
456 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
458 } 686 }
459 687
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 697
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
472#endif 703#endif
473 704
474#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
479#endif 710#endif
480 711
481 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 713 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 715
490 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
492 718
493#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
… …
506# else 732# else
507 rs[Rs_delete_key] = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
508# endif 734# endif
509#endif 735#endif
510 736
511#ifdef HAVE_SCROLLBARS 737 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 738
515#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
518 { 742 {
… …
538 color_aliases (Color_fg); 762 color_aliases (Color_fg);
539 color_aliases (Color_bg); 763 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 770 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 772 color_aliases (Color_BD);
549 color_aliases (Color_UL); 773 color_aliases (Color_UL);
550 color_aliases (Color_RV); 774 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 776
553 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 779
556 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
786{
787 this->envv = envv;
788
789 SET_R (this);
790 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :(
792
793 init_vars ();
794
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv);
798
799#ifdef KEYSYM_RESOURCE
800 keyboard->register_done ();
801#endif
802
803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
813 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
815
816 pty = ptytty::create ();
817
818 create_windows (argc, argv);
819
820 init_xlocale ();
821
822 scr_poweron (); // initialize screen
823
824#if 0
825 XSynchronize (dpy, True);
826#endif
827
828 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP
831 {
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif
876
877#if ENABLE_PERL
878 rootwin_ev.start (display, display->root);
879#endif
880
881 set_colorfgbg ();
882
883 init_command (cmd_argv);
884
885 free (cmd_argv);
886
887 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ);
889
890 HOOK_INVOKE ((this, HOOK_START, DT_END));
891
892#if ENABLE_XEMBED
893 if (rs[Rs_embed])
894 {
895 long info[2] = { 0, XEMBED_MAPPED };
896
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2);
899 }
900#endif
901
902 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]);
904
905 refresh_check ();
557} 906}
558 907
559/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
560void 909void
561rxvt_term::init_env () 910rxvt_term::init_env ()
… …
576 */ 925 */
577 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
579 928
580 if (val == NULL) 929 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
583 932
584 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
586 935
… …
626#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 977 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
632} 981}
633 982
634/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
635/* 984/*
636 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
… …
657 1006
658 this->locale = "C"; 1007 this->locale = "C";
659 } 1008 }
660 1009
661 1010
662 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
664 mbstate.reset (); 1013 mbstate.reset ();
665#endif 1014#endif
666 1015
667#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
740 run_command (argv); 1089 run_command (argv);
741} 1090}
742 1091
743/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
744void 1093void
745rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
746{ 1095{
747 int i; 1096 int i;
748 1097
749#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
751#endif 1100#endif
752 1101
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 { 1103 {
755 const char *name = rs[Rs_color + i]; 1104 const char *name = rs[Rs_color + i];
756 1105
757 if (!name) 1106 if (!name)
… …
810 * get scrollBar shadow colors 1159 * get scrollBar shadow colors
811 * 1160 *
812 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1162 * from the fvwm window manager.
814 */ 1163 */
815#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 1165 if (depth <= 2)
817 { 1166 {
818 /* Monochrome */ 1167 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 1168 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 1169 alias_color (Color_topShadow, Color_bg);
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 1185 cscroll.a)
837 )) 1186 ))
838 alias_color (Color_topShadow, Color_White); 1187 alias_color (Color_topShadow, Color_White);
839 } 1188 }
840#endif /* KEEP_SCROLLCOLOR */ 1189#endif
841 1190
842#ifdef OFF_FOCUS_FADING 1191#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 1193 update_fade_color (i);
845#endif 1194#endif
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 1203 {
855 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
856 1205
857 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
858 { /* bright colors */ 1207 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 1209 else if (i >= 0 && i <= 7)
862 } 1210 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 1212 }
867} 1213}
868 1214
869/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
970 Window top, parent; 1316 Window top, parent;
971 1317
972 dLocal (Display *, dpy); 1318 dLocal (Display *, dpy);
973 1319
974 /* grab colors before netscape does */ 1320 /* grab colors before netscape does */
975 Get_Colours (); 1321 get_colours ();
976 1322
977 if (!set_fonts ()) 1323 if (!set_fonts ())
978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979 1325
980 parent = display->root; 1326 parent = display->root;
… …
1028 this->parent[0] = top; 1374 this->parent[0] = top;
1029 1375
1030 old_width = szHint.width; 1376 old_width = szHint.width;
1031 old_height = szHint.height; 1377 old_height = szHint.height;
1032 1378
1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
1035 1381
1036 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
1037 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
1038 1384
1039 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1042 wmHint.window_group = top; 1388 wmHint.window_group = top;
1043 1389
1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
1046 1442
1047#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
1048 if (mwmhints.flags) 1444 if (mwmhints.flags)
1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1084 1480
1085 termwin_ev.start (display, top); 1481 termwin_ev.start (display, top);
1086 1482
1087 /* vt cursor: Black-on-White is standard, but this is more popular */ 1483 /* vt cursor: Black-on-White is standard, but this is more popular */
1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089
1090#ifdef HAVE_SCROLLBARS
1091 /* cursor scrollBar: Black-on-White */
1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093#endif
1094 1485
1095 /* the vt window */ 1486 /* the vt window */
1096 vt = XCreateSimpleWindow (dpy, top, 1487 vt = XCreateSimpleWindow (dpy, top,
1097 window_vt_x, window_vt_y, 1488 window_vt_x, window_vt_y,
1098 width, height, 1489 width, height,
… …
1123 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1124 &gcvalue); 1515 &gcvalue);
1125 1516
1126 drawable = new rxvt_drawable (this, vt); 1517 drawable = new rxvt_drawable (this, vt);
1127 1518
1128#ifdef RXVT_SCROLLBAR
1129 gcvalue.foreground = pix_colors[Color_topShadow];
1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135#endif
1136
1137#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1138 // initially we are in unfocused state 1520 // initially we are in unfocused state
1139 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1140 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
1141#endif 1523#endif
… …
1146 1528
1147/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1150void 1532void
1151rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1152{ 1534{
1153 /* 1535 /*
1154 * standard System V termios interface 1536 * standard System V termios interface
1155 */ 1537 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1538 if (tcgetattr (STDIN_FILENO, tio) < 0)
1157 { 1539 {
1158 // return error - use system defaults, 1540 // return error - use system defaults,
1159 // where possible, and zero elsewhere 1541 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t)); 1542 memset (tio, 0, sizeof (struct termios));
1161 1543
1162 tio->c_cc[VINTR] = CINTR; 1544 tio->c_cc[VINTR] = CINTR;
1163 tio->c_cc[VQUIT] = CQUIT; 1545 tio->c_cc[VQUIT] = CQUIT;
1164 tio->c_cc[VERASE] = CERASE; 1546 tio->c_cc[VERASE] = CERASE;
1165#ifdef VERASE2 1547#ifdef VERASE2
… …
1229 1611
1230 /* 1612 /*
1231 * Debugging 1613 * Debugging
1232 */ 1614 */
1233#ifdef DEBUG_TTYMODE 1615#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1616 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1617 fprintf (stderr, "Input flags\n");
1237 1618
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1619 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1620# define FOO(flag,name) \
… …
1302 FOO (VLNEXT, "VLNEXT"); 1683 FOO (VLNEXT, "VLNEXT");
1303# endif 1684# endif
1304 1685
1305 fprintf (stderr, "\n"); 1686 fprintf (stderr, "\n");
1306# undef FOO 1687# undef FOO
1307# endif /* HAVE_TERMIOS_H */ 1688#endif /* DEBUG_TTYMODE */
1308#endif /* DEBUG_TTYMODE */
1309} 1689}
1310 1690
1311/*----------------------------------------------------------------------*/ 1691/*----------------------------------------------------------------------*/
1312/* 1692/*
1313 * Run the command in a subprocess and return a file descriptor for the 1693 * Run the command in a subprocess and return a file descriptor for the
… …
1346 else 1726 else
1347#endif 1727#endif
1348 er = -1; 1728 er = -1;
1349 1729
1350 rxvt_get_ttymode (&tio, er); 1730 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1731 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1735 pty->set_utf8_mode (enc_utf8);
1353 1736
1354 /* set initial window size */ 1737 /* set initial window size */
1355 tt_winch (); 1738 tt_winch ();
1356 1739
… …
1416rxvt_term::run_child (const char *const *argv) 1799rxvt_term::run_child (const char *const *argv)
1417{ 1800{
1418 char *login; 1801 char *login;
1419 1802
1420 if (option (Opt_console)) 1803 if (option (Opt_console))
1804 {
1421 { /* be virtual console, fail silently */ 1805 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1806#ifdef TIOCCONS
1423 unsigned int on = 1; 1807 unsigned int on = 1;
1424 1808
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1809 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1810#elif defined (SRIOCSREDIR)
… …
1428 1812
1429 fd = open (CONSOLE, O_WRONLY, 0); 1813 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1814 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1815 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1816 close (fd);
1433#endif /* SRIOCSREDIR */ 1817#endif /* SRIOCSREDIR */
1434 } 1818 }
1435 1819
1436 /* reset signals and spin off the command interpreter */ 1820 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1821 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1822 signal (SIGQUIT, SIG_DFL);
… …
1445 */ 1829 */
1446#ifdef SIGTSTP 1830#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1831 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1832 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1833 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1834#endif /* SIGTSTP */
1451
1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss;
1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1835
1457 /* command interpreter path */ 1836 /* command interpreter path */
1458 if (argv) 1837 if (argv)
1459 { 1838 {
1460# ifdef DEBUG_CMD 1839# ifdef DEBUG_CMD
… …
1472 const char *argv0, *shell; 1851 const char *argv0, *shell;
1473 1852
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1853 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1854 shell = "/bin/sh";
1476 1855
1477 argv0 = (const char *)rxvt_basename (shell); 1856 argv0 = rxvt_basename (shell);
1478 1857
1479 if (option (Opt_loginShell)) 1858 if (option (Opt_loginShell))
1480 { 1859 {
1481 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1860 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1861

Diff Legend

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