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.133 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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.
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
… …
256 bgPixmap.pixmap = None; 217 bgPixmap.pixmap = None;
257#endif 218#endif
258 219
259 last_bot = last_state = -1; 220 last_bot = last_state = -1;
260 221
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; 222 return true;
269} 223}
270 224
271void 225void
272rxvt_term::init_secondary () 226rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 293 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 294
341 /* 295 /*
342 * Open display, get options/resources and create the window 296 * Open display, get options/resources and create the window
343 */ 297 */
298
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 299 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 300 rs[Rs_display_name] = ":0";
346 301
347 get_options (r_argc, r_argv); 302 get_options (r_argc, r_argv);
348 303
349 if (!(display = displays.get (rs[Rs_display_name]))) 304 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 306
352 extract_resources (); 307 extract_resources ();
308
353 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
354 323
355 /* 324 /*
356 * set any defaults not already set 325 * set any defaults not already set
357 */ 326 */
358 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
391 pointerBlankDelay = 2; 360 pointerBlankDelay = 2;
392#endif 361#endif
393 362
394 /* no point having a scrollbar without having any scrollback! */ 363 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 364 if (!saveLines)
396 CLR_OPTION (Opt_scrollBar); 365 set_option (Opt_scrollBar, 0);
397 366
398#ifdef PRINTPIPE 367#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 368 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 369 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 370#endif
… …
576 * This should support all European type languages. 545 * This should support all European type languages.
577 */ 546 */
578void 547void
579rxvt_term::set_locale (const char *locale) 548rxvt_term::set_locale (const char *locale)
580{ 549{
550 set_environ (envv);
551
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 552#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 553 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 554 this->locale = setlocale (LC_CTYPE, locale);
584 555
585 if (!this->locale) 556 if (!this->locale)
586 { 557 {
587 if (*locale) 558 if (*locale)
588 { 559 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 560 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 561 setlocale (LC_CTYPE, "C");
591 } 562 }
592 else 563 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 564 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 565
595 this->locale = ""; 566 this->locale = "C";
596 } 567 }
597 568
598 569
599 this->locale = rxvt_strdup (this->locale); 570 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 571 SET_LOCALE (this->locale);
… …
615} 586}
616 587
617void 588void
618rxvt_term::init_xlocale () 589rxvt_term::init_xlocale ()
619{ 590{
591 set_environ (envv);
592
620#ifdef USE_XIM 593#ifdef USE_XIM
621 if (!locale) 594 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 595 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 596 else
624 { 597 {
… …
664 if (strcmp (key_backspace, "DEC") == 0) 637 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 638 priv_modes |= PrivMode_HaveBackSpace;
666#endif 639#endif
667 640
668 /* add value for scrollBar */ 641 /* add value for scrollBar */
669 if (scrollbar_visible ()) 642 if (scrollBar.state)
670 { 643 {
671 priv_modes |= PrivMode_scrollBar; 644 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 645 SavedModes |= PrivMode_scrollBar;
673 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 } 646 }
680 647
681 run_command (argv); 648 run_command (argv);
682} 649}
683 650
… …
751 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 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]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
753 } 720 }
754 721
755 /* 722 /*
756 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
757 * 724 *
758 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
759 * from the fvwm window manager. 726 * from the fvwm window manager.
760 */ 727 */
761#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
… …
912rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
913{ 880{
914 XClassHint classHint; 881 XClassHint classHint;
915 XWMHints wmHint; 882 XWMHints wmHint;
916#if ENABLE_FRILLS 883#if ENABLE_FRILLS
917 Atom prop = None;
918 MWMHints mwmhints; 884 MWMHints mwmhints;
919#endif 885#endif
920 XGCValues gcvalue; 886 XGCValues gcvalue;
921 long vt_emask;
922 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
923 XWindowAttributes gattr;
924 Window top, parent; 888 Window top, parent;
925 dDisp; 889 dDisp;
926 890
927#ifdef USING_W11LIB 891 xa = display->xa;
928 /* enable W11 callbacks */
929 W11AddEventHandler (disp, rxvt_W11_process_x_event);
930#endif
931 892
932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
934 895
935 if (OPTION (Opt_transparent)) 896 if (!set_fonts ())
936 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
938 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
939 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
940 902
941#if ENABLE_FRILLS 903#if ENABLE_FRILLS
942 if (OPTION (Opt_borderLess)) 904 if (OPTION (Opt_borderLess))
943 { 905 {
944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
945
946 if (prop == None)
947 { 907 {
948 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* 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; 909 attributes.override_redirect = TRUE;
951#endif
952 mwmhints.flags = 0; 910 mwmhints.flags = 0;
953 } 911 }
954 else 912 else
955 { 913 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
959 } 917 }
960 else 918 else
961 mwmhints.flags = 0; 919 mwmhints.flags = 0;
962#endif 920#endif
963 921
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 922#if ENABLE_XEMBED
973 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
974 { 924 {
975 XWindowAttributes wattr; 925 XWindowAttributes wattr;
976 926
… …
984#endif 934#endif
985 935
986 window_calc (0, 0); 936 window_calc (0, 0);
987 937
988 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
989#ifdef PREFER_24BIT
990 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
992 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
993 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
994 szHint.x, szHint.y, 944 szHint.x, szHint.y,
995 szHint.width, szHint.height, 945 szHint.width, szHint.height,
996 ext_bwidth, 946 ext_bwidth,
997 display->depth, InputOutput, 947 display->depth, InputOutput,
998 display->visual, 948 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000#else 950 &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 951
1009 this->parent[0] = top; 952 this->parent[0] = top;
1010 953
1011 old_width = szHint.width; 954 old_width = szHint.width;
1012 old_height = szHint.height; 955 old_height = szHint.height;
1013 956
1014 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1015 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1016 959
1017 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1018 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1019 962
1020 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1021 wmHint.input = True; 964 wmHint.input = True;
1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1023 wmHint.window_group = top; 966 wmHint.window_group = top;
1024 967
1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1026 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1027 976
1028 Atom protocols[] = { 977 Atom protocols[] = {
1029 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1030#if ENABLE_EWMH 979#if ENABLE_EWMH
1031 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
… …
1057 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1059 1008
1060 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1061 1010
1062#if ENABLE_FRILLS
1063 if (mwmhints.flags)
1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066#endif
1067
1068 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070 1013
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1014#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1017#endif
1075 1018
1076 /* the vt window */ 1019 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1078 window_vt_x,
1079 window_vt_y, 1021 window_vt_x, window_vt_y,
1080 width,
1081 height, 1022 width, height,
1082 0, 1023 0,
1083 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, vt, "vt window");
1087#endif
1088 1026
1089 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1029
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1031
1094 if (OPTION (Opt_pointerBlank) 1032 if (OPTION (Opt_pointerBlank))
1095#ifdef ENABLE_PERL
1096 || self
1097#endif
1098 )
1099 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1100 else 1034 else
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1036
1103 XSelectInput (disp, vt, vt_emask); 1037 vt_select_input ();
1038
1104 vt_ev.start (display, vt); 1039 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 1040
1132#ifdef XPM_BACKGROUND 1041#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1042 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! OPTION (Opt_transparent)) 1043 && ! OPTION (Opt_transparent))
1135 { 1044 {
… …
1145 scr_touch (true); 1054 scr_touch (true);
1146 } 1055 }
1147#endif 1056#endif
1148 1057
1149 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1150 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1151 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1152 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1153 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (disp, vt,
1154 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1065 &gcvalue);
1156 1066
1157 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (display, vt);
1158 1068
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1171 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1172#endif 1082#endif
1173 1083
1174 pointer_unblank (); 1084 pointer_unblank ();
1175 scr_recolour (); 1085 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1186} 1086}
1187 1087
1188/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1189 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1190 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
… …
1407rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1408{ 1308{
1409#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1411 { 1311 {
1412 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1413 1313
1414 if (pty.pty >= 0) 1314 if (pty->pty >= 0)
1415 { 1315 {
1416 if (getfd_hook) 1316 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1317 pty->pty = (*getfd_hook) (pty->pty);
1418 1318
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 } 1321 }
1422 } 1322 }
1423 else 1323 else
1424#endif 1324#endif
1425 if (!pty.get ()) 1325 if (!pty->get ())
1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1427 1327
1428 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1429 1329
1430 /* set initial window size */ 1330 /* set initial window size */
1431 tt_winch (); 1331 tt_winch ();
1432 1332
1433 int er; 1333 int er;
… …
1446#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1447 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1448 return; 1348 return;
1449#endif 1349#endif
1450 1350
1451#ifndef __QNX__
1452 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1453 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1454 { 1353 {
1455 case -1: 1354 case -1:
1456 { 1355 {
… …
1458 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1459 } 1358 }
1460 case 0: 1359 case 0:
1461 init_env (); 1360 init_env ();
1462 1361
1463 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1464 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1465 else 1364 else
1466 { 1365 {
1467 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1468 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1469 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1470 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1471 1370
1472 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1473 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1474 { 1373 {
1475 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1476 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1477 } 1376 }
1478 1377
1479 run_child (argv); 1378 run_child (argv);
1480 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1481 } 1380 }
1482 1381
1483 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1484 1383
1485 default: 1384 default:
1486 { 1385 if (!OPTION (Opt_utmpInhibit))
1487#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1488 int fdstdin;
1489 1387
1490 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1491 dup2 (pty.tty, STDIN_FILENO);
1492#endif
1493 1389
1494#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1495 privileged_utmp (SAVE);
1496#endif
1497 1391
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
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; 1393 break;
1507 } 1394 }
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} 1395}
1517 1396
1518/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1519 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1520 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
… …
1564 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1565 sigset_t ss; 1444 sigset_t ss;
1566 sigemptyset (&ss); 1445 sigemptyset (&ss);
1567 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1568 1447
1569#ifndef __QNX__
1570 /* command interpreter path */ 1448 /* command interpreter path */
1571 if (argv != NULL) 1449 if (argv != NULL)
1572 { 1450 {
1573# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1574 int i; 1452 int i;
… …
1580 execvp (argv[0], (char *const *)argv); 1458 execvp (argv[0], (char *const *)argv);
1581 /* no error message: STDERR is closed! */ 1459 /* no error message: STDERR is closed! */
1582 } 1460 }
1583 else 1461 else
1584 { 1462 {
1585 const char *argv0, *shell; 1463 const char *argv0, *shell;
1586 1464
1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1588 shell = "/bin/sh"; 1466 shell = "/bin/sh";
1589 1467
1590 argv0 = (const char *)rxvt_r_basename (shell); 1468 argv0 = (const char *)rxvt_r_basename (shell);
… …
1595 1473
1596 login[0] = '-'; 1474 login[0] = '-';
1597 strcpy (&login[1], argv0); 1475 strcpy (&login[1], argv0);
1598 argv0 = login; 1476 argv0 = login;
1599 } 1477 }
1478
1600 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1601 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1602 } 1481 }
1603 1482
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; 1483 return -1;
1661} 1484}
1662 1485
1663/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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