ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

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

Diff Legend

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