[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.117 by root, Thu Jul 7 19:37:47 2005 UTC

…		…
181	"MULTIPLE",	181	"MULTIPLE",
182	"TARGETS",	182	"TARGETS",
183	"TIMESTAMP",	183	"TIMESTAMP",
184	"VT_SELECTION",	184	"VT_SELECTION",
185	"INCR",	185	"INCR",
		186	"WM_PROTOCOLS",
186	"WM_DELETE_WINDOW",	187	"WM_DELETE_WINDOW",
187	"CLIPBOARD",	188	"CLIPBOARD",
188	#if ENABLE_FRILLS	189	#if ENABLE_FRILLS
		190	"_MOTIF_WM_HINTS",
		191	#endif
		192	#if ENABLE_EWMH
189	"_NET_WM_PID",	193	"_NET_WM_PID",
190	"_MOTIF_WM_HINTS",
191	"_NET_WM_NAME",	194	"_NET_WM_NAME",
192	"_NET_WM_ICON_NAME",	195	"_NET_WM_ICON_NAME",
		196	"_NET_WM_PING",
193	#endif	197	#endif
194	#if USE_XIM	198	#if USE_XIM
195	"WM_LOCALE_NAME",	199	"WM_LOCALE_NAME",
196	#endif	200	#endif
197	#ifdef TRANSPARENT	201	#ifdef TRANSPARENT
…		…
199	"ESETROOT_PMAP_ID",	203	"ESETROOT_PMAP_ID",
200	#endif	204	#endif
201	#ifdef OFFIX_DND	205	#ifdef OFFIX_DND
202	"DndProtocol",	206	"DndProtocol",
203	"DndSelection",	207	"DndSelection",
		208	#endif
		209	#if ENABLE_XEMBED
		210	"_XEMBED",
		211	"_XEMBED_INFO",
204	#endif	212	#endif
205	};	213	};
206		214
207	bool	215	bool
208	rxvt_term::init_vars ()	216	rxvt_term::init_vars ()
…		…
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;
…		…
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);
342		348
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])))	349	if (!(display = displays.get (rs[Rs_display_name])))
356	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]);
357		351
358	extract_resources ();	352	extract_resources ();
359	free (r_argv);	353	free (r_argv);
360		354
…		…
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	}
…		…
926	#endif	921	#endif
927	XGCValues gcvalue;	922	XGCValues gcvalue;
928	long vt_emask;	923	long vt_emask;
929	XSetWindowAttributes attributes;	924	XSetWindowAttributes attributes;
930	XWindowAttributes gattr;	925	XWindowAttributes gattr;
931	Window top;	926	Window top, parent;
932	dDisp;	927	dDisp;
933		928
934	#ifdef USING_W11LIB	929	#ifdef USING_W11LIB
935	/* enable W11 callbacks */	930	/* enable W11 callbacks */
936	W11AddEventHandler (disp, rxvt_W11_process_x_event);	931	W11AddEventHandler (disp, rxvt_W11_process_x_event);
…		…
963	mwmhints.flags = MWM_HINTS_DECORATIONS;	958	mwmhints.flags = MWM_HINTS_DECORATIONS;
964	mwmhints.decorations = 0;	959	mwmhints.decorations = 0;
965	}	960	}
966	}	961	}
967	else	962	else
968	{
969	mwmhints.flags = 0;	963	mwmhints.flags = 0;
970	}
971	#endif	964	#endif
972		965
973	/* grab colors before netscape does */	966	/* grab colors before netscape does */
974	Get_Colours ();	967	Get_Colours ();
975		968
976	if (!set_fonts ())	969	if (!set_fonts ())
977	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	970	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978		971
979	#if ENABLE_FRILLS	972	parent = DefaultRootWindow (disp);
		973
		974	#if ENABLE_XEMBED
980	if (rs[Rs_embed])	975	if (rs[Rs_embed])
981	{	976	{
982	top = strtol (rs[Rs_embed], 0, 0);
983
984	XWindowAttributes wattr;	977	XWindowAttributes wattr;
		978
		979	parent = strtol (rs[Rs_embed], 0, 0);
		980
985	XGetWindowAttributes (disp, top, &wattr);	981	if (!XGetWindowAttributes (disp, parent, &wattr))
		982	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986		983
987	window_calc (wattr.width, wattr.height);	984	window_calc (wattr.width, wattr.height);
		985	}
988		986
989	#if 0	987	#endif
990	if (wattr.map_state == IsViewable)	988	window_calc (0, 0);
991	{	989
992	TermWin.mapped = 1;	990	/* sub-window placement & size in rxvt_resize_subwindows () */
993	refresh_type = FAST_REFRESH;	991	#ifdef PREFER_24BIT
994	XClearWindow (disp, top);	992	attributes.background_pixel = pix_colors_focused[Color_border];
995	// TODO: make XMapNotify-event-code a function and call it	993	attributes.border_pixel = pix_colors_focused[Color_border];
996	// TODO: how can I detetc visibility without unmpa/map?	994	attributes.colormap = display->cmap;
997	// TODO: focusin etc.	995	top = XCreateWindow (disp, parent,
998	}	996	szHint.x, szHint.y,
		997	szHint.width, szHint.height,
		998	TermWin.ext_bwidth,
		999	display->depth, InputOutput,
		1000	display->visual,
		1001	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
999	#else	1002	#else
1000	// it'S easiets just to unmap/map to get all state correctly set-up	1003	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,	1004	szHint.x, szHint.y,
1016	szHint.width, szHint.height,	1005	szHint.width, szHint.height,
1017	TermWin.ext_bwidth,	1006	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],	1007	pix_colors_focused[Color_border],
1027	pix_colors_focused[Color_border]);	1008	pix_colors_focused[Color_border]);
1028	#endif	1009	#endif
1029	}
1030		1010
1031	TermWin.parent[0] = top;	1011	TermWin.parent[0] = top;
1032		1012
1033	old_width = szHint.width;	1013	old_width = szHint.width;
1034	old_height = szHint.height;	1014	old_height = szHint.height;
…		…
1042	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1022	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1043	wmHint.input = True;	1023	wmHint.input = True;
1044	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1024	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1045	wmHint.window_group = top;	1025	wmHint.window_group = top;
1046		1026
1047	XSetWMProperties (disp, top, NULL, NULL,	1027	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048	(char **)argv, argc, &szHint, &wmHint, &classHint);	1028	&szHint, &wmHint, &classHint);
1049		1029
1050	/* Enable delete window protocol */	1030	Atom protocols[] = {
1051	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);	1031	xa[XA_WM_DELETE_WINDOW],
		1032	#if ENABLE_EWMH
		1033	xa[XA_NET_WM_PING],
		1034	#endif
		1035	};
1052		1036
1053	#if ENABLE_FRILLS	1037	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1038
		1039	#if ENABLE_EWMH
1054	long pid = getpid ();	1040	long pid = getpid ();
1055		1041
1056	XChangeProperty (disp, top,	1042	XChangeProperty (disp, top,
1057	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1043	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058	PropModeReplace, (unsigned char *)&pid, 1);	1044	PropModeReplace, (unsigned char *)&pid, 1);
		1045
		1046	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059	#endif	1047	#endif
1060		1048
1061	XSelectInput (disp, top,	1049	XSelectInput (disp, top,
1062	KeyPressMask	1050	KeyPressMask
1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1051	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1064	\| KeyReleaseMask	1052	\| KeyReleaseMask
1065	#endif	1053	#endif
1066	\| FocusChangeMask \| VisibilityChangeMask	1054	\| FocusChangeMask \| VisibilityChangeMask
1067	\| ExposureMask
1068	\| StructureNotifyMask);	1055	\| ExposureMask \| StructureNotifyMask);
		1056
1069	termwin_ev.start (display, top);	1057	termwin_ev.start (display, top);
1070		1058
1071	#if ENABLE_FRILLS	1059	#if ENABLE_FRILLS
1072	if (mwmhints.flags)	1060	if (mwmhints.flags)
1073	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1061	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1098	attributes.bit_gravity = NorthWestGravity;	1086	attributes.bit_gravity = NorthWestGravity;
1099	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1087	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1100		1088
1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1089	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1102		1090
1103	pointer_unblank ();
1104
1105	#ifdef POINTER_BLANK	1091	#ifdef POINTER_BLANK
1106	if (options & Opt_pointerBlank)	1092	if (options & Opt_pointerBlank)
1107	vt_emask \|= PointerMotionMask;	1093	vt_emask \|= PointerMotionMask;
1108	else	1094	else
1109	#endif	1095	#endif
…		…
1178	// initially we are in unfocused state	1164	// initially we are in unfocused state
1179	if (rs[Rs_fade])	1165	if (rs[Rs_fade])
1180	pix_colors = pix_colors_unfocused;	1166	pix_colors = pix_colors_unfocused;
1181	#endif	1167	#endif
1182		1168
		1169	pointer_unblank ();
1183	scr_recolour ();	1170	scr_recolour ();
		1171
		1172	#if ENABLE_XEMBED
		1173	if (rs[Rs_embed])
		1174	{
		1175	long info[2] = { 0, XEMBED_MAPPED };
		1176
		1177	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1178	32, PropModeReplace, (unsigned char *)&info, 2);
		1179	}
		1180	#endif
1184	}	1181	}
1185		1182
1186	/* ------------------------------------------------------------------------- *	1183	/* ------------------------------------------------------------------------- *
1187	* GET TTY CURRENT STATE *	1184	* GET TTY CURRENT STATE *
1188	* ------------------------------------------------------------------------- */	1185	* ------------------------------------------------------------------------- */
…		…
1417	* the slave.	1414	* the slave.
1418	*/	1415	*/
1419	void	1416	void
1420	rxvt_term::run_command (const char const argv)	1417	rxvt_term::run_command (const char const argv)
1421	{	1418	{
		1419	#if ENABLE_FRILLS
		1420	if (rs[Rs_pty_fd])
		1421	{
		1422	pty.pty = atoi (rs[Rs_pty_fd]);
		1423	fcntl (pty.pty, F_SETFL, O_NONBLOCK);
		1424	}
		1425	else
		1426	#endif
1422	if (!pty.get ())	1427	if (!pty.get ())
1423	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1428	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424		1429
1425	pty.set_utf8_mode (enc_utf8);	1430	pty.set_utf8_mode (enc_utf8);
1426		1431
1427	/* set initial window size */	1432	/* set initial window size */
1428	tt_winch ();	1433	tt_winch ();
…		…
1438	#endif	1443	#endif
1439	er = -1;	1444	er = -1;
1440		1445
1441	rxvt_get_ttymode (&tio, er);	1446	rxvt_get_ttymode (&tio, er);
1442		1447
		1448	#if ENABLE_FRILLS
		1449	if (rs[Rs_pty_fd])
		1450	return;
		1451	#endif
		1452
1443	sw_chld.start (SIGCHLD);	1453	sw_chld.start (SIGCHLD);
1444		1454
1445	#ifndef __QNX__	1455	#ifndef __QNX__
1446	/* spin off the command interpreter */	1456	/* spin off the command interpreter */
1447	switch (cmd_pid = fork ())	1457	switch (cmd_pid = fork ())
1448	{	1458	{
1449	case -1:	1459	case -1:
		1460	{
		1461	cmd_pid = 0;
1450	rxvt_fatal ("can't fork, aborting.\n");	1462	rxvt_fatal ("can't fork, aborting.\n");
		1463	}
1451	case 0:	1464	case 0:
1452	init_env ();	1465	init_env ();
1453		1466
1454	if (!pty.make_controlling_tty ())	1467	if (!pty.make_controlling_tty ())
1455	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1468	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.117 by root, Thu Jul 7 19:37:47 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.117 by root, Thu Jul 7 19:37:47 2005 UTC