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.128 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.147 by root, Tue Jan 17 16:50:42 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
49#ifndef NO_BRIGHTCOLOR
50 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
51 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
52 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
53 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
54 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */
68 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
69 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
71 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
258 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
259#endif 257#endif
260 258
261 last_bot = last_state = -1; 259 last_bot = last_state = -1;
262 260
263#ifdef MENUBAR
264 menu_readonly = 1;
265# if ! (MENUBAR_MAX > 1)
266 CurrentBar = &BarList;
267# endif /* (MENUBAR_MAX > 1) */
268#endif
269
270 return true; 261 return true;
271} 262}
272 263
273void 264void
274rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 333
343 /* 334 /*
344 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
345 */ 336 */
337
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
348 340
349 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
350 342
351 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 345
354 extract_resources (); 346 extract_resources ();
347
355 free (r_argv); 348 free (r_argv);
356 349
357 /* 350 /*
358 * set any defaults not already set 351 * set any defaults not already set
359 */ 352 */
… …
393 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
394#endif 387#endif
395 388
396 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 390 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 391 set_option (Opt_scrollBar, 0);
399 392
400#ifdef PRINTPIPE 393#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 396#endif
… …
578 * This should support all European type languages. 571 * This should support all European type languages.
579 */ 572 */
580void 573void
581rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
582{ 575{
576 set_environ (envv);
577
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 579 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
586 581
587 if (!this->locale) 582 if (!this->locale)
588 { 583 {
589 if (*locale) 584 if (*locale)
590 { 585 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
593 } 588 }
594 else 589 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 591
597 this->locale = ""; 592 this->locale = "C";
598 } 593 }
599 594
600 595
601 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
617} 612}
618 613
619void 614void
620rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
621{ 616{
617 set_environ (envv);
618
622#ifdef USE_XIM 619#ifdef USE_XIM
623 if (!locale) 620 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 622 else
626 { 623 {
… …
648 * Initialize the command connection. 645 * Initialize the command connection.
649 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
650 */ 647 */
651 648
652#ifdef META8_OPTION 649#ifdef META8_OPTION
653 meta_char = OPTION ((Opt_meta8) ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 651#endif
655 652
656 get_ourmods (); 653 get_ourmods ();
657 654
658 if (!OPTION (Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
… …
666 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
668#endif 665#endif
669 666
670 /* add value for scrollBar */ 667 /* add value for scrollBar */
671 if (scrollbar_visible ()) 668 if (scrollBar.state)
672 { 669 {
673 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
675 } 672 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (OPTION (Opt_cursorBlink))
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 673
688 run_command (argv); 674 run_command (argv);
689} 675}
690 676
691/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
759 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
760 } 746 }
761 747
762 /* 748 /*
763 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
764 * 750 *
765 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
766 * from the fvwm window manager. 752 * from the fvwm window manager.
767 */ 753 */
768#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
813 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
814 800
815 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
816 { /* bright colors */ 802 { /* bright colors */
817 i -= 8; 803 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 805 return;
821#endif
822 } 806 }
823 807
824 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 810 }
… …
925#if ENABLE_FRILLS 909#if ENABLE_FRILLS
926 Atom prop = None; 910 Atom prop = None;
927 MWMHints mwmhints; 911 MWMHints mwmhints;
928#endif 912#endif
929 XGCValues gcvalue; 913 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
932 XWindowAttributes gattr; 915 XWindowAttributes gattr;
933 Window top, parent; 916 Window top, parent;
934 dDisp; 917 dDisp;
935 918
… …
1041#endif 1024#endif
1042 }; 1025 };
1043 1026
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1028
1029#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif
1033
1046#if ENABLE_EWMH 1034#if ENABLE_EWMH
1047 long pid = getpid (); 1035 long pid = getpid ();
1048 1036
1049 XChangeProperty (disp, top, 1037 XChangeProperty (disp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1070#endif 1058#endif
1071 1059
1072 /* vt cursor: Black-on-White is standard, but this is more popular */ 1060 /* vt cursor: Black-on-White is standard, but this is more popular */
1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1074 1062
1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1076 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1078#endif 1066#endif
1079 1067
1080 /* the vt window */ 1068 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 1070 window_vt_x,
1083 window_vt_y, 1071 window_vt_y,
1084 TermWin_TotalWidth (), 1072 width,
1085 TermWin_TotalHeight (), 1073 height,
1086 0, 1074 0,
1087 pix_colors_focused[Color_fg], 1075 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1076 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X 1077#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window"); 1078 XStoreName (disp, vt, "vt window");
… …
1093 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095 1083
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1085
1098#ifdef POINTER_BLANK
1099 if (OPTION (Opt_pointerBlank)) 1086 if (OPTION (Opt_pointerBlank))
1100 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1101 else 1088 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1090
1105 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1106 vt_ev.start (display, vt); 1093 vt_ev.start (display, vt);
1107
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 TermWin_TotalWidth (),
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133 1094
1134#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! OPTION (Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1137 { 1098 {
… …
1156 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1118 &gcvalue);
1158 1119
1159 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1160 1121
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1409rxvt_term::run_command (const char *const *argv) 1370rxvt_term::run_command (const char *const *argv)
1410{ 1371{
1411#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1413 { 1374 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1375 pty->pty = atoi (rs[Rs_pty_fd]);
1415 1376
1377 if (pty->pty >= 0)
1378 {
1416 if (getfd_hook) 1379 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1380 pty->pty = (*getfd_hook) (pty->pty);
1418 1381
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1382 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 }
1421 } 1385 }
1422 else 1386 else
1423#endif 1387#endif
1424 if (!pty.get ()) 1388 if (!pty->get ())
1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1426 1390
1427 pty.set_utf8_mode (enc_utf8); 1391 pty->set_utf8_mode (enc_utf8);
1428 1392
1429 /* set initial window size */ 1393 /* set initial window size */
1430 tt_winch (); 1394 tt_winch ();
1431 1395
1432 int er; 1396 int er;
… …
1445#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1446 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1447 return; 1411 return;
1448#endif 1412#endif
1449 1413
1450#ifndef __QNX__
1451 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1452 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1453 { 1416 {
1454 case -1: 1417 case -1:
1455 { 1418 {
… …
1457 rxvt_fatal ("can't fork, aborting.\n"); 1420 rxvt_fatal ("can't fork, aborting.\n");
1458 } 1421 }
1459 case 0: 1422 case 0:
1460 init_env (); 1423 init_env ();
1461 1424
1462 if (!pty.make_controlling_tty ()) 1425 if (!pty->make_controlling_tty ())
1463 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1464 else 1427 else
1465 { 1428 {
1466 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1467 dup2 (pty.tty, STDIN_FILENO); 1430 dup2 (pty->tty, STDIN_FILENO);
1468 dup2 (pty.tty, STDOUT_FILENO); 1431 dup2 (pty->tty, STDOUT_FILENO);
1469 dup2 (pty.tty, STDERR_FILENO); 1432 dup2 (pty->tty, STDERR_FILENO);
1470 1433
1471 // close all our file handles that we do no longer need 1434 // close all our file handles that we do no longer need
1472 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1473 { 1436 {
1474 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1437 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1475 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1438 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1476 } 1439 }
1477 1440
1478 run_child (argv); 1441 run_child (argv);
1479 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1442 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1480 } 1443 }
1481 1444
1482 _exit (EXIT_FAILURE); 1445 _exit (EXIT_FAILURE);
1483 1446
1484 default: 1447 default:
1485 {
1486#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1487 int fdstdin;
1488
1489 fdstdin = dup (STDIN_FILENO);
1490 dup2 (pty.tty, STDIN_FILENO);
1491#endif
1492
1493#ifdef UTMP_SUPPORT 1448#if UTMP_SUPPORT
1494 privileged_utmp (SAVE); 1449 if (!OPTION (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1495#endif 1451#endif
1496 1452
1497#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1453 pty->close_tty ();
1498
1499 dup2 (fdstdin, STDIN_FILENO);
1500 close (fdstdin);
1501#endif
1502 }
1503
1504 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1505 break; 1454 break;
1506 } 1455 }
1507#else /* __QNX__ uses qnxspawn () */
1508 fchmod (pty.tty, 0622);
1509 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1510 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1511
1512 if (run_child (argv) == -1)
1513 exit (EXIT_FAILURE);
1514#endif
1515} 1456}
1516 1457
1517/* ------------------------------------------------------------------------- * 1458/* ------------------------------------------------------------------------- *
1518 * CHILD PROCESS OPERATIONS * 1459 * CHILD PROCESS OPERATIONS *
1519 * ------------------------------------------------------------------------- */ 1460 * ------------------------------------------------------------------------- */
… …
1563 // unblock signals (signals are blocked by iom.C 1504 // unblock signals (signals are blocked by iom.C
1564 sigset_t ss; 1505 sigset_t ss;
1565 sigemptyset (&ss); 1506 sigemptyset (&ss);
1566 sigprocmask (SIG_SETMASK, &ss, 0); 1507 sigprocmask (SIG_SETMASK, &ss, 0);
1567 1508
1568#ifndef __QNX__
1569 /* command interpreter path */ 1509 /* command interpreter path */
1570 if (argv != NULL) 1510 if (argv != NULL)
1571 { 1511 {
1572# ifdef DEBUG_CMD 1512# ifdef DEBUG_CMD
1573 int i; 1513 int i;
… …
1579 execvp (argv[0], (char *const *)argv); 1519 execvp (argv[0], (char *const *)argv);
1580 /* no error message: STDERR is closed! */ 1520 /* no error message: STDERR is closed! */
1581 } 1521 }
1582 else 1522 else
1583 { 1523 {
1584 const char *argv0, *shell; 1524 const char *argv0, *shell;
1585 1525
1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1526 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1587 shell = "/bin/sh"; 1527 shell = "/bin/sh";
1588 1528
1589 argv0 = (const char *)rxvt_r_basename (shell); 1529 argv0 = (const char *)rxvt_r_basename (shell);
… …
1594 1534
1595 login[0] = '-'; 1535 login[0] = '-';
1596 strcpy (&login[1], argv0); 1536 strcpy (&login[1], argv0);
1597 argv0 = login; 1537 argv0 = login;
1598 } 1538 }
1539
1599 execlp (shell, argv0, NULL); 1540 execlp (shell, argv0, NULL);
1600 /* no error message: STDERR is closed! */ 1541 /* no error message: STDERR is closed! */
1601 } 1542 }
1602 1543
1603#else /* __QNX__ uses qnxspawn () */
1604
1605 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1606 char *command = NULL, fullcommand[_MAX_PATH];
1607 char **arg_v, *arg_a[2] = { NULL, NULL };
1608
1609 if (argv != NULL)
1610 {
1611 if (access (argv[0], X_OK) == -1)
1612 {
1613 if (strchr (argv[0], '/') == NULL)
1614 {
1615 searchenv (argv[0], "PATH", fullcommand);
1616
1617 if (fullcommand[0] != '\0')
1618 command = fullcommand;
1619 }
1620
1621 if (access (command, X_OK) == -1)
1622 return -1;
1623 }
1624 else
1625 command = argv[0];
1626
1627 arg_v = argv;
1628 }
1629 else
1630 {
1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1632 command = "/bin/sh";
1633
1634 arg_a[0] = my_basename (command);
1635
1636 if (OPTION (Opt_loginShell))
1637 {
1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1639
1640 login[0] = '-';
1641 strcpy (&login[1], arg_a[0]);
1642 arg_a[0] = login;
1643 }
1644
1645 arg_v = arg_a;
1646 }
1647
1648 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1649 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1650 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1651 command, arg_v, environ, iov_a, 0);
1652 if (login)
1653 free (login);
1654
1655 pty.close_tty ();
1656 return pty.pty;
1657#endif
1658
1659 return -1; 1544 return -1;
1660} 1545}
1661 1546
1662/*----------------------- end-of-file (C source) -----------------------*/ 1547/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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