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.242 by ayin, Mon Jan 21 14:52:44 2008 UTC vs.
Revision 1.298 by sf-exg, Fri Aug 19 17:42:09 2011 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) 2003-2007 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#if !USE_256_COLORS
179 // 88 xterm colours 180 // 88 xterm colours
180 "rgb:00/00/00", 181 "rgb:00/00/00",
181 "rgb:00/00/8b", 182 "rgb:00/00/8b",
182 "rgb:00/00/cd", 183 "rgb:00/00/cd",
183 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
251 "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
252 496
253#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 510#if ENABLE_FRILLS
267 NULL, // Color_underline 511 NULL, // Color_underline
268#endif 512#endif
269#ifdef OPTION_HC 513#ifdef OPTION_HC
270 NULL, 514 NULL,
515 NULL,
271#endif 516#endif
272#ifdef KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 520#endif
276#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
277 NULL, 522 NULL,
278#endif 523#endif
279#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 525 "rgb:00/00/00",
… …
293 ncol = 80; 538 ncol = 80;
294 nrow = 24; 539 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 544 saveLines = SAVELINES;
299 545
300 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
301 547
302 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
313} 560 set_option (Opt_buffered);
314
315static void
316init_secondary ()
317{
318 int i;
319
320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
321 {
322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 }
324 else if (i != STDIN_FILENO)
325 {
326 dup2 (i, STDIN_FILENO);
327 close (i);
328 }
329
330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331} 561}
332 562
333/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
334const char ** 564const char **
335rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
391#if XFT 621#if XFT
392 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
393 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
394#endif 624#endif
395 625
396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
400#endif
401 free (r_argv); 626 free (r_argv);
402 627
403 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
404 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
405 rs [i] = 0; 630 rs [i] = 0;
… …
422 */ 647 */
423 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
424 { 649 {
425 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
426 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
427 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
428 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
429 } 655 }
430 else 656 else
431 { 657 {
432 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
433 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
434 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
435 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
436 } 663 }
437 664
438 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
445 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
446 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
447 674
448 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
449 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
450#endif 680#endif
451 681
452#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
453 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
454 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
457#endif 687#endif
458 688
459 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
460 if (!saveLines) 690 if (!saveLines)
461 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
462
463#ifdef PRINTPIPE
464 if (!rs[Rs_print_pipe])
465 rs[Rs_print_pipe] = PRINTPIPE;
466#endif
467 692
468 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
469 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
470 695
471#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
… …
484# else 709# else
485 rs[Rs_delete_key] = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
486# endif 711# endif
487#endif 712#endif
488 713
489#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
491#endif
492 715
493#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
494 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
495 if (option (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
496 { 719 {
… …
540{ 763{
541 this->envv = envv; 764 this->envv = envv;
542 765
543 SET_R (this); 766 SET_R (this);
544 set_locale (""); 767 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :( 768 set_environ (envv); // a few things in X do not call setlocale :(
546 769
547 init_vars (); 770 init_vars ();
548
549 init_secondary ();
550 771
551 const char **cmd_argv = init_resources (argc, argv); 772 const char **cmd_argv = init_resources (argc, argv);
552 773
553#ifdef KEYSYM_RESOURCE 774#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 775 keyboard->register_done ();
555#endif 776#endif
556 777
557#ifdef HAVE_SCROLLBARS 778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
558 if (option (Opt_scrollBar)) 788 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */ 789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
560#endif
561 790
562 pty = ptytty::create (); 791 pty = ptytty::create ();
563 792
564 create_windows (argc, argv); 793 create_windows (argc, argv);
565 794
566 init_xlocale (); 795 init_xlocale ();
567 796
568 scr_reset (); // initialize screen 797 scr_poweron (); // initialize screen
569 798
570#if 0 799#if 0
571 XSynchronize (dpy, True); 800 XSynchronize (dpy, True);
572#endif 801#endif
573 802
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
579 { 806 {
580 bgPixmap.set_target (this); 807 bg_init ();
581 bgPixmap.invalidate ();
582 808
583#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
585 { 811 {
586 bgPixmap.set_transparent (); 812 bg_set_transparent ();
587 813
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
591#endif 816
592 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
594 819
595 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
597 822
598 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
601 } 826 }
602#endif 827#endif
603 828
604#ifdef BG_IMAGE_FROM_FILE 829#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap]) 830 if (rs[Rs_backgroundPixmap])
606 { 831 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 832 if (bg_set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ()) 833 if (!bg_window_position_sensitive ())
619 update_background (); 834 update_background ();
620 } 835 }
621#endif 836#endif
622 } 837 }
623#endif 838#endif
… …
640#if ENABLE_XEMBED 855#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 856 if (rs[Rs_embed])
642 { 857 {
643 long info[2] = { 0, XEMBED_MAPPED }; 858 long info[2] = { 0, XEMBED_MAPPED };
644 859
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 861 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 862 }
648#endif 863#endif
649 864
650 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
652 867
653 refresh_check (); 868 refresh_check ();
654} 869}
655 870
656/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
657void 872void
658rxvt_term::init_env () 873rxvt_term::init_env ()
659{ 874{
660 int i;
661 char *val; 875 char *val;
662 876
663#ifdef DISPLAY_IS_IP 877#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 878 /* Fixup display_name for export over pty to any interested terminal
665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 879 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
679 val = XDisplayString (dpy); 893 val = XDisplayString (dpy);
680 894
681 if (rs[Rs_display_name] == NULL) 895 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 896 rs[Rs_display_name] = val; /* use broken `:0' value */
683 897
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 898 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 899
687 sprintf (env_display, "DISPLAY=%s", val); 900 sprintf (env_display, "DISPLAY=%s", val);
688 901
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 902 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 903
691 /* add entries to the environment: 904 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 905 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 906 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 907 * @ COLORTERM: terminal sub-name and also indicates its color
… …
837 run_command (argv); 1050 run_command (argv);
838} 1051}
839 1052
840/*----------------------------------------------------------------------*/ 1053/*----------------------------------------------------------------------*/
841void 1054void
842rxvt_term::Get_Colours () 1055rxvt_term::get_colours ()
843{ 1056{
844 int i; 1057 int i;
845 1058
846#ifdef OFF_FOCUS_FADING 1059#ifdef OFF_FOCUS_FADING
847 pix_colors = pix_colors_focused; 1060 pix_colors = pix_colors_focused;
… …
907 * get scrollBar shadow colors 1120 * get scrollBar shadow colors
908 * 1121 *
909 * The calculations of topShadow/bottomShadow values are adapted 1122 * The calculations of topShadow/bottomShadow values are adapted
910 * from the fvwm window manager. 1123 * from the fvwm window manager.
911 */ 1124 */
912#ifdef KEEP_SCROLLCOLOR 1125#ifdef RXVT_SCROLLBAR
913 if (depth <= 2) 1126 if (depth <= 2)
914 { 1127 {
915 /* Monochrome */ 1128 /* Monochrome */
916 alias_color (Color_scroll, Color_fg); 1129 alias_color (Color_scroll, Color_fg);
917 alias_color (Color_topShadow, Color_bg); 1130 alias_color (Color_topShadow, Color_bg);
… …
932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1145 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
933 cscroll.a) 1146 cscroll.a)
934 )) 1147 ))
935 alias_color (Color_topShadow, Color_White); 1148 alias_color (Color_topShadow, Color_White);
936 } 1149 }
937#endif /* KEEP_SCROLLCOLOR */ 1150#endif
938 1151
939#ifdef OFF_FOCUS_FADING 1152#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i); 1154 update_fade_color (i);
942#endif 1155#endif
… …
1047 1260
1048 if (i) 1261 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1262 ModMetaMask = modmasks[i - 1];
1050} 1263}
1051 1264
1265void
1266rxvt_term::set_icon (const char *file)
1267{
1268#ifdef HAVE_AFTERIMAGE
1269 init_asv ();
1270
1271 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1272 if (!im)
1273 {
1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1275 return;
1276 }
1277
1278 unsigned int w = im->width;
1279 unsigned int h = im->height;
1280
1281 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1282 {
1283 rxvt_warn ("Icon image too big, continuing without.\n");
1284 destroy_asimage (&im);
1285 return;
1286 }
1287
1288 ASImage *result = scale_asimage (asv, im,
1289 w, h, ASA_ARGB32,
1290 100, ASIMAGE_QUALITY_DEFAULT);
1291 destroy_asimage (&im);
1292
1293 if (!result)
1294 {
1295 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1296 return;
1297 }
1298
1299 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1300 if (buffer)
1301 {
1302 ARGB32 *asbuf = result->alt.argb32;
1303 buffer [0] = w;
1304 buffer [1] = h;
1305
1306 for (unsigned int i = 0; i < w * h; ++i)
1307 buffer [i + 2] = asbuf [i];
1308
1309 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1310 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1311 free (buffer);
1312 }
1313 else
1314 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1315
1316 destroy_asimage (&result);
1317#endif
1318
1319#ifdef HAVE_PIXBUF
1320 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1321 if (!pixbuf)
1322 {
1323 rxvt_warn ("Loading image icon failed, continuing without.\n");
1324 return;
1325 }
1326
1327 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1328 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1329
1330 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1331 {
1332 rxvt_warn ("Icon image too big, continuing without.\n");
1333 g_object_unref (pixbuf);
1334 return;
1335 }
1336
1337 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1338 {
1339 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1340 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1342
1343 buffer [0] = w;
1344 buffer [1] = h;
1345 for (int i = 0; i < h; i++)
1346 {
1347 for (int j = 0; j < w; j++)
1348 {
1349 unsigned char *pixel = row + j * channels;
1350 long value;
1351
1352 if (channels == 4)
1353 value = pixel[3];
1354 else
1355 value = (unsigned char)0x00ff;
1356
1357 value = (value << 8) + pixel[0];
1358 value = (value << 8) + pixel[1];
1359 value = (value << 8) + pixel[2];
1360 buffer[(i * w + j) + 2] = value;
1361 }
1362
1363 row += rowstride;
1364 }
1365
1366 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1367 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1368 free (buffer);
1369 }
1370 else
1371 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1372
1373 g_object_unref (pixbuf);
1374#endif
1375}
1376
1052/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1378/* Open and map the window */
1054void 1379void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1380rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1381{
1057 XClassHint classHint; 1382 XClassHint classHint;
1058 XWMHints wmHint; 1383 XWMHints wmHint;
… …
1064 Window top, parent; 1389 Window top, parent;
1065 1390
1066 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
1067 1392
1068 /* grab colors before netscape does */ 1393 /* grab colors before netscape does */
1069 Get_Colours (); 1394 get_colours ();
1070 1395
1071 if (!set_fonts ()) 1396 if (!set_fonts ())
1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1397 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1073 1398
1074 parent = display->root; 1399 parent = display->root;
… …
1104 } 1429 }
1105#endif 1430#endif
1106 1431
1107 window_calc (0, 0); 1432 window_calc (0, 0);
1108 1433
1109 /* sub-window placement & size in rxvt_resize_subwindows () */ 1434 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1110 attributes.background_pixel = pix_colors_focused [Color_border]; 1435 attributes.background_pixel = pix_colors_focused [Color_border];
1111 attributes.border_pixel = pix_colors_focused [Color_border]; 1436 attributes.border_pixel = pix_colors_focused [Color_border];
1112 attributes.colormap = cmap; 1437 attributes.colormap = cmap;
1113 1438
1114 top = XCreateWindow (dpy, parent, 1439 top = XCreateWindow (dpy, parent,
… …
1117 ext_bwidth, 1442 ext_bwidth,
1118 depth, InputOutput, visual, 1443 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1444 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1445 &attributes);
1121 1446
1122 this->parent[0] = top; 1447 this->parent = top;
1123 1448
1124 old_width = szHint.width; 1449 old_width = szHint.width;
1125 old_height = szHint.height; 1450 old_height = szHint.height;
1126 1451
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1452 set_title (rs [Rs_title]);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1453 set_icon_name (rs [Rs_iconName]);
1129 1454
1130 classHint.res_name = (char *)rs[Rs_name]; 1455 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1456 classHint.res_class = (char *)RESCLASS;
1132 1457
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1458 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1460 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1461 wmHint.window_group = top;
1137 1462
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1463 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1464 &szHint, &wmHint, &classHint);
1465#if ENABLE_EWMH
1466 /*
1467 * set up icon hint
1468 * rs [Rs_iconfile] is path to icon
1469 */
1470
1471 if (rs [Rs_iconfile])
1472 {
1473 set_icon (rs [Rs_iconfile]);
1474 }
1475#endif
1140 1476
1141#if ENABLE_FRILLS 1477#if ENABLE_FRILLS
1142 if (mwmhints.flags) 1478 if (mwmhints.flags)
1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1479 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1480 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1149#if ENABLE_EWMH 1485#if ENABLE_EWMH
1150 xa[XA_NET_WM_PING], 1486 xa[XA_NET_WM_PING],
1151#endif 1487#endif
1152 }; 1488 };
1153 1489
1154 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1490 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1155 1491
1156#if ENABLE_FRILLS 1492#if ENABLE_FRILLS
1157 if (rs[Rs_transient_for]) 1493 if (rs[Rs_transient_for])
1158 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1494 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1159#endif 1495#endif
… …
1220 pix_colors = pix_colors_unfocused; 1556 pix_colors = pix_colors_unfocused;
1221#endif 1557#endif
1222 1558
1223 pointer_unblank (); 1559 pointer_unblank ();
1224 scr_recolour (); 1560 scr_recolour ();
1225}
1226
1227/* ------------------------------------------------------------------------- *
1228 * GET TTY CURRENT STATE *
1229 * ------------------------------------------------------------------------- */
1230void
1231rxvt_get_ttymode (struct termios *tio, int erase)
1232{
1233 /*
1234 * standard System V termios interface
1235 */
1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1237 {
1238 // return error - use system defaults,
1239 // where possible, and zero elsewhere
1240 memset (tio, 0, sizeof (struct termios));
1241
1242 tio->c_cc[VINTR] = CINTR;
1243 tio->c_cc[VQUIT] = CQUIT;
1244 tio->c_cc[VERASE] = CERASE;
1245#ifdef VERASE2
1246 tio->c_cc[VERASE2] = CERASE2;
1247#endif
1248 tio->c_cc[VKILL] = CKILL;
1249 tio->c_cc[VSTART] = CSTART;
1250 tio->c_cc[VSTOP] = CSTOP;
1251 tio->c_cc[VSUSP] = CSUSP;
1252# ifdef VDSUSP
1253 tio->c_cc[VDSUSP] = CDSUSP;
1254# endif
1255# ifdef VREPRINT
1256 tio->c_cc[VREPRINT] = CRPRNT;
1257# endif
1258# ifdef VDISCRD
1259 tio->c_cc[VDISCRD] = CFLUSH;
1260# endif
1261# ifdef VWERSE
1262 tio->c_cc[VWERSE] = CWERASE;
1263# endif
1264# ifdef VLNEXT
1265 tio->c_cc[VLNEXT] = CLNEXT;
1266# endif
1267 }
1268
1269 tio->c_cc[VEOF] = CEOF;
1270 tio->c_cc[VEOL] = VDISABLE;
1271# ifdef VEOL2
1272 tio->c_cc[VEOL2] = VDISABLE;
1273# endif
1274# ifdef VSWTC
1275 tio->c_cc[VSWTC] = VDISABLE;
1276# endif
1277# ifdef VSWTCH
1278 tio->c_cc[VSWTCH] = VDISABLE;
1279# endif
1280# if VMIN != VEOF
1281 tio->c_cc[VMIN] = 1;
1282# endif
1283# if VTIME != VEOL
1284 tio->c_cc[VTIME] = 0;
1285# endif
1286
1287 if (erase != -1)
1288 tio->c_cc[VERASE] = (char)erase;
1289
1290 /* input modes */
1291 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1292# ifdef IMAXBEL
1293 | IMAXBEL
1294# endif
1295 | IXON);
1296
1297 /* output modes */
1298 tio->c_oflag = (OPOST | ONLCR);
1299
1300 /* control modes */
1301 tio->c_cflag = (CS8 | CREAD);
1302
1303 /* line discipline modes */
1304 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1305# if defined (ECHOCTL) && defined (ECHOKE)
1306 | ECHOCTL | ECHOKE
1307# endif
1308 | ECHOE | ECHOK);
1309
1310 /*
1311 * Debugging
1312 */
1313#ifdef DEBUG_TTYMODE
1314 /* c_iflag bits */
1315 fprintf (stderr, "Input flags\n");
1316
1317 /* cpp token stringize doesn't work on all machines <sigh> */
1318# define FOO(flag,name) \
1319 if ((tio->c_iflag) & flag) \
1320 fprintf (stderr, "%s ", name)
1321
1322 /* c_iflag bits */
1323 FOO (IGNBRK, "IGNBRK");
1324 FOO (BRKINT, "BRKINT");
1325 FOO (IGNPAR, "IGNPAR");
1326 FOO (PARMRK, "PARMRK");
1327 FOO (INPCK, "INPCK");
1328 FOO (ISTRIP, "ISTRIP");
1329 FOO (INLCR, "INLCR");
1330 FOO (IGNCR, "IGNCR");
1331 FOO (ICRNL, "ICRNL");
1332 FOO (IXON, "IXON");
1333 FOO (IXOFF, "IXOFF");
1334# ifdef IUCLC
1335 FOO (IUCLC, "IUCLC");
1336# endif
1337# ifdef IXANY
1338 FOO (IXANY, "IXANY");
1339# endif
1340# ifdef IMAXBEL
1341 FOO (IMAXBEL, "IMAXBEL");
1342# endif
1343
1344 fprintf (stderr, "\n");
1345
1346# undef FOO
1347# define FOO(entry, name) \
1348 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1349
1350 FOO (VINTR, "VINTR");
1351 FOO (VQUIT, "VQUIT");
1352 FOO (VERASE, "VERASE");
1353 FOO (VKILL, "VKILL");
1354 FOO (VEOF, "VEOF");
1355 FOO (VEOL, "VEOL");
1356# ifdef VEOL2
1357 FOO (VEOL2, "VEOL2");
1358# endif
1359# ifdef VSWTC
1360 FOO (VSWTC, "VSWTC");
1361# endif
1362# ifdef VSWTCH
1363 FOO (VSWTCH, "VSWTCH");
1364# endif
1365 FOO (VSTART, "VSTART");
1366 FOO (VSTOP, "VSTOP");
1367 FOO (VSUSP, "VSUSP");
1368# ifdef VDSUSP
1369 FOO (VDSUSP, "VDSUSP");
1370# endif
1371# ifdef VREPRINT
1372 FOO (VREPRINT, "VREPRINT");
1373# endif
1374# ifdef VDISCRD
1375 FOO (VDISCRD, "VDISCRD");
1376# endif
1377# ifdef VWERSE
1378 FOO (VWERSE, "VWERSE");
1379# endif
1380# ifdef VLNEXT
1381 FOO (VLNEXT, "VLNEXT");
1382# endif
1383
1384 fprintf (stderr, "\n");
1385# undef FOO
1386#endif /* DEBUG_TTYMODE */
1387} 1561}
1388 1562
1389/*----------------------------------------------------------------------*/ 1563/*----------------------------------------------------------------------*/
1390/* 1564/*
1391 * Run the command in a subprocess and return a file descriptor for the 1565 * Run the command in a subprocess and return a file descriptor for the
… …
1412 else 1586 else
1413#endif 1587#endif
1414 if (!pty->get ()) 1588 if (!pty->get ())
1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1589 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1416 1590
1417 int er; 1591 struct termios tio = def_tio;
1418 1592
1419#ifndef NO_BACKSPACE_KEY 1593#ifndef NO_BACKSPACE_KEY
1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1594 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1421 er = rs[Rs_backspace_key][0]; 1595 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1596 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */ 1597 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1424 else
1425#endif 1598#endif
1426 er = -1;
1427 1599
1428 rxvt_get_ttymode (&tio, er);
1429 /* init terminal attributes */ 1600 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE); 1601 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE); 1602 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio); 1603 tcsetattr (pty->tty, TCSANOW, &tio);
1433 pty->set_utf8_mode (enc_utf8); 1604 pty->set_utf8_mode (enc_utf8);
… …
1520 signal (SIGQUIT, SIG_DFL); 1691 signal (SIGQUIT, SIG_DFL);
1521 signal (SIGCHLD, SIG_DFL); 1692 signal (SIGCHLD, SIG_DFL);
1522 signal (SIGHUP, SIG_DFL); 1693 signal (SIGHUP, SIG_DFL);
1523 signal (SIGPIPE, SIG_DFL); 1694 signal (SIGPIPE, SIG_DFL);
1524 /* 1695 /*
1525 * mimick login's behavior by disabling the job control signals 1696 * mimic login's behavior by disabling the job control signals
1526 * a shell that wants them can turn them back on 1697 * a shell that wants them can turn them back on
1527 */ 1698 */
1528#ifdef SIGTSTP 1699#ifdef SIGTSTP
1529 signal (SIGTSTP, SIG_IGN); 1700 signal (SIGTSTP, SIG_IGN);
1530 signal (SIGTTIN, SIG_IGN); 1701 signal (SIGTTIN, SIG_IGN);
1531 signal (SIGTTOU, SIG_IGN); 1702 signal (SIGTTOU, SIG_IGN);
1532#endif /* SIGTSTP */ 1703#endif /* SIGTSTP */
1533 1704
1534 // unblock signals (signals are blocked by iom.C
1535 sigset_t ss;
1536 sigemptyset (&ss);
1537 sigprocmask (SIG_SETMASK, &ss, 0);
1538
1539 /* command interpreter path */ 1705 /* command interpreter path */
1540 if (argv) 1706 if (argv)
1541 { 1707 {
1542# ifdef DEBUG_CMD 1708# ifdef DEBUG_CMD
1543 int i; 1709 int i;
… …
1554 const char *argv0, *shell; 1720 const char *argv0, *shell;
1555 1721
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1722 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1723 shell = "/bin/sh";
1558 1724
1559 argv0 = (const char *)rxvt_basename (shell); 1725 argv0 = rxvt_basename (shell);
1560 1726
1561 if (option (Opt_loginShell)) 1727 if (option (Opt_loginShell))
1562 { 1728 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1729 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1730

Diff Legend

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