[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.108 by root, Fri Feb 4 11:41:23 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[] =
…		…
205		206
206	bool	207	bool
207	rxvt_term::init_vars ()	208	rxvt_term::init_vars ()
208	{	209	{
209	sw_term.start (SIGTERM);	210	sw_term.start (SIGTERM);
		211	sw_int.start (SIGINT);
210		212
211	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	213	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
212	#ifdef OFF_FOCUS_FADING	214	#ifdef OFF_FOCUS_FADING
213	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	215	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
214	#endif	216	#endif
…		…
251	last_bot = last_state = -1;	253	last_bot = last_state = -1;
252		254
253	#ifdef MENUBAR	255	#ifdef MENUBAR
254	menu_readonly = 1;	256	menu_readonly = 1;
255	# if ! (MENUBAR_MAX > 1)	257	# if ! (MENUBAR_MAX > 1)
256	CurrentBar = & (BarList);	258	CurrentBar = &BarList;
257	# endif /* (MENUBAR_MAX > 1) */	259	# endif /* (MENUBAR_MAX > 1) */
258	#endif	260	#endif
259		261
260	return true;	262	return true;
261	}	263	}
…		…
335	*/	337	*/
336	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	338	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337	rs[Rs_display_name] = ":0";	339	rs[Rs_display_name] = ":0";
338		340
339	get_options (r_argc, r_argv);	341	get_options (r_argc, r_argv);
340	free (r_argv);
341		342
342	#ifdef LOCAL_X_IS_UNIX	343	#ifdef LOCAL_X_IS_UNIX
343	if (rs[Rs_display_name][0] == ':')	344	if (rs[Rs_display_name][0] == ':')
344	{	345	{
345	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));	346	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
…		…
352		353
353	if (!display	354	if (!display
354	&& ! (display = displays.get (rs[Rs_display_name])))	355	&& ! (display = displays.get (rs[Rs_display_name])))
355	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	356	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
356		357
357	extract_resources (display->display, rs[Rs_name]);	358	extract_resources ();
		359	free (r_argv);
358		360
359	/*	361	/*
360	* set any defaults not already set	362	* set any defaults not already set
361	*/	363	*/
362	if (cmd_argv && cmd_argv[0])	364	if (cmd_argv && cmd_argv[0])
…		…
380	#if ENABLE_FRILLS	382	#if ENABLE_FRILLS
381	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	383	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	384	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
383	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	385	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	386	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)	387	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	388	TermWin.lineSpace = min (i, 100); /* arbitrary limit */
390	#endif	389	#endif
391		390
392	#ifdef POINTER_BLANK	391	#ifdef POINTER_BLANK
…		…
604	this->locale = rxvt_strdup (this->locale);	603	this->locale = rxvt_strdup (this->locale);
605	SET_LOCALE (this->locale);	604	SET_LOCALE (this->locale);
606	mbstate.reset ();	605	mbstate.reset ();
607	#endif	606	#endif
608		607
609	#if 0
610	#if HAVE_NL_LANGINFO	608	#if HAVE_NL_LANGINFO
611	char *codeset = strdup (nl_langinfo (CODESET));	609	char *codeset = strdup (nl_langinfo (CODESET));
612	enc_utf8 = !strcasecmp (codeset, "UTF-8")	610	// /^UTF.?8/i
613	\|\| !strcasecmp (codeset, "UTF8");	611	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
		612	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
		613	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
		614	&& (codeset[3] == '8' \|\| codeset[4] == '8');
614	free (codeset);	615	free (codeset);
615	#else	616	#else
616	enc_utf8 = 0;	617	enc_utf8 = 0;
617	#endif
618	#endif	618	#endif
619	}	619	}
620		620
621	void	621	void
622	rxvt_term::init_xlocale ()	622	rxvt_term::init_xlocale ()
…		…
830	* Use resource ``modifier'' to override the Meta modifier	830	* Use resource ``modifier'' to override the Meta modifier
831	*/	831	*/
832	void	832	void
833	rxvt_term::get_ourmods ()	833	rxvt_term::get_ourmods ()
834	{	834	{
835	int i, j, k;	835	int i, j, k;
836	int requestedmeta, realmeta, realalt;	836	int requestedmeta, realmeta, realalt;
837	const char cm, rsmod;	837	const char cm, rsmod;
838	XModifierKeymap *map;	838	XModifierKeymap *map;
839	KeyCode *kc;	839	KeyCode *kc;
840	const unsigned int modmasks[] =	840	const unsigned int modmasks[] =
841	{	841	{
842	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	842	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843	};	843	};
844		844
845	requestedmeta = realmeta = realalt = 0;	845	requestedmeta = realmeta = realalt = 0;
846	rsmod = rs[Rs_modifier];	846	rsmod = rs[Rs_modifier];
		847
847	if (rsmod	848	if (rsmod
848	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	849	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849	requestedmeta = rsmod[3] - '0';	850	requestedmeta = rsmod[3] - '0';
850		851
851	map = XGetModifierMapping (display->display);	852	map = XGetModifierMapping (display->display);
852	kc = map->modifiermap;	853	kc = map->modifiermap;
		854
853	for (i = 1; i < 6; i++)	855	for (i = 1; i < 6; i++)
854	{	856	{
855	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	857	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
		858
856	for (j = map->max_keypermod; j--; k++)	859	for (j = map->max_keypermod; j--; k++)
857	{	860	{
858	if (kc[k] == 0)	861	if (kc[k] == 0)
859	break;	862	break;
		863
860	switch (XKeycodeToKeysym (display->display, kc[k], 0))	864	switch (XKeycodeToKeysym (display->display, kc[k], 0))
861	{	865	{
862	case XK_Num_Lock:	866	case XK_Num_Lock:
863	ModNumLockMask = modmasks[i - 1];	867	ModNumLockMask = modmasks[i - 1];
864	/* FALLTHROUGH */	868	continue;
865	default:	869
866	continue; /* for (;;) */	870	case XK_ISO_Level3_Shift:
		871	ModLevel3Mask = modmasks[i - 1];
		872	continue;
		873
867	case XK_Meta_L:	874	case XK_Meta_L:
868	case XK_Meta_R:	875	case XK_Meta_R:
869	cm = "meta";	876	cm = "meta";
870	realmeta = i;	877	realmeta = i;
871	break;	878	break;
		879
872	case XK_Alt_L:	880	case XK_Alt_L:
873	case XK_Alt_R:	881	case XK_Alt_R:
874	cm = "alt";	882	cm = "alt";
875	realalt = i;	883	realalt = i;
876	break;	884	break;
		885
877	case XK_Super_L:	886	case XK_Super_L:
878	case XK_Super_R:	887	case XK_Super_R:
879	cm = "super";	888	cm = "super";
880	break;	889	break;
		890
881	case XK_Hyper_L:	891	case XK_Hyper_L:
882	case XK_Hyper_R:	892	case XK_Hyper_R:
883	cm = "hyper";	893	cm = "hyper";
884	break;	894	break;
		895
		896	default:
		897	continue;
885	}	898	}
		899
886	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)	900	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887	requestedmeta = i;	901	requestedmeta = i;
888	}	902	}
889	}	903	}
		904
890	XFreeModifiermap (map);	905	XFreeModifiermap (map);
		906
891	i = (requestedmeta ? requestedmeta	907	i = requestedmeta ? requestedmeta
892	: (realmeta ? realmeta	908	: realmeta ? realmeta
893	: (realalt ? realalt : 0)));	909	: realalt ? realalt
		910	: 0;
		911
894	if (i)	912	if (i)
895	ModMetaMask = modmasks[i - 1];	913	ModMetaMask = modmasks[i - 1];
896	}	914	}
897		915
898	/----------------------------------------------------------------------/	916	/----------------------------------------------------------------------/
…		…
908	#endif	926	#endif
909	XGCValues gcvalue;	927	XGCValues gcvalue;
910	long vt_emask;	928	long vt_emask;
911	XSetWindowAttributes attributes;	929	XSetWindowAttributes attributes;
912	XWindowAttributes gattr;	930	XWindowAttributes gattr;
		931	dDisp;
913		932
914	#ifdef USING_W11LIB	933	#ifdef USING_W11LIB
915	/* enable W11 callbacks */	934	/* enable W11 callbacks */
916	W11AddEventHandler (display->display, rxvt_W11_process_x_event);	935	W11AddEventHandler (disp, rxvt_W11_process_x_event);
917	#endif	936	#endif
918		937
919	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920	XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);	939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
921		940
922	if (options & Opt_transparent)	941	if (options & Opt_transparent)
923	{	942	{
924	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
925	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
926	}	945	}
927		946
928	#if ENABLE_FRILLS	947	#if ENABLE_FRILLS
929	if (options & Opt_borderLess)	948	if (options & Opt_borderLess)
930	{	949	{
931	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
932		951
933	if (prop == None)	952	if (prop == None)
934	{	953	{
935	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	954	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
936	#ifdef PREFER_24BIT	955	#ifdef PREFER_24BIT
…		…
964		983
965	#ifdef PREFER_24BIT	984	#ifdef PREFER_24BIT
966	attributes.background_pixel = pix_colors_focused[Color_border];	985	attributes.background_pixel = pix_colors_focused[Color_border];
967	attributes.border_pixel = pix_colors_focused[Color_border];	986	attributes.border_pixel = pix_colors_focused[Color_border];
968	attributes.colormap = display->cmap;	987	attributes.colormap = display->cmap;
969	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),	988	TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp),
970	szHint.x, szHint.y,	989	szHint.x, szHint.y,
971	szHint.width, szHint.height,	990	szHint.width, szHint.height,
972	TermWin.ext_bwidth,	991	TermWin.ext_bwidth,
973	display->depth, InputOutput,	992	display->depth, InputOutput,
974	display->visual,	993	display->visual,
975	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	994	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
976	#else	995	#else
977	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),	996	TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
978	szHint.x, szHint.y,	997	szHint.x, szHint.y,
979	szHint.width, szHint.height,	998	szHint.width, szHint.height,
980	TermWin.ext_bwidth,	999	TermWin.ext_bwidth,
981	pix_colors_focused[Color_border],	1000	pix_colors_focused[Color_border],
982	pix_colors_focused[Color_border]);	1001	pix_colors_focused[Color_border]);
…		…
991	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1010	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
992	wmHint.input = True;	1011	wmHint.input = True;
993	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1012	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
994	wmHint.window_group = TermWin.parent[0];	1013	wmHint.window_group = TermWin.parent[0];
995		1014
996	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1015	XSetWMProperties (disp, TermWin.parent[0], NULL, NULL,
997	(char **)argv, argc, &szHint, &wmHint, &classHint);	1016	(char **)argv, argc, &szHint, &wmHint, &classHint);
998		1017
999	/* Enable delete window protocol */	1018	/* Enable delete window protocol */
1000	XSetWMProtocols (display->display, TermWin.parent[0],	1019	XSetWMProtocols (disp, TermWin.parent[0],
1001	&xa[XA_WMDELETEWINDOW], 1);	1020	&xa[XA_WMDELETEWINDOW], 1);
1002		1021
1003	#if ENABLE_FRILLS	1022	#if ENABLE_FRILLS
1004	long pid = getpid ();	1023	long pid = getpid ();
1005		1024
1006	XChangeProperty (display->display, TermWin.parent[0],	1025	XChangeProperty (disp, TermWin.parent[0],
1007	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1026	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008	PropModeReplace, (unsigned char *)&pid, 1);	1027	PropModeReplace, (unsigned char *)&pid, 1);
1009	#endif	1028	#endif
1010		1029
1011	XSelectInput (display->display, TermWin.parent[0],	1030	XSelectInput (disp, TermWin.parent[0],
1012	KeyPressMask	1031	KeyPressMask
1013	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1032	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1014	\| KeyReleaseMask	1033	\| KeyReleaseMask
1015	#endif	1034	#endif
1016	\| FocusChangeMask \| VisibilityChangeMask	1035	\| FocusChangeMask \| VisibilityChangeMask
…		…
1018	\| StructureNotifyMask);	1037	\| StructureNotifyMask);
1019	termwin_ev.start (display, TermWin.parent[0]);	1038	termwin_ev.start (display, TermWin.parent[0]);
1020		1039
1021	#if ENABLE_FRILLS	1040	#if ENABLE_FRILLS
1022	if (mwmhints.flags)	1041	if (mwmhints.flags)
1023	XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1042	XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1024	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1043	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1025	#endif	1044	#endif
1026		1045
1027	/* vt cursor: Black-on-White is standard, but this is more popular */	1046	/* vt cursor: Black-on-White is standard, but this is more popular */
1028	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1047	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1029		1048
1030	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1049	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
1031	/* cursor (menuBar/scrollBar): Black-on-White */	1050	/* cursor (menuBar/scrollBar): Black-on-White */
1032	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1051	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	1052	#endif
1047		1053
1048	/* the vt window */	1054	/* the vt window */
1049	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1055	TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0],
1050	window_vt_x,	1056	window_vt_x,
1051	window_vt_y,	1057	window_vt_y,
1052	TermWin_TotalWidth (),	1058	TermWin_TotalWidth (),
1053	TermWin_TotalHeight (),	1059	TermWin_TotalHeight (),
1054	0,	1060	0,
1055	pix_colors_focused[Color_fg],	1061	pix_colors_focused[Color_fg],
1056	pix_colors_focused[Color_bg]);	1062	pix_colors_focused[Color_bg]);
1057	#ifdef DEBUG_X	1063	#ifdef DEBUG_X
1058	XStoreName (display->display, TermWin.vt, "vt window");	1064	XStoreName (disp, TermWin.vt, "vt window");
1059	#endif	1065	#endif
1060		1066
1061	attributes.bit_gravity = NorthWestGravity;	1067	attributes.bit_gravity = NorthWestGravity;
1062	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1068	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1063		1069
1064	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1070	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1065		1071
1066	pointer_unblank ();	1072	pointer_unblank ();
1067		1073
…		…
1070	vt_emask \|= PointerMotionMask;	1076	vt_emask \|= PointerMotionMask;
1071	else	1077	else
1072	#endif	1078	#endif
1073	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1079	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1074		1080
1075	XSelectInput (display->display, TermWin.vt, vt_emask);	1081	XSelectInput (disp, TermWin.vt, vt_emask);
1076	vt_ev.start (display, TermWin.vt);	1082	vt_ev.start (display, TermWin.vt);
1077		1083
1078	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1084	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1079	if (menuBar_height ())	1085	if (menuBar_height ())
1080	{	1086	{
1081	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],	1087	menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0],
1082	window_vt_x, 0,	1088	window_vt_x, 0,
1083	TermWin_TotalWidth (),	1089	TermWin_TotalWidth (),
1084	menuBar_TotalHeight (),	1090	menuBar_TotalHeight (),
1085	0,	1091	0,
1086	pix_colors_focused[Color_fg],	1092	pix_colors_focused[Color_fg],
1087	pix_colors_focused[Color_scroll]);	1093	pix_colors_focused[Color_scroll]);
1088		1094
1089	#ifdef DEBUG_X	1095	#ifdef DEBUG_X
1090	XStoreName (display->display, menuBar.win, "menubar");	1096	XStoreName (disp, menuBar.win, "menubar");
1091	#endif	1097	#endif
1092		1098
1093	menuBar.drawable = new rxvt_drawable (display, menuBar.win);	1099	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1094		1100
1095	XDefineCursor (display->display, menuBar.win,	1101	XDefineCursor (disp, menuBar.win,
1096	XCreateFontCursor (display->display, XC_left_ptr));	1102	XCreateFontCursor (disp, XC_left_ptr));
1097		1103
1098	XSelectInput (display->display, menuBar.win,	1104	XSelectInput (disp, menuBar.win,
1099	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask	1105	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1100	\| Button1MotionMask));
1101	menubar_ev.start (display, menuBar.win);	1106	menubar_ev.start (display, menuBar.win);
1102	}	1107	}
1103	#endif	1108	#endif
1104		1109
1105	#ifdef XPM_BACKGROUND	1110	#ifdef XPM_BACKGROUND
…		…
1121		1126
1122	/* graphics context for the vt window */	1127	/* graphics context for the vt window */
1123	gcvalue.foreground = pix_colors[Color_fg];	1128	gcvalue.foreground = pix_colors[Color_fg];
1124	gcvalue.background = pix_colors[Color_bg];	1129	gcvalue.background = pix_colors[Color_bg];
1125	gcvalue.graphics_exposures = 1;	1130	gcvalue.graphics_exposures = 1;
1126	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1131	TermWin.gc = XCreateGC (disp, TermWin.vt,
1127	GCForeground \| GCBackground \| GCGraphicsExposures,	1132	GCForeground \| GCBackground \| GCGraphicsExposures,
1128	&gcvalue);	1133	&gcvalue);
1129		1134
1130	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1135	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1131		1136
1132	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1137	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1133	gcvalue.foreground = pix_colors[Color_topShadow];	1138	gcvalue.foreground = pix_colors[Color_topShadow];
1134	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1139	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1135	gcvalue.foreground = pix_colors[Color_bottomShadow];	1140	gcvalue.foreground = pix_colors[Color_bottomShadow];
1136	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1141	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1137	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1142	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1138	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1143	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1139	#endif	1144	#endif
1140		1145
1141	#ifdef OFF_FOCUS_FADING	1146	#ifdef OFF_FOCUS_FADING
1142	// initially we are in unfocused state	1147	// initially we are in unfocused state
1143	if (rs[Rs_fade])	1148	if (rs[Rs_fade])
…		…
1381	* the slave.	1386	* the slave.
1382	*/	1387	*/
1383	void	1388	void
1384	rxvt_term::run_command (const char const argv)	1389	rxvt_term::run_command (const char const argv)
1385	{	1390	{
1386	int er;
1387
1388	if (!pty.get ())	1391	if (!pty.get ())
1389	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1392	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1393
		1394	pty.set_utf8_mode (enc_utf8);
		1395
		1396	/* set initial window size */
		1397	tt_winch ();
		1398
		1399	int er;
1390		1400
1391	#ifndef NO_BACKSPACE_KEY	1401	#ifndef NO_BACKSPACE_KEY
1392	if (key_backspace[0] && !key_backspace[1])	1402	if (key_backspace[0] && !key_backspace[1])
1393	er = key_backspace[0];	1403	er = key_backspace[0];
1394	else if (strcmp (key_backspace, "DEC") == 0)	1404	else if (strcmp (key_backspace, "DEC") == 0)
…		…
1396	else	1406	else
1397	#endif	1407	#endif
1398	er = -1;	1408	er = -1;
1399		1409
1400	rxvt_get_ttymode (&tio, er);	1410	rxvt_get_ttymode (&tio, er);
1401
1402	/* set initial window size */
1403	tt_winch ();
1404		1411
1405	sw_chld.start (SIGCHLD);	1412	sw_chld.start (SIGCHLD);
1406		1413
1407	#ifndef __QNX__	1414	#ifndef __QNX__
1408	/* spin off the command interpreter */	1415	/* spin off the command interpreter */

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.108 by root, Fri Feb 4 11:41:23 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.108 by root, Fri Feb 4 11:41:23 2005 UTC