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.130 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 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 {
… …
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 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 } 672 }
682 673
683 run_command (argv); 674 run_command (argv);
684} 675}
685 676
… …
753 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];
754 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];
755 } 746 }
756 747
757 /* 748 /*
758 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
759 * 750 *
760 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 752 * from the fvwm window manager.
762 */ 753 */
763#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
808 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
809 800
810 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
811 { /* bright colors */ 802 { /* bright colors */
812 i -= 8; 803 i -= 8;
813#ifndef NO_BRIGHTCOLOR
814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815 return; 805 return;
816#endif
817 } 806 }
818 807
819 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821 } 810 }
… …
920#if ENABLE_FRILLS 909#if ENABLE_FRILLS
921 Atom prop = None; 910 Atom prop = None;
922 MWMHints mwmhints; 911 MWMHints mwmhints;
923#endif 912#endif
924 XGCValues gcvalue; 913 XGCValues gcvalue;
925 long vt_emask;
926 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
927 XWindowAttributes gattr; 915 XWindowAttributes gattr;
928 Window top, parent; 916 Window top, parent;
929 dDisp; 917 dDisp;
930 918
… …
940 { 928 {
941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 931 }
944 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
945#if ENABLE_FRILLS 943#if ENABLE_FRILLS
946 if (OPTION (Opt_borderLess)) 944 if (OPTION (Opt_borderLess))
947 { 945 {
948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
949 947
950 if (prop == None) 948 if (prop == None)
951 { 949 {
952 /* 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");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
955#endif
956 mwmhints.flags = 0; 952 mwmhints.flags = 0;
957 } 953 }
958 else 954 else
959 { 955 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
963 } 959 }
964 else 960 else
965 mwmhints.flags = 0; 961 mwmhints.flags = 0;
966#endif 962#endif
967 963
968 /* grab colors before netscape does */
969 Get_Colours ();
970
971 if (!set_fonts ())
972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
973
974 parent = DefaultRootWindow (disp);
975
976#if ENABLE_XEMBED 964#if ENABLE_XEMBED
977 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
978 { 966 {
979 XWindowAttributes wattr; 967 XWindowAttributes wattr;
980 968
… …
988#endif 976#endif
989 977
990 window_calc (0, 0); 978 window_calc (0, 0);
991 979
992 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
993#ifdef PREFER_24BIT
994 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
995 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
996 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
997 top = XCreateWindow (disp, parent, 984 top = XCreateWindow (disp, parent,
998 szHint.x, szHint.y, 985 szHint.x, szHint.y,
999 szHint.width, szHint.height, 986 szHint.width, szHint.height,
1000 ext_bwidth, 987 ext_bwidth,
1001 display->depth, InputOutput, 988 display->depth, InputOutput,
1002 display->visual, 989 display->visual,
1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1004#else 991 &attributes);
1005 top = XCreateSimpleWindow (disp, parent,
1006 szHint.x, szHint.y,
1007 szHint.width, szHint.height,
1008 ext_bwidth,
1009 pix_colors_focused[Color_border],
1010 pix_colors_focused[Color_border]);
1011#endif
1012 992
1013 this->parent[0] = top; 993 this->parent[0] = top;
1014 994
1015 old_width = szHint.width; 995 old_width = szHint.width;
1016 old_height = szHint.height; 996 old_height = szHint.height;
… …
1036#endif 1016#endif
1037 }; 1017 };
1038 1018
1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1040 1020
1021#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif
1025
1041#if ENABLE_EWMH 1026#if ENABLE_EWMH
1042 long pid = getpid (); 1027 long pid = getpid ();
1043 1028
1044 XChangeProperty (disp, top, 1029 XChangeProperty (disp, top,
1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1065#endif 1050#endif
1066 1051
1067 /* 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 */
1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1069 1054
1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1071 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1073#endif 1058#endif
1074 1059
1075 /* the vt window */ 1060 /* the vt window */
1076 vt = XCreateSimpleWindow (disp, top, 1061 vt = XCreateSimpleWindow (disp, top,
… …
1088 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1090 1075
1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1092 1077
1093#ifdef POINTER_BLANK
1094 if (OPTION (Opt_pointerBlank)) 1078 if (OPTION (Opt_pointerBlank))
1095 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1096 else 1080 else
1097#endif
1098 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1099 1082
1100 XSelectInput (disp, vt, vt_emask); 1083 vt_select_input ();
1084
1101 vt_ev.start (display, vt); 1085 vt_ev.start (display, vt);
1102
1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1104 if (menuBar_height ())
1105 {
1106 menuBar.win = XCreateSimpleWindow (disp, top,
1107 window_vt_x, 0,
1108 width,
1109 menuBar_TotalHeight (),
1110 0,
1111 pix_colors_focused[Color_fg],
1112 pix_colors_focused[Color_scroll]);
1113
1114#ifdef DEBUG_X
1115 XStoreName (disp, menuBar.win, "menubar");
1116#endif
1117
1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1119
1120 XDefineCursor (disp, menuBar.win,
1121 XCreateFontCursor (disp, XC_left_ptr));
1122
1123 XSelectInput (disp, menuBar.win,
1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1125 menubar_ev.start (display, menuBar.win);
1126 }
1127#endif
1128 1086
1129#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1130 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1131 && ! OPTION (Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1132 { 1090 {
… …
1151 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1152 &gcvalue); 1110 &gcvalue);
1153 1111
1154 drawable = new rxvt_drawable (display, vt); 1112 drawable = new rxvt_drawable (display, vt);
1155 1113
1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1157 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1404rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1405{ 1363{
1406#if ENABLE_FRILLS 1364#if ENABLE_FRILLS
1407 if (rs[Rs_pty_fd]) 1365 if (rs[Rs_pty_fd])
1408 { 1366 {
1409 pty.pty = atoi (rs[Rs_pty_fd]); 1367 pty->pty = atoi (rs[Rs_pty_fd]);
1410 1368
1369 if (pty->pty >= 0)
1370 {
1411 if (getfd_hook) 1371 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty); 1372 pty->pty = (*getfd_hook) (pty->pty);
1413 1373
1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1376 }
1416 } 1377 }
1417 else 1378 else
1418#endif 1379#endif
1419 if (!pty.get ()) 1380 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421 1382
1422 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1423 1384
1424 /* set initial window size */ 1385 /* set initial window size */
1425 tt_winch (); 1386 tt_winch ();
1426 1387
1427 int er; 1388 int er;
… …
1440#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
1441 if (rs[Rs_pty_fd]) 1402 if (rs[Rs_pty_fd])
1442 return; 1403 return;
1443#endif 1404#endif
1444 1405
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1448 { 1408 {
1449 case -1: 1409 case -1:
1450 { 1410 {
… …
1452 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1453 } 1413 }
1454 case 0: 1414 case 0:
1455 init_env (); 1415 init_env ();
1456 1416
1457 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1459 else 1419 else
1460 { 1420 {
1461 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1462 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1463 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1464 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1465 1425
1466 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1467 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1468 { 1428 {
1469 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1470 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1471 } 1431 }
1472 1432
1473 run_child (argv); 1433 run_child (argv);
1474 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1475 } 1435 }
1476 1436
1477 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1478 1438
1479 default: 1439 default:
1480 {
1481#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1482 int fdstdin;
1483
1484 fdstdin = dup (STDIN_FILENO);
1485 dup2 (pty.tty, STDIN_FILENO);
1486#endif
1487
1488#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1489 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1490#endif 1443#endif
1491 1444
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1493
1494 dup2 (fdstdin, STDIN_FILENO);
1495 close (fdstdin);
1496#endif
1497 }
1498
1499 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1500 break; 1446 break;
1501 } 1447 }
1502#else /* __QNX__ uses qnxspawn () */
1503 fchmod (pty.tty, 0622);
1504 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1505 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1506
1507 if (run_child (argv) == -1)
1508 exit (EXIT_FAILURE);
1509#endif
1510} 1448}
1511 1449
1512/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1513 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1514 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1558 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1559 sigset_t ss; 1497 sigset_t ss;
1560 sigemptyset (&ss); 1498 sigemptyset (&ss);
1561 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1562 1500
1563#ifndef __QNX__
1564 /* command interpreter path */ 1501 /* command interpreter path */
1565 if (argv != NULL) 1502 if (argv != NULL)
1566 { 1503 {
1567# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1568 int i; 1505 int i;
… …
1574 execvp (argv[0], (char *const *)argv); 1511 execvp (argv[0], (char *const *)argv);
1575 /* no error message: STDERR is closed! */ 1512 /* no error message: STDERR is closed! */
1576 } 1513 }
1577 else 1514 else
1578 { 1515 {
1579 const char *argv0, *shell; 1516 const char *argv0, *shell;
1580 1517
1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1582 shell = "/bin/sh"; 1519 shell = "/bin/sh";
1583 1520
1584 argv0 = (const char *)rxvt_r_basename (shell); 1521 argv0 = (const char *)rxvt_r_basename (shell);
… …
1589 1526
1590 login[0] = '-'; 1527 login[0] = '-';
1591 strcpy (&login[1], argv0); 1528 strcpy (&login[1], argv0);
1592 argv0 = login; 1529 argv0 = login;
1593 } 1530 }
1531
1594 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1595 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1596 } 1534 }
1597 1535
1598#else /* __QNX__ uses qnxspawn () */
1599
1600 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1601 char *command = NULL, fullcommand[_MAX_PATH];
1602 char **arg_v, *arg_a[2] = { NULL, NULL };
1603
1604 if (argv != NULL)
1605 {
1606 if (access (argv[0], X_OK) == -1)
1607 {
1608 if (strchr (argv[0], '/') == NULL)
1609 {
1610 searchenv (argv[0], "PATH", fullcommand);
1611
1612 if (fullcommand[0] != '\0')
1613 command = fullcommand;
1614 }
1615
1616 if (access (command, X_OK) == -1)
1617 return -1;
1618 }
1619 else
1620 command = argv[0];
1621
1622 arg_v = argv;
1623 }
1624 else
1625 {
1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1627 command = "/bin/sh";
1628
1629 arg_a[0] = my_basename (command);
1630
1631 if (OPTION (Opt_loginShell))
1632 {
1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1634
1635 login[0] = '-';
1636 strcpy (&login[1], arg_a[0]);
1637 arg_a[0] = login;
1638 }
1639
1640 arg_v = arg_a;
1641 }
1642
1643 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1644 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1645 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1646 command, arg_v, environ, iov_a, 0);
1647 if (login)
1648 free (login);
1649
1650 pty.close_tty ();
1651 return pty.pty;
1652#endif
1653
1654 return -1; 1536 return -1;
1655} 1537}
1656 1538
1657/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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