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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 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 ()
…		…
225		236
226	MEvent.time = CurrentTime;	237	MEvent.time = CurrentTime;
227	MEvent.button = AnyButton;	238	MEvent.button = AnyButton;
228	options = DEFAULT_OPTIONS;	239	options = DEFAULT_OPTIONS;
229	want_refresh = 1;	240	want_refresh = 1;
230	cmd_pid = -1;
231	pty.pty = pty.tty = -1;
232	priv_modes = SavedModes = PrivMode_Default;	241	priv_modes = SavedModes = PrivMode_Default;
233	TermWin.focus = 0;	242	TermWin.focus = 0;
234	TermWin.ncol = 80;	243	TermWin.ncol = 80;
235	TermWin.nrow = 24;	244	TermWin.nrow = 24;
236	TermWin.int_bwidth = INTERNALBORDERWIDTH;	245	TermWin.int_bwidth = INTERNALBORDERWIDTH;
…		…
338	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339	rs[Rs_display_name] = ":0";	348	rs[Rs_display_name] = ":0";
340		349
341	get_options (r_argc, r_argv);	350	get_options (r_argc, r_argv);
342		351
343	#ifdef LOCAL_X_IS_UNIX
344	if (rs[Rs_display_name][0] == ':')
345	{
346	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347	strcpy (val, "unix");
348	strcat (val, rs[Rs_display_name]);
349	display = displays.get (val);
350	free (val);
351	}
352	#endif
353
354	if (!display
355	&& ! (display = displays.get (rs[Rs_display_name])))	352	if (!(display = displays.get (rs[Rs_display_name])))
356	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]);
357		354
358	extract_resources ();	355	extract_resources ();
359	free (r_argv);	356	free (r_argv);
360		357
…		…
673	if (scrollbar_visible ())	670	if (scrollbar_visible ())
674	{	671	{
675	priv_modes \|= PrivMode_scrollBar;	672	priv_modes \|= PrivMode_scrollBar;
676	SavedModes \|= PrivMode_scrollBar;	673	SavedModes \|= PrivMode_scrollBar;
677	}	674	}
		675
678	if (menubar_visible ())	676	if (menubar_visible ())
679	{	677	{
680	priv_modes \|= PrivMode_menuBar;	678	priv_modes \|= PrivMode_menuBar;
681	SavedModes \|= PrivMode_menuBar;	679	SavedModes \|= PrivMode_menuBar;
682	}	680	}
…		…
742	}	740	}
743	}	741	}
744	}	742	}
745		743
746	pix_colors[i] = xcol;	744	pix_colors[i] = xcol;
		745	SET_PIXCOLOR (i);
		746	}
		747
747	#ifdef OFF_FOCUS_FADING	748	#ifdef OFF_FOCUS_FADING
748	if (rs[Rs_fade])	749	if (rs[Rs_fade])
		750	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749	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]);
750	#endif	752	#endif
751	SET_PIXCOLOR (i);
752	}
753		753
754	if (display->depth <= 2)	754	if (display->depth <= 2)
755	{	755	{
756	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];
757	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];
…		…
765	* from the fvwm window manager.	765	* from the fvwm window manager.
766	*/	766	*/
767	#ifdef KEEP_SCROLLCOLOR	767	#ifdef KEEP_SCROLLCOLOR
768		768
769	if (display->depth <= 2)	769	if (display->depth <= 2)
		770	{
770	{ /* Monochrome */	771	/* Monochrome */
771	pix_colors[Color_scroll] = pix_colors[Color_fg];	772	pix_colors[Color_scroll] = pix_colors[Color_fg];
772	pix_colors[Color_topShadow] = pix_colors[Color_bg];	773	pix_colors[Color_topShadow] = pix_colors[Color_bg];
773	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	774	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774	}	775	}
775	else	776	else
…		…
926	#endif	927	#endif
927	XGCValues gcvalue;	928	XGCValues gcvalue;
928	long vt_emask;	929	long vt_emask;
929	XSetWindowAttributes attributes;	930	XSetWindowAttributes attributes;
930	XWindowAttributes gattr;	931	XWindowAttributes gattr;
931	Window top;	932	Window top, parent;
932	dDisp;	933	dDisp;
933		934
934	#ifdef USING_W11LIB	935	#ifdef USING_W11LIB
935	/* enable W11 callbacks */	936	/* enable W11 callbacks */
936	W11AddEventHandler (disp, rxvt_W11_process_x_event);	937	W11AddEventHandler (disp, rxvt_W11_process_x_event);
…		…
963	mwmhints.flags = MWM_HINTS_DECORATIONS;	964	mwmhints.flags = MWM_HINTS_DECORATIONS;
964	mwmhints.decorations = 0;	965	mwmhints.decorations = 0;
965	}	966	}
966	}	967	}
967	else	968	else
968	{
969	mwmhints.flags = 0;	969	mwmhints.flags = 0;
970	}
971	#endif	970	#endif
972		971
973	/* grab colors before netscape does */	972	/* grab colors before netscape does */
974	Get_Colours ();	973	Get_Colours ();
975		974
976	if (!set_fonts ())	975	if (!set_fonts ())
977	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");
978		977
979	#if ENABLE_FRILLS	978	parent = DefaultRootWindow (disp);
		979
		980	#if ENABLE_XEMBED
980	if (rs[Rs_embed])	981	if (rs[Rs_embed])
981	{	982	{
982	top = strtol (rs[Rs_embed], 0, 0);
983
984	XWindowAttributes wattr;	983	XWindowAttributes wattr;
		984
		985	parent = strtol (rs[Rs_embed], 0, 0);
		986
985	XGetWindowAttributes (disp, top, &wattr);	987	if (!XGetWindowAttributes (disp, parent, &wattr))
		988	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986		989
987	window_calc (wattr.width, wattr.height);	990	window_calc (wattr.width, wattr.height);
		991	}
988		992
989	#if 0	993	#endif
990	if (wattr.map_state == IsViewable)	994	window_calc (0, 0);
991	{	995
992	TermWin.mapped = 1;	996	/* sub-window placement & size in rxvt_resize_subwindows () */
993	refresh_type = FAST_REFRESH;	997	#ifdef PREFER_24BIT
994	XClearWindow (disp, top);	998	attributes.background_pixel = pix_colors_focused[Color_border];
995	// TODO: make XMapNotify-event-code a function and call it	999	attributes.border_pixel = pix_colors_focused[Color_border];
996	// TODO: how can I detetc visibility without unmpa/map?	1000	attributes.colormap = display->cmap;
997	// TODO: focusin etc.	1001	top = XCreateWindow (disp, parent,
998	}	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);
999	#else	1008	#else
1000	// it'S easiets just to unmap/map to get all state correctly set-up	1009	top = XCreateSimpleWindow (disp, parent,
1001	XUnmapWindow (disp, top);
1002	#endif
1003	}
1004	else
1005	#endif
1006	{
1007	window_calc (0, 0);
1008
1009	/* sub-window placement & size in rxvt_resize_subwindows () */
1010	#ifdef PREFER_24BIT
1011	attributes.background_pixel = pix_colors_focused[Color_border];
1012	attributes.border_pixel = pix_colors_focused[Color_border];
1013	attributes.colormap = display->cmap;
1014	top = XCreateWindow (disp, DefaultRootWindow (disp),
1015	szHint.x, szHint.y,	1010	szHint.x, szHint.y,
1016	szHint.width, szHint.height,	1011	szHint.width, szHint.height,
1017	TermWin.ext_bwidth,	1012	TermWin.ext_bwidth,
1018	display->depth, InputOutput,
1019	display->visual,
1020	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1021	#else
1022	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023	szHint.x, szHint.y,
1024	szHint.width, szHint.height,
1025	TermWin.ext_bwidth,
1026	pix_colors_focused[Color_border],	1013	pix_colors_focused[Color_border],
1027	pix_colors_focused[Color_border]);	1014	pix_colors_focused[Color_border]);
1028	#endif	1015	#endif
1029	}
1030		1016
1031	TermWin.parent[0] = top;	1017	TermWin.parent[0] = top;
1032		1018
1033	old_width = szHint.width;	1019	old_width = szHint.width;
1034	old_height = szHint.height;	1020	old_height = szHint.height;
…		…
1042	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1028	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1043	wmHint.input = True;	1029	wmHint.input = True;
1044	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1030	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1045	wmHint.window_group = top;	1031	wmHint.window_group = top;
1046		1032
1047	XSetWMProperties (disp, top, NULL, NULL,	1033	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048	(char **)argv, argc, &szHint, &wmHint, &classHint);	1034	&szHint, &wmHint, &classHint);
1049		1035
1050	/* Enable delete window protocol */	1036	Atom protocols[] = {
1051	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	};
1052		1042
1053	#if ENABLE_FRILLS	1043	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1044
		1045	#if ENABLE_EWMH
1054	long pid = getpid ();	1046	long pid = getpid ();
1055		1047
1056	XChangeProperty (disp, top,	1048	XChangeProperty (disp, top,
1057	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1049	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058	PropModeReplace, (unsigned char *)&pid, 1);	1050	PropModeReplace, (unsigned char *)&pid, 1);
		1051
		1052	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059	#endif	1053	#endif
1060		1054
1061	XSelectInput (disp, top,	1055	XSelectInput (disp, top,
1062	KeyPressMask	1056	KeyPressMask
1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1057	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1064	\| KeyReleaseMask	1058	\| KeyReleaseMask
1065	#endif	1059	#endif
1066	\| FocusChangeMask \| VisibilityChangeMask	1060	\| FocusChangeMask \| VisibilityChangeMask
1067	\| ExposureMask
1068	\| StructureNotifyMask);	1061	\| ExposureMask \| StructureNotifyMask);
		1062
1069	termwin_ev.start (display, top);	1063	termwin_ev.start (display, top);
1070		1064
1071	#if ENABLE_FRILLS	1065	#if ENABLE_FRILLS
1072	if (mwmhints.flags)	1066	if (mwmhints.flags)
1073	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,
…		…
1098	attributes.bit_gravity = NorthWestGravity;	1092	attributes.bit_gravity = NorthWestGravity;
1099	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1093	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1100		1094
1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1095	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1102		1096
1103	pointer_unblank ();
1104
1105	#ifdef POINTER_BLANK	1097	#ifdef POINTER_BLANK
1106	if (options & Opt_pointerBlank)	1098	if (options & Opt_pointerBlank)
1107	vt_emask \|= PointerMotionMask;	1099	vt_emask \|= PointerMotionMask;
1108	else	1100	else
1109	#endif	1101	#endif
…		…
1178	// initially we are in unfocused state	1170	// initially we are in unfocused state
1179	if (rs[Rs_fade])	1171	if (rs[Rs_fade])
1180	pix_colors = pix_colors_unfocused;	1172	pix_colors = pix_colors_unfocused;
1181	#endif	1173	#endif
1182		1174
		1175	pointer_unblank ();
1183	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
1184	}	1187	}
1185		1188
1186	/* ------------------------------------------------------------------------- *	1189	/* ------------------------------------------------------------------------- *
1187	* GET TTY CURRENT STATE *	1190	* GET TTY CURRENT STATE *
1188	* ------------------------------------------------------------------------- */	1191	* ------------------------------------------------------------------------- */
…		…
1417	* the slave.	1420	* the slave.
1418	*/	1421	*/
1419	void	1422	void
1420	rxvt_term::run_command (const char const argv)	1423	rxvt_term::run_command (const char const argv)
1421	{	1424	{
		1425	#if ENABLE_FRILLS
		1426	if (rs[Rs_pty_fd])
		1427	{
		1428	pty.pty = atoi (rs[Rs_pty_fd]);
		1429	fcntl (pty.pty, F_SETFL, O_NONBLOCK);
		1430	}
		1431	else
		1432	#endif
1422	if (!pty.get ())	1433	if (!pty.get ())
1423	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1434	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424		1435
1425	pty.set_utf8_mode (enc_utf8);	1436	pty.set_utf8_mode (enc_utf8);
1426		1437
1427	/* set initial window size */	1438	/* set initial window size */
1428	tt_winch ();	1439	tt_winch ();
…		…
1438	#endif	1449	#endif
1439	er = -1;	1450	er = -1;
1440		1451
1441	rxvt_get_ttymode (&tio, er);	1452	rxvt_get_ttymode (&tio, er);
1442		1453
		1454	#if ENABLE_FRILLS
		1455	if (rs[Rs_pty_fd])
		1456	return;
		1457	#endif
		1458
1443	sw_chld.start (SIGCHLD);	1459	sw_chld.start (SIGCHLD);
1444		1460
1445	#ifndef __QNX__	1461	#ifndef __QNX__
1446	/* spin off the command interpreter */	1462	/* spin off the command interpreter */
1447	switch (cmd_pid = fork ())	1463	switch (cmd_pid = fork ())
1448	{	1464	{
1449	case -1:	1465	case -1:
		1466	{
		1467	cmd_pid = 0;
1450	rxvt_fatal ("can't fork, aborting.\n");	1468	rxvt_fatal ("can't fork, aborting.\n");
		1469	}
1451	case 0:	1470	case 0:
1452	init_env ();	1471	init_env ();
1453		1472
1454	if (!pty.make_controlling_tty ())	1473	if (!pty.make_controlling_tty ())
1455	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1474	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC vs. Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC