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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 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,
…		…
167	#if TINTING	171	#if TINTING
168	NULL,	172	NULL,
169	#endif	173	#endif
170	};	174	};
171		175
172	const char *const xa_names[NUM_XA] =	176	const char *const xa_names[] =
173	{	177	{
174	"TEXT",	178	"TEXT",
175	"COMPOUND_TEXT",	179	"COMPOUND_TEXT",
176	"UTF8_STRING",	180	"UTF8_STRING",
177	"MULTIPLE",	181	"MULTIPLE",
178	"TARGETS",	182	"TARGETS",
179	"TIMESTAMP",	183	"TIMESTAMP",
180	"VT_SELECTION",	184	"VT_SELECTION",
181	"INCR",	185	"INCR",
182	"WM_DELETE_WINDOW",	186	"WM_DELETE_WINDOW",
		187	"CLIPBOARD",
		188	#if ENABLE_FRILLS
		189	"_NET_WM_PID",
		190	"_MOTIF_WM_HINTS",
		191	"_NET_WM_NAME",
		192	"_NET_WM_ICON_NAME",
		193	#endif
		194	#if USE_XIM
		195	"WM_LOCALE_NAME",
		196	#endif
183	#ifdef TRANSPARENT	197	#ifdef TRANSPARENT
184	"_XROOTPMAP_ID",	198	"_XROOTPMAP_ID",
		199	"ESETROOT_PMAP_ID",
185	#endif	200	#endif
186	#ifdef OFFIX_DND	201	#ifdef OFFIX_DND
187	"DndProtocol",	202	"DndProtocol",
188	"DndSelection",	203	"DndSelection",
189	#endif	204	#endif
190	"CLIPBOARD"
191	};	205	};
192		206
193	bool	207	bool
194	rxvt_term::init_vars ()	208	rxvt_term::init_vars ()
195	{	209	{
		210	sw_term.start (SIGTERM);
		211	sw_int.start (SIGINT);
		212
196	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	213	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
197	#ifdef OFF_FOCUS_FADING	214	#ifdef OFF_FOCUS_FADING
198	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	215	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
199	#endif	216	#endif
200	pix_colors = pix_colors_focused;	217	pix_colors = pix_colors_focused;
…		…
236	last_bot = last_state = -1;	253	last_bot = last_state = -1;
237		254
238	#ifdef MENUBAR	255	#ifdef MENUBAR
239	menu_readonly = 1;	256	menu_readonly = 1;
240	# if ! (MENUBAR_MAX > 1)	257	# if ! (MENUBAR_MAX > 1)
241	CurrentBar = & (BarList);	258	CurrentBar = &BarList;
242	# endif /* (MENUBAR_MAX > 1) */	259	# endif /* (MENUBAR_MAX > 1) */
243	#endif	260	#endif
244		261
245	return true;	262	return true;
246	}	263	}
…		…
320	*/	337	*/
321	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	338	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
322	rs[Rs_display_name] = ":0";	339	rs[Rs_display_name] = ":0";
323		340
324	get_options (r_argc, r_argv);	341	get_options (r_argc, r_argv);
325	free (r_argv);
326		342
327	#ifdef LOCAL_X_IS_UNIX	343	#ifdef LOCAL_X_IS_UNIX
328	if (rs[Rs_display_name][0] == ':')	344	if (rs[Rs_display_name][0] == ':')
329	{	345	{
330	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));	346	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
…		…
337		353
338	if (!display	354	if (!display
339	&& ! (display = displays.get (rs[Rs_display_name])))	355	&& ! (display = displays.get (rs[Rs_display_name])))
340	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]);
341		357
342	extract_resources (display->display, rs[Rs_name]);	358	extract_resources ();
		359	free (r_argv);
343		360
344	/*	361	/*
345	* set any defaults not already set	362	* set any defaults not already set
346	*/	363	*/
347	if (cmd_argv && cmd_argv[0])	364	if (cmd_argv && cmd_argv[0])
…		…
365	#if ENABLE_FRILLS	382	#if ENABLE_FRILLS
366	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)
367	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	384	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
368	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)
369	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	386	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
370	#endif
371
372	#ifndef NO_LINESPACE
373	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	387	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	388	TermWin.lineSpace = min (i, 100); /* arbitrary limit */
375	#endif	389	#endif
376		390
377	#ifdef POINTER_BLANK	391	#ifdef POINTER_BLANK
…		…
588		602
589	this->locale = rxvt_strdup (this->locale);	603	this->locale = rxvt_strdup (this->locale);
590	SET_LOCALE (this->locale);	604	SET_LOCALE (this->locale);
591	mbstate.reset ();	605	mbstate.reset ();
592	#endif	606	#endif
593	#if 0	607
594	#if HAVE_NL_LANGINFO	608	#if HAVE_NL_LANGINFO
		609	char *codeset = strdup (nl_langinfo (CODESET));
		610	// /^UTF.?8/i
		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');
595	free (codeset);	615	free (codeset);
596	codeset = strdup (nl_langinfo (CODESET));
597	enc_utf8 = !strcasecmp (codeset, "UTF-8")
598	\|\| !strcasecmp (codeset, "UTF8");
599	#else	616	#else
600	enc_utf8 = 1;	617	enc_utf8 = 0;
601	#endif
602	#endif	618	#endif
603	}	619	}
604		620
605	void	621	void
606	rxvt_term::init_xlocale ()	622	rxvt_term::init_xlocale ()
…		…
608	#ifdef USE_XIM	624	#ifdef USE_XIM
609	if (!locale)	625	if (!locale)
610	rxvt_warn ("setting locale failed, working without locale support.\n");	626	rxvt_warn ("setting locale failed, working without locale support.\n");
611	else	627	else
612	{	628	{
613	Atom wmlocale;	629	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614
615	wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
616	XChangeProperty (display->display, TermWin.parent[0], wmlocale,
617	XA_STRING, 8, PropModeReplace,
618	(unsigned char *)locale, strlen (locale));
619		630
620	if (!XSupportsLocale ())	631	if (!XSupportsLocale ())
621	{	632	{
622	rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");	633	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
623	return;	634	return;
624	}	635	}
625		636
626	im_ev.start (display);	637	im_ev.start (display);
627		638
…		…
637	{	648	{
638	/*	649	/*
639	* Initialize the command connection.	650	* Initialize the command connection.
640	* This should be called after the X server connection is established.	651	* This should be called after the X server connection is established.
641	*/	652	*/
642	int i;
643
644	for (i = 0; i < NUM_XA; i++)
645	xa[i] = XInternAtom (display->display, xa_names[i], False);
646
647	/* Enable delete window protocol */
648	XSetWMProtocols (display->display, TermWin.parent[0],
649	& (xa[XA_WMDELETEWINDOW]), 1);
650
651	#ifdef USING_W11LIB
652	/* enable W11 callbacks */
653	W11AddEventHandler (display->display, rxvt_W11_process_x_event);
654	#endif
655		653
656	#ifdef META8_OPTION	654	#ifdef META8_OPTION
657	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	655	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
658	#endif	656	#endif
659		657
…		…
832	* Use resource ``modifier'' to override the Meta modifier	830	* Use resource ``modifier'' to override the Meta modifier
833	*/	831	*/
834	void	832	void
835	rxvt_term::get_ourmods ()	833	rxvt_term::get_ourmods ()
836	{	834	{
837	int i, j, k;	835	int i, j, k;
838	int requestedmeta, realmeta, realalt;	836	int requestedmeta, realmeta, realalt;
839	const char cm, rsmod;	837	const char cm, rsmod;
840	XModifierKeymap *map;	838	XModifierKeymap *map;
841	KeyCode *kc;	839	KeyCode *kc;
842	const unsigned int modmasks[] =	840	const unsigned int modmasks[] =
843	{	841	{
844	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	842	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
845	};	843	};
846		844
847	requestedmeta = realmeta = realalt = 0;	845	requestedmeta = realmeta = realalt = 0;
848	rsmod = rs[Rs_modifier];	846	rsmod = rs[Rs_modifier];
		847
849	if (rsmod	848	if (rsmod
850	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	849	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851	requestedmeta = rsmod[3] - '0';	850	requestedmeta = rsmod[3] - '0';
852		851
853	map = XGetModifierMapping (display->display);	852	map = XGetModifierMapping (display->display);
854	kc = map->modifiermap;	853	kc = map->modifiermap;
		854
855	for (i = 1; i < 6; i++)	855	for (i = 1; i < 6; i++)
856	{	856	{
857	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	857	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
		858
858	for (j = map->max_keypermod; j--; k++)	859	for (j = map->max_keypermod; j--; k++)
859	{	860	{
860	if (kc[k] == 0)	861	if (kc[k] == 0)
861	break;	862	break;
		863
862	switch (XKeycodeToKeysym (display->display, kc[k], 0))	864	switch (XKeycodeToKeysym (display->display, kc[k], 0))
863	{	865	{
864	case XK_Num_Lock:	866	case XK_Num_Lock:
865	ModNumLockMask = modmasks[i - 1];	867	ModNumLockMask = modmasks[i - 1];
866	/* FALLTHROUGH */	868	continue;
867	default:	869
868	continue; /* for (;;) */	870	case XK_ISO_Level3_Shift:
		871	ModLevel3Mask = modmasks[i - 1];
		872	continue;
		873
869	case XK_Meta_L:	874	case XK_Meta_L:
870	case XK_Meta_R:	875	case XK_Meta_R:
871	cm = "meta";	876	cm = "meta";
872	realmeta = i;	877	realmeta = i;
873	break;	878	break;
		879
874	case XK_Alt_L:	880	case XK_Alt_L:
875	case XK_Alt_R:	881	case XK_Alt_R:
876	cm = "alt";	882	cm = "alt";
877	realalt = i;	883	realalt = i;
878	break;	884	break;
		885
879	case XK_Super_L:	886	case XK_Super_L:
880	case XK_Super_R:	887	case XK_Super_R:
881	cm = "super";	888	cm = "super";
882	break;	889	break;
		890
883	case XK_Hyper_L:	891	case XK_Hyper_L:
884	case XK_Hyper_R:	892	case XK_Hyper_R:
885	cm = "hyper";	893	cm = "hyper";
886	break;	894	break;
		895
		896	default:
		897	continue;
887	}	898	}
		899
888	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)	900	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
889	requestedmeta = i;	901	requestedmeta = i;
890	}	902	}
891	}	903	}
		904
892	XFreeModifiermap (map);	905	XFreeModifiermap (map);
		906
893	i = (requestedmeta ? requestedmeta	907	i = requestedmeta ? requestedmeta
894	: (realmeta ? realmeta	908	: realmeta ? realmeta
895	: (realalt ? realalt : 0)));	909	: realalt ? realalt
		910	: 0;
		911
896	if (i)	912	if (i)
897	ModMetaMask = modmasks[i - 1];	913	ModMetaMask = modmasks[i - 1];
898	}	914	}
899		915
900	/----------------------------------------------------------------------/	916	/----------------------------------------------------------------------/
…		…
910	#endif	926	#endif
911	XGCValues gcvalue;	927	XGCValues gcvalue;
912	long vt_emask;	928	long vt_emask;
913	XSetWindowAttributes attributes;	929	XSetWindowAttributes attributes;
914	XWindowAttributes gattr;	930	XWindowAttributes gattr;
		931	Window top;
		932	dDisp;
		933
		934	#ifdef USING_W11LIB
		935	/* enable W11 callbacks */
		936	W11AddEventHandler (disp, rxvt_W11_process_x_event);
		937	#endif
		938
		939	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
		940	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
915		941
916	if (options & Opt_transparent)	942	if (options & Opt_transparent)
917	{	943	{
918	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	944	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
919	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	945	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
920	}	946	}
921		947
922	#if ENABLE_FRILLS	948	#if ENABLE_FRILLS
923	if (options & Opt_borderLess)	949	if (options & Opt_borderLess)
924	{	950	{
925	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	951	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
		952
926	if (prop == None)	953	if (prop == None)
927	{	954	{
928	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	955	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
929	#ifdef PREFER_24BIT	956	#ifdef PREFER_24BIT
930	attributes.override_redirect = TRUE;	957	attributes.override_redirect = TRUE;
…		…
945		972
946	/* grab colors before netscape does */	973	/* grab colors before netscape does */
947	Get_Colours ();	974	Get_Colours ();
948		975
949	if (!set_fonts ())	976	if (!set_fonts ())
950	rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n");	977	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
951		978
		979	#if ENABLE_FRILLS
		980	if (rs[Rs_embed])
		981	{
		982	top = strtol (rs[Rs_embed], 0, 0);
		983
		984	XWindowAttributes wattr;
		985	XGetWindowAttributes (disp, top, &wattr);
		986
		987	window_calc (wattr.width, wattr.height);
		988
		989	#if 0
		990	if (wattr.map_state == IsViewable)
		991	{
		992	TermWin.mapped = 1;
		993	refresh_type = FAST_REFRESH;
		994	XClearWindow (disp, top);
		995	// TODO: make XMapNotify-event-code a function and call it
		996	// TODO: how can I detetc visibility without unmpa/map?
		997	// TODO: focusin etc.
		998	}
		999	#else
		1000	// it'S easiets just to unmap/map to get all state correctly set-up
		1001	XUnmapWindow (disp, top);
		1002	#endif
		1003	}
		1004	else
		1005	#endif
		1006	{
952	window_calc (0, 0);	1007	window_calc (0, 0);
		1008
		1009	/* sub-window placement & size in rxvt_resize_subwindows () */
		1010	#ifdef PREFER_24BIT
		1011	attributes.background_pixel = pix_colors_focused[Color_border];
		1012	attributes.border_pixel = pix_colors_focused[Color_border];
		1013	attributes.colormap = display->cmap;
		1014	top = XCreateWindow (disp, DefaultRootWindow (disp),
		1015	szHint.x, szHint.y,
		1016	szHint.width, szHint.height,
		1017	TermWin.ext_bwidth,
		1018	display->depth, InputOutput,
		1019	display->visual,
		1020	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
		1021	#else
		1022	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
		1023	szHint.x, szHint.y,
		1024	szHint.width, szHint.height,
		1025	TermWin.ext_bwidth,
		1026	pix_colors_focused[Color_border],
		1027	pix_colors_focused[Color_border]);
		1028	#endif
		1029	}
		1030
		1031	TermWin.parent[0] = top;
		1032
953	old_width = szHint.width;	1033	old_width = szHint.width;
954	old_height = szHint.height;	1034	old_height = szHint.height;
955
956	/* sub-window placement & size in rxvt_resize_subwindows () */
957
958	#ifdef PREFER_24BIT
959	attributes.background_pixel = pix_colors_focused[Color_border];
960	attributes.border_pixel = pix_colors_focused[Color_border];
961	attributes.colormap = display->cmap;
962	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
963	szHint.x, szHint.y,
964	szHint.width, szHint.height,
965	TermWin.ext_bwidth,
966	display->depth, InputOutput,
967	display->visual,
968	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
969	#else
970	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
971	szHint.x, szHint.y,
972	szHint.width, szHint.height,
973	TermWin.ext_bwidth,
974	pix_colors_focused[Color_border],
975	pix_colors_focused[Color_border]);
976	#endif
977		1035
978	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1036	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
979	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1037	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
980		1038
981	classHint.res_name = (char *)rs[Rs_name];	1039	classHint.res_name = (char *)rs[Rs_name];
982	classHint.res_class = (char *)RESCLASS;	1040	classHint.res_class = (char *)RESCLASS;
983		1041
984	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1042	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
985	wmHint.input = True;	1043	wmHint.input = True;
986	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1044	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
987	wmHint.window_group = TermWin.parent[0];	1045	wmHint.window_group = top;
988		1046
989	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1047	XSetWMProperties (disp, top, NULL, NULL,
990	(char **)argv, argc, &szHint, &wmHint, &classHint);	1048	(char **)argv, argc, &szHint, &wmHint, &classHint);
		1049
		1050	/* Enable delete window protocol */
		1051	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
991		1052
992	#if ENABLE_FRILLS	1053	#if ENABLE_FRILLS
993	long pid = getpid ();	1054	long pid = getpid ();
994	XChangeProperty (display->display, TermWin.parent[0],	1055
		1056	XChangeProperty (disp, top,
995	display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,	1057	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996	PropModeReplace, (unsigned char *)&pid, 1);	1058	PropModeReplace, (unsigned char *)&pid, 1);
997	#endif	1059	#endif
998		1060
999	XSelectInput (display->display, TermWin.parent[0],	1061	XSelectInput (disp, top,
1000	KeyPressMask	1062	KeyPressMask
1001	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1002	\| KeyReleaseMask	1064	\| KeyReleaseMask
1003	#endif	1065	#endif
1004	\| FocusChangeMask \| VisibilityChangeMask	1066	\| FocusChangeMask \| VisibilityChangeMask
1005	\| ExposureMask	1067	\| ExposureMask
1006	\| StructureNotifyMask);	1068	\| StructureNotifyMask);
1007	termwin_ev.start (display, TermWin.parent[0]);	1069	termwin_ev.start (display, top);
1008		1070
1009	#if ENABLE_FRILLS	1071	#if ENABLE_FRILLS
1010	if (mwmhints.flags)	1072	if (mwmhints.flags)
1011	{	1073	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1012	prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);	1074	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1013	XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014	}
1015	#endif	1075	#endif
1016		1076
1017	/* vt cursor: Black-on-White is standard, but this is more popular */	1077	/* vt cursor: Black-on-White is standard, but this is more popular */
1018	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1078	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019		1079
1020	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1080	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
1021	/* cursor (menuBar/scrollBar): Black-on-White */	1081	/* cursor (menuBar/scrollBar): Black-on-White */
1022	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1082	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023	#endif
1024
1025	#ifdef POINTER_BLANK
1026	{
1027	XColor blackcolour;
1028	blackcolour.red = 0;
1029	blackcolour.green = 0;
1030	blackcolour.blue = 0;
1031	Font f = XLoadFont (display->display, "fixed");
1032	blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033	&blackcolour, &blackcolour);
1034	XUnloadFont (display->display, f);
1035	}
1036	#endif	1083	#endif
1037		1084
1038	/* the vt window */	1085	/* the vt window */
1039	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1086	TermWin.vt = XCreateSimpleWindow (disp, top,
1040	window_vt_x,	1087	window_vt_x,
1041	window_vt_y,	1088	window_vt_y,
1042	TermWin_TotalWidth (),	1089	TermWin_TotalWidth (),
1043	TermWin_TotalHeight (),	1090	TermWin_TotalHeight (),
1044	0,	1091	0,
1045	pix_colors_focused[Color_fg],	1092	pix_colors_focused[Color_fg],
1046	pix_colors_focused[Color_bg]);	1093	pix_colors_focused[Color_bg]);
1047	#ifdef DEBUG_X	1094	#ifdef DEBUG_X
1048	XStoreName (display->display, TermWin.vt, "vt window");	1095	XStoreName (disp, TermWin.vt, "vt window");
1049	#endif	1096	#endif
1050		1097
1051	attributes.bit_gravity = NorthWestGravity;	1098	attributes.bit_gravity = NorthWestGravity;
1052	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1099	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053		1100
1054	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1055		1102
1056	pointer_unblank ();	1103	pointer_unblank ();
1057		1104
…		…
1060	vt_emask \|= PointerMotionMask;	1107	vt_emask \|= PointerMotionMask;
1061	else	1108	else
1062	#endif	1109	#endif
1063	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1110	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1064		1111
1065	XSelectInput (display->display, TermWin.vt, vt_emask);	1112	XSelectInput (disp, TermWin.vt, vt_emask);
1066	vt_ev.start (display, TermWin.vt);	1113	vt_ev.start (display, TermWin.vt);
1067		1114
1068	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1115	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069	if (menuBar_height ())	1116	if (menuBar_height ())
1070	{	1117	{
1071	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],	1118	menuBar.win = XCreateSimpleWindow (disp, top,
1072	window_vt_x, 0,	1119	window_vt_x, 0,
1073	TermWin_TotalWidth (),	1120	TermWin_TotalWidth (),
1074	menuBar_TotalHeight (),	1121	menuBar_TotalHeight (),
1075	0,	1122	0,
1076	pix_colors_focused[Color_fg],	1123	pix_colors_focused[Color_fg],
1077	pix_colors_focused[Color_scroll]);	1124	pix_colors_focused[Color_scroll]);
1078		1125
1079	#ifdef DEBUG_X	1126	#ifdef DEBUG_X
1080	XStoreName (display->display, menuBar.win, "menubar");	1127	XStoreName (disp, menuBar.win, "menubar");
1081	#endif	1128	#endif
1082		1129
1083	menuBar.drawable = new rxvt_drawable (display, menuBar.win);	1130	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084		1131
1085	XDefineCursor (display->display, menuBar.win,	1132	XDefineCursor (disp, menuBar.win,
1086	XCreateFontCursor (display->display, XC_left_ptr));	1133	XCreateFontCursor (disp, XC_left_ptr));
1087		1134
1088	XSelectInput (display->display, menuBar.win,	1135	XSelectInput (disp, menuBar.win,
1089	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask	1136	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1090	\| Button1MotionMask));
1091	menubar_ev.start (display, menuBar.win);	1137	menubar_ev.start (display, menuBar.win);
1092	}	1138	}
1093	#endif	1139	#endif
1094		1140
1095	#ifdef XPM_BACKGROUND	1141	#ifdef XPM_BACKGROUND
…		…
1111		1157
1112	/* graphics context for the vt window */	1158	/* graphics context for the vt window */
1113	gcvalue.foreground = pix_colors[Color_fg];	1159	gcvalue.foreground = pix_colors[Color_fg];
1114	gcvalue.background = pix_colors[Color_bg];	1160	gcvalue.background = pix_colors[Color_bg];
1115	gcvalue.graphics_exposures = 1;	1161	gcvalue.graphics_exposures = 1;
1116	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1162	TermWin.gc = XCreateGC (disp, TermWin.vt,
1117	GCForeground \| GCBackground \| GCGraphicsExposures,	1163	GCForeground \| GCBackground \| GCGraphicsExposures,
1118	&gcvalue);	1164	&gcvalue);
1119		1165
1120	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1166	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121		1167
1122	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1168	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1123	gcvalue.foreground = pix_colors[Color_topShadow];	1169	gcvalue.foreground = pix_colors[Color_topShadow];
1124	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1170	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125	gcvalue.foreground = pix_colors[Color_bottomShadow];	1171	gcvalue.foreground = pix_colors[Color_bottomShadow];
1126	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1172	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1173	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1174	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129	#endif	1175	#endif
1130		1176
1131	#ifdef OFF_FOCUS_FADING	1177	#ifdef OFF_FOCUS_FADING
1132	// initially we are in unfocused state	1178	// initially we are in unfocused state
1133	if (rs[Rs_fade])	1179	if (rs[Rs_fade])
…		…
1371	* the slave.	1417	* the slave.
1372	*/	1418	*/
1373	void	1419	void
1374	rxvt_term::run_command (const char const argv)	1420	rxvt_term::run_command (const char const argv)
1375	{	1421	{
1376	int er;
1377
1378	if (!pty.get ())	1422	if (!pty.get ())
1379	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1423	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1424
		1425	pty.set_utf8_mode (enc_utf8);
		1426
		1427	/* set initial window size */
		1428	tt_winch ();
		1429
		1430	int er;
1380		1431
1381	#ifndef NO_BACKSPACE_KEY	1432	#ifndef NO_BACKSPACE_KEY
1382	if (key_backspace[0] && !key_backspace[1])	1433	if (key_backspace[0] && !key_backspace[1])
1383	er = key_backspace[0];	1434	er = key_backspace[0];
1384	else if (strcmp (key_backspace, "DEC") == 0)	1435	else if (strcmp (key_backspace, "DEC") == 0)
…		…
1387	#endif	1438	#endif
1388	er = -1;	1439	er = -1;
1389		1440
1390	rxvt_get_ttymode (&tio, er);	1441	rxvt_get_ttymode (&tio, er);
1391		1442
1392	/* set initial window size */	1443	sw_chld.start (SIGCHLD);
1393	tt_winch ();
1394		1444
1395	#ifndef __QNX__	1445	#ifndef __QNX__
1396	/* spin off the command interpreter */	1446	/* spin off the command interpreter */
1397	switch (cmd_pid = fork ())	1447	switch (cmd_pid = fork ())
1398	{	1448	{

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC vs. Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC