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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC

…		…
31	* Initialisation routines.	31	* Initialisation routines.
32	*/	32	*/
33		33
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
		36	#include "rxvtutil.h"
36	#include "init.h"	37	#include "init.h"
37		38
38	#include <signal.h>	39	#include <csignal>
39		40
40	const char *const def_colorName[] =	41	const char *const def_colorName[] =
41	{	42	{
42	COLOR_FOREGROUND,	43	COLOR_FOREGROUND,
43	COLOR_BACKGROUND,	44	COLOR_BACKGROUND,
…		…
155	NULL, /* Color_BD */	156	NULL, /* Color_BD */
156	NULL, /* Color_IT */	157	NULL, /* Color_IT */
157	NULL, /* Color_UL */	158	NULL, /* Color_UL */
158	NULL, /* Color_RV */	159	NULL, /* Color_RV */
159	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		161	#if ENABLE_FRILLS
		162	NULL, // Color_underline
		163	#endif
160	#ifdef OPTION_HC	164	#ifdef OPTION_HC
161	NULL,	165	NULL,
162	#endif	166	#endif
163	#ifdef KEEP_SCROLLCOLOR	167	#ifdef KEEP_SCROLLCOLOR
164	COLOR_SCROLLBAR,	168	COLOR_SCROLLBAR,
…		…
177	"MULTIPLE",	181	"MULTIPLE",
178	"TARGETS",	182	"TARGETS",
179	"TIMESTAMP",	183	"TIMESTAMP",
180	"VT_SELECTION",	184	"VT_SELECTION",
181	"INCR",	185	"INCR",
		186	"WM_PROTOCOLS",
182	"WM_DELETE_WINDOW",	187	"WM_DELETE_WINDOW",
183	"CLIPBOARD",	188	"CLIPBOARD",
184	#if ENABLE_FRILLS	189	#if ENABLE_FRILLS
		190	"_MOTIF_WM_HINTS",
		191	#endif
		192	#if ENABLE_EWMH
185	"_NET_WM_PID",	193	"_NET_WM_PID",
186	"_MOTIF_WM_HINTS",
187	"_NET_WM_NAME",	194	"_NET_WM_NAME",
188	"_NET_WM_ICON_NAME",	195	"_NET_WM_ICON_NAME",
		196	"_NET_WM_PING",
189	#endif	197	#endif
190	#if USE_XIM	198	#if USE_XIM
191	"WM_LOCALE_NAME",	199	"WM_LOCALE_NAME",
192	#endif	200	#endif
193	#ifdef TRANSPARENT	201	#ifdef TRANSPARENT
194	"_XROOTPMAP_ID",	202	"_XROOTPMAP_ID",
195	"_XSETROOT_ID",	203	"ESETROOT_PMAP_ID",
196	#endif	204	#endif
197	#ifdef OFFIX_DND	205	#ifdef OFFIX_DND
198	"DndProtocol",	206	"DndProtocol",
199	"DndSelection",	207	"DndSelection",
		208	#endif
		209	#if ENABLE_XEMBED
		210	"_XEMBED",
		211	"_XEMBED_INFO",
200	#endif	212	#endif
201	};	213	};
202		214
203	bool	215	bool
204	rxvt_term::init_vars ()	216	rxvt_term::init_vars ()
205	{	217	{
206	sw_term.start (SIGTERM);	218	sw_term.start (SIGTERM);
		219	sw_int.start (SIGINT);
207		220
208	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209	#ifdef OFF_FOCUS_FADING	222	#ifdef OFF_FOCUS_FADING
210	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211	#endif	224	#endif
…		…
220		233
221	MEvent.time = CurrentTime;	234	MEvent.time = CurrentTime;
222	MEvent.button = AnyButton;	235	MEvent.button = AnyButton;
223	options = DEFAULT_OPTIONS;	236	options = DEFAULT_OPTIONS;
224	want_refresh = 1;	237	want_refresh = 1;
225	cmd_pid = -1;
226	pty.pty = pty.tty = -1;
227	priv_modes = SavedModes = PrivMode_Default;	238	priv_modes = SavedModes = PrivMode_Default;
228	TermWin.focus = 0;	239	TermWin.focus = 0;
229	TermWin.ncol = 80;	240	TermWin.ncol = 80;
230	TermWin.nrow = 24;	241	TermWin.nrow = 24;
231	TermWin.int_bwidth = INTERNALBORDERWIDTH;	242	TermWin.int_bwidth = INTERNALBORDERWIDTH;
…		…
248	last_bot = last_state = -1;	259	last_bot = last_state = -1;
249		260
250	#ifdef MENUBAR	261	#ifdef MENUBAR
251	menu_readonly = 1;	262	menu_readonly = 1;
252	# if ! (MENUBAR_MAX > 1)	263	# if ! (MENUBAR_MAX > 1)
253	CurrentBar = & (BarList);	264	CurrentBar = &BarList;
254	# endif /* (MENUBAR_MAX > 1) */	265	# endif /* (MENUBAR_MAX > 1) */
255	#endif	266	#endif
256		267
257	return true;	268	return true;
258	}	269	}
…		…
332	*/	343	*/
333	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334	rs[Rs_display_name] = ":0";	345	rs[Rs_display_name] = ":0";
335		346
336	get_options (r_argc, r_argv);	347	get_options (r_argc, r_argv);
337	free (r_argv);
338		348
339	#ifdef LOCAL_X_IS_UNIX	349	#ifdef LOCAL_X_IS_UNIX
340	if (rs[Rs_display_name][0] == ':')	350	if (rs[Rs_display_name][0] == ':')
341	{	351	{
342	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));	352	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
…		…
349		359
350	if (!display	360	if (!display
351	&& ! (display = displays.get (rs[Rs_display_name])))	361	&& ! (display = displays.get (rs[Rs_display_name])))
352	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	362	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353		363
354	extract_resources (display->display, rs[Rs_name]);	364	extract_resources ();
		365	free (r_argv);
355		366
356	/*	367	/*
357	* set any defaults not already set	368	* set any defaults not already set
358	*/	369	*/
359	if (cmd_argv && cmd_argv[0])	370	if (cmd_argv && cmd_argv[0])
…		…
377	#if ENABLE_FRILLS	388	#if ENABLE_FRILLS
378	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	389	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
379	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	390	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
380	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	391	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	392	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
382	#endif
383
384	#ifndef NO_LINESPACE
385	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	393	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	394	TermWin.lineSpace = min (i, 100); /* arbitrary limit */
387	#endif	395	#endif
388		396
389	#ifdef POINTER_BLANK	397	#ifdef POINTER_BLANK
…		…
601	this->locale = rxvt_strdup (this->locale);	609	this->locale = rxvt_strdup (this->locale);
602	SET_LOCALE (this->locale);	610	SET_LOCALE (this->locale);
603	mbstate.reset ();	611	mbstate.reset ();
604	#endif	612	#endif
605		613
606	#if 0
607	#if HAVE_NL_LANGINFO	614	#if HAVE_NL_LANGINFO
608	char *codeset = strdup (nl_langinfo (CODESET));	615	char *codeset = strdup (nl_langinfo (CODESET));
609	enc_utf8 = !strcasecmp (codeset, "UTF-8")	616	// /^UTF.?8/i
610	\|\| !strcasecmp (codeset, "UTF8");	617	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
		618	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
		619	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
		620	&& (codeset[3] == '8' \|\| codeset[4] == '8');
611	free (codeset);	621	free (codeset);
612	#else	622	#else
613	enc_utf8 = 0;	623	enc_utf8 = 0;
614	#endif
615	#endif	624	#endif
616	}	625	}
617		626
618	void	627	void
619	rxvt_term::init_xlocale ()	628	rxvt_term::init_xlocale ()
…		…
670	if (scrollbar_visible ())	679	if (scrollbar_visible ())
671	{	680	{
672	priv_modes \|= PrivMode_scrollBar;	681	priv_modes \|= PrivMode_scrollBar;
673	SavedModes \|= PrivMode_scrollBar;	682	SavedModes \|= PrivMode_scrollBar;
674	}	683	}
		684
675	if (menubar_visible ())	685	if (menubar_visible ())
676	{	686	{
677	priv_modes \|= PrivMode_menuBar;	687	priv_modes \|= PrivMode_menuBar;
678	SavedModes \|= PrivMode_menuBar;	688	SavedModes \|= PrivMode_menuBar;
679	}	689	}
…		…
827	* Use resource ``modifier'' to override the Meta modifier	837	* Use resource ``modifier'' to override the Meta modifier
828	*/	838	*/
829	void	839	void
830	rxvt_term::get_ourmods ()	840	rxvt_term::get_ourmods ()
831	{	841	{
832	int i, j, k;	842	int i, j, k;
833	int requestedmeta, realmeta, realalt;	843	int requestedmeta, realmeta, realalt;
834	const char cm, rsmod;	844	const char cm, rsmod;
835	XModifierKeymap *map;	845	XModifierKeymap *map;
836	KeyCode *kc;	846	KeyCode *kc;
837	const unsigned int modmasks[] =	847	const unsigned int modmasks[] =
838	{	848	{
839	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	849	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840	};	850	};
841		851
842	requestedmeta = realmeta = realalt = 0;	852	requestedmeta = realmeta = realalt = 0;
843	rsmod = rs[Rs_modifier];	853	rsmod = rs[Rs_modifier];
		854
844	if (rsmod	855	if (rsmod
845	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	856	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846	requestedmeta = rsmod[3] - '0';	857	requestedmeta = rsmod[3] - '0';
847		858
848	map = XGetModifierMapping (display->display);	859	map = XGetModifierMapping (display->display);
849	kc = map->modifiermap;	860	kc = map->modifiermap;
		861
850	for (i = 1; i < 6; i++)	862	for (i = 1; i < 6; i++)
851	{	863	{
852	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	864	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
		865
853	for (j = map->max_keypermod; j--; k++)	866	for (j = map->max_keypermod; j--; k++)
854	{	867	{
855	if (kc[k] == 0)	868	if (kc[k] == 0)
856	break;	869	break;
		870
857	switch (XKeycodeToKeysym (display->display, kc[k], 0))	871	switch (XKeycodeToKeysym (display->display, kc[k], 0))
858	{	872	{
859	case XK_Num_Lock:	873	case XK_Num_Lock:
860	ModNumLockMask = modmasks[i - 1];	874	ModNumLockMask = modmasks[i - 1];
861	/* FALLTHROUGH */	875	continue;
862	default:	876
863	continue; /* for (;;) */	877	case XK_ISO_Level3_Shift:
		878	ModLevel3Mask = modmasks[i - 1];
		879	continue;
		880
864	case XK_Meta_L:	881	case XK_Meta_L:
865	case XK_Meta_R:	882	case XK_Meta_R:
866	cm = "meta";	883	cm = "meta";
867	realmeta = i;	884	realmeta = i;
868	break;	885	break;
		886
869	case XK_Alt_L:	887	case XK_Alt_L:
870	case XK_Alt_R:	888	case XK_Alt_R:
871	cm = "alt";	889	cm = "alt";
872	realalt = i;	890	realalt = i;
873	break;	891	break;
		892
874	case XK_Super_L:	893	case XK_Super_L:
875	case XK_Super_R:	894	case XK_Super_R:
876	cm = "super";	895	cm = "super";
877	break;	896	break;
		897
878	case XK_Hyper_L:	898	case XK_Hyper_L:
879	case XK_Hyper_R:	899	case XK_Hyper_R:
880	cm = "hyper";	900	cm = "hyper";
881	break;	901	break;
		902
		903	default:
		904	continue;
882	}	905	}
		906
883	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)	907	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884	requestedmeta = i;	908	requestedmeta = i;
885	}	909	}
886	}	910	}
		911
887	XFreeModifiermap (map);	912	XFreeModifiermap (map);
		913
888	i = (requestedmeta ? requestedmeta	914	i = requestedmeta ? requestedmeta
889	: (realmeta ? realmeta	915	: realmeta ? realmeta
890	: (realalt ? realalt : 0)));	916	: realalt ? realalt
		917	: 0;
		918
891	if (i)	919	if (i)
892	ModMetaMask = modmasks[i - 1];	920	ModMetaMask = modmasks[i - 1];
893	}	921	}
894		922
895	/----------------------------------------------------------------------/	923	/----------------------------------------------------------------------/
…		…
905	#endif	933	#endif
906	XGCValues gcvalue;	934	XGCValues gcvalue;
907	long vt_emask;	935	long vt_emask;
908	XSetWindowAttributes attributes;	936	XSetWindowAttributes attributes;
909	XWindowAttributes gattr;	937	XWindowAttributes gattr;
		938	Window top, parent;
		939	dDisp;
910		940
911	#ifdef USING_W11LIB	941	#ifdef USING_W11LIB
912	/* enable W11 callbacks */	942	/* enable W11 callbacks */
913	W11AddEventHandler (display->display, rxvt_W11_process_x_event);	943	W11AddEventHandler (disp, rxvt_W11_process_x_event);
914	#endif	944	#endif
915		945
916	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	946	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917	XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);	947	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
918		948
919	if (options & Opt_transparent)	949	if (options & Opt_transparent)
920	{	950	{
921	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	951	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
922	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	952	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
923	}	953	}
924		954
925	#if ENABLE_FRILLS	955	#if ENABLE_FRILLS
926	if (options & Opt_borderLess)	956	if (options & Opt_borderLess)
927	{	957	{
928	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	958	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
929		959
930	if (prop == None)	960	if (prop == None)
931	{	961	{
932	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	962	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
933	#ifdef PREFER_24BIT	963	#ifdef PREFER_24BIT
…		…
940	mwmhints.flags = MWM_HINTS_DECORATIONS;	970	mwmhints.flags = MWM_HINTS_DECORATIONS;
941	mwmhints.decorations = 0;	971	mwmhints.decorations = 0;
942	}	972	}
943	}	973	}
944	else	974	else
945	{
946	mwmhints.flags = 0;	975	mwmhints.flags = 0;
947	}
948	#endif	976	#endif
949		977
950	/* grab colors before netscape does */	978	/* grab colors before netscape does */
951	Get_Colours ();	979	Get_Colours ();
952		980
953	if (!set_fonts ())	981	if (!set_fonts ())
954	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	982	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
955		983
		984	parent = DefaultRootWindow (disp);
		985
		986	#if ENABLE_XEMBED
		987	if (rs[Rs_embed])
		988	{
		989	XWindowAttributes wattr;
		990
		991	parent = strtol (rs[Rs_embed], 0, 0);
		992
		993	if (!XGetWindowAttributes (disp, parent, &wattr))
		994	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
		995
		996	window_calc (wattr.width, wattr.height);
		997	}
		998
		999	#endif
956	window_calc (0, 0);	1000	window_calc (0, 0);
957	old_width = szHint.width;
958	old_height = szHint.height;
959		1001
960	/* sub-window placement & size in rxvt_resize_subwindows () */	1002	/* sub-window placement & size in rxvt_resize_subwindows () */
961
962	#ifdef PREFER_24BIT	1003	#ifdef PREFER_24BIT
963	attributes.background_pixel = pix_colors_focused[Color_border];	1004	attributes.background_pixel = pix_colors_focused[Color_border];
964	attributes.border_pixel = pix_colors_focused[Color_border];	1005	attributes.border_pixel = pix_colors_focused[Color_border];
965	attributes.colormap = display->cmap;	1006	attributes.colormap = display->cmap;
966	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),	1007	top = XCreateWindow (disp, parent,
967	szHint.x, szHint.y,	1008	szHint.x, szHint.y,
968	szHint.width, szHint.height,	1009	szHint.width, szHint.height,
969	TermWin.ext_bwidth,	1010	TermWin.ext_bwidth,
970	display->depth, InputOutput,	1011	display->depth, InputOutput,
971	display->visual,	1012	display->visual,
972	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	1013	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
973	#else	1014	#else
974	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),	1015	top = XCreateSimpleWindow (disp, parent,
975	szHint.x, szHint.y,	1016	szHint.x, szHint.y,
976	szHint.width, szHint.height,	1017	szHint.width, szHint.height,
977	TermWin.ext_bwidth,	1018	TermWin.ext_bwidth,
978	pix_colors_focused[Color_border],	1019	pix_colors_focused[Color_border],
979	pix_colors_focused[Color_border]);	1020	pix_colors_focused[Color_border]);
980	#endif	1021	#endif
		1022
		1023	TermWin.parent[0] = top;
		1024
		1025	old_width = szHint.width;
		1026	old_height = szHint.height;
981		1027
982	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1028	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1029	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984		1030
985	classHint.res_name = (char *)rs[Rs_name];	1031	classHint.res_name = (char *)rs[Rs_name];
986	classHint.res_class = (char *)RESCLASS;	1032	classHint.res_class = (char *)RESCLASS;
987		1033
988	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1034	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
989	wmHint.input = True;	1035	wmHint.input = True;
990	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1036	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
991	wmHint.window_group = TermWin.parent[0];	1037	wmHint.window_group = top;
992		1038
993	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1039	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
994	(char **)argv, argc, &szHint, &wmHint, &classHint);	1040	&szHint, &wmHint, &classHint);
995		1041
996	/* Enable delete window protocol */	1042	Atom protocols[] = {
997	XSetWMProtocols (display->display, TermWin.parent[0],	1043	xa[XA_WM_DELETE_WINDOW],
998	&xa[XA_WMDELETEWINDOW], 1);	1044	#if ENABLE_EWMH
		1045	xa[XA_NET_WM_PING],
		1046	#endif
		1047	};
999		1048
1000	#if ENABLE_FRILLS	1049	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1050
		1051	#if ENABLE_EWMH
1001	long pid = getpid ();	1052	long pid = getpid ();
1002		1053
1003	XChangeProperty (display->display, TermWin.parent[0],	1054	XChangeProperty (disp, top,
1004	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1055	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005	PropModeReplace, (unsigned char *)&pid, 1);	1056	PropModeReplace, (unsigned char *)&pid, 1);
1006	#endif
1007		1057
1008	XSelectInput (display->display, TermWin.parent[0],	1058	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		1059	#endif
		1060
		1061	XSelectInput (disp, top,
1009	KeyPressMask	1062	KeyPressMask
1010	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1011	\| KeyReleaseMask	1064	\| KeyReleaseMask
1012	#endif	1065	#endif
1013	\| FocusChangeMask \| VisibilityChangeMask	1066	\| FocusChangeMask \| VisibilityChangeMask
1014	\| ExposureMask
1015	\| StructureNotifyMask);	1067	\| ExposureMask \| StructureNotifyMask);
		1068
1016	termwin_ev.start (display, TermWin.parent[0]);	1069	termwin_ev.start (display, top);
1017		1070
1018	#if ENABLE_FRILLS	1071	#if ENABLE_FRILLS
1019	if (mwmhints.flags)	1072	if (mwmhints.flags)
1020	XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1073	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1021	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1074	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1022	#endif	1075	#endif
1023		1076
1024	/* vt cursor: Black-on-White is standard, but this is more popular */	1077	/* vt cursor: Black-on-White is standard, but this is more popular */
1025	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1078	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1026		1079
1027	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1080	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
1028	/* cursor (menuBar/scrollBar): Black-on-White */	1081	/* cursor (menuBar/scrollBar): Black-on-White */
1029	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1082	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1030	#endif
1031
1032	#ifdef POINTER_BLANK
1033	{
1034	XColor blackcolour;
1035	blackcolour.red = 0;
1036	blackcolour.green = 0;
1037	blackcolour.blue = 0;
1038	Font f = XLoadFont (display->display, "fixed");
1039	blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040	&blackcolour, &blackcolour);
1041	XUnloadFont (display->display, f);
1042	}
1043	#endif	1083	#endif
1044		1084
1045	/* the vt window */	1085	/* the vt window */
1046	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1086	TermWin.vt = XCreateSimpleWindow (disp, top,
1047	window_vt_x,	1087	window_vt_x,
1048	window_vt_y,	1088	window_vt_y,
1049	TermWin_TotalWidth (),	1089	TermWin_TotalWidth (),
1050	TermWin_TotalHeight (),	1090	TermWin_TotalHeight (),
1051	0,	1091	0,
1052	pix_colors_focused[Color_fg],	1092	pix_colors_focused[Color_fg],
1053	pix_colors_focused[Color_bg]);	1093	pix_colors_focused[Color_bg]);
1054	#ifdef DEBUG_X	1094	#ifdef DEBUG_X
1055	XStoreName (display->display, TermWin.vt, "vt window");	1095	XStoreName (disp, TermWin.vt, "vt window");
1056	#endif	1096	#endif
1057		1097
1058	attributes.bit_gravity = NorthWestGravity;	1098	attributes.bit_gravity = NorthWestGravity;
1059	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1099	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1060		1100
1061	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1062
1063	pointer_unblank ();
1064		1102
1065	#ifdef POINTER_BLANK	1103	#ifdef POINTER_BLANK
1066	if (options & Opt_pointerBlank)	1104	if (options & Opt_pointerBlank)
1067	vt_emask \|= PointerMotionMask;	1105	vt_emask \|= PointerMotionMask;
1068	else	1106	else
1069	#endif	1107	#endif
1070	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1108	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1071		1109
1072	XSelectInput (display->display, TermWin.vt, vt_emask);	1110	XSelectInput (disp, TermWin.vt, vt_emask);
1073	vt_ev.start (display, TermWin.vt);	1111	vt_ev.start (display, TermWin.vt);
1074		1112
1075	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1113	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076	if (menuBar_height ())	1114	if (menuBar_height ())
1077	{	1115	{
1078	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],	1116	menuBar.win = XCreateSimpleWindow (disp, top,
1079	window_vt_x, 0,	1117	window_vt_x, 0,
1080	TermWin_TotalWidth (),	1118	TermWin_TotalWidth (),
1081	menuBar_TotalHeight (),	1119	menuBar_TotalHeight (),
1082	0,	1120	0,
1083	pix_colors_focused[Color_fg],	1121	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_scroll]);	1122	pix_colors_focused[Color_scroll]);
1085		1123
1086	#ifdef DEBUG_X	1124	#ifdef DEBUG_X
1087	XStoreName (display->display, menuBar.win, "menubar");	1125	XStoreName (disp, menuBar.win, "menubar");
1088	#endif	1126	#endif
1089		1127
1090	menuBar.drawable = new rxvt_drawable (display, menuBar.win);	1128	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091		1129
1092	XDefineCursor (display->display, menuBar.win,	1130	XDefineCursor (disp, menuBar.win,
1093	XCreateFontCursor (display->display, XC_left_ptr));	1131	XCreateFontCursor (disp, XC_left_ptr));
1094		1132
1095	XSelectInput (display->display, menuBar.win,	1133	XSelectInput (disp, menuBar.win,
1096	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask	1134	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1097	\| Button1MotionMask));
1098	menubar_ev.start (display, menuBar.win);	1135	menubar_ev.start (display, menuBar.win);
1099	}	1136	}
1100	#endif	1137	#endif
1101		1138
1102	#ifdef XPM_BACKGROUND	1139	#ifdef XPM_BACKGROUND
…		…
1118		1155
1119	/* graphics context for the vt window */	1156	/* graphics context for the vt window */
1120	gcvalue.foreground = pix_colors[Color_fg];	1157	gcvalue.foreground = pix_colors[Color_fg];
1121	gcvalue.background = pix_colors[Color_bg];	1158	gcvalue.background = pix_colors[Color_bg];
1122	gcvalue.graphics_exposures = 1;	1159	gcvalue.graphics_exposures = 1;
1123	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1160	TermWin.gc = XCreateGC (disp, TermWin.vt,
1124	GCForeground \| GCBackground \| GCGraphicsExposures,	1161	GCForeground \| GCBackground \| GCGraphicsExposures,
1125	&gcvalue);	1162	&gcvalue);
1126		1163
1127	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1164	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1128		1165
1129	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1166	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1130	gcvalue.foreground = pix_colors[Color_topShadow];	1167	gcvalue.foreground = pix_colors[Color_topShadow];
1131	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1168	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132	gcvalue.foreground = pix_colors[Color_bottomShadow];	1169	gcvalue.foreground = pix_colors[Color_bottomShadow];
1133	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1170	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1171	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1135	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1172	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1136	#endif	1173	#endif
1137		1174
1138	#ifdef OFF_FOCUS_FADING	1175	#ifdef OFF_FOCUS_FADING
1139	// initially we are in unfocused state	1176	// initially we are in unfocused state
1140	if (rs[Rs_fade])	1177	if (rs[Rs_fade])
1141	pix_colors = pix_colors_unfocused;	1178	pix_colors = pix_colors_unfocused;
1142	#endif	1179	#endif
1143		1180
		1181	pointer_unblank ();
1144	scr_recolour ();	1182	scr_recolour ();
		1183
		1184	#if ENABLE_XEMBED
		1185	if (rs[Rs_embed])
		1186	{
		1187	long info[2] = { 0, XEMBED_MAPPED };
		1188
		1189	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1190	32, PropModeReplace, (unsigned char *)&info, 2);
		1191	}
		1192	#endif
1145	}	1193	}
1146		1194
1147	/* ------------------------------------------------------------------------- *	1195	/* ------------------------------------------------------------------------- *
1148	* GET TTY CURRENT STATE *	1196	* GET TTY CURRENT STATE *
1149	* ------------------------------------------------------------------------- */	1197	* ------------------------------------------------------------------------- */
…		…
1378	* the slave.	1426	* the slave.
1379	*/	1427	*/
1380	void	1428	void
1381	rxvt_term::run_command (const char const argv)	1429	rxvt_term::run_command (const char const argv)
1382	{	1430	{
		1431	#if ENABLE_FRILLS
		1432	if (rs[Rs_pty_fd])
		1433	{
		1434	pty.pty = atoi (rs[Rs_pty_fd]);
		1435	fcntl (pty.pty, F_SETFL, O_NONBLOCK);
		1436	}
		1437	else
		1438	#endif
		1439	if (!pty.get ())
		1440	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1441
		1442	pty.set_utf8_mode (enc_utf8);
		1443
		1444	/* set initial window size */
		1445	tt_winch ();
		1446
1383	int er;	1447	int er;
1384
1385	if (!pty.get ())
1386	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387		1448
1388	#ifndef NO_BACKSPACE_KEY	1449	#ifndef NO_BACKSPACE_KEY
1389	if (key_backspace[0] && !key_backspace[1])	1450	if (key_backspace[0] && !key_backspace[1])
1390	er = key_backspace[0];	1451	er = key_backspace[0];
1391	else if (strcmp (key_backspace, "DEC") == 0)	1452	else if (strcmp (key_backspace, "DEC") == 0)
…		…
1394	#endif	1455	#endif
1395	er = -1;	1456	er = -1;
1396		1457
1397	rxvt_get_ttymode (&tio, er);	1458	rxvt_get_ttymode (&tio, er);
1398		1459
1399	/* set initial window size */	1460	#if ENABLE_FRILLS
1400	tt_winch ();	1461	if (rs[Rs_pty_fd])
		1462	return;
		1463	#endif
1401		1464
1402	sw_chld.start (SIGCHLD);	1465	sw_chld.start (SIGCHLD);
1403		1466
1404	#ifndef __QNX__	1467	#ifndef __QNX__
1405	/* spin off the command interpreter */	1468	/* spin off the command interpreter */
1406	switch (cmd_pid = fork ())	1469	switch (cmd_pid = fork ())
1407	{	1470	{
1408	case -1:	1471	case -1:
		1472	{
		1473	cmd_pid = 0;
1409	rxvt_fatal ("can't fork, aborting.\n");	1474	rxvt_fatal ("can't fork, aborting.\n");
		1475	}
1410	case 0:	1476	case 0:
1411	init_env ();	1477	init_env ();
1412		1478
1413	if (!pty.make_controlling_tty ())	1479	if (!pty.make_controlling_tty ())
1414	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1480	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.97 by root, Wed Dec 15 00:12:58 2004 UTC vs. Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC