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