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

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

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs. Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC