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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.147 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC

…		…
174	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
175	"black",	175	"black",
176	#endif	176	#endif
177	};	177	};
178		178
179	const char *const xa_names[] =
180	{
181	"TEXT",
182	"COMPOUND_TEXT",
183	"UTF8_STRING",
184	"MULTIPLE",
185	"TARGETS",
186	"TIMESTAMP",
187	"VT_SELECTION",
188	"INCR",
189	"WM_PROTOCOLS",
190	"WM_DELETE_WINDOW",
191	"CLIPBOARD",
192	#if ENABLE_FRILLS
193	"_MOTIF_WM_HINTS",
194	#endif
195	#if ENABLE_EWMH
196	"_NET_WM_PID",
197	"_NET_WM_NAME",
198	"_NET_WM_ICON_NAME",
199	"_NET_WM_PING",
200	#endif
201	#if USE_XIM
202	"WM_LOCALE_NAME",
203	#endif
204	#ifdef TRANSPARENT
205	"_XROOTPMAP_ID",
206	"ESETROOT_PMAP_ID",
207	#endif
208	#ifdef OFFIX_DND
209	"DndProtocol",
210	"DndSelection",
211	#endif
212	#if ENABLE_XEMBED
213	"_XEMBED",
214	"_XEMBED_INFO",
215	#endif
216	};
217
218	bool	179	bool
219	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
220	{	181	{
		182	pix_colors = //
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224	#endif	186	#endif
225	pix_colors = pix_colors_focused;
226
227	if (pix_colors == NULL)
228	return false;
229		187
230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
231	pixmap = None;	189	pixmap = None;
232	#endif	190	#endif
233		191
234	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
235	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
236	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
237	want_refresh = 1;	195	want_refresh = 1;
238	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
239	focus = 0;
240	ncol = 80;	197	ncol = 80;
241	nrow = 24;	198	nrow = 24;
242	int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
243	ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
244	lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
245	saveLines = SAVELINES;	202	saveLines = SAVELINES;
246	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
247		204
248	refresh_limit = 1;	205	refresh_limit = 1;
249	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
250	prev_nrow = prev_ncol = 0;
251		207
252	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
253	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
254	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
255	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
…		…
341	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
342		298
343	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
344	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345		301
		302	xa = display->xa;
		303
		304	#if ENABLE_FRILLS
		305	if (rs[Rs_depth])
		306	set (display, strtol (rs[Rs_depth], 0, 0));
		307	else
		308	#endif
		309	set (display);
		310
346	extract_resources ();	311	extract_resources ();
347		312
348	free (r_argv);	313	free (r_argv);
		314
		315	#if ENABLE_PERL
		316	if (!rs[Rs_perl_ext_1])
		317	rs[Rs_perl_ext_1] = "default";
		318
		319	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		320	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		321	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		322	{
		323	rxvt_perl.init (this);
		324	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		325	}
		326	#endif
349		327
350	/*	328	/*
351	* set any defaults not already set	329	* set any defaults not already set
352	*/	330	*/
353	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
504	val = rxvt_network_display (rs[Rs_display_name]);	482	val = rxvt_network_display (rs[Rs_display_name]);
505	rs[Rs_display_name] = (const char *)val;	483	rs[Rs_display_name] = (const char *)val;
506		484
507	if (val == NULL)	485	if (val == NULL)
508	#endif /* DISPLAY_IS_IP */	486	#endif /* DISPLAY_IS_IP */
509	val = XDisplayString (display->display);	487	val = XDisplayString (xdisp);
510		488
511	if (rs[Rs_display_name] == NULL)	489	if (rs[Rs_display_name] == NULL)
512	rs[Rs_display_name] = val; /* use broken `:0' value */	490	rs[Rs_display_name] = val; /* use broken `:0' value */
513		491
514	i = strlen (val);	492	i = strlen (val);
515	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
516		494
517	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
518		496
519	/* avoiding the math library:	497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522	;
523	max_it (i, 1);
524	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
525
526	sprintf (env_windowid, "WINDOWID=%u",
527	(unsigned int)parent[0]);
528		498
529	/* add entries to the environment:	499	/* add entries to the environment:
530	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
531	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
532	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
534	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
535	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
536	*/	506	*/
537	putenv (env_display);	507	putenv (env_display);
538	putenv (env_windowid);	508	putenv (env_windowid);
		509
539	if (env_colorfgbg)	510	if (env_colorfgbg)
540	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
541		512
542	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
543	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
544	#endif	515	#endif
545		516
546	if (display->depth <= 2)	517	if (depth <= 2)
547	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
548	else	519	else
549	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
550		521
551	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
682		653
683	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
684	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
685	#endif	656	#endif
686		657
687	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688	{	659	{
689	rxvt_color xcol;	660	rxvt_color xcol;
690		661
691	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
692	continue;	663	continue;
…		…
732	SET_PIXCOLOR (i);	703	SET_PIXCOLOR (i);
733	}	704	}
734		705
735	#ifdef OFF_FOCUS_FADING	706	#ifdef OFF_FOCUS_FADING
736	if (rs[Rs_fade])	707	if (rs[Rs_fade])
737	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	709	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739	#endif	710	#endif
740		711
741	if (display->depth <= 2)	712	if (depth <= 2)
742	{	713	{
743	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	714	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
744	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	715	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
745	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	716	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
746	}	717	}
…		…
751	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
752	* from the fvwm window manager.	723	* from the fvwm window manager.
753	*/	724	*/
754	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
755		726
756	if (display->depth <= 2)	727	if (depth <= 2)
757	{	728	{
758	/* Monochrome */	729	/* Monochrome */
759	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	pix_colors[Color_scroll] = pix_colors[Color_fg];
760	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	pix_colors[Color_topShadow] = pix_colors[Color_bg];
761	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
766	/* xcol[0] == white	737	/* xcol[0] == white
767	* xcol[1] == top shadow	738	* xcol[1] == top shadow
768	* xcol[2] == bot shadow */	739	* xcol[2] == bot shadow */
769		740
770	xcol[1] = pix_colors[Color_scroll];	741	xcol[1] = pix_colors[Color_scroll];
771	xcol[0].set (display, 65535, 65535, 65535);	742	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
772		743
773	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	744	rxvt_rgba c0, c1;
774		745
775	xcol[0].get (display, pr0, pg0, pb0);	746	xcol[0].get (this, c0);
776	xcol[1].get (display, pr1, pg1, pb1);	747	xcol[1].get (this, c1);
777		748
778	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
779		750
780	/* topShadowColor */	751	/* topShadowColor */
781	if (!xcol[1].set (display,	752	if (!xcol[1].set (this,
		753	rxvt_rgba (
782	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	754	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
783	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	755	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
784	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	756	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
		757	c1.a) // pa1 vs. pa0: arbitrary
		758	));
785	xcol[1] = pix_colors[Color_White];	759	xcol[1] = pix_colors[Color_White];
786		760
787	pix_colors[Color_topShadow] = xcol[1];	761	pix_colors[Color_topShadow] = xcol[1];
788	}	762	}
789	#endif /* KEEP_SCROLLCOLOR */	763	#endif /* KEEP_SCROLLCOLOR */
…		…
833		807
834	if (rsmod	808	if (rsmod
835	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	809	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836	requestedmeta = rsmod[3] - '0';	810	requestedmeta = rsmod[3] - '0';
837		811
838	map = XGetModifierMapping (display->display);	812	map = XGetModifierMapping (xdisp);
839	kc = map->modifiermap;	813	kc = map->modifiermap;
840		814
841	for (i = 1; i < 6; i++)	815	for (i = 1; i < 6; i++)
842	{	816	{
843	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	817	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
845	for (j = map->max_keypermod; j--; k++)	819	for (j = map->max_keypermod; j--; k++)
846	{	820	{
847	if (kc[k] == 0)	821	if (kc[k] == 0)
848	break;	822	break;
849		823
850	switch (XKeycodeToKeysym (display->display, kc[k], 0))	824	switch (XKeycodeToKeysym (xdisp, kc[k], 0))
851	{	825	{
852	case XK_Num_Lock:	826	case XK_Num_Lock:
853	ModNumLockMask = modmasks[i - 1];	827	ModNumLockMask = modmasks[i - 1];
854	continue;	828	continue;
855		829
…		…
905	rxvt_term::create_windows (int argc, const char const argv)	879	rxvt_term::create_windows (int argc, const char const argv)
906	{	880	{
907	XClassHint classHint;	881	XClassHint classHint;
908	XWMHints wmHint;	882	XWMHints wmHint;
909	#if ENABLE_FRILLS	883	#if ENABLE_FRILLS
910	Atom prop = None;
911	MWMHints mwmhints;	884	MWMHints mwmhints;
912	#endif	885	#endif
913	XGCValues gcvalue;	886	XGCValues gcvalue;
914	XSetWindowAttributes attributes;	887	XSetWindowAttributes attributes;
915	XWindowAttributes gattr;
916	Window top, parent;	888	Window top, parent;
917	dDisp;
918		889
919	#ifdef USING_W11LIB	890	dLocal (Display *, xdisp);
920	/* enable W11 callbacks */
921	W11AddEventHandler (disp, rxvt_W11_process_x_event);
922	#endif
923		891
924	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	892	/* grab colors before netscape does */
925	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	893	Get_Colours ();
926		894
927	if (OPTION (Opt_transparent))	895	if (!set_fonts ())
928	{	896	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	897
930	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	898	parent = display->root;
931	}	899
		900	attributes.override_redirect = !!OPTION (Opt_override_redirect);
932		901
933	#if ENABLE_FRILLS	902	#if ENABLE_FRILLS
934	if (OPTION (Opt_borderLess))	903	if (OPTION (Opt_borderLess))
935	{	904	{
936	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	905	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
937
938	if (prop == None)
939	{	906	{
940	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	907	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941	#ifdef PREFER_24BIT
942	attributes.override_redirect = TRUE;	908	attributes.override_redirect = true;
943	#endif
944	mwmhints.flags = 0;	909	mwmhints.flags = 0;
945	}	910	}
946	else	911	else
947	{	912	{
948	mwmhints.flags = MWM_HINTS_DECORATIONS;	913	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
951	}	916	}
952	else	917	else
953	mwmhints.flags = 0;	918	mwmhints.flags = 0;
954	#endif	919	#endif
955		920
956	/* grab colors before netscape does */
957	Get_Colours ();
958
959	if (!set_fonts ())
960	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962	parent = DefaultRootWindow (disp);
963
964	#if ENABLE_XEMBED	921	#if ENABLE_XEMBED
965	if (rs[Rs_embed])	922	if (rs[Rs_embed])
966	{	923	{
967	XWindowAttributes wattr;	924	XWindowAttributes wattr;
968		925
969	parent = strtol (rs[Rs_embed], 0, 0);	926	parent = strtol (rs[Rs_embed], 0, 0);
970		927
971	if (!XGetWindowAttributes (disp, parent, &wattr))	928	if (!XGetWindowAttributes (xdisp, parent, &wattr))
972	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	929	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973		930
974	window_calc (wattr.width, wattr.height);	931	window_calc (wattr.width, wattr.height);
975	}	932	}
976	#endif	933	#endif
977		934
978	window_calc (0, 0);	935	window_calc (0, 0);
979		936
980	/* sub-window placement & size in rxvt_resize_subwindows () */	937	/* sub-window placement & size in rxvt_resize_subwindows () */
981	#ifdef PREFER_24BIT
982	attributes.background_pixel = pix_colors_focused[Color_border];	938	attributes.background_pixel = pix_colors_focused [Color_border];
983	attributes.border_pixel = pix_colors_focused[Color_border];	939	attributes.border_pixel = pix_colors_focused [Color_border];
984	attributes.colormap = display->cmap;	940	attributes.colormap = cmap;
		941
985	top = XCreateWindow (disp, parent,	942	top = XCreateWindow (xdisp, parent,
986	szHint.x, szHint.y,	943	szHint.x, szHint.y,
987	szHint.width, szHint.height,	944	szHint.width, szHint.height,
988	ext_bwidth,	945	ext_bwidth,
989	display->depth, InputOutput,	946	depth, InputOutput, visual,
990	display->visual,
991	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	947	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
992	#else	948	&attributes);
993	top = XCreateSimpleWindow (disp, parent,
994	szHint.x, szHint.y,
995	szHint.width, szHint.height,
996	ext_bwidth,
997	pix_colors_focused[Color_border],
998	pix_colors_focused[Color_border]);
999	#endif
1000		949
1001	this->parent[0] = top;	950	this->parent[0] = top;
1002		951
1003	old_width = szHint.width;	952	old_width = szHint.width;
1004	old_height = szHint.height;	953	old_height = szHint.height;
1005		954
1006	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	955	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	956	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008		957
1009	classHint.res_name = (char *)rs[Rs_name];	958	classHint.res_name = (char *)rs[Rs_name];
1010	classHint.res_class = (char *)RESCLASS;	959	classHint.res_class = (char *)RESCLASS;
1011		960
1012	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	961	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1013	wmHint.input = True;	962	wmHint.input = True;
1014	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	963	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015	wmHint.window_group = top;	964	wmHint.window_group = top;
1016		965
1017	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	966	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1018	&szHint, &wmHint, &classHint);	967	&szHint, &wmHint, &classHint);
		968
		969	#if ENABLE_FRILLS
		970	if (mwmhints.flags)
		971	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		972	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		973	#endif
1019		974
1020	Atom protocols[] = {	975	Atom protocols[] = {
1021	xa[XA_WM_DELETE_WINDOW],	976	xa[XA_WM_DELETE_WINDOW],
1022	#if ENABLE_EWMH	977	#if ENABLE_EWMH
1023	xa[XA_NET_WM_PING],	978	xa[XA_NET_WM_PING],
1024	#endif	979	#endif
1025	};	980	};
1026		981
1027	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	982	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028		983
1029	#if ENABLE_FRILLS	984	#if ENABLE_FRILLS
1030	if (rs[Rs_transient_for])	985	if (rs[Rs_transient_for])
1031	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	986	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032	#endif	987	#endif
1033		988
1034	#if ENABLE_EWMH	989	#if ENABLE_EWMH
1035	long pid = getpid ();	990	long pid = getpid ();
1036		991
1037	XChangeProperty (disp, top,	992	XChangeProperty (xdisp, top,
1038	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	993	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039	PropModeReplace, (unsigned char *)&pid, 1);	994	PropModeReplace, (unsigned char *)&pid, 1);
1040		995
1041	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	996	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042	#endif	997	#endif
1043		998
1044	XSelectInput (disp, top,	999	XSelectInput (xdisp, top,
1045	KeyPressMask	1000	KeyPressMask
1046	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1001	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1047	\| KeyReleaseMask	1002	\| KeyReleaseMask
1048	#endif	1003	#endif
1049	\| FocusChangeMask \| VisibilityChangeMask	1004	\| FocusChangeMask \| VisibilityChangeMask
1050	\| ExposureMask \| StructureNotifyMask);	1005	\| ExposureMask \| StructureNotifyMask);
1051		1006
1052	termwin_ev.start (display, top);	1007	termwin_ev.start (display, top);
1053		1008
1054	#if ENABLE_FRILLS
1055	if (mwmhints.flags)
1056	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058	#endif
1059
1060	/* vt cursor: Black-on-White is standard, but this is more popular */	1009	/* vt cursor: Black-on-White is standard, but this is more popular */
1061	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1010	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1062		1011
1063	#ifdef HAVE_SCROLLBARS	1012	#ifdef HAVE_SCROLLBARS
1064	/* cursor scrollBar: Black-on-White */	1013	/* cursor scrollBar: Black-on-White */
1065	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1014	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1066	#endif	1015	#endif
1067		1016
1068	/* the vt window */	1017	/* the vt window */
1069	vt = XCreateSimpleWindow (disp, top,	1018	vt = XCreateSimpleWindow (xdisp, top,
1070	window_vt_x,
1071	window_vt_y,	1019	window_vt_x, window_vt_y,
1072	width,
1073	height,	1020	width, height,
1074	0,	1021	0,
1075	pix_colors_focused[Color_fg],	1022	pix_colors_focused[Color_fg],
1076	pix_colors_focused[Color_bg]);	1023	pix_colors_focused[Color_bg]);
1077	#ifdef DEBUG_X
1078	XStoreName (disp, vt, "vt window");
1079	#endif
1080		1024
1081	attributes.bit_gravity = NorthWestGravity;	1025	attributes.bit_gravity = NorthWestGravity;
1082	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1026	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1083		1027
1084	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1028	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1085		1029
1086	if (OPTION (Opt_pointerBlank))	1030	if (OPTION (Opt_pointerBlank))
1087	vt_emask \|= PointerMotionMask;	1031	vt_emask \|= PointerMotionMask;
…		…
1092		1036
1093	vt_ev.start (display, vt);	1037	vt_ev.start (display, vt);
1094		1038
1095	#ifdef XPM_BACKGROUND	1039	#ifdef XPM_BACKGROUND
1096	if (rs[Rs_backgroundPixmap] != NULL	1040	if (rs[Rs_backgroundPixmap] != NULL
1097	&& ! OPTION (Opt_transparent))	1041	&& !OPTION (Opt_transparent))
1098	{	1042	{
1099	const char *p = rs[Rs_backgroundPixmap];	1043	const char *p = rs[Rs_backgroundPixmap];
1100		1044
1101	if ((p = strchr (p, ';')) != NULL)	1045	if ((p = strchr (p, ';')) != NULL)
1102	{	1046	{
…		…
1108	scr_touch (true);	1052	scr_touch (true);
1109	}	1053	}
1110	#endif	1054	#endif
1111		1055
1112	/* graphics context for the vt window */	1056	/* graphics context for the vt window */
1113	gcvalue.foreground = pix_colors[Color_fg];	1057	gcvalue.foreground = pix_colors[Color_fg];
1114	gcvalue.background = pix_colors[Color_bg];	1058	gcvalue.background = pix_colors[Color_bg];
1115	gcvalue.graphics_exposures = 1;	1059	gcvalue.graphics_exposures = 1;
		1060
1116	gc = XCreateGC (disp, vt,	1061	gc = XCreateGC (xdisp, vt,
1117	GCForeground \| GCBackground \| GCGraphicsExposures,	1062	GCForeground \| GCBackground \| GCGraphicsExposures,
1118	&gcvalue);	1063	&gcvalue);
1119		1064
1120	drawable = new rxvt_drawable (display, vt);	1065	drawable = new rxvt_drawable (this, vt);
1121		1066
1122	#ifdef RXVT_SCROLLBAR	1067	#ifdef RXVT_SCROLLBAR
1123	gcvalue.foreground = pix_colors[Color_topShadow];	1068	gcvalue.foreground = pix_colors[Color_topShadow];
1124	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1069	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1125	gcvalue.foreground = pix_colors[Color_bottomShadow];	1070	gcvalue.foreground = pix_colors[Color_bottomShadow];
1126	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1127	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1072	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1073	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1129	#endif	1074	#endif
1130		1075
1131	#ifdef OFF_FOCUS_FADING	1076	#ifdef OFF_FOCUS_FADING
1132	// initially we are in unfocused state	1077	// initially we are in unfocused state
1133	if (rs[Rs_fade])	1078	if (rs[Rs_fade])
1134	pix_colors = pix_colors_unfocused;	1079	pix_colors = pix_colors_unfocused;
1135	#endif	1080	#endif
1136		1081
1137	pointer_unblank ();	1082	pointer_unblank ();
1138	scr_recolour ();	1083	scr_recolour ();
1139
1140	#if ENABLE_XEMBED
1141	if (rs[Rs_embed])
1142	{
1143	long info[2] = { 0, XEMBED_MAPPED };
1144
1145	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146	32, PropModeReplace, (unsigned char *)&info, 2);
1147	}
1148	#endif
1149	}	1084	}
1150		1085
1151	/* ------------------------------------------------------------------------- *	1086	/* ------------------------------------------------------------------------- *
1152	* GET TTY CURRENT STATE *	1087	* GET TTY CURRENT STATE *
1153	* ------------------------------------------------------------------------- */	1088	* ------------------------------------------------------------------------- */
…		…
1443	}	1378	}
1444		1379
1445	_exit (EXIT_FAILURE);	1380	_exit (EXIT_FAILURE);
1446		1381
1447	default:	1382	default:
1448	#if UTMP_SUPPORT
1449	if (!OPTION (Opt_utmpInhibit))	1383	if (!OPTION (Opt_utmpInhibit))
1450	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1384	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1451	#endif
1452		1385
1453	pty->close_tty ();	1386	pty->close_tty ();
		1387
		1388	child_ev.start (cmd_pid);
		1389
		1390	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1454	break;	1391	break;
1455	}	1392	}
1456	}	1393	}
1457		1394
1458	/* ------------------------------------------------------------------------- *	1395	/* ------------------------------------------------------------------------- *

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.147 by root, Tue Jan 17 16:50:42 2006 UTC vs. Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.147 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC