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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
204#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
209{ 220{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 224#endif
217 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
… …
225 233
226 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 237 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 239 TermWin.focus = 0;
234 TermWin.ncol = 80; 240 TermWin.ncol = 80;
235 TermWin.nrow = 24; 241 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
337 */ 343 */
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
340 346
341 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 ();
342 free (r_argv); 353 free (r_argv);
343
344#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':')
346 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
348 strcpy (val, "unix");
349 strcat (val, rs[Rs_display_name]);
350 display = displays.get (val);
351 free (val);
352 }
353#endif
354
355 if (!display
356 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358
359 extract_resources (display->display, rs[Rs_name]);
360 354
361 /* 355 /*
362 * set any defaults not already set 356 * set any defaults not already set
363 */ 357 */
364 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
673 if (scrollbar_visible ()) 667 if (scrollbar_visible ())
674 { 668 {
675 priv_modes |= PrivMode_scrollBar; 669 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 670 SavedModes |= PrivMode_scrollBar;
677 } 671 }
672
678 if (menubar_visible ()) 673 if (menubar_visible ())
679 { 674 {
680 priv_modes |= PrivMode_menuBar; 675 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 676 SavedModes |= PrivMode_menuBar;
682 } 677 }
… …
742 } 737 }
743 } 738 }
744 } 739 }
745 740
746 pix_colors[i] = xcol; 741 pix_colors[i] = xcol;
742 SET_PIXCOLOR (i);
743 }
744
747#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 746 if (rs[Rs_fade])
747 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 748 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 749#endif
751 SET_PIXCOLOR (i);
752 }
753 750
754 if (display->depth <= 2) 751 if (display->depth <= 2)
755 { 752 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 753 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
765 * from the fvwm window manager. 762 * from the fvwm window manager.
766 */ 763 */
767#ifdef KEEP_SCROLLCOLOR 764#ifdef KEEP_SCROLLCOLOR
768 765
769 if (display->depth <= 2) 766 if (display->depth <= 2)
767 {
770 { /* Monochrome */ 768 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 769 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 772 }
775 else 773 else
… …
830 * Use resource ``modifier'' to override the Meta modifier 828 * Use resource ``modifier'' to override the Meta modifier
831 */ 829 */
832void 830void
833rxvt_term::get_ourmods () 831rxvt_term::get_ourmods ()
834{ 832{
835 int i, j, k; 833 int i, j, k;
836 int requestedmeta, realmeta, realalt; 834 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 835 const char *cm, *rsmod;
838 XModifierKeymap *map; 836 XModifierKeymap *map;
839 KeyCode *kc; 837 KeyCode *kc;
840 const unsigned int modmasks[] = 838 const unsigned int modmasks[] =
841 { 839 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 840 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 841 };
844 842
… …
926#endif 924#endif
927 XGCValues gcvalue; 925 XGCValues gcvalue;
928 long vt_emask; 926 long vt_emask;
929 XSetWindowAttributes attributes; 927 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 928 XWindowAttributes gattr;
929 Window top, parent;
930 dDisp;
931 931
932#ifdef USING_W11LIB 932#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 933 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 935#endif
936 936
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 939
940 if (options & Opt_transparent) 940 if (options & Opt_transparent)
941 { 941 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 944 }
945 945
946#if ENABLE_FRILLS 946#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 947 if (options & Opt_borderLess)
948 { 948 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 950
951 if (prop == None) 951 if (prop == None)
952 { 952 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 954#ifdef PREFER_24BIT
… …
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 961 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0; 962 mwmhints.decorations = 0;
963 } 963 }
964 } 964 }
965 else 965 else
966 {
967 mwmhints.flags = 0; 966 mwmhints.flags = 0;
968 }
969#endif 967#endif
970 968
971 /* grab colors before netscape does */ 969 /* grab colors before netscape does */
972 Get_Colours (); 970 Get_Colours ();
973 971
974 if (!set_fonts ()) 972 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED
978 if (rs[Rs_embed])
979 {
980 XWindowAttributes wattr;
981
982 parent = strtol (rs[Rs_embed], 0, 0);
983
984 if (!XGetWindowAttributes (disp, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986
987 window_calc (wattr.width, wattr.height);
988 }
989
990#endif
977 window_calc (0, 0); 991 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 992
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 993 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 994#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 995 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 996 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 997 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 998 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 999 szHint.x, szHint.y,
989 szHint.width, szHint.height, 1000 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 1001 TermWin.ext_bwidth,
991 display->depth, InputOutput, 1002 display->depth, InputOutput,
992 display->visual, 1003 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1005#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1006 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1007 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1008 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1009 TermWin.ext_bwidth,
999 pix_colors_focused[Color_border], 1010 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1011 pix_colors_focused[Color_border]);
1001#endif 1012#endif
1013
1014 TermWin.parent[0] = top;
1015
1016 old_width = szHint.width;
1017 old_height = szHint.height;
1002 1018
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1021
1006 classHint.res_name = (char *)rs[Rs_name]; 1022 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1023 classHint.res_class = (char *)RESCLASS;
1008 1024
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1025 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1026 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1028 wmHint.window_group = top;
1013 1029
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1016 1032
1017 /* Enable delete window protocol */ 1033 Atom protocols[] = {
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1034 xa[XA_WM_DELETE_WINDOW],
1019 &xa[XA_WMDELETEWINDOW], 1); 1035#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING],
1037#endif
1038 };
1020 1039
1021#if ENABLE_FRILLS 1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041
1042#if ENABLE_EWMH
1022 long pid = getpid (); 1043 long pid = getpid ();
1023 1044
1024 XChangeProperty (display->display, TermWin.parent[0], 1045 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1047 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif
1028 1048
1029 XSelectInput (display->display, TermWin.parent[0], 1049 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif
1051
1052 XSelectInput (disp, top,
1030 KeyPressMask 1053 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1055 | KeyReleaseMask
1033#endif 1056#endif
1034 | FocusChangeMask | VisibilityChangeMask 1057 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1058 | ExposureMask | StructureNotifyMask);
1059
1037 termwin_ev.start (display, TermWin.parent[0]); 1060 termwin_ev.start (display, top);
1038 1061
1039#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1063 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1066#endif
1044 1067
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1068 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1070
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1072 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1074#endif
1052 1075
1053 /* the vt window */ 1076 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1077 TermWin.vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1078 window_vt_x,
1056 window_vt_y, 1079 window_vt_y,
1057 TermWin_TotalWidth (), 1080 TermWin_TotalWidth (),
1058 TermWin_TotalHeight (), 1081 TermWin_TotalHeight (),
1059 0, 1082 0,
1060 pix_colors_focused[Color_fg], 1083 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1084 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1085#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1086 XStoreName (disp, TermWin.vt, "vt window");
1064#endif 1087#endif
1065 1088
1066 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1068 1091
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070
1071 pointer_unblank ();
1072 1093
1073#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
1074 if (options & Opt_pointerBlank) 1095 if (options & Opt_pointerBlank)
1075 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1076 else 1097 else
1077#endif 1098#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1099 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1100
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1101 XSelectInput (disp, TermWin.vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1102 vt_ev.start (display, TermWin.vt);
1082 1103
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1105 if (menuBar_height ())
1085 { 1106 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1107 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1108 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1109 TermWin_TotalWidth (),
1089 menuBar_TotalHeight (), 1110 menuBar_TotalHeight (),
1090 0, 1111 0,
1091 pix_colors_focused[Color_fg], 1112 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1113 pix_colors_focused[Color_scroll]);
1093 1114
1094#ifdef DEBUG_X 1115#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1116 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1117#endif
1097 1118
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1120
1100 XDefineCursor (display->display, menuBar.win, 1121 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1122 XCreateFontCursor (disp, XC_left_ptr));
1102 1123
1103 XSelectInput (display->display, menuBar.win, 1124 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1126 menubar_ev.start (display, menuBar.win);
1107 } 1127 }
1108#endif 1128#endif
1109 1129
1110#ifdef XPM_BACKGROUND 1130#ifdef XPM_BACKGROUND
… …
1126 1146
1127 /* graphics context for the vt window */ 1147 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1148 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1149 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1150 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1151 TermWin.gc = XCreateGC (disp, TermWin.vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1152 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1153 &gcvalue);
1134 1154
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1136 1156
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1158 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1160 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1144#endif 1164#endif
1145 1165
1146#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1167 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1168 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1169 pix_colors = pix_colors_unfocused;
1150#endif 1170#endif
1151 1171
1172 pointer_unblank ();
1152 scr_recolour (); 1173 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1153} 1184}
1154 1185
1155/* ------------------------------------------------------------------------- * 1186/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1187 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1188 * ------------------------------------------------------------------------- */
… …
1171 tio->c_cc[VKILL] = CKILL; 1202 tio->c_cc[VKILL] = CKILL;
1172 tio->c_cc[VSTART] = CSTART; 1203 tio->c_cc[VSTART] = CSTART;
1173 tio->c_cc[VSTOP] = CSTOP; 1204 tio->c_cc[VSTOP] = CSTOP;
1174 tio->c_cc[VSUSP] = CSUSP; 1205 tio->c_cc[VSUSP] = CSUSP;
1175# ifdef VDSUSP 1206# ifdef VDSUSP
1176
1177 tio->c_cc[VDSUSP] = CDSUSP; 1207 tio->c_cc[VDSUSP] = CDSUSP;
1178# endif 1208# endif
1179# ifdef VREPRINT 1209# ifdef VREPRINT
1180
1181 tio->c_cc[VREPRINT] = CRPRNT; 1210 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif 1211# endif
1183# ifdef VDISCRD 1212# ifdef VDISCRD
1184
1185 tio->c_cc[VDISCRD] = CFLUSH; 1213 tio->c_cc[VDISCRD] = CFLUSH;
1186# endif 1214# endif
1187# ifdef VWERSE 1215# ifdef VWERSE
1188
1189 tio->c_cc[VWERSE] = CWERASE; 1216 tio->c_cc[VWERSE] = CWERASE;
1190# endif 1217# endif
1191# ifdef VLNEXT 1218# ifdef VLNEXT
1192
1193 tio->c_cc[VLNEXT] = CLNEXT; 1219 tio->c_cc[VLNEXT] = CLNEXT;
1194# endif 1220# endif
1195
1196 } 1221 }
1222
1197 tio->c_cc[VEOF] = CEOF; 1223 tio->c_cc[VEOF] = CEOF;
1198 tio->c_cc[VEOL] = VDISABLE; 1224 tio->c_cc[VEOL] = VDISABLE;
1199# ifdef VEOL2 1225# ifdef VEOL2
1200
1201 tio->c_cc[VEOL2] = VDISABLE; 1226 tio->c_cc[VEOL2] = VDISABLE;
1202# endif 1227# endif
1203# ifdef VSWTC 1228# ifdef VSWTC
1204
1205 tio->c_cc[VSWTC] = VDISABLE; 1229 tio->c_cc[VSWTC] = VDISABLE;
1206# endif 1230# endif
1207# ifdef VSWTCH 1231# ifdef VSWTCH
1208
1209 tio->c_cc[VSWTCH] = VDISABLE; 1232 tio->c_cc[VSWTCH] = VDISABLE;
1210# endif 1233# endif
1211# if VMIN != VEOF 1234# if VMIN != VEOF
1212
1213 tio->c_cc[VMIN] = 1; 1235 tio->c_cc[VMIN] = 1;
1214# endif 1236# endif
1215# if VTIME != VEOL 1237# if VTIME != VEOL
1216
1217 tio->c_cc[VTIME] = 0; 1238 tio->c_cc[VTIME] = 0;
1218# endif 1239# endif
1219 1240
1220 if (erase != -1) 1241 if (erase != -1)
1221 tio->c_cc[VERASE] = (char)erase; 1242 tio->c_cc[VERASE] = (char)erase;
… …
1249 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1250 { 1271 {
1251 tio->sg.sg_erase = CERASE; /* ^H */ 1272 tio->sg.sg_erase = CERASE; /* ^H */
1252 tio->sg.sg_kill = CKILL; /* ^U */ 1273 tio->sg.sg_kill = CKILL; /* ^U */
1253 } 1274 }
1275
1254 if (erase != -1) 1276 if (erase != -1)
1255 tio->sg.sg_erase = (char)erase; 1277 tio->sg.sg_erase = (char)erase;
1256 1278
1257 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1258 1280
… …
1264 tio->tc.t_startc = CSTART; /* ^Q */ 1286 tio->tc.t_startc = CSTART; /* ^Q */
1265 tio->tc.t_stopc = CSTOP; /* ^S */ 1287 tio->tc.t_stopc = CSTOP; /* ^S */
1266 tio->tc.t_eofc = CEOF; /* ^D */ 1288 tio->tc.t_eofc = CEOF; /* ^D */
1267 tio->tc.t_brkc = -1; 1289 tio->tc.t_brkc = -1;
1268 } 1290 }
1291
1269 /* get local special chars */ 1292 /* get local special chars */
1270 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1271 { 1294 {
1272 tio->lc.t_suspc = CSUSP; /* ^Z */ 1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1273 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1277 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1278 } 1301 }
1279 /* get line discipline */ 1302 /* get line discipline */
1280 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1281# ifdef NTTYDISC 1304# ifdef NTTYDISC
1282
1283 tio->line = NTTYDISC; 1305 tio->line = NTTYDISC;
1284# endif /* NTTYDISC */ 1306# endif /* NTTYDISC */
1285 1307
1286 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1287#endif /* HAVE_TERMIOS_H */ 1309#endif /* HAVE_TERMIOS_H */
… …
1310 FOO (IGNCR, "IGNCR"); 1332 FOO (IGNCR, "IGNCR");
1311 FOO (ICRNL, "ICRNL"); 1333 FOO (ICRNL, "ICRNL");
1312 FOO (IXON, "IXON"); 1334 FOO (IXON, "IXON");
1313 FOO (IXOFF, "IXOFF"); 1335 FOO (IXOFF, "IXOFF");
1314# ifdef IUCLC 1336# ifdef IUCLC
1315
1316 FOO (IUCLC, "IUCLC"); 1337 FOO (IUCLC, "IUCLC");
1317# endif 1338# endif
1318# ifdef IXANY 1339# ifdef IXANY
1319
1320 FOO (IXANY, "IXANY"); 1340 FOO (IXANY, "IXANY");
1321# endif 1341# endif
1322# ifdef IMAXBEL 1342# ifdef IMAXBEL
1323
1324 FOO (IMAXBEL, "IMAXBEL"); 1343 FOO (IMAXBEL, "IMAXBEL");
1325# endif 1344# endif
1326 1345
1327 fprintf (stderr, "\n"); 1346 fprintf (stderr, "\n");
1328 1347
… …
1335 FOO (VERASE, "VERASE"); 1354 FOO (VERASE, "VERASE");
1336 FOO (VKILL, "VKILL"); 1355 FOO (VKILL, "VKILL");
1337 FOO (VEOF, "VEOF"); 1356 FOO (VEOF, "VEOF");
1338 FOO (VEOL, "VEOL"); 1357 FOO (VEOL, "VEOL");
1339# ifdef VEOL2 1358# ifdef VEOL2
1340
1341 FOO (VEOL2, "VEOL2"); 1359 FOO (VEOL2, "VEOL2");
1342# endif 1360# endif
1343# ifdef VSWTC 1361# ifdef VSWTC
1344
1345 FOO (VSWTC, "VSWTC"); 1362 FOO (VSWTC, "VSWTC");
1346# endif 1363# endif
1347# ifdef VSWTCH 1364# ifdef VSWTCH
1348
1349 FOO (VSWTCH, "VSWTCH"); 1365 FOO (VSWTCH, "VSWTCH");
1350# endif 1366# endif
1351
1352 FOO (VSTART, "VSTART"); 1367 FOO (VSTART, "VSTART");
1353 FOO (VSTOP, "VSTOP"); 1368 FOO (VSTOP, "VSTOP");
1354 FOO (VSUSP, "VSUSP"); 1369 FOO (VSUSP, "VSUSP");
1355# ifdef VDSUSP 1370# ifdef VDSUSP
1356
1357 FOO (VDSUSP, "VDSUSP"); 1371 FOO (VDSUSP, "VDSUSP");
1358# endif 1372# endif
1359# ifdef VREPRINT 1373# ifdef VREPRINT
1360
1361 FOO (VREPRINT, "VREPRINT"); 1374 FOO (VREPRINT, "VREPRINT");
1362# endif 1375# endif
1363# ifdef VDISCRD 1376# ifdef VDISCRD
1364
1365 FOO (VDISCRD, "VDISCRD"); 1377 FOO (VDISCRD, "VDISCRD");
1366# endif 1378# endif
1367# ifdef VWERSE 1379# ifdef VWERSE
1368
1369 FOO (VWERSE, "VWERSE"); 1380 FOO (VWERSE, "VWERSE");
1370# endif 1381# endif
1371# ifdef VLNEXT 1382# ifdef VLNEXT
1372
1373 FOO (VLNEXT, "VLNEXT"); 1383 FOO (VLNEXT, "VLNEXT");
1374# endif 1384# endif
1375 1385
1376 fprintf (stderr, "\n"); 1386 fprintf (stderr, "\n");
1377# undef FOO 1387# undef FOO
… …
1386 * the slave. 1396 * the slave.
1387 */ 1397 */
1388void 1398void
1389rxvt_term::run_command (const char *const *argv) 1399rxvt_term::run_command (const char *const *argv)
1390{ 1400{
1401#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd])
1403 {
1404 pty.pty = atoi (rs[Rs_pty_fd]);
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1406 }
1407 else
1408#endif
1391 if (!pty.get ()) 1409 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1411
1394 pty.set_utf8_mode (enc_utf8); 1412 pty.set_utf8_mode (enc_utf8);
1395 1413
1396 /* set initial window size */ 1414 /* set initial window size */
1397 tt_winch (); 1415 tt_winch ();
… …
1407#endif 1425#endif
1408 er = -1; 1426 er = -1;
1409 1427
1410 rxvt_get_ttymode (&tio, er); 1428 rxvt_get_ttymode (&tio, er);
1411 1429
1412 sw_chld.start (SIGCHLD); 1430#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd])
1432 return;
1433#endif
1413 1434
1414#ifndef __QNX__ 1435#ifndef __QNX__
1415 /* spin off the command interpreter */ 1436 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1437 switch (cmd_pid = fork ())
1417 { 1438 {
1418 case -1: 1439 case -1:
1440 {
1441 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1442 rxvt_fatal ("can't fork, aborting.\n");
1443 }
1420 case 0: 1444 case 0:
1421 init_env (); 1445 init_env ();
1422 1446
1423 if (!pty.make_controlling_tty ()) 1447 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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