[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.110 by root, Thu Feb 17 15:07:48 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
176	const char *const xa_names[] =	179	const 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
207	bool	218	bool
208	rxvt_term::init_vars ()	219	rxvt_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;
…		…
336	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337	rs[Rs_display_name] = ":0";	345	rs[Rs_display_name] = ":0";
338		346
339	get_options (r_argc, r_argv);	347	get_options (r_argc, r_argv);
340		348
341	#ifdef LOCAL_X_IS_UNIX
342	if (rs[Rs_display_name][0] == ':')
343	{
344	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345	strcpy (val, "unix");
346	strcat (val, rs[Rs_display_name]);
347	display = displays.get (val);
348	free (val);
349	}
350	#endif
351
352	if (!display
353	&& ! (display = displays.get (rs[Rs_display_name])))	349	if (!(display = displays.get (rs[Rs_display_name])))
354	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	350	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355		351
356	extract_resources ();	352	extract_resources ();
357	free (r_argv);	353	free (r_argv);
358		354
…		…
741	}	737	}
742	}	738	}
743	}	739	}
744		740
745	pix_colors[i] = xcol;	741	pix_colors[i] = xcol;
		742	SET_PIXCOLOR (i);
		743	}
		744
746	#ifdef OFF_FOCUS_FADING	745	#ifdef OFF_FOCUS_FADING
747	if (rs[Rs_fade])	746	if (rs[Rs_fade])
		747	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748	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]);
749	#endif	749	#endif
750	SET_PIXCOLOR (i);
751	}
752		750
753	if (display->depth <= 2)	751	if (display->depth <= 2)
754	{	752	{
755	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];
756	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];
…		…
764	* from the fvwm window manager.	762	* from the fvwm window manager.
765	*/	763	*/
766	#ifdef KEEP_SCROLLCOLOR	764	#ifdef KEEP_SCROLLCOLOR
767		765
768	if (display->depth <= 2)	766	if (display->depth <= 2)
		767	{
769	{ /* Monochrome */	768	/* Monochrome */
770	pix_colors[Color_scroll] = pix_colors[Color_fg];	769	pix_colors[Color_scroll] = pix_colors[Color_fg];
771	pix_colors[Color_topShadow] = pix_colors[Color_bg];	770	pix_colors[Color_topShadow] = pix_colors[Color_bg];
772	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	771	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773	}	772	}
774	else	773	else
…		…
925	#endif	924	#endif
926	XGCValues gcvalue;	925	XGCValues gcvalue;
927	long vt_emask;	926	long vt_emask;
928	XSetWindowAttributes attributes;	927	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;	928	XWindowAttributes gattr;
930	Window top;	929	Window top, parent;
931	dDisp;	930	dDisp;
932		931
933	#ifdef USING_W11LIB	932	#ifdef USING_W11LIB
934	/* enable W11 callbacks */	933	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);	934	W11AddEventHandler (disp, rxvt_W11_process_x_event);
…		…
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	961	mwmhints.flags = MWM_HINTS_DECORATIONS;
963	mwmhints.decorations = 0;	962	mwmhints.decorations = 0;
964	}	963	}
965	}	964	}
966	else	965	else
967	{
968	mwmhints.flags = 0;	966	mwmhints.flags = 0;
969	}
970	#endif	967	#endif
971		968
972	/* grab colors before netscape does */	969	/* grab colors before netscape does */
973	Get_Colours ();	970	Get_Colours ();
974		971
975	if (!set_fonts ())	972	if (!set_fonts ())
976	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");
977		974
978	#if ENABLE_FRILLS	975	parent = DefaultRootWindow (disp);
		976
		977	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	978	if (rs[Rs_embed])
980	{	979	{
981	top = strtol (rs[Rs_embed], 0, 0);
982
983	XWindowAttributes wattr;	980	XWindowAttributes wattr;
		981
		982	parent = strtol (rs[Rs_embed], 0, 0);
		983
984	XGetWindowAttributes (disp, top, &wattr);	984	if (!XGetWindowAttributes (disp, parent, &wattr))
		985	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985		986
986	window_calc (wattr.width, wattr.height);	987	window_calc (wattr.width, wattr.height);
		988	}
987		989
988	#if 0	990	#endif
989	if (wattr.map_state == IsViewable)	991	window_calc (0, 0);
990	{	992
991	TermWin.mapped = 1;	993	/* sub-window placement & size in rxvt_resize_subwindows () */
992	refresh_type = FAST_REFRESH;	994	#ifdef PREFER_24BIT
993	XClearWindow (disp, top);	995	attributes.background_pixel = pix_colors_focused[Color_border];
994	// TODO: make XMapNotify-event-code a function and call it	996	attributes.border_pixel = pix_colors_focused[Color_border];
995	// TODO: how can I detetc visibility without unmpa/map?	997	attributes.colormap = display->cmap;
996	// TODO: focusin etc.	998	top = XCreateWindow (disp, parent,
997	}	999	szHint.x, szHint.y,
		1000	szHint.width, szHint.height,
		1001	TermWin.ext_bwidth,
		1002	display->depth, InputOutput,
		1003	display->visual,
		1004	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
998	#else	1005	#else
999	// it'S easiets just to unmap/map to get all state correctly set-up	1006	top = XCreateSimpleWindow (disp, parent,
1000	XUnmapWindow (disp, top);
1001	#endif
1002	}
1003	else
1004	#endif
1005	{
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,	1007	szHint.x, szHint.y,
1015	szHint.width, szHint.height,	1008	szHint.width, szHint.height,
1016	TermWin.ext_bwidth,	1009	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],	1010	pix_colors_focused[Color_border],
1026	pix_colors_focused[Color_border]);	1011	pix_colors_focused[Color_border]);
1027	#endif	1012	#endif
1028	}
1029		1013
1030	TermWin.parent[0] = top;	1014	TermWin.parent[0] = top;
1031		1015
1032	old_width = szHint.width;	1016	old_width = szHint.width;
1033	old_height = szHint.height;	1017	old_height = szHint.height;
…		…
1041	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1025	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1042	wmHint.input = True;	1026	wmHint.input = True;
1043	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1027	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1044	wmHint.window_group = top;	1028	wmHint.window_group = top;
1045		1029
1046	XSetWMProperties (disp, top, NULL, NULL,	1030	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1047	(char **)argv, argc, &szHint, &wmHint, &classHint);	1031	&szHint, &wmHint, &classHint);
1048		1032
1049	/* Enable delete window protocol */	1033	Atom protocols[] = {
1050	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);	1034	xa[XA_WM_DELETE_WINDOW],
		1035	#if ENABLE_EWMH
		1036	xa[XA_NET_WM_PING],
		1037	#endif
		1038	};
1051		1039
1052	#if ENABLE_FRILLS	1040	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1041
		1042	#if ENABLE_EWMH
1053	long pid = getpid ();	1043	long pid = getpid ();
1054		1044
1055	XChangeProperty (disp, top,	1045	XChangeProperty (disp, top,
1056	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1046	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1057	PropModeReplace, (unsigned char *)&pid, 1);	1047	PropModeReplace, (unsigned char *)&pid, 1);
		1048
		1049	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058	#endif	1050	#endif
1059		1051
1060	XSelectInput (disp, top,	1052	XSelectInput (disp, top,
1061	KeyPressMask	1053	KeyPressMask
1062	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1054	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1063	\| KeyReleaseMask	1055	\| KeyReleaseMask
1064	#endif	1056	#endif
1065	\| FocusChangeMask \| VisibilityChangeMask	1057	\| FocusChangeMask \| VisibilityChangeMask
1066	\| ExposureMask
1067	\| StructureNotifyMask);	1058	\| ExposureMask \| StructureNotifyMask);
		1059
1068	termwin_ev.start (display, top);	1060	termwin_ev.start (display, top);
1069		1061
1070	#if ENABLE_FRILLS	1062	#if ENABLE_FRILLS
1071	if (mwmhints.flags)	1063	if (mwmhints.flags)
1072	XChangeProperty (disp, top, 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,
…		…
1097	attributes.bit_gravity = NorthWestGravity;	1089	attributes.bit_gravity = NorthWestGravity;
1098	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1090	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1099		1091
1100	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1092	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1101		1093
1102	pointer_unblank ();
1103
1104	#ifdef POINTER_BLANK	1094	#ifdef POINTER_BLANK
1105	if (options & Opt_pointerBlank)	1095	if (options & Opt_pointerBlank)
1106	vt_emask \|= PointerMotionMask;	1096	vt_emask \|= PointerMotionMask;
1107	else	1097	else
1108	#endif	1098	#endif
…		…
1177	// initially we are in unfocused state	1167	// initially we are in unfocused state
1178	if (rs[Rs_fade])	1168	if (rs[Rs_fade])
1179	pix_colors = pix_colors_unfocused;	1169	pix_colors = pix_colors_unfocused;
1180	#endif	1170	#endif
1181		1171
		1172	pointer_unblank ();
1182	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
1183	}	1184	}
1184		1185
1185	/* ------------------------------------------------------------------------- *	1186	/* ------------------------------------------------------------------------- *
1186	* GET TTY CURRENT STATE *	1187	* GET TTY CURRENT STATE *
1187	* ------------------------------------------------------------------------- */	1188	* ------------------------------------------------------------------------- */
…		…
1201	tio->c_cc[VKILL] = CKILL;	1202	tio->c_cc[VKILL] = CKILL;
1202	tio->c_cc[VSTART] = CSTART;	1203	tio->c_cc[VSTART] = CSTART;
1203	tio->c_cc[VSTOP] = CSTOP;	1204	tio->c_cc[VSTOP] = CSTOP;
1204	tio->c_cc[VSUSP] = CSUSP;	1205	tio->c_cc[VSUSP] = CSUSP;
1205	# ifdef VDSUSP	1206	# ifdef VDSUSP
1206
1207	tio->c_cc[VDSUSP] = CDSUSP;	1207	tio->c_cc[VDSUSP] = CDSUSP;
1208	# endif	1208	# endif
1209	# ifdef VREPRINT	1209	# ifdef VREPRINT
1210
1211	tio->c_cc[VREPRINT] = CRPRNT;	1210	tio->c_cc[VREPRINT] = CRPRNT;
1212	# endif	1211	# endif
1213	# ifdef VDISCRD	1212	# ifdef VDISCRD
1214
1215	tio->c_cc[VDISCRD] = CFLUSH;	1213	tio->c_cc[VDISCRD] = CFLUSH;
1216	# endif	1214	# endif
1217	# ifdef VWERSE	1215	# ifdef VWERSE
1218
1219	tio->c_cc[VWERSE] = CWERASE;	1216	tio->c_cc[VWERSE] = CWERASE;
1220	# endif	1217	# endif
1221	# ifdef VLNEXT	1218	# ifdef VLNEXT
1222
1223	tio->c_cc[VLNEXT] = CLNEXT;	1219	tio->c_cc[VLNEXT] = CLNEXT;
1224	# endif	1220	# endif
1225
1226	}	1221	}
		1222
1227	tio->c_cc[VEOF] = CEOF;	1223	tio->c_cc[VEOF] = CEOF;
1228	tio->c_cc[VEOL] = VDISABLE;	1224	tio->c_cc[VEOL] = VDISABLE;
1229	# ifdef VEOL2	1225	# ifdef VEOL2
1230
1231	tio->c_cc[VEOL2] = VDISABLE;	1226	tio->c_cc[VEOL2] = VDISABLE;
1232	# endif	1227	# endif
1233	# ifdef VSWTC	1228	# ifdef VSWTC
1234
1235	tio->c_cc[VSWTC] = VDISABLE;	1229	tio->c_cc[VSWTC] = VDISABLE;
1236	# endif	1230	# endif
1237	# ifdef VSWTCH	1231	# ifdef VSWTCH
1238
1239	tio->c_cc[VSWTCH] = VDISABLE;	1232	tio->c_cc[VSWTCH] = VDISABLE;
1240	# endif	1233	# endif
1241	# if VMIN != VEOF	1234	# if VMIN != VEOF
1242
1243	tio->c_cc[VMIN] = 1;	1235	tio->c_cc[VMIN] = 1;
1244	# endif	1236	# endif
1245	# if VTIME != VEOL	1237	# if VTIME != VEOL
1246
1247	tio->c_cc[VTIME] = 0;	1238	tio->c_cc[VTIME] = 0;
1248	# endif	1239	# endif
1249		1240
1250	if (erase != -1)	1241	if (erase != -1)
1251	tio->c_cc[VERASE] = (char)erase;	1242	tio->c_cc[VERASE] = (char)erase;
…		…
1279	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1270	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1280	{	1271	{
1281	tio->sg.sg_erase = CERASE; /* ^H */	1272	tio->sg.sg_erase = CERASE; /* ^H */
1282	tio->sg.sg_kill = CKILL; /* ^U */	1273	tio->sg.sg_kill = CKILL; /* ^U */
1283	}	1274	}
		1275
1284	if (erase != -1)	1276	if (erase != -1)
1285	tio->sg.sg_erase = (char)erase;	1277	tio->sg.sg_erase = (char)erase;
1286		1278
1287	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1279	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1288		1280
…		…
1294	tio->tc.t_startc = CSTART; /* ^Q */	1286	tio->tc.t_startc = CSTART; /* ^Q */
1295	tio->tc.t_stopc = CSTOP; /* ^S */	1287	tio->tc.t_stopc = CSTOP; /* ^S */
1296	tio->tc.t_eofc = CEOF; /* ^D */	1288	tio->tc.t_eofc = CEOF; /* ^D */
1297	tio->tc.t_brkc = -1;	1289	tio->tc.t_brkc = -1;
1298	}	1290	}
		1291
1299	/* get local special chars */	1292	/* get local special chars */
1300	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1293	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1301	{	1294	{
1302	tio->lc.t_suspc = CSUSP; /* ^Z */	1295	tio->lc.t_suspc = CSUSP; /* ^Z */
1303	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1296	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1307	tio->lc.t_lnextc = CLNEXT; /* ^V */	1300	tio->lc.t_lnextc = CLNEXT; /* ^V */
1308	}	1301	}
1309	/* get line discipline */	1302	/* get line discipline */
1310	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1303	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1311	# ifdef NTTYDISC	1304	# ifdef NTTYDISC
1312
1313	tio->line = NTTYDISC;	1305	tio->line = NTTYDISC;
1314	# endif /* NTTYDISC */	1306	# endif /* NTTYDISC */
1315		1307
1316	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1308	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1317	#endif /* HAVE_TERMIOS_H */	1309	#endif /* HAVE_TERMIOS_H */
…		…
1340	FOO (IGNCR, "IGNCR");	1332	FOO (IGNCR, "IGNCR");
1341	FOO (ICRNL, "ICRNL");	1333	FOO (ICRNL, "ICRNL");
1342	FOO (IXON, "IXON");	1334	FOO (IXON, "IXON");
1343	FOO (IXOFF, "IXOFF");	1335	FOO (IXOFF, "IXOFF");
1344	# ifdef IUCLC	1336	# ifdef IUCLC
1345
1346	FOO (IUCLC, "IUCLC");	1337	FOO (IUCLC, "IUCLC");
1347	# endif	1338	# endif
1348	# ifdef IXANY	1339	# ifdef IXANY
1349
1350	FOO (IXANY, "IXANY");	1340	FOO (IXANY, "IXANY");
1351	# endif	1341	# endif
1352	# ifdef IMAXBEL	1342	# ifdef IMAXBEL
1353
1354	FOO (IMAXBEL, "IMAXBEL");	1343	FOO (IMAXBEL, "IMAXBEL");
1355	# endif	1344	# endif
1356		1345
1357	fprintf (stderr, "\n");	1346	fprintf (stderr, "\n");
1358		1347
…		…
1365	FOO (VERASE, "VERASE");	1354	FOO (VERASE, "VERASE");
1366	FOO (VKILL, "VKILL");	1355	FOO (VKILL, "VKILL");
1367	FOO (VEOF, "VEOF");	1356	FOO (VEOF, "VEOF");
1368	FOO (VEOL, "VEOL");	1357	FOO (VEOL, "VEOL");
1369	# ifdef VEOL2	1358	# ifdef VEOL2
1370
1371	FOO (VEOL2, "VEOL2");	1359	FOO (VEOL2, "VEOL2");
1372	# endif	1360	# endif
1373	# ifdef VSWTC	1361	# ifdef VSWTC
1374
1375	FOO (VSWTC, "VSWTC");	1362	FOO (VSWTC, "VSWTC");
1376	# endif	1363	# endif
1377	# ifdef VSWTCH	1364	# ifdef VSWTCH
1378
1379	FOO (VSWTCH, "VSWTCH");	1365	FOO (VSWTCH, "VSWTCH");
1380	# endif	1366	# endif
1381
1382	FOO (VSTART, "VSTART");	1367	FOO (VSTART, "VSTART");
1383	FOO (VSTOP, "VSTOP");	1368	FOO (VSTOP, "VSTOP");
1384	FOO (VSUSP, "VSUSP");	1369	FOO (VSUSP, "VSUSP");
1385	# ifdef VDSUSP	1370	# ifdef VDSUSP
1386
1387	FOO (VDSUSP, "VDSUSP");	1371	FOO (VDSUSP, "VDSUSP");
1388	# endif	1372	# endif
1389	# ifdef VREPRINT	1373	# ifdef VREPRINT
1390
1391	FOO (VREPRINT, "VREPRINT");	1374	FOO (VREPRINT, "VREPRINT");
1392	# endif	1375	# endif
1393	# ifdef VDISCRD	1376	# ifdef VDISCRD
1394
1395	FOO (VDISCRD, "VDISCRD");	1377	FOO (VDISCRD, "VDISCRD");
1396	# endif	1378	# endif
1397	# ifdef VWERSE	1379	# ifdef VWERSE
1398
1399	FOO (VWERSE, "VWERSE");	1380	FOO (VWERSE, "VWERSE");
1400	# endif	1381	# endif
1401	# ifdef VLNEXT	1382	# ifdef VLNEXT
1402
1403	FOO (VLNEXT, "VLNEXT");	1383	FOO (VLNEXT, "VLNEXT");
1404	# endif	1384	# endif
1405		1385
1406	fprintf (stderr, "\n");	1386	fprintf (stderr, "\n");
1407	# undef FOO	1387	# undef FOO
…		…
1449		1429
1450	#if ENABLE_FRILLS	1430	#if ENABLE_FRILLS
1451	if (rs[Rs_pty_fd])	1431	if (rs[Rs_pty_fd])
1452	return;	1432	return;
1453	#endif	1433	#endif
1454
1455	sw_chld.start (SIGCHLD);
1456		1434
1457	#ifndef __QNX__	1435	#ifndef __QNX__
1458	/* spin off the command interpreter */	1436	/* spin off the command interpreter */
1459	switch (cmd_pid = fork ())	1437	switch (cmd_pid = fork ())
1460	{	1438	{

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.110 by root, Thu Feb 17 15:07:48 2005 UTC vs. Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC