… | |
… | |
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 |
189 | "_NET_WM_PID", |
190 | "_NET_WM_PID", |
190 | "_MOTIF_WM_HINTS", |
191 | "_MOTIF_WM_HINTS", |
… | |
… | |
200 | #endif |
201 | #endif |
201 | #ifdef OFFIX_DND |
202 | #ifdef OFFIX_DND |
202 | "DndProtocol", |
203 | "DndProtocol", |
203 | "DndSelection", |
204 | "DndSelection", |
204 | #endif |
205 | #endif |
|
|
206 | #if ENABLE_XEMBED |
|
|
207 | "_XEMBED", |
|
|
208 | #endif |
205 | }; |
209 | }; |
206 | |
210 | |
207 | bool |
211 | bool |
208 | rxvt_term::init_vars () |
212 | rxvt_term::init_vars () |
209 | { |
213 | { |
… | |
… | |
225 | |
229 | |
226 | MEvent.time = CurrentTime; |
230 | MEvent.time = CurrentTime; |
227 | MEvent.button = AnyButton; |
231 | MEvent.button = AnyButton; |
228 | options = DEFAULT_OPTIONS; |
232 | options = DEFAULT_OPTIONS; |
229 | want_refresh = 1; |
233 | want_refresh = 1; |
230 | cmd_pid = -1; |
|
|
231 | pty.pty = pty.tty = -1; |
|
|
232 | priv_modes = SavedModes = PrivMode_Default; |
234 | priv_modes = SavedModes = PrivMode_Default; |
233 | TermWin.focus = 0; |
235 | TermWin.focus = 0; |
234 | TermWin.ncol = 80; |
236 | TermWin.ncol = 80; |
235 | TermWin.nrow = 24; |
237 | TermWin.nrow = 24; |
236 | TermWin.int_bwidth = INTERNALBORDERWIDTH; |
238 | TermWin.int_bwidth = INTERNALBORDERWIDTH; |
… | |
… | |
337 | */ |
339 | */ |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
340 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
339 | rs[Rs_display_name] = ":0"; |
341 | rs[Rs_display_name] = ":0"; |
340 | |
342 | |
341 | get_options (r_argc, r_argv); |
343 | get_options (r_argc, r_argv); |
342 | free (r_argv); |
|
|
343 | |
344 | |
344 | #ifdef LOCAL_X_IS_UNIX |
345 | #ifdef LOCAL_X_IS_UNIX |
345 | if (rs[Rs_display_name][0] == ':') |
346 | if (rs[Rs_display_name][0] == ':') |
346 | { |
347 | { |
347 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
348 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
… | |
… | |
354 | |
355 | |
355 | if (!display |
356 | if (!display |
356 | && ! (display = displays.get (rs[Rs_display_name]))) |
357 | && ! (display = displays.get (rs[Rs_display_name]))) |
357 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
358 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
358 | |
359 | |
359 | extract_resources (display->display, rs[Rs_name]); |
360 | extract_resources (); |
|
|
361 | free (r_argv); |
360 | |
362 | |
361 | /* |
363 | /* |
362 | * set any defaults not already set |
364 | * set any defaults not already set |
363 | */ |
365 | */ |
364 | if (cmd_argv && cmd_argv[0]) |
366 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
673 | if (scrollbar_visible ()) |
675 | if (scrollbar_visible ()) |
674 | { |
676 | { |
675 | priv_modes |= PrivMode_scrollBar; |
677 | priv_modes |= PrivMode_scrollBar; |
676 | SavedModes |= PrivMode_scrollBar; |
678 | SavedModes |= PrivMode_scrollBar; |
677 | } |
679 | } |
|
|
680 | |
678 | if (menubar_visible ()) |
681 | if (menubar_visible ()) |
679 | { |
682 | { |
680 | priv_modes |= PrivMode_menuBar; |
683 | priv_modes |= PrivMode_menuBar; |
681 | SavedModes |= PrivMode_menuBar; |
684 | SavedModes |= PrivMode_menuBar; |
682 | } |
685 | } |
… | |
… | |
830 | * Use resource ``modifier'' to override the Meta modifier |
833 | * Use resource ``modifier'' to override the Meta modifier |
831 | */ |
834 | */ |
832 | void |
835 | void |
833 | rxvt_term::get_ourmods () |
836 | rxvt_term::get_ourmods () |
834 | { |
837 | { |
835 | int i, j, k; |
838 | int i, j, k; |
836 | int requestedmeta, realmeta, realalt; |
839 | int requestedmeta, realmeta, realalt; |
837 | const char *cm, *rsmod; |
840 | const char *cm, *rsmod; |
838 | XModifierKeymap *map; |
841 | XModifierKeymap *map; |
839 | KeyCode *kc; |
842 | KeyCode *kc; |
840 | const unsigned int modmasks[] = |
843 | const unsigned int modmasks[] = |
841 | { |
844 | { |
842 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
845 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
843 | }; |
846 | }; |
844 | |
847 | |
… | |
… | |
926 | #endif |
929 | #endif |
927 | XGCValues gcvalue; |
930 | XGCValues gcvalue; |
928 | long vt_emask; |
931 | long vt_emask; |
929 | XSetWindowAttributes attributes; |
932 | XSetWindowAttributes attributes; |
930 | XWindowAttributes gattr; |
933 | XWindowAttributes gattr; |
|
|
934 | Window top; |
|
|
935 | dDisp; |
931 | |
936 | |
932 | #ifdef USING_W11LIB |
937 | #ifdef USING_W11LIB |
933 | /* enable W11 callbacks */ |
938 | /* enable W11 callbacks */ |
934 | W11AddEventHandler (display->display, rxvt_W11_process_x_event); |
939 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
935 | #endif |
940 | #endif |
936 | |
941 | |
937 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
942 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
938 | XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); |
943 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
939 | |
944 | |
940 | if (options & Opt_transparent) |
945 | if (options & Opt_transparent) |
941 | { |
946 | { |
942 | XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); |
947 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
943 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
948 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
944 | } |
949 | } |
945 | |
950 | |
946 | #if ENABLE_FRILLS |
951 | #if ENABLE_FRILLS |
947 | if (options & Opt_borderLess) |
952 | if (options & Opt_borderLess) |
948 | { |
953 | { |
949 | prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); |
954 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
950 | |
955 | |
951 | if (prop == None) |
956 | if (prop == None) |
952 | { |
957 | { |
953 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
958 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
954 | #ifdef PREFER_24BIT |
959 | #ifdef PREFER_24BIT |
… | |
… | |
972 | Get_Colours (); |
977 | Get_Colours (); |
973 | |
978 | |
974 | if (!set_fonts ()) |
979 | if (!set_fonts ()) |
975 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
980 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
976 | |
981 | |
|
|
982 | #if ENABLE_XEMBED |
|
|
983 | if (rs[Rs_embed]) |
|
|
984 | { |
|
|
985 | XWindowAttributes wattr; |
|
|
986 | |
|
|
987 | top = strtol (rs[Rs_embed], 0, 0); |
|
|
988 | |
|
|
989 | if (!XGetWindowAttributes (disp, top, &wattr)) |
|
|
990 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
|
|
991 | |
|
|
992 | window_calc (wattr.width, wattr.height); |
|
|
993 | |
|
|
994 | #if 0 |
|
|
995 | if (wattr.map_state == IsViewable) |
|
|
996 | { |
|
|
997 | TermWin.mapped = 1; |
|
|
998 | refresh_type = FAST_REFRESH; |
|
|
999 | XClearWindow (disp, top); |
|
|
1000 | // TODO: make XMapNotify-event-code a function and call it |
|
|
1001 | // TODO: how can I detetc visibility without unmpa/map? |
|
|
1002 | // TODO: focusin etc. |
|
|
1003 | } |
|
|
1004 | #else |
|
|
1005 | // it'S easiets just to unmap/map to get all state correctly set-up |
|
|
1006 | XUnmapWindow (disp, top); |
|
|
1007 | #endif |
|
|
1008 | } |
|
|
1009 | else |
|
|
1010 | #endif |
|
|
1011 | { |
977 | window_calc (0, 0); |
1012 | window_calc (0, 0); |
|
|
1013 | |
|
|
1014 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
|
|
1015 | #ifdef PREFER_24BIT |
|
|
1016 | attributes.background_pixel = pix_colors_focused[Color_border]; |
|
|
1017 | attributes.border_pixel = pix_colors_focused[Color_border]; |
|
|
1018 | attributes.colormap = display->cmap; |
|
|
1019 | top = XCreateWindow (disp, DefaultRootWindow (disp), |
|
|
1020 | szHint.x, szHint.y, |
|
|
1021 | szHint.width, szHint.height, |
|
|
1022 | TermWin.ext_bwidth, |
|
|
1023 | display->depth, InputOutput, |
|
|
1024 | display->visual, |
|
|
1025 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
|
|
1026 | #else |
|
|
1027 | top = XCreateSimpleWindow (disp, DefaultRootWindow (disp), |
|
|
1028 | szHint.x, szHint.y, |
|
|
1029 | szHint.width, szHint.height, |
|
|
1030 | TermWin.ext_bwidth, |
|
|
1031 | pix_colors_focused[Color_border], |
|
|
1032 | pix_colors_focused[Color_border]); |
|
|
1033 | #endif |
|
|
1034 | } |
|
|
1035 | |
|
|
1036 | TermWin.parent[0] = top; |
|
|
1037 | |
978 | old_width = szHint.width; |
1038 | old_width = szHint.width; |
979 | old_height = szHint.height; |
1039 | old_height = szHint.height; |
980 | |
|
|
981 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
|
|
982 | |
|
|
983 | #ifdef PREFER_24BIT |
|
|
984 | attributes.background_pixel = pix_colors_focused[Color_border]; |
|
|
985 | attributes.border_pixel = pix_colors_focused[Color_border]; |
|
|
986 | attributes.colormap = display->cmap; |
|
|
987 | TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), |
|
|
988 | szHint.x, szHint.y, |
|
|
989 | szHint.width, szHint.height, |
|
|
990 | TermWin.ext_bwidth, |
|
|
991 | display->depth, InputOutput, |
|
|
992 | display->visual, |
|
|
993 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
|
|
994 | #else |
|
|
995 | TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), |
|
|
996 | szHint.x, szHint.y, |
|
|
997 | szHint.width, szHint.height, |
|
|
998 | TermWin.ext_bwidth, |
|
|
999 | pix_colors_focused[Color_border], |
|
|
1000 | pix_colors_focused[Color_border]); |
|
|
1001 | #endif |
|
|
1002 | |
1040 | |
1003 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1041 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1004 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1042 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1005 | |
1043 | |
1006 | classHint.res_name = (char *)rs[Rs_name]; |
1044 | classHint.res_name = (char *)rs[Rs_name]; |
1007 | classHint.res_class = (char *)RESCLASS; |
1045 | classHint.res_class = (char *)RESCLASS; |
1008 | |
1046 | |
1009 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1047 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1010 | wmHint.input = True; |
1048 | wmHint.input = True; |
1011 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1049 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1012 | wmHint.window_group = TermWin.parent[0]; |
1050 | wmHint.window_group = top; |
1013 | |
1051 | |
1014 | XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, |
1052 | XSetWMProperties (disp, top, NULL, NULL, |
1015 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1053 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1016 | |
1054 | |
1017 | /* Enable delete window protocol */ |
1055 | /* Enable delete window protocol */ |
1018 | XSetWMProtocols (display->display, TermWin.parent[0], |
1056 | XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); |
1019 | &xa[XA_WMDELETEWINDOW], 1); |
|
|
1020 | |
1057 | |
1021 | #if ENABLE_FRILLS |
1058 | #if ENABLE_FRILLS |
1022 | long pid = getpid (); |
1059 | long pid = getpid (); |
1023 | |
1060 | |
1024 | XChangeProperty (display->display, TermWin.parent[0], |
1061 | XChangeProperty (disp, top, |
1025 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1062 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1026 | PropModeReplace, (unsigned char *)&pid, 1); |
1063 | PropModeReplace, (unsigned char *)&pid, 1); |
1027 | #endif |
1064 | #endif |
1028 | |
1065 | |
1029 | XSelectInput (display->display, TermWin.parent[0], |
1066 | XSelectInput (disp, top, |
1030 | KeyPressMask |
1067 | KeyPressMask |
1031 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1068 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1032 | | KeyReleaseMask |
1069 | | KeyReleaseMask |
1033 | #endif |
1070 | #endif |
1034 | | FocusChangeMask | VisibilityChangeMask |
1071 | | FocusChangeMask | VisibilityChangeMask |
1035 | | ExposureMask |
|
|
1036 | | StructureNotifyMask); |
1072 | | ExposureMask | StructureNotifyMask); |
|
|
1073 | |
1037 | termwin_ev.start (display, TermWin.parent[0]); |
1074 | termwin_ev.start (display, top); |
1038 | |
1075 | |
1039 | #if ENABLE_FRILLS |
1076 | #if ENABLE_FRILLS |
1040 | if (mwmhints.flags) |
1077 | if (mwmhints.flags) |
1041 | XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1078 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1042 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1079 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1043 | #endif |
1080 | #endif |
1044 | |
1081 | |
1045 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1082 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1046 | TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); |
1083 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1047 | |
1084 | |
1048 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1085 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1049 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1086 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1050 | leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); |
1087 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1051 | #endif |
1088 | #endif |
1052 | |
1089 | |
1053 | /* the vt window */ |
1090 | /* the vt window */ |
1054 | TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], |
1091 | TermWin.vt = XCreateSimpleWindow (disp, top, |
1055 | window_vt_x, |
1092 | window_vt_x, |
1056 | window_vt_y, |
1093 | window_vt_y, |
1057 | TermWin_TotalWidth (), |
1094 | TermWin_TotalWidth (), |
1058 | TermWin_TotalHeight (), |
1095 | TermWin_TotalHeight (), |
1059 | 0, |
1096 | 0, |
1060 | pix_colors_focused[Color_fg], |
1097 | pix_colors_focused[Color_fg], |
1061 | pix_colors_focused[Color_bg]); |
1098 | pix_colors_focused[Color_bg]); |
1062 | #ifdef DEBUG_X |
1099 | #ifdef DEBUG_X |
1063 | XStoreName (display->display, TermWin.vt, "vt window"); |
1100 | XStoreName (disp, TermWin.vt, "vt window"); |
1064 | #endif |
1101 | #endif |
1065 | |
1102 | |
1066 | attributes.bit_gravity = NorthWestGravity; |
1103 | attributes.bit_gravity = NorthWestGravity; |
1067 | XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); |
1104 | XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); |
1068 | |
1105 | |
1069 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1106 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1070 | |
1107 | |
1071 | pointer_unblank (); |
1108 | pointer_unblank (); |
1072 | |
1109 | |
… | |
… | |
1075 | vt_emask |= PointerMotionMask; |
1112 | vt_emask |= PointerMotionMask; |
1076 | else |
1113 | else |
1077 | #endif |
1114 | #endif |
1078 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1115 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1079 | |
1116 | |
1080 | XSelectInput (display->display, TermWin.vt, vt_emask); |
1117 | XSelectInput (disp, TermWin.vt, vt_emask); |
1081 | vt_ev.start (display, TermWin.vt); |
1118 | vt_ev.start (display, TermWin.vt); |
1082 | |
1119 | |
1083 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1120 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1084 | if (menuBar_height ()) |
1121 | if (menuBar_height ()) |
1085 | { |
1122 | { |
1086 | menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], |
1123 | menuBar.win = XCreateSimpleWindow (disp, top, |
1087 | window_vt_x, 0, |
1124 | window_vt_x, 0, |
1088 | TermWin_TotalWidth (), |
1125 | TermWin_TotalWidth (), |
1089 | menuBar_TotalHeight (), |
1126 | menuBar_TotalHeight (), |
1090 | 0, |
1127 | 0, |
1091 | pix_colors_focused[Color_fg], |
1128 | pix_colors_focused[Color_fg], |
1092 | pix_colors_focused[Color_scroll]); |
1129 | pix_colors_focused[Color_scroll]); |
1093 | |
1130 | |
1094 | #ifdef DEBUG_X |
1131 | #ifdef DEBUG_X |
1095 | XStoreName (display->display, menuBar.win, "menubar"); |
1132 | XStoreName (disp, menuBar.win, "menubar"); |
1096 | #endif |
1133 | #endif |
1097 | |
1134 | |
1098 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1135 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1099 | |
1136 | |
1100 | XDefineCursor (display->display, menuBar.win, |
1137 | XDefineCursor (disp, menuBar.win, |
1101 | XCreateFontCursor (display->display, XC_left_ptr)); |
1138 | XCreateFontCursor (disp, XC_left_ptr)); |
1102 | |
1139 | |
1103 | XSelectInput (display->display, menuBar.win, |
1140 | XSelectInput (disp, menuBar.win, |
1104 | (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1141 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
1105 | | Button1MotionMask)); |
|
|
1106 | menubar_ev.start (display, menuBar.win); |
1142 | menubar_ev.start (display, menuBar.win); |
1107 | } |
1143 | } |
1108 | #endif |
1144 | #endif |
1109 | |
1145 | |
1110 | #ifdef XPM_BACKGROUND |
1146 | #ifdef XPM_BACKGROUND |
… | |
… | |
1126 | |
1162 | |
1127 | /* graphics context for the vt window */ |
1163 | /* graphics context for the vt window */ |
1128 | gcvalue.foreground = pix_colors[Color_fg]; |
1164 | gcvalue.foreground = pix_colors[Color_fg]; |
1129 | gcvalue.background = pix_colors[Color_bg]; |
1165 | gcvalue.background = pix_colors[Color_bg]; |
1130 | gcvalue.graphics_exposures = 1; |
1166 | gcvalue.graphics_exposures = 1; |
1131 | TermWin.gc = XCreateGC (display->display, TermWin.vt, |
1167 | TermWin.gc = XCreateGC (disp, TermWin.vt, |
1132 | GCForeground | GCBackground | GCGraphicsExposures, |
1168 | GCForeground | GCBackground | GCGraphicsExposures, |
1133 | &gcvalue); |
1169 | &gcvalue); |
1134 | |
1170 | |
1135 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1171 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1136 | |
1172 | |
1137 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1173 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1138 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1174 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1139 | topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1175 | topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1140 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1176 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1141 | botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1177 | botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1142 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1178 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1143 | scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1179 | scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1144 | #endif |
1180 | #endif |
1145 | |
1181 | |
1146 | #ifdef OFF_FOCUS_FADING |
1182 | #ifdef OFF_FOCUS_FADING |
1147 | // initially we are in unfocused state |
1183 | // initially we are in unfocused state |
1148 | if (rs[Rs_fade]) |
1184 | if (rs[Rs_fade]) |
… | |
… | |
1386 | * the slave. |
1422 | * the slave. |
1387 | */ |
1423 | */ |
1388 | void |
1424 | void |
1389 | rxvt_term::run_command (const char *const *argv) |
1425 | rxvt_term::run_command (const char *const *argv) |
1390 | { |
1426 | { |
|
|
1427 | #if ENABLE_FRILLS |
|
|
1428 | if (rs[Rs_pty_fd]) |
|
|
1429 | { |
|
|
1430 | pty.pty = atoi (rs[Rs_pty_fd]); |
|
|
1431 | fcntl (pty.pty, F_SETFL, O_NONBLOCK); |
|
|
1432 | } |
|
|
1433 | else |
|
|
1434 | #endif |
1391 | if (!pty.get ()) |
1435 | if (!pty.get ()) |
1392 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1436 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1393 | |
1437 | |
1394 | pty.set_utf8_mode (enc_utf8); |
1438 | pty.set_utf8_mode (enc_utf8); |
1395 | |
1439 | |
1396 | /* set initial window size */ |
1440 | /* set initial window size */ |
1397 | tt_winch (); |
1441 | tt_winch (); |
… | |
… | |
1407 | #endif |
1451 | #endif |
1408 | er = -1; |
1452 | er = -1; |
1409 | |
1453 | |
1410 | rxvt_get_ttymode (&tio, er); |
1454 | rxvt_get_ttymode (&tio, er); |
1411 | |
1455 | |
|
|
1456 | #if ENABLE_FRILLS |
|
|
1457 | if (rs[Rs_pty_fd]) |
|
|
1458 | return; |
|
|
1459 | #endif |
|
|
1460 | |
1412 | sw_chld.start (SIGCHLD); |
1461 | sw_chld.start (SIGCHLD); |
1413 | |
1462 | |
1414 | #ifndef __QNX__ |
1463 | #ifndef __QNX__ |
1415 | /* spin off the command interpreter */ |
1464 | /* spin off the command interpreter */ |
1416 | switch (cmd_pid = fork ()) |
1465 | switch (cmd_pid = fork ()) |
1417 | { |
1466 | { |
1418 | case -1: |
1467 | case -1: |
|
|
1468 | { |
|
|
1469 | cmd_pid = 0; |
1419 | rxvt_fatal ("can't fork, aborting.\n"); |
1470 | rxvt_fatal ("can't fork, aborting.\n"); |
|
|
1471 | } |
1420 | case 0: |
1472 | case 0: |
1421 | init_env (); |
1473 | init_env (); |
1422 | |
1474 | |
1423 | if (!pty.make_controlling_tty ()) |
1475 | if (!pty.make_controlling_tty ()) |
1424 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1476 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |