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