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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.99 by root, Mon Dec 20 16:44:31 2004 UTC vs.
Revision 1.112 by root, Sat Feb 19 01:07:58 2005 UTC