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.117 by root, Thu Jul 7 19:37:47 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 }
… …
829 * Use resource ``modifier'' to override the Meta modifier 825 * Use resource ``modifier'' to override the Meta modifier
830 */ 826 */
831void 827void
832rxvt_term::get_ourmods () 828rxvt_term::get_ourmods ()
833{ 829{
834 int i, j, k; 830 int i, j, k;
835 int requestedmeta, realmeta, realalt; 831 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 832 const char *cm, *rsmod;
837 XModifierKeymap *map; 833 XModifierKeymap *map;
838 KeyCode *kc; 834 KeyCode *kc;
839 const unsigned int modmasks[] = 835 const unsigned int modmasks[] =
840 { 836 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 837 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 838 };
843 839
… …
925#endif 921#endif
926 XGCValues gcvalue; 922 XGCValues gcvalue;
927 long vt_emask; 923 long vt_emask;
928 XSetWindowAttributes attributes; 924 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 925 XWindowAttributes gattr;
926 Window top, parent;
927 dDisp;
930 928
931#ifdef USING_W11LIB 929#ifdef USING_W11LIB
932 /* enable W11 callbacks */ 930 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 931 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif 932#endif
935 933
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938 936
939 if (options & Opt_transparent) 937 if (options & Opt_transparent)
940 { 938 {
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 940 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 941 }
944 942
945#if ENABLE_FRILLS 943#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 944 if (options & Opt_borderLess)
947 { 945 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
949 947
950 if (prop == None) 948 if (prop == None)
951 { 949 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT 951#ifdef PREFER_24BIT
… …
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 958 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 959 mwmhints.decorations = 0;
962 } 960 }
963 } 961 }
964 else 962 else
965 {
966 mwmhints.flags = 0; 963 mwmhints.flags = 0;
967 }
968#endif 964#endif
969 965
970 /* grab colors before netscape does */ 966 /* grab colors before netscape does */
971 Get_Colours (); 967 Get_Colours ();
972 968
973 if (!set_fonts ()) 969 if (!set_fonts ())
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 970 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
975 971
972 parent = DefaultRootWindow (disp);
973
974#if ENABLE_XEMBED
975 if (rs[Rs_embed])
976 {
977 XWindowAttributes wattr;
978
979 parent = strtol (rs[Rs_embed], 0, 0);
980
981 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983
984 window_calc (wattr.width, wattr.height);
985 }
986
987#endif
976 window_calc (0, 0); 988 window_calc (0, 0);
977 old_width = szHint.width;
978 old_height = szHint.height;
979 989
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 990 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT 991#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border]; 992 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border]; 993 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap; 994 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 995 top = XCreateWindow (disp, parent,
987 szHint.x, szHint.y, 996 szHint.x, szHint.y,
988 szHint.width, szHint.height, 997 szHint.width, szHint.height,
989 TermWin.ext_bwidth, 998 TermWin.ext_bwidth,
990 display->depth, InputOutput, 999 display->depth, InputOutput,
991 display->visual, 1000 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else 1002#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1003 top = XCreateSimpleWindow (disp, parent,
995 szHint.x, szHint.y, 1004 szHint.x, szHint.y,
996 szHint.width, szHint.height, 1005 szHint.width, szHint.height,
997 TermWin.ext_bwidth, 1006 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border], 1007 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]); 1008 pix_colors_focused[Color_border]);
1000#endif 1009#endif
1010
1011 TermWin.parent[0] = top;
1012
1013 old_width = szHint.width;
1014 old_height = szHint.height;
1001 1015
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1017 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 1018
1005 classHint.res_name = (char *)rs[Rs_name]; 1019 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1020 classHint.res_class = (char *)RESCLASS;
1007 1021
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1022 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1023 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1025 wmHint.window_group = top;
1012 1026
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1028 &szHint, &wmHint, &classHint);
1015 1029
1016 /* Enable delete window protocol */ 1030 Atom protocols[] = {
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1031 xa[XA_WM_DELETE_WINDOW],
1018 &xa[XA_WMDELETEWINDOW], 1); 1032#if ENABLE_EWMH
1033 xa[XA_NET_WM_PING],
1034#endif
1035 };
1019 1036
1020#if ENABLE_FRILLS 1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038
1039#if ENABLE_EWMH
1021 long pid = getpid (); 1040 long pid = getpid ();
1022 1041
1023 XChangeProperty (display->display, TermWin.parent[0], 1042 XChangeProperty (disp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1044 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1045
1028 XSelectInput (display->display, TermWin.parent[0], 1046 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1047#endif
1048
1049 XSelectInput (disp, top,
1029 KeyPressMask 1050 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1051#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1052 | KeyReleaseMask
1032#endif 1053#endif
1033 | FocusChangeMask | VisibilityChangeMask 1054 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1055 | ExposureMask | StructureNotifyMask);
1056
1036 termwin_ev.start (display, TermWin.parent[0]); 1057 termwin_ev.start (display, top);
1037 1058
1038#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
1039 if (mwmhints.flags) 1060 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1061 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1062 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif 1063#endif
1043 1064
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1065 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1066 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046 1067
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1068#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1069 /* cursor (menuBar/scrollBar): Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050#endif 1071#endif
1051 1072
1052 /* the vt window */ 1073 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1074 TermWin.vt = XCreateSimpleWindow (disp, top,
1054 window_vt_x, 1075 window_vt_x,
1055 window_vt_y, 1076 window_vt_y,
1056 TermWin_TotalWidth (), 1077 TermWin_TotalWidth (),
1057 TermWin_TotalHeight (), 1078 TermWin_TotalHeight (),
1058 0, 1079 0,
1059 pix_colors_focused[Color_fg], 1080 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1081 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X 1082#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window"); 1083 XStoreName (disp, TermWin.vt, "vt window");
1063#endif 1084#endif
1064 1085
1065 attributes.bit_gravity = NorthWestGravity; 1086 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1067 1088
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069
1070 pointer_unblank ();
1071 1090
1072#ifdef POINTER_BLANK 1091#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1092 if (options & Opt_pointerBlank)
1074 vt_emask |= PointerMotionMask; 1093 vt_emask |= PointerMotionMask;
1075 else 1094 else
1076#endif 1095#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1096 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1097
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1098 XSelectInput (disp, TermWin.vt, vt_emask);
1080 vt_ev.start (display, TermWin.vt); 1099 vt_ev.start (display, TermWin.vt);
1081 1100
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1101#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ()) 1102 if (menuBar_height ())
1084 { 1103 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1104 menuBar.win = XCreateSimpleWindow (disp, top,
1086 window_vt_x, 0, 1105 window_vt_x, 0,
1087 TermWin_TotalWidth (), 1106 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (), 1107 menuBar_TotalHeight (),
1089 0, 1108 0,
1090 pix_colors_focused[Color_fg], 1109 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]); 1110 pix_colors_focused[Color_scroll]);
1092 1111
1093#ifdef DEBUG_X 1112#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar"); 1113 XStoreName (disp, menuBar.win, "menubar");
1095#endif 1114#endif
1096 1115
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1116 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098 1117
1099 XDefineCursor (display->display, menuBar.win, 1118 XDefineCursor (disp, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr)); 1119 XCreateFontCursor (disp, XC_left_ptr));
1101 1120
1102 XSelectInput (display->display, menuBar.win, 1121 XSelectInput (disp, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1122 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win); 1123 menubar_ev.start (display, menuBar.win);
1106 } 1124 }
1107#endif 1125#endif
1108 1126
1109#ifdef XPM_BACKGROUND 1127#ifdef XPM_BACKGROUND
… …
1125 1143
1126 /* graphics context for the vt window */ 1144 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1145 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1146 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1147 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1148 TermWin.gc = XCreateGC (disp, TermWin.vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1149 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1150 &gcvalue);
1133 1151
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1135 1153
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1155 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1157 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1143#endif 1161#endif
1144 1162
1145#ifdef OFF_FOCUS_FADING 1163#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1164 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1165 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1166 pix_colors = pix_colors_unfocused;
1149#endif 1167#endif
1150 1168
1169 pointer_unblank ();
1151 scr_recolour (); 1170 scr_recolour ();
1171
1172#if ENABLE_XEMBED
1173 if (rs[Rs_embed])
1174 {
1175 long info[2] = { 0, XEMBED_MAPPED };
1176
1177 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1178 32, PropModeReplace, (unsigned char *)&info, 2);
1179 }
1180#endif
1152} 1181}
1153 1182
1154/* ------------------------------------------------------------------------- * 1183/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1184 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1185 * ------------------------------------------------------------------------- */
… …
1385 * the slave. 1414 * the slave.
1386 */ 1415 */
1387void 1416void
1388rxvt_term::run_command (const char *const *argv) 1417rxvt_term::run_command (const char *const *argv)
1389{ 1418{
1419#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd])
1421 {
1422 pty.pty = atoi (rs[Rs_pty_fd]);
1423 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1424 }
1425 else
1426#endif
1390 if (!pty.get ()) 1427 if (!pty.get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1429
1393 pty.set_utf8_mode (enc_utf8); 1430 pty.set_utf8_mode (enc_utf8);
1394 1431
1395 /* set initial window size */ 1432 /* set initial window size */
1396 tt_winch (); 1433 tt_winch ();
… …
1406#endif 1443#endif
1407 er = -1; 1444 er = -1;
1408 1445
1409 rxvt_get_ttymode (&tio, er); 1446 rxvt_get_ttymode (&tio, er);
1410 1447
1448#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd])
1450 return;
1451#endif
1452
1411 sw_chld.start (SIGCHLD); 1453 sw_chld.start (SIGCHLD);
1412 1454
1413#ifndef __QNX__ 1455#ifndef __QNX__
1414 /* spin off the command interpreter */ 1456 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1457 switch (cmd_pid = fork ())
1416 { 1458 {
1417 case -1: 1459 case -1:
1460 {
1461 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1462 rxvt_fatal ("can't fork, aborting.\n");
1463 }
1419 case 0: 1464 case 0:
1420 init_env (); 1465 init_env ();
1421 1466
1422 if (!pty.make_controlling_tty ()) 1467 if (!pty.make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1468 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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