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.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 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.
… …
203#endif 203#endif
204#ifdef TRANSPARENT 204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID", 206 "ESETROOT_PMAP_ID",
207#endif 207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED 208#if ENABLE_XEMBED
213 "_XEMBED", 209 "_XEMBED",
214 "_XEMBED_INFO", 210 "_XEMBED_INFO",
215#endif 211#endif
216 }; 212 };
… …
256 bgPixmap.pixmap = None; 252 bgPixmap.pixmap = None;
257#endif 253#endif
258 254
259 last_bot = last_state = -1; 255 last_bot = last_state = -1;
260 256
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267
268 return true; 257 return true;
269} 258}
270 259
271void 260void
272rxvt_term::init_secondary () 261rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 328 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 329
341 /* 330 /*
342 * Open display, get options/resources and create the window 331 * Open display, get options/resources and create the window
343 */ 332 */
333
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 334 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 335 rs[Rs_display_name] = ":0";
346 336
347 get_options (r_argc, r_argv); 337 get_options (r_argc, r_argv);
348 338
349 if (!(display = displays.get (rs[Rs_display_name]))) 339 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 341
352 extract_resources (); 342 extract_resources ();
343
353 free (r_argv); 344 free (r_argv);
354 345
355 /* 346 /*
356 * set any defaults not already set 347 * set any defaults not already set
357 */ 348 */
… …
391 pointerBlankDelay = 2; 382 pointerBlankDelay = 2;
392#endif 383#endif
393 384
394 /* no point having a scrollbar without having any scrollback! */ 385 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 386 if (!saveLines)
396 CLR_OPTION (Opt_scrollBar); 387 set_option (Opt_scrollBar, 0);
397 388
398#ifdef PRINTPIPE 389#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 390 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 391 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 392#endif
… …
576 * This should support all European type languages. 567 * This should support all European type languages.
577 */ 568 */
578void 569void
579rxvt_term::set_locale (const char *locale) 570rxvt_term::set_locale (const char *locale)
580{ 571{
572 set_environ (envv);
573
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 574#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 575 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 576 this->locale = setlocale (LC_CTYPE, locale);
584 577
585 if (!this->locale) 578 if (!this->locale)
586 { 579 {
587 if (*locale) 580 if (*locale)
588 { 581 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 582 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 583 setlocale (LC_CTYPE, "C");
591 } 584 }
592 else 585 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 586 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 587
595 this->locale = ""; 588 this->locale = "C";
596 } 589 }
597 590
598 591
599 this->locale = rxvt_strdup (this->locale); 592 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 593 SET_LOCALE (this->locale);
… …
615} 608}
616 609
617void 610void
618rxvt_term::init_xlocale () 611rxvt_term::init_xlocale ()
619{ 612{
613 set_environ (envv);
614
620#ifdef USE_XIM 615#ifdef USE_XIM
621 if (!locale) 616 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 617 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 618 else
624 { 619 {
… …
664 if (strcmp (key_backspace, "DEC") == 0) 659 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 660 priv_modes |= PrivMode_HaveBackSpace;
666#endif 661#endif
667 662
668 /* add value for scrollBar */ 663 /* add value for scrollBar */
669 if (scrollbar_visible ()) 664 if (scrollBar.state)
670 { 665 {
671 priv_modes |= PrivMode_scrollBar; 666 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 667 SavedModes |= PrivMode_scrollBar;
673 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 } 668 }
680 669
681 run_command (argv); 670 run_command (argv);
682} 671}
683 672
… …
751 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 740 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
752 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 741 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
753 } 742 }
754 743
755 /* 744 /*
756 * get scrollBar/menuBar shadow colors 745 * get scrollBar shadow colors
757 * 746 *
758 * The calculations of topShadow/bottomShadow values are adapted 747 * The calculations of topShadow/bottomShadow values are adapted
759 * from the fvwm window manager. 748 * from the fvwm window manager.
760 */ 749 */
761#ifdef KEEP_SCROLLCOLOR 750#ifdef KEEP_SCROLLCOLOR
… …
916#if ENABLE_FRILLS 905#if ENABLE_FRILLS
917 Atom prop = None; 906 Atom prop = None;
918 MWMHints mwmhints; 907 MWMHints mwmhints;
919#endif 908#endif
920 XGCValues gcvalue; 909 XGCValues gcvalue;
921 long vt_emask;
922 XSetWindowAttributes attributes; 910 XSetWindowAttributes attributes;
923 XWindowAttributes gattr; 911 XWindowAttributes gattr;
924 Window top, parent; 912 Window top, parent;
925 dDisp; 913 dDisp;
926 914
… …
936 { 924 {
937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 925 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
938 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 926 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
939 } 927 }
940 928
929 /* grab colors before netscape does */
930 Get_Colours ();
931
932 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934
935 parent = DefaultRootWindow (disp);
936
937 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938
941#if ENABLE_FRILLS 939#if ENABLE_FRILLS
942 if (OPTION (Opt_borderLess)) 940 if (OPTION (Opt_borderLess))
943 { 941 {
944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
945 943
946 if (prop == None) 944 if (prop == None)
947 { 945 {
948 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 946 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
949#ifdef PREFER_24BIT
950 attributes.override_redirect = TRUE; 947 attributes.override_redirect = TRUE;
951#endif
952 mwmhints.flags = 0; 948 mwmhints.flags = 0;
953 } 949 }
954 else 950 else
955 { 951 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 952 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
959 } 955 }
960 else 956 else
961 mwmhints.flags = 0; 957 mwmhints.flags = 0;
962#endif 958#endif
963 959
964 /* grab colors before netscape does */
965 Get_Colours ();
966
967 if (!set_fonts ())
968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969
970 parent = DefaultRootWindow (disp);
971
972#if ENABLE_XEMBED 960#if ENABLE_XEMBED
973 if (rs[Rs_embed]) 961 if (rs[Rs_embed])
974 { 962 {
975 XWindowAttributes wattr; 963 XWindowAttributes wattr;
976 964
… …
984#endif 972#endif
985 973
986 window_calc (0, 0); 974 window_calc (0, 0);
987 975
988 /* sub-window placement & size in rxvt_resize_subwindows () */ 976 /* sub-window placement & size in rxvt_resize_subwindows () */
989#ifdef PREFER_24BIT
990 attributes.background_pixel = pix_colors_focused[Color_border]; 977 attributes.background_pixel = pix_colors_focused[Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 978 attributes.border_pixel = pix_colors_focused[Color_border];
992 attributes.colormap = display->cmap; 979 attributes.colormap = display->cmap;
993 top = XCreateWindow (disp, parent, 980 top = XCreateWindow (disp, parent,
994 szHint.x, szHint.y, 981 szHint.x, szHint.y,
995 szHint.width, szHint.height, 982 szHint.width, szHint.height,
996 ext_bwidth, 983 ext_bwidth,
997 display->depth, InputOutput, 984 display->depth, InputOutput,
998 display->visual, 985 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000#else 987 &attributes);
1001 top = XCreateSimpleWindow (disp, parent,
1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height,
1004 ext_bwidth,
1005 pix_colors_focused[Color_border],
1006 pix_colors_focused[Color_border]);
1007#endif
1008 988
1009 this->parent[0] = top; 989 this->parent[0] = top;
1010 990
1011 old_width = szHint.width; 991 old_width = szHint.width;
1012 old_height = szHint.height; 992 old_height = szHint.height;
… …
1032#endif 1012#endif
1033 }; 1013 };
1034 1014
1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1015 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1036 1016
1017#if ENABLE_FRILLS
1018 if (rs[Rs_transient_for])
1019 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020#endif
1021
1037#if ENABLE_EWMH 1022#if ENABLE_EWMH
1038 long pid = getpid (); 1023 long pid = getpid ();
1039 1024
1040 XChangeProperty (disp, top, 1025 XChangeProperty (disp, top,
1041 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1061#endif 1046#endif
1062 1047
1063 /* vt cursor: Black-on-White is standard, but this is more popular */ 1048 /* vt cursor: Black-on-White is standard, but this is more popular */
1064 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1065 1050
1066#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1051#ifdef HAVE_SCROLLBARS
1067 /* cursor (menuBar/scrollBar): Black-on-White */ 1052 /* cursor scrollBar: Black-on-White */
1068 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1069#endif 1054#endif
1070 1055
1071 /* the vt window */ 1056 /* the vt window */
1072 vt = XCreateSimpleWindow (disp, top, 1057 vt = XCreateSimpleWindow (disp, top,
… …
1084 attributes.bit_gravity = NorthWestGravity; 1069 attributes.bit_gravity = NorthWestGravity;
1085 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1086 1071
1087 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1088 1073
1089#ifdef POINTER_BLANK
1090 if (OPTION (Opt_pointerBlank)) 1074 if (OPTION (Opt_pointerBlank))
1091 vt_emask |= PointerMotionMask; 1075 vt_emask |= PointerMotionMask;
1092 else 1076 else
1093#endif
1094 vt_emask |= Button1MotionMask | Button3MotionMask; 1077 vt_emask |= Button1MotionMask | Button3MotionMask;
1095 1078
1096 XSelectInput (disp, vt, vt_emask); 1079 vt_select_input ();
1080
1097 vt_ev.start (display, vt); 1081 vt_ev.start (display, vt);
1098
1099#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1100 if (menuBar_height ())
1101 {
1102 menuBar.win = XCreateSimpleWindow (disp, top,
1103 window_vt_x, 0,
1104 width,
1105 menuBar_TotalHeight (),
1106 0,
1107 pix_colors_focused[Color_fg],
1108 pix_colors_focused[Color_scroll]);
1109
1110#ifdef DEBUG_X
1111 XStoreName (disp, menuBar.win, "menubar");
1112#endif
1113
1114 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1115
1116 XDefineCursor (disp, menuBar.win,
1117 XCreateFontCursor (disp, XC_left_ptr));
1118
1119 XSelectInput (disp, menuBar.win,
1120 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1121 menubar_ev.start (display, menuBar.win);
1122 }
1123#endif
1124 1082
1125#ifdef XPM_BACKGROUND 1083#ifdef XPM_BACKGROUND
1126 if (rs[Rs_backgroundPixmap] != NULL 1084 if (rs[Rs_backgroundPixmap] != NULL
1127 && ! OPTION (Opt_transparent)) 1085 && ! OPTION (Opt_transparent))
1128 { 1086 {
… …
1147 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1148 &gcvalue); 1106 &gcvalue);
1149 1107
1150 drawable = new rxvt_drawable (display, vt); 1108 drawable = new rxvt_drawable (display, vt);
1151 1109
1152#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1110#ifdef RXVT_SCROLLBAR
1153 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1154 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1155 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1156 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1400rxvt_term::run_command (const char *const *argv) 1358rxvt_term::run_command (const char *const *argv)
1401{ 1359{
1402#if ENABLE_FRILLS 1360#if ENABLE_FRILLS
1403 if (rs[Rs_pty_fd]) 1361 if (rs[Rs_pty_fd])
1404 { 1362 {
1405 pty.pty = atoi (rs[Rs_pty_fd]); 1363 pty->pty = atoi (rs[Rs_pty_fd]);
1406 1364
1407 if (pty.pty >= 0) 1365 if (pty->pty >= 0)
1408 { 1366 {
1409 if (getfd_hook) 1367 if (getfd_hook)
1410 pty.pty = (*getfd_hook) (pty.pty); 1368 pty->pty = (*getfd_hook) (pty->pty);
1411 1369
1412 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1370 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1413 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1371 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414 } 1372 }
1415 } 1373 }
1416 else 1374 else
1417#endif 1375#endif
1418 if (!pty.get ()) 1376 if (!pty->get ())
1419 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1377 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1420 1378
1421 pty.set_utf8_mode (enc_utf8); 1379 pty->set_utf8_mode (enc_utf8);
1422 1380
1423 /* set initial window size */ 1381 /* set initial window size */
1424 tt_winch (); 1382 tt_winch ();
1425 1383
1426 int er; 1384 int er;
… …
1439#if ENABLE_FRILLS 1397#if ENABLE_FRILLS
1440 if (rs[Rs_pty_fd]) 1398 if (rs[Rs_pty_fd])
1441 return; 1399 return;
1442#endif 1400#endif
1443 1401
1444#ifndef __QNX__
1445 /* spin off the command interpreter */ 1402 /* spin off the command interpreter */
1446 switch (cmd_pid = fork ()) 1403 switch (cmd_pid = fork ())
1447 { 1404 {
1448 case -1: 1405 case -1:
1449 { 1406 {
… …
1451 rxvt_fatal ("can't fork, aborting.\n"); 1408 rxvt_fatal ("can't fork, aborting.\n");
1452 } 1409 }
1453 case 0: 1410 case 0:
1454 init_env (); 1411 init_env ();
1455 1412
1456 if (!pty.make_controlling_tty ()) 1413 if (!pty->make_controlling_tty ())
1457 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1458 else 1415 else
1459 { 1416 {
1460 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1461 dup2 (pty.tty, STDIN_FILENO); 1418 dup2 (pty->tty, STDIN_FILENO);
1462 dup2 (pty.tty, STDOUT_FILENO); 1419 dup2 (pty->tty, STDOUT_FILENO);
1463 dup2 (pty.tty, STDERR_FILENO); 1420 dup2 (pty->tty, STDERR_FILENO);
1464 1421
1465 // close all our file handles that we do no longer need 1422 // close all our file handles that we do no longer need
1466 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1423 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1467 { 1424 {
1468 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1425 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1469 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1426 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1470 } 1427 }
1471 1428
1472 run_child (argv); 1429 run_child (argv);
1473 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1430 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1474 } 1431 }
1475 1432
1476 _exit (EXIT_FAILURE); 1433 _exit (EXIT_FAILURE);
1477 1434
1478 default: 1435 default:
1479 {
1480#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1481 int fdstdin;
1482
1483 fdstdin = dup (STDIN_FILENO);
1484 dup2 (pty.tty, STDIN_FILENO);
1485#endif
1486
1487#ifdef UTMP_SUPPORT 1436#if UTMP_SUPPORT
1488 privileged_utmp (SAVE); 1437 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1489#endif 1439#endif
1490 1440
1491#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1441 pty->close_tty ();
1492 1442
1493 dup2 (fdstdin, STDIN_FILENO); 1443 child_ev.start (cmd_pid);
1494 close (fdstdin);
1495#endif
1496 }
1497 1444
1498 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1445 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1499 break; 1446 break;
1500 } 1447 }
1501#else /* __QNX__ uses qnxspawn () */
1502 fchmod (pty.tty, 0622);
1503 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1504 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1505
1506 if (run_child (argv) == -1)
1507 exit (EXIT_FAILURE);
1508#endif
1509} 1448}
1510 1449
1511/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1512 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1513 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1557 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1558 sigset_t ss; 1497 sigset_t ss;
1559 sigemptyset (&ss); 1498 sigemptyset (&ss);
1560 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1561 1500
1562#ifndef __QNX__
1563 /* command interpreter path */ 1501 /* command interpreter path */
1564 if (argv != NULL) 1502 if (argv != NULL)
1565 { 1503 {
1566# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1567 int i; 1505 int i;
… …
1573 execvp (argv[0], (char *const *)argv); 1511 execvp (argv[0], (char *const *)argv);
1574 /* no error message: STDERR is closed! */ 1512 /* no error message: STDERR is closed! */
1575 } 1513 }
1576 else 1514 else
1577 { 1515 {
1578 const char *argv0, *shell; 1516 const char *argv0, *shell;
1579 1517
1580 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1581 shell = "/bin/sh"; 1519 shell = "/bin/sh";
1582 1520
1583 argv0 = (const char *)rxvt_r_basename (shell); 1521 argv0 = (const char *)rxvt_r_basename (shell);
… …
1588 1526
1589 login[0] = '-'; 1527 login[0] = '-';
1590 strcpy (&login[1], argv0); 1528 strcpy (&login[1], argv0);
1591 argv0 = login; 1529 argv0 = login;
1592 } 1530 }
1531
1593 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1594 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1595 } 1534 }
1596 1535
1597#else /* __QNX__ uses qnxspawn () */
1598
1599 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1600 char *command = NULL, fullcommand[_MAX_PATH];
1601 char **arg_v, *arg_a[2] = { NULL, NULL };
1602
1603 if (argv != NULL)
1604 {
1605 if (access (argv[0], X_OK) == -1)
1606 {
1607 if (strchr (argv[0], '/') == NULL)
1608 {
1609 searchenv (argv[0], "PATH", fullcommand);
1610
1611 if (fullcommand[0] != '\0')
1612 command = fullcommand;
1613 }
1614
1615 if (access (command, X_OK) == -1)
1616 return -1;
1617 }
1618 else
1619 command = argv[0];
1620
1621 arg_v = argv;
1622 }
1623 else
1624 {
1625 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1626 command = "/bin/sh";
1627
1628 arg_a[0] = my_basename (command);
1629
1630 if (OPTION (Opt_loginShell))
1631 {
1632 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1633
1634 login[0] = '-';
1635 strcpy (&login[1], arg_a[0]);
1636 arg_a[0] = login;
1637 }
1638
1639 arg_v = arg_a;
1640 }
1641
1642 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1643 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1644 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1645 command, arg_v, environ, iov_a, 0);
1646 if (login)
1647 free (login);
1648
1649 pty.close_tty ();
1650 return pty.pty;
1651#endif
1652
1653 return -1; 1536 return -1;
1654} 1537}
1655 1538
1656/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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