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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC

…		…
174	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
175	"black",	175	"black",
176	#endif	176	#endif
177	};	177	};
178		178
179	const char *const xa_names[] =
180	{
181	"TEXT",
182	"COMPOUND_TEXT",
183	"UTF8_STRING",
184	"MULTIPLE",
185	"TARGETS",
186	"TIMESTAMP",
187	"VT_SELECTION",
188	"INCR",
189	"WM_PROTOCOLS",
190	"WM_DELETE_WINDOW",
191	"CLIPBOARD",
192	#if ENABLE_FRILLS
193	"_MOTIF_WM_HINTS",
194	#endif
195	#if ENABLE_EWMH
196	"_NET_WM_PID",
197	"_NET_WM_NAME",
198	"_NET_WM_ICON_NAME",
199	"_NET_WM_PING",
200	#endif
201	#if USE_XIM
202	"WM_LOCALE_NAME",
203	#endif
204	#ifdef TRANSPARENT
205	"_XROOTPMAP_ID",
206	"ESETROOT_PMAP_ID",
207	#endif
208	#ifdef OFFIX_DND
209	"DndProtocol",
210	"DndSelection",
211	#endif
212	#if ENABLE_XEMBED
213	"_XEMBED",
214	"_XEMBED_INFO",
215	#endif
216	};
217
218	bool	179	bool
219	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
220	{	181	{
		182	pix_colors = //
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224	#endif	186	#endif
225	pix_colors = pix_colors_focused;
226
227	if (pix_colors == NULL)
228	return false;
229		187
230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
231	pixmap = None;	189	pixmap = None;
232	#endif	190	#endif
233		191
…		…
344	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	302	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345		303
346	extract_resources ();	304	extract_resources ();
347		305
348	free (r_argv);	306	free (r_argv);
		307
		308	#if ENABLE_PERL
		309	if (!rs[Rs_perl_ext_1])
		310	rs[Rs_perl_ext_1] = "default";
		311
		312	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		313	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		314	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		315	{
		316	rxvt_perl.init (this);
		317	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		318	}
		319	#endif
349		320
350	/*	321	/*
351	* set any defaults not already set	322	* set any defaults not already set
352	*/	323	*/
353	if (cmd_argv && cmd_argv[0])	324	if (cmd_argv && cmd_argv[0])
…		…
905	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
906	{	877	{
907	XClassHint classHint;	878	XClassHint classHint;
908	XWMHints wmHint;	879	XWMHints wmHint;
909	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
910	Atom prop = None;
911	MWMHints mwmhints;	881	MWMHints mwmhints;
912	#endif	882	#endif
913	XGCValues gcvalue;	883	XGCValues gcvalue;
914	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
915	XWindowAttributes gattr;
916	Window top, parent;	885	Window top, parent;
917	dDisp;	886	dDisp;
918		887
919	#ifdef USING_W11LIB	888	xa = display->xa;
920	/* enable W11 callbacks */
921	W11AddEventHandler (disp, rxvt_W11_process_x_event);
922	#endif
923		889
924	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	890	/* grab colors before netscape does */
925	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	891	Get_Colours ();
926		892
927	if (OPTION (Opt_transparent))	893	if (!set_fonts ())
928	{	894	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	895
930	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	896	parent = display->root;
931	}	897
		898	attributes.override_redirect = !!OPTION (Opt_override_redirect);
932		899
933	#if ENABLE_FRILLS	900	#if ENABLE_FRILLS
934	if (OPTION (Opt_borderLess))	901	if (OPTION (Opt_borderLess))
935	{	902	{
936	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	903	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
937
938	if (prop == None)
939	{	904	{
940	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	905	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941	#ifdef PREFER_24BIT
942	attributes.override_redirect = TRUE;	906	attributes.override_redirect = TRUE;
943	#endif
944	mwmhints.flags = 0;	907	mwmhints.flags = 0;
945	}	908	}
946	else	909	else
947	{	910	{
948	mwmhints.flags = MWM_HINTS_DECORATIONS;	911	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
951	}	914	}
952	else	915	else
953	mwmhints.flags = 0;	916	mwmhints.flags = 0;
954	#endif	917	#endif
955		918
956	/* grab colors before netscape does */
957	Get_Colours ();
958
959	if (!set_fonts ())
960	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962	parent = DefaultRootWindow (disp);
963
964	#if ENABLE_XEMBED	919	#if ENABLE_XEMBED
965	if (rs[Rs_embed])	920	if (rs[Rs_embed])
966	{	921	{
967	XWindowAttributes wattr;	922	XWindowAttributes wattr;
968		923
…		…
976	#endif	931	#endif
977		932
978	window_calc (0, 0);	933	window_calc (0, 0);
979		934
980	/* sub-window placement & size in rxvt_resize_subwindows () */	935	/* sub-window placement & size in rxvt_resize_subwindows () */
981	#ifdef PREFER_24BIT
982	attributes.background_pixel = pix_colors_focused[Color_border];	936	attributes.background_pixel = pix_colors_focused[Color_border];
983	attributes.border_pixel = pix_colors_focused[Color_border];	937	attributes.border_pixel = pix_colors_focused[Color_border];
984	attributes.colormap = display->cmap;	938	attributes.colormap = display->cmap;
		939
985	top = XCreateWindow (disp, parent,	940	top = XCreateWindow (disp, parent,
986	szHint.x, szHint.y,	941	szHint.x, szHint.y,
987	szHint.width, szHint.height,	942	szHint.width, szHint.height,
988	ext_bwidth,	943	ext_bwidth,
989	display->depth, InputOutput,	944	display->depth, InputOutput,
990	display->visual,	945	display->visual,
991	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	946	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
992	#else	947	&attributes);
993	top = XCreateSimpleWindow (disp, parent,
994	szHint.x, szHint.y,
995	szHint.width, szHint.height,
996	ext_bwidth,
997	pix_colors_focused[Color_border],
998	pix_colors_focused[Color_border]);
999	#endif
1000		948
1001	this->parent[0] = top;	949	this->parent[0] = top;
1002		950
1003	old_width = szHint.width;	951	old_width = szHint.width;
1004	old_height = szHint.height;	952	old_height = szHint.height;
1005		953
1006	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	954	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	955	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008		956
1009	classHint.res_name = (char *)rs[Rs_name];	957	classHint.res_name = (char *)rs[Rs_name];
1010	classHint.res_class = (char *)RESCLASS;	958	classHint.res_class = (char *)RESCLASS;
1011		959
1012	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	960	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1013	wmHint.input = True;	961	wmHint.input = True;
1014	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	962	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015	wmHint.window_group = top;	963	wmHint.window_group = top;
1016		964
1017	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	965	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1018	&szHint, &wmHint, &classHint);	966	&szHint, &wmHint, &classHint);
		967
		968	#if ENABLE_FRILLS
		969	if (mwmhints.flags)
		970	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		971	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		972	#endif
1019		973
1020	Atom protocols[] = {	974	Atom protocols[] = {
1021	xa[XA_WM_DELETE_WINDOW],	975	xa[XA_WM_DELETE_WINDOW],
1022	#if ENABLE_EWMH	976	#if ENABLE_EWMH
1023	xa[XA_NET_WM_PING],	977	xa[XA_NET_WM_PING],
…		…
1049	\| FocusChangeMask \| VisibilityChangeMask	1003	\| FocusChangeMask \| VisibilityChangeMask
1050	\| ExposureMask \| StructureNotifyMask);	1004	\| ExposureMask \| StructureNotifyMask);
1051		1005
1052	termwin_ev.start (display, top);	1006	termwin_ev.start (display, top);
1053		1007
1054	#if ENABLE_FRILLS
1055	if (mwmhints.flags)
1056	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058	#endif
1059
1060	/* vt cursor: Black-on-White is standard, but this is more popular */	1008	/* vt cursor: Black-on-White is standard, but this is more popular */
1061	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1009	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1062		1010
1063	#ifdef HAVE_SCROLLBARS	1011	#ifdef HAVE_SCROLLBARS
1064	/* cursor scrollBar: Black-on-White */	1012	/* cursor scrollBar: Black-on-White */
1065	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1013	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1066	#endif	1014	#endif
1067		1015
1068	/* the vt window */	1016	/* the vt window */
1069	vt = XCreateSimpleWindow (disp, top,	1017	vt = XCreateSimpleWindow (disp, top,
1070	window_vt_x,
1071	window_vt_y,	1018	window_vt_x, window_vt_y,
1072	width,
1073	height,	1019	width, height,
1074	0,	1020	0,
1075	pix_colors_focused[Color_fg],	1021	pix_colors_focused[Color_fg],
1076	pix_colors_focused[Color_bg]);	1022	pix_colors_focused[Color_bg]);
1077	#ifdef DEBUG_X
1078	XStoreName (disp, vt, "vt window");
1079	#endif
1080		1023
1081	attributes.bit_gravity = NorthWestGravity;	1024	attributes.bit_gravity = NorthWestGravity;
1082	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1025	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1083		1026
1084	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1027	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
…		…
1092		1035
1093	vt_ev.start (display, vt);	1036	vt_ev.start (display, vt);
1094		1037
1095	#ifdef XPM_BACKGROUND	1038	#ifdef XPM_BACKGROUND
1096	if (rs[Rs_backgroundPixmap] != NULL	1039	if (rs[Rs_backgroundPixmap] != NULL
1097	&& ! OPTION (Opt_transparent))	1040	&& !OPTION (Opt_transparent))
1098	{	1041	{
1099	const char *p = rs[Rs_backgroundPixmap];	1042	const char *p = rs[Rs_backgroundPixmap];
1100		1043
1101	if ((p = strchr (p, ';')) != NULL)	1044	if ((p = strchr (p, ';')) != NULL)
1102	{	1045	{
…		…
1108	scr_touch (true);	1051	scr_touch (true);
1109	}	1052	}
1110	#endif	1053	#endif
1111		1054
1112	/* graphics context for the vt window */	1055	/* graphics context for the vt window */
1113	gcvalue.foreground = pix_colors[Color_fg];	1056	gcvalue.foreground = pix_colors[Color_fg];
1114	gcvalue.background = pix_colors[Color_bg];	1057	gcvalue.background = pix_colors[Color_bg];
1115	gcvalue.graphics_exposures = 1;	1058	gcvalue.graphics_exposures = 1;
		1059
1116	gc = XCreateGC (disp, vt,	1060	gc = XCreateGC (disp, vt,
1117	GCForeground \| GCBackground \| GCGraphicsExposures,	1061	GCForeground \| GCBackground \| GCGraphicsExposures,
1118	&gcvalue);	1062	&gcvalue);
1119		1063
1120	drawable = new rxvt_drawable (display, vt);	1064	drawable = new rxvt_drawable (display, vt);
1121		1065
1122	#ifdef RXVT_SCROLLBAR	1066	#ifdef RXVT_SCROLLBAR
1123	gcvalue.foreground = pix_colors[Color_topShadow];	1067	gcvalue.foreground = pix_colors[Color_topShadow];
…		…
1134	pix_colors = pix_colors_unfocused;	1078	pix_colors = pix_colors_unfocused;
1135	#endif	1079	#endif
1136		1080
1137	pointer_unblank ();	1081	pointer_unblank ();
1138	scr_recolour ();	1082	scr_recolour ();
1139
1140	#if ENABLE_XEMBED
1141	if (rs[Rs_embed])
1142	{
1143	long info[2] = { 0, XEMBED_MAPPED };
1144
1145	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146	32, PropModeReplace, (unsigned char *)&info, 2);
1147	}
1148	#endif
1149	}	1083	}
1150		1084
1151	/* ------------------------------------------------------------------------- *	1085	/* ------------------------------------------------------------------------- *
1152	* GET TTY CURRENT STATE *	1086	* GET TTY CURRENT STATE *
1153	* ------------------------------------------------------------------------- */	1087	* ------------------------------------------------------------------------- */
…		…
1370	rxvt_term::run_command (const char const argv)	1304	rxvt_term::run_command (const char const argv)
1371	{	1305	{
1372	#if ENABLE_FRILLS	1306	#if ENABLE_FRILLS
1373	if (rs[Rs_pty_fd])	1307	if (rs[Rs_pty_fd])
1374	{	1308	{
1375	pty.pty = atoi (rs[Rs_pty_fd]);	1309	pty->pty = atoi (rs[Rs_pty_fd]);
1376		1310
1377	if (pty.pty >= 0)	1311	if (pty->pty >= 0)
1378	{	1312	{
1379	if (getfd_hook)	1313	if (getfd_hook)
1380	pty.pty = (*getfd_hook) (pty.pty);	1314	pty->pty = (*getfd_hook) (pty->pty);
1381		1315
1382	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1316	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1317	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384	}	1318	}
1385	}	1319	}
1386	else	1320	else
1387	#endif	1321	#endif
1388	if (!pty.get ())	1322	if (!pty->get ())
1389	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1323	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390		1324
1391	pty.set_utf8_mode (enc_utf8);	1325	pty->set_utf8_mode (enc_utf8);
1392		1326
1393	/* set initial window size */	1327	/* set initial window size */
1394	tt_winch ();	1328	tt_winch ();
1395		1329
1396	int er;	1330	int er;
…		…
1420	rxvt_fatal ("can't fork, aborting.\n");	1354	rxvt_fatal ("can't fork, aborting.\n");
1421	}	1355	}
1422	case 0:	1356	case 0:
1423	init_env ();	1357	init_env ();
1424		1358
1425	if (!pty.make_controlling_tty ())	1359	if (!pty->make_controlling_tty ())
1426	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1360	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1427	else	1361	else
1428	{	1362	{
1429	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1363	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1430	dup2 (pty.tty, STDIN_FILENO);	1364	dup2 (pty->tty, STDIN_FILENO);
1431	dup2 (pty.tty, STDOUT_FILENO);	1365	dup2 (pty->tty, STDOUT_FILENO);
1432	dup2 (pty.tty, STDERR_FILENO);	1366	dup2 (pty->tty, STDERR_FILENO);
1433		1367
1434	// close all our file handles that we do no longer need	1368	// close all our file handles that we do no longer need
1435	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1369	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1436	{	1370	{
1437	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1371	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1438	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1372	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1439	}	1373	}
1440		1374
1441	run_child (argv);	1375	run_child (argv);
1442	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1376	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1443	}	1377	}
1444		1378
1445	_exit (EXIT_FAILURE);	1379	_exit (EXIT_FAILURE);
1446		1380
1447	default:	1381	default:
1448	{	1382	if (!OPTION (Opt_utmpInhibit))
1449	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1383	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1450	int fdstdin;
1451		1384
1452	fdstdin = dup (STDIN_FILENO);	1385	pty->close_tty ();
1453	dup2 (pty.tty, STDIN_FILENO);
1454	#endif
1455		1386
1456	#ifdef UTMP_SUPPORT	1387	child_ev.start (cmd_pid);
1457	privileged_utmp (SAVE);
1458	#endif
1459		1388
1460	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1389	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1461
1462	dup2 (fdstdin, STDIN_FILENO);
1463	close (fdstdin);
1464	#endif
1465	}
1466
1467	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1468	break;	1390	break;
1469	}	1391	}
1470	}	1392	}
1471		1393
1472	/* ------------------------------------------------------------------------- *	1394	/* ------------------------------------------------------------------------- *

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC vs. Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC