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.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.118 by root, Wed Aug 10 15:10:06 2005 UTC

… …
181 "MULTIPLE", 181 "MULTIPLE",
182 "TARGETS", 182 "TARGETS",
183 "TIMESTAMP", 183 "TIMESTAMP",
184 "VT_SELECTION", 184 "VT_SELECTION",
185 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 188 "CLIPBOARD",
188#if ENABLE_FRILLS 189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
189 "_NET_WM_PID", 193 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 194 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
193#endif 197#endif
194#if USE_XIM 198#if USE_XIM
195 "WM_LOCALE_NAME", 199 "WM_LOCALE_NAME",
196#endif 200#endif
197#ifdef TRANSPARENT 201#ifdef TRANSPARENT
… …
199 "ESETROOT_PMAP_ID", 203 "ESETROOT_PMAP_ID",
200#endif 204#endif
201#ifdef OFFIX_DND 205#ifdef OFFIX_DND
202 "DndProtocol", 206 "DndProtocol",
203 "DndSelection", 207 "DndSelection",
208#endif
209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
204#endif 212#endif
205 }; 213 };
206 214
207bool 215bool
208rxvt_term::init_vars () 216rxvt_term::init_vars ()
209{ 217{
210 sw_term.start (SIGTERM); 218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
211 220
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif 224#endif
… …
224 233
225 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
226 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
227 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
228 want_refresh = 1; 237 want_refresh = 1;
229 cmd_pid = -1;
230 pty.pty = pty.tty = -1;
231 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
232 TermWin.focus = 0; 239 TermWin.focus = 0;
233 TermWin.ncol = 80; 240 TermWin.ncol = 80;
234 TermWin.nrow = 24; 241 TermWin.nrow = 24;
235 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
252 last_bot = last_state = -1; 259 last_bot = last_state = -1;
253 260
254#ifdef MENUBAR 261#ifdef MENUBAR
255 menu_readonly = 1; 262 menu_readonly = 1;
256# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
257 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
258# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
259#endif 266#endif
260 267
261 return true; 268 return true;
262} 269}
… …
336 */ 343 */
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
339 346
340 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
348
349 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351
352 extract_resources ();
341 free (r_argv); 353 free (r_argv);
342
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 354
360 /* 355 /*
361 * set any defaults not already set 356 * set any defaults not already set
362 */ 357 */
363 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
672 if (scrollbar_visible ()) 667 if (scrollbar_visible ())
673 { 668 {
674 priv_modes |= PrivMode_scrollBar; 669 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 670 SavedModes |= PrivMode_scrollBar;
676 } 671 }
672
677 if (menubar_visible ()) 673 if (menubar_visible ())
678 { 674 {
679 priv_modes |= PrivMode_menuBar; 675 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 676 SavedModes |= PrivMode_menuBar;
681 } 677 }
… …
764 * from the fvwm window manager. 760 * from the fvwm window manager.
765 */ 761 */
766#ifdef KEEP_SCROLLCOLOR 762#ifdef KEEP_SCROLLCOLOR
767 763
768 if (display->depth <= 2) 764 if (display->depth <= 2)
765 {
769 { /* Monochrome */ 766 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 767 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 768 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 770 }
774 else 771 else
… …
829 * Use resource ``modifier'' to override the Meta modifier 826 * Use resource ``modifier'' to override the Meta modifier
830 */ 827 */
831void 828void
832rxvt_term::get_ourmods () 829rxvt_term::get_ourmods ()
833{ 830{
834 int i, j, k; 831 int i, j, k;
835 int requestedmeta, realmeta, realalt; 832 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 833 const char *cm, *rsmod;
837 XModifierKeymap *map; 834 XModifierKeymap *map;
838 KeyCode *kc; 835 KeyCode *kc;
839 const unsigned int modmasks[] = 836 const unsigned int modmasks[] =
840 { 837 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 838 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 839 };
843 840
… …
925#endif 922#endif
926 XGCValues gcvalue; 923 XGCValues gcvalue;
927 long vt_emask; 924 long vt_emask;
928 XSetWindowAttributes attributes; 925 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 926 XWindowAttributes gattr;
927 Window top, parent;
928 dDisp;
930 929
931#ifdef USING_W11LIB 930#ifdef USING_W11LIB
932 /* enable W11 callbacks */ 931 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 932 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif 933#endif
935 934
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 935 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 936 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938 937
939 if (options & Opt_transparent) 938 if (options & Opt_transparent)
940 { 939 {
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 940 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 941 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 942 }
944 943
945#if ENABLE_FRILLS 944#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 945 if (options & Opt_borderLess)
947 { 946 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 947 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
949 948
950 if (prop == None) 949 if (prop == None)
951 { 950 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 951 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT 952#ifdef PREFER_24BIT
… …
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 959 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 960 mwmhints.decorations = 0;
962 } 961 }
963 } 962 }
964 else 963 else
965 {
966 mwmhints.flags = 0; 964 mwmhints.flags = 0;
967 }
968#endif 965#endif
969 966
970 /* grab colors before netscape does */ 967 /* grab colors before netscape does */
971 Get_Colours (); 968 Get_Colours ();
972 969
973 if (!set_fonts ()) 970 if (!set_fonts ())
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
975 972
973 parent = DefaultRootWindow (disp);
974
975#if ENABLE_XEMBED
976 if (rs[Rs_embed])
977 {
978 XWindowAttributes wattr;
979
980 parent = strtol (rs[Rs_embed], 0, 0);
981
982 if (!XGetWindowAttributes (disp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984
985 window_calc (wattr.width, wattr.height);
986 }
987
988#endif
976 window_calc (0, 0); 989 window_calc (0, 0);
977 old_width = szHint.width;
978 old_height = szHint.height;
979 990
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 991 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT 992#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border]; 993 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border]; 994 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap; 995 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 996 top = XCreateWindow (disp, parent,
987 szHint.x, szHint.y, 997 szHint.x, szHint.y,
988 szHint.width, szHint.height, 998 szHint.width, szHint.height,
989 TermWin.ext_bwidth, 999 TermWin.ext_bwidth,
990 display->depth, InputOutput, 1000 display->depth, InputOutput,
991 display->visual, 1001 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else 1003#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1004 top = XCreateSimpleWindow (disp, parent,
995 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
996 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
997 TermWin.ext_bwidth, 1007 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border], 1008 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]); 1009 pix_colors_focused[Color_border]);
1000#endif 1010#endif
1011
1012 TermWin.parent[0] = top;
1013
1014 old_width = szHint.width;
1015 old_height = szHint.height;
1001 1016
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 1019
1005 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
1007 1022
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1024 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1025 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1026 wmHint.window_group = top;
1012 1027
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1028 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1029 &szHint, &wmHint, &classHint);
1015 1030
1016 /* Enable delete window protocol */ 1031 Atom protocols[] = {
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1032 xa[XA_WM_DELETE_WINDOW],
1018 &xa[XA_WMDELETEWINDOW], 1); 1033#if ENABLE_EWMH
1034 xa[XA_NET_WM_PING],
1035#endif
1036 };
1019 1037
1020#if ENABLE_FRILLS 1038 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1039
1040#if ENABLE_EWMH
1021 long pid = getpid (); 1041 long pid = getpid ();
1022 1042
1023 XChangeProperty (display->display, TermWin.parent[0], 1043 XChangeProperty (disp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1044 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1045 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1046
1028 XSelectInput (display->display, TermWin.parent[0], 1047 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1048#endif
1049
1050 XSelectInput (disp, top,
1029 KeyPressMask 1051 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1052#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1053 | KeyReleaseMask
1032#endif 1054#endif
1033 | FocusChangeMask | VisibilityChangeMask 1055 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1056 | ExposureMask | StructureNotifyMask);
1057
1036 termwin_ev.start (display, TermWin.parent[0]); 1058 termwin_ev.start (display, top);
1037 1059
1038#if ENABLE_FRILLS 1060#if ENABLE_FRILLS
1039 if (mwmhints.flags) 1061 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1062 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1063 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif 1064#endif
1043 1065
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1066 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1067 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046 1068
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1069#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1070 /* cursor (menuBar/scrollBar): Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050#endif 1072#endif
1051 1073
1052 /* the vt window */ 1074 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1075 TermWin.vt = XCreateSimpleWindow (disp, top,
1054 window_vt_x, 1076 window_vt_x,
1055 window_vt_y, 1077 window_vt_y,
1056 TermWin_TotalWidth (), 1078 TermWin_TotalWidth (),
1057 TermWin_TotalHeight (), 1079 TermWin_TotalHeight (),
1058 0, 1080 0,
1059 pix_colors_focused[Color_fg], 1081 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1082 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X 1083#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window"); 1084 XStoreName (disp, TermWin.vt, "vt window");
1063#endif 1085#endif
1064 1086
1065 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1067 1089
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069
1070 pointer_unblank ();
1071 1091
1072#ifdef POINTER_BLANK 1092#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1093 if (options & Opt_pointerBlank)
1074 vt_emask |= PointerMotionMask; 1094 vt_emask |= PointerMotionMask;
1075 else 1095 else
1076#endif 1096#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1097 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1098
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1099 XSelectInput (disp, TermWin.vt, vt_emask);
1080 vt_ev.start (display, TermWin.vt); 1100 vt_ev.start (display, TermWin.vt);
1081 1101
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1102#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ()) 1103 if (menuBar_height ())
1084 { 1104 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1105 menuBar.win = XCreateSimpleWindow (disp, top,
1086 window_vt_x, 0, 1106 window_vt_x, 0,
1087 TermWin_TotalWidth (), 1107 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (), 1108 menuBar_TotalHeight (),
1089 0, 1109 0,
1090 pix_colors_focused[Color_fg], 1110 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]); 1111 pix_colors_focused[Color_scroll]);
1092 1112
1093#ifdef DEBUG_X 1113#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar"); 1114 XStoreName (disp, menuBar.win, "menubar");
1095#endif 1115#endif
1096 1116
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1117 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098 1118
1099 XDefineCursor (display->display, menuBar.win, 1119 XDefineCursor (disp, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr)); 1120 XCreateFontCursor (disp, XC_left_ptr));
1101 1121
1102 XSelectInput (display->display, menuBar.win, 1122 XSelectInput (disp, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1123 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win); 1124 menubar_ev.start (display, menuBar.win);
1106 } 1125 }
1107#endif 1126#endif
1108 1127
1109#ifdef XPM_BACKGROUND 1128#ifdef XPM_BACKGROUND
… …
1125 1144
1126 /* graphics context for the vt window */ 1145 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1146 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1147 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1148 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1149 TermWin.gc = XCreateGC (disp, TermWin.vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1150 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1151 &gcvalue);
1133 1152
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1153 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1135 1154
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1155#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1156 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1157 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1158 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1159 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1160 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1143#endif 1162#endif
1144 1163
1145#ifdef OFF_FOCUS_FADING 1164#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1165 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1166 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1167 pix_colors = pix_colors_unfocused;
1149#endif 1168#endif
1150 1169
1170 pointer_unblank ();
1151 scr_recolour (); 1171 scr_recolour ();
1172
1173#if ENABLE_XEMBED
1174 if (rs[Rs_embed])
1175 {
1176 long info[2] = { 0, XEMBED_MAPPED };
1177
1178 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1179 32, PropModeReplace, (unsigned char *)&info, 2);
1180 }
1181#endif
1152} 1182}
1153 1183
1154/* ------------------------------------------------------------------------- * 1184/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1185 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1186 * ------------------------------------------------------------------------- */
… …
1385 * the slave. 1415 * the slave.
1386 */ 1416 */
1387void 1417void
1388rxvt_term::run_command (const char *const *argv) 1418rxvt_term::run_command (const char *const *argv)
1389{ 1419{
1420#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd])
1422 {
1423 pty.pty = atoi (rs[Rs_pty_fd]);
1424 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1425 }
1426 else
1427#endif
1390 if (!pty.get ()) 1428 if (!pty.get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1429 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1430
1393 pty.set_utf8_mode (enc_utf8); 1431 pty.set_utf8_mode (enc_utf8);
1394 1432
1395 /* set initial window size */ 1433 /* set initial window size */
1396 tt_winch (); 1434 tt_winch ();
… …
1406#endif 1444#endif
1407 er = -1; 1445 er = -1;
1408 1446
1409 rxvt_get_ttymode (&tio, er); 1447 rxvt_get_ttymode (&tio, er);
1410 1448
1449#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd])
1451 return;
1452#endif
1453
1411 sw_chld.start (SIGCHLD); 1454 sw_chld.start (SIGCHLD);
1412 1455
1413#ifndef __QNX__ 1456#ifndef __QNX__
1414 /* spin off the command interpreter */ 1457 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1458 switch (cmd_pid = fork ())
1416 { 1459 {
1417 case -1: 1460 case -1:
1461 {
1462 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1463 rxvt_fatal ("can't fork, aborting.\n");
1464 }
1419 case 0: 1465 case 0:
1420 init_env (); 1466 init_env ();
1421 1467
1422 if (!pty.make_controlling_tty ()) 1468 if (!pty.make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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