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

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