… | |
… | |
256 | bgPixmap.pixmap = None; |
256 | bgPixmap.pixmap = None; |
257 | #endif |
257 | #endif |
258 | |
258 | |
259 | last_bot = last_state = -1; |
259 | last_bot = last_state = -1; |
260 | |
260 | |
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; |
261 | return true; |
269 | } |
262 | } |
270 | |
263 | |
271 | void |
264 | void |
272 | rxvt_term::init_secondary () |
265 | rxvt_term::init_secondary () |
… | |
… | |
339 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
332 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
340 | |
333 | |
341 | /* |
334 | /* |
342 | * Open display, get options/resources and create the window |
335 | * Open display, get options/resources and create the window |
343 | */ |
336 | */ |
344 | { |
|
|
345 | TEMP_ENV; |
|
|
346 | |
337 | |
347 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
348 | rs[Rs_display_name] = ":0"; |
339 | rs[Rs_display_name] = ":0"; |
349 | |
340 | |
350 | get_options (r_argc, r_argv); |
341 | get_options (r_argc, r_argv); |
351 | |
342 | |
352 | if (!(display = displays.get (rs[Rs_display_name]))) |
343 | if (!(display = displays.get (rs[Rs_display_name]))) |
353 | 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]); |
354 | } |
|
|
355 | |
345 | |
356 | extract_resources (); |
346 | extract_resources (); |
|
|
347 | |
357 | free (r_argv); |
348 | free (r_argv); |
358 | |
349 | |
359 | /* |
350 | /* |
360 | * set any defaults not already set |
351 | * set any defaults not already set |
361 | */ |
352 | */ |
… | |
… | |
580 | * This should support all European type languages. |
571 | * This should support all European type languages. |
581 | */ |
572 | */ |
582 | void |
573 | void |
583 | rxvt_term::set_locale (const char *locale) |
574 | rxvt_term::set_locale (const char *locale) |
584 | { |
575 | { |
585 | TEMP_ENV; |
576 | set_environ (envv); |
586 | |
577 | |
587 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
578 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
588 | free (this->locale); |
579 | free (this->locale); |
589 | this->locale = setlocale (LC_CTYPE, locale); |
580 | this->locale = setlocale (LC_CTYPE, locale); |
590 | |
581 | |
… | |
… | |
621 | } |
612 | } |
622 | |
613 | |
623 | void |
614 | void |
624 | rxvt_term::init_xlocale () |
615 | rxvt_term::init_xlocale () |
625 | { |
616 | { |
626 | TEMP_ENV; |
617 | set_environ (envv); |
627 | |
618 | |
628 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
629 | if (!locale) |
620 | if (!locale) |
630 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
621 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
631 | else |
622 | else |
… | |
… | |
672 | if (strcmp (key_backspace, "DEC") == 0) |
663 | if (strcmp (key_backspace, "DEC") == 0) |
673 | priv_modes |= PrivMode_HaveBackSpace; |
664 | priv_modes |= PrivMode_HaveBackSpace; |
674 | #endif |
665 | #endif |
675 | |
666 | |
676 | /* add value for scrollBar */ |
667 | /* add value for scrollBar */ |
677 | if (scrollbar_visible ()) |
668 | if (scrollBar.state) |
678 | { |
669 | { |
679 | priv_modes |= PrivMode_scrollBar; |
670 | priv_modes |= PrivMode_scrollBar; |
680 | SavedModes |= PrivMode_scrollBar; |
671 | SavedModes |= PrivMode_scrollBar; |
681 | } |
|
|
682 | |
|
|
683 | if (menubar_visible ()) |
|
|
684 | { |
|
|
685 | priv_modes |= PrivMode_menuBar; |
|
|
686 | SavedModes |= PrivMode_menuBar; |
|
|
687 | } |
672 | } |
688 | |
673 | |
689 | run_command (argv); |
674 | run_command (argv); |
690 | } |
675 | } |
691 | |
676 | |
… | |
… | |
759 | 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]; |
760 | 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]; |
761 | } |
746 | } |
762 | |
747 | |
763 | /* |
748 | /* |
764 | * get scrollBar/menuBar shadow colors |
749 | * get scrollBar shadow colors |
765 | * |
750 | * |
766 | * The calculations of topShadow/bottomShadow values are adapted |
751 | * The calculations of topShadow/bottomShadow values are adapted |
767 | * from the fvwm window manager. |
752 | * from the fvwm window manager. |
768 | */ |
753 | */ |
769 | #ifdef KEEP_SCROLLCOLOR |
754 | #ifdef KEEP_SCROLLCOLOR |
… | |
… | |
924 | #if ENABLE_FRILLS |
909 | #if ENABLE_FRILLS |
925 | Atom prop = None; |
910 | Atom prop = None; |
926 | MWMHints mwmhints; |
911 | MWMHints mwmhints; |
927 | #endif |
912 | #endif |
928 | XGCValues gcvalue; |
913 | XGCValues gcvalue; |
929 | long vt_emask; |
|
|
930 | XSetWindowAttributes attributes; |
914 | XSetWindowAttributes attributes; |
931 | XWindowAttributes gattr; |
915 | XWindowAttributes gattr; |
932 | Window top, parent; |
916 | Window top, parent; |
933 | dDisp; |
917 | dDisp; |
934 | |
918 | |
… | |
… | |
944 | { |
928 | { |
945 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
929 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
946 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
930 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
947 | } |
931 | } |
948 | |
932 | |
|
|
933 | /* grab colors before netscape does */ |
|
|
934 | Get_Colours (); |
|
|
935 | |
|
|
936 | if (!set_fonts ()) |
|
|
937 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
938 | |
|
|
939 | parent = DefaultRootWindow (disp); |
|
|
940 | |
|
|
941 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
|
|
942 | |
949 | #if ENABLE_FRILLS |
943 | #if ENABLE_FRILLS |
950 | if (OPTION (Opt_borderLess)) |
944 | if (OPTION (Opt_borderLess)) |
951 | { |
945 | { |
952 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
946 | prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); |
953 | |
947 | |
954 | if (prop == None) |
948 | if (prop == None) |
955 | { |
949 | { |
956 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
950 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
957 | #ifdef PREFER_24BIT |
|
|
958 | attributes.override_redirect = TRUE; |
951 | attributes.override_redirect = TRUE; |
959 | #endif |
|
|
960 | mwmhints.flags = 0; |
952 | mwmhints.flags = 0; |
961 | } |
953 | } |
962 | else |
954 | else |
963 | { |
955 | { |
964 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
956 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
967 | } |
959 | } |
968 | else |
960 | else |
969 | mwmhints.flags = 0; |
961 | mwmhints.flags = 0; |
970 | #endif |
962 | #endif |
971 | |
963 | |
972 | /* grab colors before netscape does */ |
|
|
973 | Get_Colours (); |
|
|
974 | |
|
|
975 | if (!set_fonts ()) |
|
|
976 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
977 | |
|
|
978 | parent = DefaultRootWindow (disp); |
|
|
979 | |
|
|
980 | #if ENABLE_XEMBED |
964 | #if ENABLE_XEMBED |
981 | if (rs[Rs_embed]) |
965 | if (rs[Rs_embed]) |
982 | { |
966 | { |
983 | XWindowAttributes wattr; |
967 | XWindowAttributes wattr; |
984 | |
968 | |
… | |
… | |
992 | #endif |
976 | #endif |
993 | |
977 | |
994 | window_calc (0, 0); |
978 | window_calc (0, 0); |
995 | |
979 | |
996 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
980 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
997 | #ifdef PREFER_24BIT |
|
|
998 | attributes.background_pixel = pix_colors_focused[Color_border]; |
981 | attributes.background_pixel = pix_colors_focused[Color_border]; |
999 | attributes.border_pixel = pix_colors_focused[Color_border]; |
982 | attributes.border_pixel = pix_colors_focused[Color_border]; |
1000 | attributes.colormap = display->cmap; |
983 | attributes.colormap = display->cmap; |
1001 | top = XCreateWindow (disp, parent, |
984 | top = XCreateWindow (disp, parent, |
1002 | szHint.x, szHint.y, |
985 | szHint.x, szHint.y, |
1003 | szHint.width, szHint.height, |
986 | szHint.width, szHint.height, |
1004 | ext_bwidth, |
987 | ext_bwidth, |
1005 | display->depth, InputOutput, |
988 | display->depth, InputOutput, |
1006 | display->visual, |
989 | display->visual, |
1007 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
990 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1008 | #else |
991 | &attributes); |
1009 | top = XCreateSimpleWindow (disp, parent, |
|
|
1010 | szHint.x, szHint.y, |
|
|
1011 | szHint.width, szHint.height, |
|
|
1012 | ext_bwidth, |
|
|
1013 | pix_colors_focused[Color_border], |
|
|
1014 | pix_colors_focused[Color_border]); |
|
|
1015 | #endif |
|
|
1016 | |
992 | |
1017 | this->parent[0] = top; |
993 | this->parent[0] = top; |
1018 | |
994 | |
1019 | old_width = szHint.width; |
995 | old_width = szHint.width; |
1020 | old_height = szHint.height; |
996 | old_height = szHint.height; |
… | |
… | |
1074 | #endif |
1050 | #endif |
1075 | |
1051 | |
1076 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1052 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1077 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1053 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1078 | |
1054 | |
1079 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1055 | #ifdef HAVE_SCROLLBARS |
1080 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1056 | /* cursor scrollBar: Black-on-White */ |
1081 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1057 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1082 | #endif |
1058 | #endif |
1083 | |
1059 | |
1084 | /* the vt window */ |
1060 | /* the vt window */ |
1085 | vt = XCreateSimpleWindow (disp, top, |
1061 | vt = XCreateSimpleWindow (disp, top, |
… | |
… | |
1097 | attributes.bit_gravity = NorthWestGravity; |
1073 | attributes.bit_gravity = NorthWestGravity; |
1098 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1074 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1099 | |
1075 | |
1100 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1076 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1101 | |
1077 | |
1102 | if (OPTION (Opt_pointerBlank) |
1078 | if (OPTION (Opt_pointerBlank)) |
1103 | #ifdef ENABLE_PERL |
|
|
1104 | || perl.self |
|
|
1105 | #endif |
|
|
1106 | ) |
|
|
1107 | vt_emask |= PointerMotionMask; |
1079 | vt_emask |= PointerMotionMask; |
1108 | else |
1080 | else |
1109 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1081 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1110 | |
1082 | |
1111 | XSelectInput (disp, vt, vt_emask); |
1083 | vt_select_input (); |
|
|
1084 | |
1112 | vt_ev.start (display, vt); |
1085 | vt_ev.start (display, vt); |
1113 | |
|
|
1114 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1115 | if (menuBar_height ()) |
|
|
1116 | { |
|
|
1117 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1118 | window_vt_x, 0, |
|
|
1119 | width, |
|
|
1120 | menuBar_TotalHeight (), |
|
|
1121 | 0, |
|
|
1122 | pix_colors_focused[Color_fg], |
|
|
1123 | pix_colors_focused[Color_scroll]); |
|
|
1124 | |
|
|
1125 | #ifdef DEBUG_X |
|
|
1126 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1127 | #endif |
|
|
1128 | |
|
|
1129 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1130 | |
|
|
1131 | XDefineCursor (disp, menuBar.win, |
|
|
1132 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1133 | |
|
|
1134 | XSelectInput (disp, menuBar.win, |
|
|
1135 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1136 | menubar_ev.start (display, menuBar.win); |
|
|
1137 | } |
|
|
1138 | #endif |
|
|
1139 | |
1086 | |
1140 | #ifdef XPM_BACKGROUND |
1087 | #ifdef XPM_BACKGROUND |
1141 | if (rs[Rs_backgroundPixmap] != NULL |
1088 | if (rs[Rs_backgroundPixmap] != NULL |
1142 | && ! OPTION (Opt_transparent)) |
1089 | && ! OPTION (Opt_transparent)) |
1143 | { |
1090 | { |
… | |
… | |
1162 | GCForeground | GCBackground | GCGraphicsExposures, |
1109 | GCForeground | GCBackground | GCGraphicsExposures, |
1163 | &gcvalue); |
1110 | &gcvalue); |
1164 | |
1111 | |
1165 | drawable = new rxvt_drawable (display, vt); |
1112 | drawable = new rxvt_drawable (display, vt); |
1166 | |
1113 | |
1167 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1114 | #ifdef RXVT_SCROLLBAR |
1168 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1115 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1169 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1116 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1170 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1117 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1171 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1118 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1172 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1119 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
… | |
… | |
1415 | rxvt_term::run_command (const char *const *argv) |
1362 | rxvt_term::run_command (const char *const *argv) |
1416 | { |
1363 | { |
1417 | #if ENABLE_FRILLS |
1364 | #if ENABLE_FRILLS |
1418 | if (rs[Rs_pty_fd]) |
1365 | if (rs[Rs_pty_fd]) |
1419 | { |
1366 | { |
1420 | pty.pty = atoi (rs[Rs_pty_fd]); |
1367 | pty->pty = atoi (rs[Rs_pty_fd]); |
1421 | |
1368 | |
1422 | if (pty.pty >= 0) |
1369 | if (pty->pty >= 0) |
1423 | { |
1370 | { |
1424 | if (getfd_hook) |
1371 | if (getfd_hook) |
1425 | pty.pty = (*getfd_hook) (pty.pty); |
1372 | pty->pty = (*getfd_hook) (pty->pty); |
1426 | |
1373 | |
1427 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1374 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1428 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1375 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1429 | } |
1376 | } |
1430 | } |
1377 | } |
1431 | else |
1378 | else |
1432 | #endif |
1379 | #endif |
1433 | if (!pty.get ()) |
1380 | if (!pty->get ()) |
1434 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1381 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1435 | |
1382 | |
1436 | pty.set_utf8_mode (enc_utf8); |
1383 | pty->set_utf8_mode (enc_utf8); |
1437 | |
1384 | |
1438 | /* set initial window size */ |
1385 | /* set initial window size */ |
1439 | tt_winch (); |
1386 | tt_winch (); |
1440 | |
1387 | |
1441 | int er; |
1388 | int er; |
… | |
… | |
1454 | #if ENABLE_FRILLS |
1401 | #if ENABLE_FRILLS |
1455 | if (rs[Rs_pty_fd]) |
1402 | if (rs[Rs_pty_fd]) |
1456 | return; |
1403 | return; |
1457 | #endif |
1404 | #endif |
1458 | |
1405 | |
1459 | #ifndef __QNX__ |
|
|
1460 | /* spin off the command interpreter */ |
1406 | /* spin off the command interpreter */ |
1461 | switch (cmd_pid = fork ()) |
1407 | switch (cmd_pid = fork ()) |
1462 | { |
1408 | { |
1463 | case -1: |
1409 | case -1: |
1464 | { |
1410 | { |
… | |
… | |
1466 | rxvt_fatal ("can't fork, aborting.\n"); |
1412 | rxvt_fatal ("can't fork, aborting.\n"); |
1467 | } |
1413 | } |
1468 | case 0: |
1414 | case 0: |
1469 | init_env (); |
1415 | init_env (); |
1470 | |
1416 | |
1471 | if (!pty.make_controlling_tty ()) |
1417 | if (!pty->make_controlling_tty ()) |
1472 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1418 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1473 | else |
1419 | else |
1474 | { |
1420 | { |
1475 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1421 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1476 | dup2 (pty.tty, STDIN_FILENO); |
1422 | dup2 (pty->tty, STDIN_FILENO); |
1477 | dup2 (pty.tty, STDOUT_FILENO); |
1423 | dup2 (pty->tty, STDOUT_FILENO); |
1478 | dup2 (pty.tty, STDERR_FILENO); |
1424 | dup2 (pty->tty, STDERR_FILENO); |
1479 | |
1425 | |
1480 | // close all our file handles that we do no longer need |
1426 | // close all our file handles that we do no longer need |
1481 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1427 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1482 | { |
1428 | { |
1483 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1429 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1484 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1430 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1485 | } |
1431 | } |
1486 | |
1432 | |
1487 | run_child (argv); |
1433 | run_child (argv); |
1488 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1434 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1489 | } |
1435 | } |
1490 | |
1436 | |
1491 | _exit (EXIT_FAILURE); |
1437 | _exit (EXIT_FAILURE); |
1492 | |
1438 | |
1493 | default: |
1439 | default: |
1494 | { |
|
|
1495 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
|
|
1496 | int fdstdin; |
|
|
1497 | |
|
|
1498 | fdstdin = dup (STDIN_FILENO); |
|
|
1499 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1500 | #endif |
|
|
1501 | |
|
|
1502 | #ifdef UTMP_SUPPORT |
1440 | #if UTMP_SUPPORT |
1503 | privileged_utmp (SAVE); |
1441 | if (!OPTION (Opt_utmpInhibit)) |
|
|
1442 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1504 | #endif |
1443 | #endif |
1505 | |
1444 | |
1506 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1445 | pty->close_tty (); |
1507 | |
|
|
1508 | dup2 (fdstdin, STDIN_FILENO); |
|
|
1509 | close (fdstdin); |
|
|
1510 | #endif |
|
|
1511 | } |
|
|
1512 | |
|
|
1513 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
|
|
1514 | break; |
1446 | break; |
1515 | } |
1447 | } |
1516 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1517 | fchmod (pty.tty, 0622); |
|
|
1518 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1519 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1520 | |
|
|
1521 | if (run_child (argv) == -1) |
|
|
1522 | exit (EXIT_FAILURE); |
|
|
1523 | #endif |
|
|
1524 | } |
1448 | } |
1525 | |
1449 | |
1526 | /* ------------------------------------------------------------------------- * |
1450 | /* ------------------------------------------------------------------------- * |
1527 | * CHILD PROCESS OPERATIONS * |
1451 | * CHILD PROCESS OPERATIONS * |
1528 | * ------------------------------------------------------------------------- */ |
1452 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1532 | */ |
1456 | */ |
1533 | int |
1457 | int |
1534 | rxvt_term::run_child (const char *const *argv) |
1458 | rxvt_term::run_child (const char *const *argv) |
1535 | { |
1459 | { |
1536 | char *login; |
1460 | char *login; |
1537 | |
|
|
1538 | TEMP_ENV; // not very temporary... |
|
|
1539 | |
1461 | |
1540 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1462 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1541 | |
1463 | |
1542 | if (OPTION (Opt_console)) |
1464 | if (OPTION (Opt_console)) |
1543 | { /* be virtual console, fail silently */ |
1465 | { /* be virtual console, fail silently */ |
… | |
… | |
1574 | // unblock signals (signals are blocked by iom.C |
1496 | // unblock signals (signals are blocked by iom.C |
1575 | sigset_t ss; |
1497 | sigset_t ss; |
1576 | sigemptyset (&ss); |
1498 | sigemptyset (&ss); |
1577 | sigprocmask (SIG_SETMASK, &ss, 0); |
1499 | sigprocmask (SIG_SETMASK, &ss, 0); |
1578 | |
1500 | |
1579 | #ifndef __QNX__ |
|
|
1580 | /* command interpreter path */ |
1501 | /* command interpreter path */ |
1581 | if (argv != NULL) |
1502 | if (argv != NULL) |
1582 | { |
1503 | { |
1583 | # ifdef DEBUG_CMD |
1504 | # ifdef DEBUG_CMD |
1584 | int i; |
1505 | int i; |
… | |
… | |
1610 | |
1531 | |
1611 | execlp (shell, argv0, NULL); |
1532 | execlp (shell, argv0, NULL); |
1612 | /* no error message: STDERR is closed! */ |
1533 | /* no error message: STDERR is closed! */ |
1613 | } |
1534 | } |
1614 | |
1535 | |
1615 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1616 | |
|
|
1617 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1618 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1619 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1620 | |
|
|
1621 | if (argv != NULL) |
|
|
1622 | { |
|
|
1623 | if (access (argv[0], X_OK) == -1) |
|
|
1624 | { |
|
|
1625 | if (strchr (argv[0], '/') == NULL) |
|
|
1626 | { |
|
|
1627 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1628 | |
|
|
1629 | if (fullcommand[0] != '\0') |
|
|
1630 | command = fullcommand; |
|
|
1631 | } |
|
|
1632 | |
|
|
1633 | if (access (command, X_OK) == -1) |
|
|
1634 | return -1; |
|
|
1635 | } |
|
|
1636 | else |
|
|
1637 | command = argv[0]; |
|
|
1638 | |
|
|
1639 | arg_v = argv; |
|
|
1640 | } |
|
|
1641 | else |
|
|
1642 | { |
|
|
1643 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1644 | command = "/bin/sh"; |
|
|
1645 | |
|
|
1646 | arg_a[0] = my_basename (command); |
|
|
1647 | |
|
|
1648 | if (OPTION (Opt_loginShell)) |
|
|
1649 | { |
|
|
1650 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1651 | |
|
|
1652 | login[0] = '-'; |
|
|
1653 | strcpy (&login[1], arg_a[0]); |
|
|
1654 | arg_a[0] = login; |
|
|
1655 | } |
|
|
1656 | |
|
|
1657 | arg_v = arg_a; |
|
|
1658 | } |
|
|
1659 | |
|
|
1660 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1661 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1662 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1663 | command, arg_v, environ, iov_a, 0); |
|
|
1664 | if (login) |
|
|
1665 | free (login); |
|
|
1666 | |
|
|
1667 | pty.close_tty (); |
|
|
1668 | return pty.pty; |
|
|
1669 | #endif |
|
|
1670 | |
|
|
1671 | return -1; |
1536 | return -1; |
1672 | } |
1537 | } |
1673 | |
1538 | |
1674 | /*----------------------- end-of-file (C source) -----------------------*/ |
1539 | /*----------------------- end-of-file (C source) -----------------------*/ |