… | |
… | |
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. |
… | |
… | |
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 | */ |
|
|
337 | |
344 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
345 | rs[Rs_display_name] = ":0"; |
339 | rs[Rs_display_name] = ":0"; |
346 | |
340 | |
347 | get_options (r_argc, r_argv); |
341 | get_options (r_argc, r_argv); |
348 | |
342 | |
349 | if (!(display = displays.get (rs[Rs_display_name]))) |
343 | if (!(display = displays.get (rs[Rs_display_name]))) |
350 | 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]); |
351 | |
345 | |
352 | extract_resources (); |
346 | extract_resources (); |
|
|
347 | |
353 | free (r_argv); |
348 | free (r_argv); |
354 | |
349 | |
355 | /* |
350 | /* |
356 | * set any defaults not already set |
351 | * set any defaults not already set |
357 | */ |
352 | */ |
… | |
… | |
391 | pointerBlankDelay = 2; |
386 | pointerBlankDelay = 2; |
392 | #endif |
387 | #endif |
393 | |
388 | |
394 | /* no point having a scrollbar without having any scrollback! */ |
389 | /* no point having a scrollbar without having any scrollback! */ |
395 | if (!saveLines) |
390 | if (!saveLines) |
396 | CLR_OPTION (Opt_scrollBar); |
391 | set_option (Opt_scrollBar, 0); |
397 | |
392 | |
398 | #ifdef PRINTPIPE |
393 | #ifdef PRINTPIPE |
399 | if (!rs[Rs_print_pipe]) |
394 | if (!rs[Rs_print_pipe]) |
400 | rs[Rs_print_pipe] = PRINTPIPE; |
395 | rs[Rs_print_pipe] = PRINTPIPE; |
401 | #endif |
396 | #endif |
… | |
… | |
576 | * This should support all European type languages. |
571 | * This should support all European type languages. |
577 | */ |
572 | */ |
578 | void |
573 | void |
579 | rxvt_term::set_locale (const char *locale) |
574 | rxvt_term::set_locale (const char *locale) |
580 | { |
575 | { |
|
|
576 | set_environ (envv); |
|
|
577 | |
581 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
578 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
582 | free (this->locale); |
579 | free (this->locale); |
583 | this->locale = setlocale (LC_CTYPE, locale); |
580 | this->locale = setlocale (LC_CTYPE, locale); |
584 | |
581 | |
585 | if (!this->locale) |
582 | if (!this->locale) |
586 | { |
583 | { |
587 | if (*locale) |
584 | if (*locale) |
588 | { |
585 | { |
589 | 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); |
590 | setlocale (LC_CTYPE, ""); |
587 | setlocale (LC_CTYPE, "C"); |
591 | } |
588 | } |
592 | else |
589 | else |
593 | 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"); |
594 | |
591 | |
595 | this->locale = ""; |
592 | this->locale = "C"; |
596 | } |
593 | } |
597 | |
594 | |
598 | |
595 | |
599 | this->locale = rxvt_strdup (this->locale); |
596 | this->locale = rxvt_strdup (this->locale); |
600 | SET_LOCALE (this->locale); |
597 | SET_LOCALE (this->locale); |
… | |
… | |
615 | } |
612 | } |
616 | |
613 | |
617 | void |
614 | void |
618 | rxvt_term::init_xlocale () |
615 | rxvt_term::init_xlocale () |
619 | { |
616 | { |
|
|
617 | set_environ (envv); |
|
|
618 | |
620 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
621 | if (!locale) |
620 | if (!locale) |
622 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
621 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
623 | else |
622 | else |
624 | { |
623 | { |
… | |
… | |
664 | if (strcmp (key_backspace, "DEC") == 0) |
663 | if (strcmp (key_backspace, "DEC") == 0) |
665 | priv_modes |= PrivMode_HaveBackSpace; |
664 | priv_modes |= PrivMode_HaveBackSpace; |
666 | #endif |
665 | #endif |
667 | |
666 | |
668 | /* add value for scrollBar */ |
667 | /* add value for scrollBar */ |
669 | if (scrollbar_visible ()) |
668 | if (scrollBar.state) |
670 | { |
669 | { |
671 | priv_modes |= PrivMode_scrollBar; |
670 | priv_modes |= PrivMode_scrollBar; |
672 | SavedModes |= PrivMode_scrollBar; |
671 | SavedModes |= PrivMode_scrollBar; |
673 | } |
|
|
674 | |
|
|
675 | if (menubar_visible ()) |
|
|
676 | { |
|
|
677 | priv_modes |= PrivMode_menuBar; |
|
|
678 | SavedModes |= PrivMode_menuBar; |
|
|
679 | } |
672 | } |
680 | |
673 | |
681 | run_command (argv); |
674 | run_command (argv); |
682 | } |
675 | } |
683 | |
676 | |
… | |
… | |
751 | 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]; |
752 | 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]; |
753 | } |
746 | } |
754 | |
747 | |
755 | /* |
748 | /* |
756 | * get scrollBar/menuBar shadow colors |
749 | * get scrollBar shadow colors |
757 | * |
750 | * |
758 | * The calculations of topShadow/bottomShadow values are adapted |
751 | * The calculations of topShadow/bottomShadow values are adapted |
759 | * from the fvwm window manager. |
752 | * from the fvwm window manager. |
760 | */ |
753 | */ |
761 | #ifdef KEEP_SCROLLCOLOR |
754 | #ifdef KEEP_SCROLLCOLOR |
… | |
… | |
916 | #if ENABLE_FRILLS |
909 | #if ENABLE_FRILLS |
917 | Atom prop = None; |
910 | Atom prop = None; |
918 | MWMHints mwmhints; |
911 | MWMHints mwmhints; |
919 | #endif |
912 | #endif |
920 | XGCValues gcvalue; |
913 | XGCValues gcvalue; |
921 | long vt_emask; |
|
|
922 | XSetWindowAttributes attributes; |
914 | XSetWindowAttributes attributes; |
923 | XWindowAttributes gattr; |
915 | XWindowAttributes gattr; |
924 | Window top, parent; |
916 | Window top, parent; |
925 | dDisp; |
917 | dDisp; |
926 | |
918 | |
… | |
… | |
936 | { |
928 | { |
937 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
929 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
938 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
930 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
939 | } |
931 | } |
940 | |
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 | |
941 | #if ENABLE_FRILLS |
943 | #if ENABLE_FRILLS |
942 | if (OPTION (Opt_borderLess)) |
944 | if (OPTION (Opt_borderLess)) |
943 | { |
945 | { |
944 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
946 | prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); |
945 | |
947 | |
946 | if (prop == None) |
948 | if (prop == None) |
947 | { |
949 | { |
948 | /* 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");*/ |
949 | #ifdef PREFER_24BIT |
|
|
950 | attributes.override_redirect = TRUE; |
951 | attributes.override_redirect = TRUE; |
951 | #endif |
|
|
952 | mwmhints.flags = 0; |
952 | mwmhints.flags = 0; |
953 | } |
953 | } |
954 | else |
954 | else |
955 | { |
955 | { |
956 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
956 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
959 | } |
959 | } |
960 | else |
960 | else |
961 | mwmhints.flags = 0; |
961 | mwmhints.flags = 0; |
962 | #endif |
962 | #endif |
963 | |
963 | |
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 |
964 | #if ENABLE_XEMBED |
973 | if (rs[Rs_embed]) |
965 | if (rs[Rs_embed]) |
974 | { |
966 | { |
975 | XWindowAttributes wattr; |
967 | XWindowAttributes wattr; |
976 | |
968 | |
… | |
… | |
984 | #endif |
976 | #endif |
985 | |
977 | |
986 | window_calc (0, 0); |
978 | window_calc (0, 0); |
987 | |
979 | |
988 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
980 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
989 | #ifdef PREFER_24BIT |
|
|
990 | attributes.background_pixel = pix_colors_focused[Color_border]; |
981 | attributes.background_pixel = pix_colors_focused[Color_border]; |
991 | attributes.border_pixel = pix_colors_focused[Color_border]; |
982 | attributes.border_pixel = pix_colors_focused[Color_border]; |
992 | attributes.colormap = display->cmap; |
983 | attributes.colormap = display->cmap; |
993 | top = XCreateWindow (disp, parent, |
984 | top = XCreateWindow (disp, parent, |
994 | szHint.x, szHint.y, |
985 | szHint.x, szHint.y, |
995 | szHint.width, szHint.height, |
986 | szHint.width, szHint.height, |
996 | ext_bwidth, |
987 | ext_bwidth, |
997 | display->depth, InputOutput, |
988 | display->depth, InputOutput, |
998 | display->visual, |
989 | display->visual, |
999 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
990 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1000 | #else |
991 | &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 | |
992 | |
1009 | this->parent[0] = top; |
993 | this->parent[0] = top; |
1010 | |
994 | |
1011 | old_width = szHint.width; |
995 | old_width = szHint.width; |
1012 | old_height = szHint.height; |
996 | old_height = szHint.height; |
… | |
… | |
1066 | #endif |
1050 | #endif |
1067 | |
1051 | |
1068 | /* 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 */ |
1069 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1053 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1070 | |
1054 | |
1071 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1055 | #ifdef HAVE_SCROLLBARS |
1072 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1056 | /* cursor scrollBar: Black-on-White */ |
1073 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1057 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1074 | #endif |
1058 | #endif |
1075 | |
1059 | |
1076 | /* the vt window */ |
1060 | /* the vt window */ |
1077 | vt = XCreateSimpleWindow (disp, top, |
1061 | vt = XCreateSimpleWindow (disp, top, |
… | |
… | |
1089 | attributes.bit_gravity = NorthWestGravity; |
1073 | attributes.bit_gravity = NorthWestGravity; |
1090 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1074 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1091 | |
1075 | |
1092 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1076 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1093 | |
1077 | |
1094 | if (OPTION (Opt_pointerBlank) |
1078 | if (OPTION (Opt_pointerBlank)) |
1095 | #ifdef ENABLE_PERL |
|
|
1096 | || self |
|
|
1097 | #endif |
|
|
1098 | ) |
|
|
1099 | vt_emask |= PointerMotionMask; |
1079 | vt_emask |= PointerMotionMask; |
1100 | else |
1080 | else |
1101 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1081 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1102 | |
1082 | |
1103 | XSelectInput (disp, vt, vt_emask); |
1083 | vt_select_input (); |
|
|
1084 | |
1104 | vt_ev.start (display, vt); |
1085 | vt_ev.start (display, vt); |
1105 | |
|
|
1106 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1107 | if (menuBar_height ()) |
|
|
1108 | { |
|
|
1109 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1110 | window_vt_x, 0, |
|
|
1111 | width, |
|
|
1112 | menuBar_TotalHeight (), |
|
|
1113 | 0, |
|
|
1114 | pix_colors_focused[Color_fg], |
|
|
1115 | pix_colors_focused[Color_scroll]); |
|
|
1116 | |
|
|
1117 | #ifdef DEBUG_X |
|
|
1118 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1119 | #endif |
|
|
1120 | |
|
|
1121 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1122 | |
|
|
1123 | XDefineCursor (disp, menuBar.win, |
|
|
1124 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1125 | |
|
|
1126 | XSelectInput (disp, menuBar.win, |
|
|
1127 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1128 | menubar_ev.start (display, menuBar.win); |
|
|
1129 | } |
|
|
1130 | #endif |
|
|
1131 | |
1086 | |
1132 | #ifdef XPM_BACKGROUND |
1087 | #ifdef XPM_BACKGROUND |
1133 | if (rs[Rs_backgroundPixmap] != NULL |
1088 | if (rs[Rs_backgroundPixmap] != NULL |
1134 | && ! OPTION (Opt_transparent)) |
1089 | && ! OPTION (Opt_transparent)) |
1135 | { |
1090 | { |
… | |
… | |
1154 | GCForeground | GCBackground | GCGraphicsExposures, |
1109 | GCForeground | GCBackground | GCGraphicsExposures, |
1155 | &gcvalue); |
1110 | &gcvalue); |
1156 | |
1111 | |
1157 | drawable = new rxvt_drawable (display, vt); |
1112 | drawable = new rxvt_drawable (display, vt); |
1158 | |
1113 | |
1159 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1114 | #ifdef RXVT_SCROLLBAR |
1160 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1115 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1161 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1116 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1162 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1117 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1163 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1118 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1164 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1119 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
… | |
… | |
1407 | rxvt_term::run_command (const char *const *argv) |
1362 | rxvt_term::run_command (const char *const *argv) |
1408 | { |
1363 | { |
1409 | #if ENABLE_FRILLS |
1364 | #if ENABLE_FRILLS |
1410 | if (rs[Rs_pty_fd]) |
1365 | if (rs[Rs_pty_fd]) |
1411 | { |
1366 | { |
1412 | pty.pty = atoi (rs[Rs_pty_fd]); |
1367 | pty->pty = atoi (rs[Rs_pty_fd]); |
1413 | |
1368 | |
1414 | if (pty.pty >= 0) |
1369 | if (pty->pty >= 0) |
1415 | { |
1370 | { |
1416 | if (getfd_hook) |
1371 | if (getfd_hook) |
1417 | pty.pty = (*getfd_hook) (pty.pty); |
1372 | pty->pty = (*getfd_hook) (pty->pty); |
1418 | |
1373 | |
1419 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1374 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1420 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1375 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1421 | } |
1376 | } |
1422 | } |
1377 | } |
1423 | else |
1378 | else |
1424 | #endif |
1379 | #endif |
1425 | if (!pty.get ()) |
1380 | if (!pty->get ()) |
1426 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1381 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1427 | |
1382 | |
1428 | pty.set_utf8_mode (enc_utf8); |
1383 | pty->set_utf8_mode (enc_utf8); |
1429 | |
1384 | |
1430 | /* set initial window size */ |
1385 | /* set initial window size */ |
1431 | tt_winch (); |
1386 | tt_winch (); |
1432 | |
1387 | |
1433 | int er; |
1388 | int er; |
… | |
… | |
1446 | #if ENABLE_FRILLS |
1401 | #if ENABLE_FRILLS |
1447 | if (rs[Rs_pty_fd]) |
1402 | if (rs[Rs_pty_fd]) |
1448 | return; |
1403 | return; |
1449 | #endif |
1404 | #endif |
1450 | |
1405 | |
1451 | #ifndef __QNX__ |
|
|
1452 | /* spin off the command interpreter */ |
1406 | /* spin off the command interpreter */ |
1453 | switch (cmd_pid = fork ()) |
1407 | switch (cmd_pid = fork ()) |
1454 | { |
1408 | { |
1455 | case -1: |
1409 | case -1: |
1456 | { |
1410 | { |
… | |
… | |
1458 | rxvt_fatal ("can't fork, aborting.\n"); |
1412 | rxvt_fatal ("can't fork, aborting.\n"); |
1459 | } |
1413 | } |
1460 | case 0: |
1414 | case 0: |
1461 | init_env (); |
1415 | init_env (); |
1462 | |
1416 | |
1463 | if (!pty.make_controlling_tty ()) |
1417 | if (!pty->make_controlling_tty ()) |
1464 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1418 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1465 | else |
1419 | else |
1466 | { |
1420 | { |
1467 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1421 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1468 | dup2 (pty.tty, STDIN_FILENO); |
1422 | dup2 (pty->tty, STDIN_FILENO); |
1469 | dup2 (pty.tty, STDOUT_FILENO); |
1423 | dup2 (pty->tty, STDOUT_FILENO); |
1470 | dup2 (pty.tty, STDERR_FILENO); |
1424 | dup2 (pty->tty, STDERR_FILENO); |
1471 | |
1425 | |
1472 | // close all our file handles that we do no longer need |
1426 | // close all our file handles that we do no longer need |
1473 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1427 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1474 | { |
1428 | { |
1475 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1429 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1476 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1430 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1477 | } |
1431 | } |
1478 | |
1432 | |
1479 | run_child (argv); |
1433 | run_child (argv); |
1480 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1434 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1481 | } |
1435 | } |
1482 | |
1436 | |
1483 | _exit (EXIT_FAILURE); |
1437 | _exit (EXIT_FAILURE); |
1484 | |
1438 | |
1485 | default: |
1439 | default: |
1486 | { |
|
|
1487 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
|
|
1488 | int fdstdin; |
|
|
1489 | |
|
|
1490 | fdstdin = dup (STDIN_FILENO); |
|
|
1491 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1492 | #endif |
|
|
1493 | |
|
|
1494 | #ifdef UTMP_SUPPORT |
1440 | #if UTMP_SUPPORT |
1495 | privileged_utmp (SAVE); |
1441 | if (!OPTION (Opt_utmpInhibit)) |
|
|
1442 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1496 | #endif |
1443 | #endif |
1497 | |
1444 | |
1498 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1445 | pty->close_tty (); |
1499 | |
|
|
1500 | dup2 (fdstdin, STDIN_FILENO); |
|
|
1501 | close (fdstdin); |
|
|
1502 | #endif |
|
|
1503 | } |
|
|
1504 | |
|
|
1505 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
|
|
1506 | break; |
1446 | break; |
1507 | } |
1447 | } |
1508 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1509 | fchmod (pty.tty, 0622); |
|
|
1510 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1511 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1512 | |
|
|
1513 | if (run_child (argv) == -1) |
|
|
1514 | exit (EXIT_FAILURE); |
|
|
1515 | #endif |
|
|
1516 | } |
1448 | } |
1517 | |
1449 | |
1518 | /* ------------------------------------------------------------------------- * |
1450 | /* ------------------------------------------------------------------------- * |
1519 | * CHILD PROCESS OPERATIONS * |
1451 | * CHILD PROCESS OPERATIONS * |
1520 | * ------------------------------------------------------------------------- */ |
1452 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1564 | // unblock signals (signals are blocked by iom.C |
1496 | // unblock signals (signals are blocked by iom.C |
1565 | sigset_t ss; |
1497 | sigset_t ss; |
1566 | sigemptyset (&ss); |
1498 | sigemptyset (&ss); |
1567 | sigprocmask (SIG_SETMASK, &ss, 0); |
1499 | sigprocmask (SIG_SETMASK, &ss, 0); |
1568 | |
1500 | |
1569 | #ifndef __QNX__ |
|
|
1570 | /* command interpreter path */ |
1501 | /* command interpreter path */ |
1571 | if (argv != NULL) |
1502 | if (argv != NULL) |
1572 | { |
1503 | { |
1573 | # ifdef DEBUG_CMD |
1504 | # ifdef DEBUG_CMD |
1574 | int i; |
1505 | int i; |
… | |
… | |
1580 | execvp (argv[0], (char *const *)argv); |
1511 | execvp (argv[0], (char *const *)argv); |
1581 | /* no error message: STDERR is closed! */ |
1512 | /* no error message: STDERR is closed! */ |
1582 | } |
1513 | } |
1583 | else |
1514 | else |
1584 | { |
1515 | { |
1585 | const char *argv0, *shell; |
1516 | const char *argv0, *shell; |
1586 | |
1517 | |
1587 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1518 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1588 | shell = "/bin/sh"; |
1519 | shell = "/bin/sh"; |
1589 | |
1520 | |
1590 | argv0 = (const char *)rxvt_r_basename (shell); |
1521 | argv0 = (const char *)rxvt_r_basename (shell); |
… | |
… | |
1595 | |
1526 | |
1596 | login[0] = '-'; |
1527 | login[0] = '-'; |
1597 | strcpy (&login[1], argv0); |
1528 | strcpy (&login[1], argv0); |
1598 | argv0 = login; |
1529 | argv0 = login; |
1599 | } |
1530 | } |
|
|
1531 | |
1600 | execlp (shell, argv0, NULL); |
1532 | execlp (shell, argv0, NULL); |
1601 | /* no error message: STDERR is closed! */ |
1533 | /* no error message: STDERR is closed! */ |
1602 | } |
1534 | } |
1603 | |
1535 | |
1604 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1605 | |
|
|
1606 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1607 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1608 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1609 | |
|
|
1610 | if (argv != NULL) |
|
|
1611 | { |
|
|
1612 | if (access (argv[0], X_OK) == -1) |
|
|
1613 | { |
|
|
1614 | if (strchr (argv[0], '/') == NULL) |
|
|
1615 | { |
|
|
1616 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1617 | |
|
|
1618 | if (fullcommand[0] != '\0') |
|
|
1619 | command = fullcommand; |
|
|
1620 | } |
|
|
1621 | |
|
|
1622 | if (access (command, X_OK) == -1) |
|
|
1623 | return -1; |
|
|
1624 | } |
|
|
1625 | else |
|
|
1626 | command = argv[0]; |
|
|
1627 | |
|
|
1628 | arg_v = argv; |
|
|
1629 | } |
|
|
1630 | else |
|
|
1631 | { |
|
|
1632 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1633 | command = "/bin/sh"; |
|
|
1634 | |
|
|
1635 | arg_a[0] = my_basename (command); |
|
|
1636 | |
|
|
1637 | if (OPTION (Opt_loginShell)) |
|
|
1638 | { |
|
|
1639 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1640 | |
|
|
1641 | login[0] = '-'; |
|
|
1642 | strcpy (&login[1], arg_a[0]); |
|
|
1643 | arg_a[0] = login; |
|
|
1644 | } |
|
|
1645 | |
|
|
1646 | arg_v = arg_a; |
|
|
1647 | } |
|
|
1648 | |
|
|
1649 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1650 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1651 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1652 | command, arg_v, environ, iov_a, 0); |
|
|
1653 | if (login) |
|
|
1654 | free (login); |
|
|
1655 | |
|
|
1656 | pty.close_tty (); |
|
|
1657 | return pty.pty; |
|
|
1658 | #endif |
|
|
1659 | |
|
|
1660 | return -1; |
1536 | return -1; |
1661 | } |
1537 | } |
1662 | |
1538 | |
1663 | /*----------------------- end-of-file (C source) -----------------------*/ |
1539 | /*----------------------- end-of-file (C source) -----------------------*/ |