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

Diff Legend

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