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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.244 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

…		…
143		143
144	return rval;	144	return rval;
145	}	145	}
146	#endif	146	#endif
147		147
148	const char *const def_colorName[] =	148	static const char *const def_colorName[] =
149	{	149	{
150	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
152	/* low-intensity colors */	152	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	153	"rgb:00/00/00", // 0: black (Black)
…		…
174	"rgb:00/00/ff", // 4/12: bright blue (Blue)	174	"rgb:00/00/ff", // 4/12: bright blue (Blue)
175	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)	175	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)	176	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177	"rgb:ff/ff/ff", // 7/15: bright white (White)	177	"rgb:ff/ff/ff", // 7/15: bright white (White)
178		178
		179	#if !USE_256_COLORS
179	// 88 xterm colours	180	// 88 xterm colours
180	"rgb:00/00/00",	181	"rgb:00/00/00",
181	"rgb:00/00/8b",	182	"rgb:00/00/8b",
182	"rgb:00/00/cd",	183	"rgb:00/00/cd",
183	"rgb:00/00/ff",	184	"rgb:00/00/ff",
…		…
247	"rgb:8b/8b/8b",	248	"rgb:8b/8b/8b",
248	"rgb:a2/a2/a2",	249	"rgb:a2/a2/a2",
249	"rgb:b9/b9/b9",	250	"rgb:b9/b9/b9",
250	"rgb:d0/d0/d0",	251	"rgb:d0/d0/d0",
251	"rgb:e7/e7/e7",	252	"rgb:e7/e7/e7",
		253	#else
		254	// 256 xterm colours
		255	"rgb:00/00/00",
		256	"rgb:00/00/5f",
		257	"rgb:00/00/87",
		258	"rgb:00/00/af",
		259	"rgb:00/00/d7",
		260	"rgb:00/00/ff",
		261	"rgb:00/5f/00",
		262	"rgb:00/5f/5f",
		263	"rgb:00/5f/87",
		264	"rgb:00/5f/af",
		265	"rgb:00/5f/d7",
		266	"rgb:00/5f/ff",
		267	"rgb:00/87/00",
		268	"rgb:00/87/5f",
		269	"rgb:00/87/87",
		270	"rgb:00/87/af",
		271	"rgb:00/87/d7",
		272	"rgb:00/87/ff",
		273	"rgb:00/af/00",
		274	"rgb:00/af/5f",
		275	"rgb:00/af/87",
		276	"rgb:00/af/af",
		277	"rgb:00/af/d7",
		278	"rgb:00/af/ff",
		279	"rgb:00/d7/00",
		280	"rgb:00/d7/5f",
		281	"rgb:00/d7/87",
		282	"rgb:00/d7/af",
		283	"rgb:00/d7/d7",
		284	"rgb:00/d7/ff",
		285	"rgb:00/ff/00",
		286	"rgb:00/ff/5f",
		287	"rgb:00/ff/87",
		288	"rgb:00/ff/af",
		289	"rgb:00/ff/d7",
		290	"rgb:00/ff/ff",
		291	"rgb:5f/00/00",
		292	"rgb:5f/00/5f",
		293	"rgb:5f/00/87",
		294	"rgb:5f/00/af",
		295	"rgb:5f/00/d7",
		296	"rgb:5f/00/ff",
		297	"rgb:5f/5f/00",
		298	"rgb:5f/5f/5f",
		299	"rgb:5f/5f/87",
		300	"rgb:5f/5f/af",
		301	"rgb:5f/5f/d7",
		302	"rgb:5f/5f/ff",
		303	"rgb:5f/87/00",
		304	"rgb:5f/87/5f",
		305	"rgb:5f/87/87",
		306	"rgb:5f/87/af",
		307	"rgb:5f/87/d7",
		308	"rgb:5f/87/ff",
		309	"rgb:5f/af/00",
		310	"rgb:5f/af/5f",
		311	"rgb:5f/af/87",
		312	"rgb:5f/af/af",
		313	"rgb:5f/af/d7",
		314	"rgb:5f/af/ff",
		315	"rgb:5f/d7/00",
		316	"rgb:5f/d7/5f",
		317	"rgb:5f/d7/87",
		318	"rgb:5f/d7/af",
		319	"rgb:5f/d7/d7",
		320	"rgb:5f/d7/ff",
		321	"rgb:5f/ff/00",
		322	"rgb:5f/ff/5f",
		323	"rgb:5f/ff/87",
		324	"rgb:5f/ff/af",
		325	"rgb:5f/ff/d7",
		326	"rgb:5f/ff/ff",
		327	"rgb:87/00/00",
		328	"rgb:87/00/5f",
		329	"rgb:87/00/87",
		330	"rgb:87/00/af",
		331	"rgb:87/00/d7",
		332	"rgb:87/00/ff",
		333	"rgb:87/5f/00",
		334	"rgb:87/5f/5f",
		335	"rgb:87/5f/87",
		336	"rgb:87/5f/af",
		337	"rgb:87/5f/d7",
		338	"rgb:87/5f/ff",
		339	"rgb:87/87/00",
		340	"rgb:87/87/5f",
		341	"rgb:87/87/87",
		342	"rgb:87/87/af",
		343	"rgb:87/87/d7",
		344	"rgb:87/87/ff",
		345	"rgb:87/af/00",
		346	"rgb:87/af/5f",
		347	"rgb:87/af/87",
		348	"rgb:87/af/af",
		349	"rgb:87/af/d7",
		350	"rgb:87/af/ff",
		351	"rgb:87/d7/00",
		352	"rgb:87/d7/5f",
		353	"rgb:87/d7/87",
		354	"rgb:87/d7/af",
		355	"rgb:87/d7/d7",
		356	"rgb:87/d7/ff",
		357	"rgb:87/ff/00",
		358	"rgb:87/ff/5f",
		359	"rgb:87/ff/87",
		360	"rgb:87/ff/af",
		361	"rgb:87/ff/d7",
		362	"rgb:87/ff/ff",
		363	"rgb:af/00/00",
		364	"rgb:af/00/5f",
		365	"rgb:af/00/87",
		366	"rgb:af/00/af",
		367	"rgb:af/00/d7",
		368	"rgb:af/00/ff",
		369	"rgb:af/5f/00",
		370	"rgb:af/5f/5f",
		371	"rgb:af/5f/87",
		372	"rgb:af/5f/af",
		373	"rgb:af/5f/d7",
		374	"rgb:af/5f/ff",
		375	"rgb:af/87/00",
		376	"rgb:af/87/5f",
		377	"rgb:af/87/87",
		378	"rgb:af/87/af",
		379	"rgb:af/87/d7",
		380	"rgb:af/87/ff",
		381	"rgb:af/af/00",
		382	"rgb:af/af/5f",
		383	"rgb:af/af/87",
		384	"rgb:af/af/af",
		385	"rgb:af/af/d7",
		386	"rgb:af/af/ff",
		387	"rgb:af/d7/00",
		388	"rgb:af/d7/5f",
		389	"rgb:af/d7/87",
		390	"rgb:af/d7/af",
		391	"rgb:af/d7/d7",
		392	"rgb:af/d7/ff",
		393	"rgb:af/ff/00",
		394	"rgb:af/ff/5f",
		395	"rgb:af/ff/87",
		396	"rgb:af/ff/af",
		397	"rgb:af/ff/d7",
		398	"rgb:af/ff/ff",
		399	"rgb:d7/00/00",
		400	"rgb:d7/00/5f",
		401	"rgb:d7/00/87",
		402	"rgb:d7/00/af",
		403	"rgb:d7/00/d7",
		404	"rgb:d7/00/ff",
		405	"rgb:d7/5f/00",
		406	"rgb:d7/5f/5f",
		407	"rgb:d7/5f/87",
		408	"rgb:d7/5f/af",
		409	"rgb:d7/5f/d7",
		410	"rgb:d7/5f/ff",
		411	"rgb:d7/87/00",
		412	"rgb:d7/87/5f",
		413	"rgb:d7/87/87",
		414	"rgb:d7/87/af",
		415	"rgb:d7/87/d7",
		416	"rgb:d7/87/ff",
		417	"rgb:d7/af/00",
		418	"rgb:d7/af/5f",
		419	"rgb:d7/af/87",
		420	"rgb:d7/af/af",
		421	"rgb:d7/af/d7",
		422	"rgb:d7/af/ff",
		423	"rgb:d7/d7/00",
		424	"rgb:d7/d7/5f",
		425	"rgb:d7/d7/87",
		426	"rgb:d7/d7/af",
		427	"rgb:d7/d7/d7",
		428	"rgb:d7/d7/ff",
		429	"rgb:d7/ff/00",
		430	"rgb:d7/ff/5f",
		431	"rgb:d7/ff/87",
		432	"rgb:d7/ff/af",
		433	"rgb:d7/ff/d7",
		434	"rgb:d7/ff/ff",
		435	"rgb:ff/00/00",
		436	"rgb:ff/00/5f",
		437	"rgb:ff/00/87",
		438	"rgb:ff/00/af",
		439	"rgb:ff/00/d7",
		440	"rgb:ff/00/ff",
		441	"rgb:ff/5f/00",
		442	"rgb:ff/5f/5f",
		443	"rgb:ff/5f/87",
		444	"rgb:ff/5f/af",
		445	"rgb:ff/5f/d7",
		446	"rgb:ff/5f/ff",
		447	"rgb:ff/87/00",
		448	"rgb:ff/87/5f",
		449	"rgb:ff/87/87",
		450	"rgb:ff/87/af",
		451	"rgb:ff/87/d7",
		452	"rgb:ff/87/ff",
		453	"rgb:ff/af/00",
		454	"rgb:ff/af/5f",
		455	"rgb:ff/af/87",
		456	"rgb:ff/af/af",
		457	"rgb:ff/af/d7",
		458	"rgb:ff/af/ff",
		459	"rgb:ff/d7/00",
		460	"rgb:ff/d7/5f",
		461	"rgb:ff/d7/87",
		462	"rgb:ff/d7/af",
		463	"rgb:ff/d7/d7",
		464	"rgb:ff/d7/ff",
		465	"rgb:ff/ff/00",
		466	"rgb:ff/ff/5f",
		467	"rgb:ff/ff/87",
		468	"rgb:ff/ff/af",
		469	"rgb:ff/ff/d7",
		470	"rgb:ff/ff/ff",
		471	"rgb:08/08/08",
		472	"rgb:12/12/12",
		473	"rgb:1c/1c/1c",
		474	"rgb:26/26/26",
		475	"rgb:30/30/30",
		476	"rgb:3a/3a/3a",
		477	"rgb:44/44/44",
		478	"rgb:4e/4e/4e",
		479	"rgb:58/58/58",
		480	"rgb:62/62/62",
		481	"rgb:6c/6c/6c",
		482	"rgb:76/76/76",
		483	"rgb:80/80/80",
		484	"rgb:8a/8a/8a",
		485	"rgb:94/94/94",
		486	"rgb:9e/9e/9e",
		487	"rgb:a8/a8/a8",
		488	"rgb:b2/b2/b2",
		489	"rgb:bc/bc/bc",
		490	"rgb:c6/c6/c6",
		491	"rgb:d0/d0/d0",
		492	"rgb:da/da/da",
		493	"rgb:e4/e4/e4",
		494	"rgb:ee/ee/ee",
		495	#endif
252		496
253	#ifndef NO_CURSORCOLOR	497	#ifndef NO_CURSORCOLOR
254	COLOR_CURSOR_BACKGROUND,	498	COLOR_CURSOR_BACKGROUND,
255	COLOR_CURSOR_FOREGROUND,	499	COLOR_CURSOR_FOREGROUND,
256	#endif /* ! NO_CURSORCOLOR */	500	#endif /* ! NO_CURSORCOLOR */
…		…
266	#if ENABLE_FRILLS	510	#if ENABLE_FRILLS
267	NULL, // Color_underline	511	NULL, // Color_underline
268	#endif	512	#endif
269	#ifdef OPTION_HC	513	#ifdef OPTION_HC
270	NULL,	514	NULL,
		515	NULL,
271	#endif	516	#endif
272	#ifdef KEEP_SCROLLCOLOR
273	COLOR_SCROLLBAR,	517	COLOR_SCROLLBAR,
		518	#ifdef RXVT_SCROLLBAR
274	COLOR_SCROLLTROUGH,	519	COLOR_SCROLLTROUGH,
275	#endif /* KEEP_SCROLLCOLOR */	520	#endif
276	#if ENABLE_TRANSPARENCY	521	#if ENABLE_TRANSPARENCY
277	NULL,	522	NULL,
278	#endif	523	#endif
279	#if OFF_FOCUS_FADING	524	#if OFF_FOCUS_FADING
280	"rgb:00/00/00",	525	"rgb:00/00/00",
…		…
293	ncol = 80;	538	ncol = 80;
294	nrow = 24;	539	nrow = 24;
295	int_bwidth = INTERNALBORDERWIDTH;	540	int_bwidth = INTERNALBORDERWIDTH;
296	ext_bwidth = EXTERNALBORDERWIDTH;	541	ext_bwidth = EXTERNALBORDERWIDTH;
297	lineSpace = LINESPACE;	542	lineSpace = LINESPACE;
		543	letterSpace = LETTERSPACE;
298	saveLines = SAVELINES;	544	saveLines = SAVELINES;
299		545
300	refresh_type = SLOW_REFRESH;	546	refresh_type = SLOW_REFRESH;
301		547
302	oldcursor.row = oldcursor.col = -1;	548	oldcursor.row = oldcursor.col = -1;
…		…
307	set_option (Opt_skipScroll);	553	set_option (Opt_skipScroll);
308	set_option (Opt_secondaryScreen);	554	set_option (Opt_secondaryScreen);
309	set_option (Opt_secondaryScroll);	555	set_option (Opt_secondaryScroll);
310	set_option (Opt_pastableTabs);	556	set_option (Opt_pastableTabs);
311	set_option (Opt_intensityStyles);	557	set_option (Opt_intensityStyles);
		558	set_option (Opt_iso14755);
312	set_option (Opt_iso14755_52);	559	set_option (Opt_iso14755_52);
313	set_option (Opt_buffered);	560	set_option (Opt_buffered);
314	}
315
316	static void
317	init_secondary ()
318	{
319	int i;
320
321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
322	{
323	dup2 (STDERR_FILENO, STDIN_FILENO);
324	}
325	else if (i != STDIN_FILENO)
326	{
327	dup2 (i, STDIN_FILENO);
328	close (i);
329	}
330
331	dup2 (STDERR_FILENO, STDOUT_FILENO);
332	}	561	}
333		562
334	/----------------------------------------------------------------------/	563	/----------------------------------------------------------------------/
335	const char **	564	const char **
336	rxvt_term::init_resources (int argc, const char const argv)	565	rxvt_term::init_resources (int argc, const char const argv)
…		…
392	#if XFT	621	#if XFT
393	if (rs[Rs_depth])	622	if (rs[Rs_depth])
394	select_visual (strtol (rs[Rs_depth], 0, 0));	623	select_visual (strtol (rs[Rs_depth], 0, 0));
395	#endif	624	#endif
396		625
397	#ifdef HAVE_AFTERIMAGE
398	set_application_name ((char*)rs[Rs_name]);
399	set_output_threshold (OUTPUT_LEVEL_WARNING);
400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401	#endif
402	free (r_argv);	626	free (r_argv);
403		627
404	for (int i = NUM_RESOURCES; i--; )	628	for (int i = NUM_RESOURCES; i--; )
405	if (rs [i] == resval_undef)	629	if (rs [i] == resval_undef)
406	rs [i] = 0;	630	rs [i] = 0;
		631
		632	#ifdef HAVE_AFTERIMAGE
		633	set_application_name ((char *)rs[Rs_name]);
		634	set_output_threshold (OUTPUT_LEVEL_WARNING);
		635	#endif
		636
		637	#ifdef HAVE_PIXBUF
		638	g_type_init ();
		639	#endif
407		640
408	#if ENABLE_PERL	641	#if ENABLE_PERL
409	if (!rs[Rs_perl_ext_1])	642	if (!rs[Rs_perl_ext_1])
410	rs[Rs_perl_ext_1] = "default";	643	rs[Rs_perl_ext_1] = "default";
411		644
…		…
423	*/	656	*/
424	if (cmd_argv && cmd_argv[0])	657	if (cmd_argv && cmd_argv[0])
425	{	658	{
426	if (!rs[Rs_title])	659	if (!rs[Rs_title])
427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);	660	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		661
428	if (!rs[Rs_iconName])	662	if (!rs[Rs_iconName])
429	rs[Rs_iconName] = rs[Rs_title];	663	rs[Rs_iconName] = rs[Rs_title];
430	}	664	}
431	else	665	else
432	{	666	{
433	if (!rs[Rs_title])	667	if (!rs[Rs_title])
434	rs[Rs_title] = rs[Rs_name];	668	rs[Rs_title] = rs[Rs_name];
		669
435	if (!rs[Rs_iconName])	670	if (!rs[Rs_iconName])
436	rs[Rs_iconName] = rs[Rs_name];	671	rs[Rs_iconName] = rs[Rs_name];
437	}	672	}
438		673
439	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	674	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
446	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	681	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());	682	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448		683
449	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	684	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450	lineSpace = min (i, std::numeric_limits<int16_t>::max ());	685	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
		686
		687	if (rs[Rs_letterSpace])
		688	letterSpace = atoi (rs[Rs_letterSpace]);
451	#endif	689	#endif
452		690
453	#ifdef POINTER_BLANK	691	#ifdef POINTER_BLANK
454	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	692	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455	pointerBlankDelay = i;	693	pointerBlankDelay = i;
…		…
458	#endif	696	#endif
459		697
460	/* no point having a scrollbar without having any scrollback! */	698	/* no point having a scrollbar without having any scrollback! */
461	if (!saveLines)	699	if (!saveLines)
462	set_option (Opt_scrollBar, 0);	700	set_option (Opt_scrollBar, 0);
463
464	#ifdef PRINTPIPE
465	if (!rs[Rs_print_pipe])
466	rs[Rs_print_pipe] = PRINTPIPE;
467	#endif
468		701
469	if (!rs[Rs_cutchars])	702	if (!rs[Rs_cutchars])
470	rs[Rs_cutchars] = CUTCHARS;	703	rs[Rs_cutchars] = CUTCHARS;
471		704
472	#ifndef NO_BACKSPACE_KEY	705	#ifndef NO_BACKSPACE_KEY
…		…
485	# else	718	# else
486	rs[Rs_delete_key] = "\033[3~";	719	rs[Rs_delete_key] = "\033[3~";
487	# endif	720	# endif
488	#endif	721	#endif
489		722
490	#ifdef HAVE_SCROLLBARS	723	scrollBar.setup (this);
491	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
492	#endif
493		724
494	#ifdef XTERM_REVERSE_VIDEO	725	#ifdef XTERM_REVERSE_VIDEO
495	/* this is how xterm implements reverseVideo */	726	/* this is how xterm implements reverseVideo */
496	if (option (Opt_reverseVideo))	727	if (option (Opt_reverseVideo))
497	{	728	{
…		…
541	{	772	{
542	this->envv = envv;	773	this->envv = envv;
543		774
544	SET_R (this);	775	SET_R (this);
545	set_locale ("");	776	set_locale ("");
546	set_environ (envv); // few things in X do not call setlocale :(	777	set_environ (envv); // a few things in X do not call setlocale :(
547		778
548	init_vars ();	779	init_vars ();
549
550	init_secondary ();
551		780
552	const char **cmd_argv = init_resources (argc, argv);	781	const char **cmd_argv = init_resources (argc, argv);
553		782
554	#ifdef KEYSYM_RESOURCE	783	#ifdef KEYSYM_RESOURCE
555	keyboard->register_done ();	784	keyboard->register_done ();
556	#endif	785	#endif
557		786
558	#ifdef HAVE_SCROLLBARS	787	if (const char *path = rs[Rs_chdir])
		788	if (*path) // ignored if empty
		789	{
		790	if (*path != '/')
		791	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		792
		793	if (chdir (path))
		794	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		795	}
		796
559	if (option (Opt_scrollBar))	797	if (option (Opt_scrollBar))
560	scrollBar.setIdle (); /* set existence for size calculations */	798	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
561	#endif
562		799
563	pty = ptytty::create ();	800	pty = ptytty::create ();
564		801
565	create_windows (argc, argv);	802	create_windows (argc, argv);
566		803
567	init_xlocale ();	804	init_xlocale ();
568		805
569	scr_reset (); // initialize screen	806	scr_poweron (); // initialize screen
570		807
571	#if 0	808	#if 0
572	XSynchronize (dpy, True);	809	XSynchronize (dpy, True);
573	#endif	810	#endif
574		811
575	#ifdef HAVE_SCROLLBARS
576	if (option (Opt_scrollBar))	812	if (option (Opt_scrollBar))
577	resize_scrollbar (); /* create and map scrollbar */	813	scrollBar.resize (); /* create and map scrollbar */
578	#endif
579	#ifdef HAVE_BG_PIXMAP	814	#ifdef HAVE_BG_PIXMAP
580	{	815	{
581	bgPixmap.set_target (this);	816	bgPixmap.set_target (this);
582	bgPixmap.invalidate ();	817	bgPixmap.invalidate ();
583		818
584	#ifdef ENABLE_TRANSPARENCY	819	#ifdef ENABLE_TRANSPARENCY
585	if (option (Opt_transparent))	820	if (option (Opt_transparent))
586	{	821	{
587	bgPixmap.set_transparent ();	822	bgPixmap.set_transparent ();
588		823
589	#ifdef HAVE_AFTERIMAGE
590	if (rs [Rs_blurradius])	824	if (rs [Rs_blurradius])
591	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	825	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
592	#endif	826
593	if (ISSET_PIXCOLOR (Color_tint))	827	if (ISSET_PIXCOLOR (Color_tint))
594	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	828	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
595		829
596	if (rs [Rs_shade])	830	if (rs [Rs_shade])
597	bgPixmap.set_shade (rs [Rs_shade]);	831	bgPixmap.set_shade (rs [Rs_shade]);
…		…
656		890
657	/----------------------------------------------------------------------/	891	/----------------------------------------------------------------------/
658	void	892	void
659	rxvt_term::init_env ()	893	rxvt_term::init_env ()
660	{	894	{
661	int i;
662	char *val;	895	char *val;
663		896
664	#ifdef DISPLAY_IS_IP	897	#ifdef DISPLAY_IS_IP
665	/* Fixup display_name for export over pty to any interested terminal	898	/* Fixup display_name for export over pty to any interested terminal
666	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	899	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
680	val = XDisplayString (dpy);	913	val = XDisplayString (dpy);
681		914
682	if (rs[Rs_display_name] == NULL)	915	if (rs[Rs_display_name] == NULL)
683	rs[Rs_display_name] = val; /* use broken `:0' value */	916	rs[Rs_display_name] = val; /* use broken `:0' value */
684		917
685	i = strlen (val);
686	env_display = (char *)rxvt_malloc (i + 9);	918	env_display = (char *)rxvt_malloc (strlen (val) + 9);
687		919
688	sprintf (env_display, "DISPLAY=%s", val);	920	sprintf (env_display, "DISPLAY=%s", val);
689		921
690	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	922	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
691		923
…		…
838	run_command (argv);	1070	run_command (argv);
839	}	1071	}
840		1072
841	/----------------------------------------------------------------------/	1073	/----------------------------------------------------------------------/
842	void	1074	void
843	rxvt_term::Get_Colours ()	1075	rxvt_term::get_colours ()
844	{	1076	{
845	int i;	1077	int i;
846		1078
847	#ifdef OFF_FOCUS_FADING	1079	#ifdef OFF_FOCUS_FADING
848	pix_colors = pix_colors_focused;	1080	pix_colors = pix_colors_focused;
…		…
908	* get scrollBar shadow colors	1140	* get scrollBar shadow colors
909	*	1141	*
910	* The calculations of topShadow/bottomShadow values are adapted	1142	* The calculations of topShadow/bottomShadow values are adapted
911	* from the fvwm window manager.	1143	* from the fvwm window manager.
912	*/	1144	*/
913	#ifdef KEEP_SCROLLCOLOR	1145	#ifdef RXVT_SCROLLBAR
914	if (depth <= 2)	1146	if (depth <= 2)
915	{	1147	{
916	/* Monochrome */	1148	/* Monochrome */
917	alias_color (Color_scroll, Color_fg);	1149	alias_color (Color_scroll, Color_fg);
918	alias_color (Color_topShadow, Color_bg);	1150	alias_color (Color_topShadow, Color_bg);
…		…
933	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	1165	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
934	cscroll.a)	1166	cscroll.a)
935	))	1167	))
936	alias_color (Color_topShadow, Color_White);	1168	alias_color (Color_topShadow, Color_White);
937	}	1169	}
938	#endif /* KEEP_SCROLLCOLOR */	1170	#endif
939		1171
940	#ifdef OFF_FOCUS_FADING	1172	#ifdef OFF_FOCUS_FADING
941	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	1173	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
942	update_fade_color (i);	1174	update_fade_color (i);
943	#endif	1175	#endif
…		…
1048		1280
1049	if (i)	1281	if (i)
1050	ModMetaMask = modmasks[i - 1];	1282	ModMetaMask = modmasks[i - 1];
1051	}	1283	}
1052		1284
		1285	void
		1286	rxvt_term::set_icon (const char *file)
		1287	{
		1288	#ifdef HAVE_AFTERIMAGE
		1289	init_asv ();
		1290
		1291	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1292	if (!im)
		1293	{
		1294	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1295	return;
		1296	}
		1297
		1298	unsigned int w = im->width;
		1299	unsigned int h = im->height;
		1300
		1301	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1302	{
		1303	rxvt_warn ("Icon image too big, continuing without.\n");
		1304	destroy_asimage (&im);
		1305	return;
		1306	}
		1307
		1308	ASImage *result = scale_asimage (asv, im,
		1309	w, h, ASA_ARGB32,
		1310	100, ASIMAGE_QUALITY_DEFAULT);
		1311	destroy_asimage (&im);
		1312
		1313	if (!result)
		1314	{
		1315	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1316	return;
		1317	}
		1318
		1319	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1320	if (buffer)
		1321	{
		1322	ARGB32 *asbuf = result->alt.argb32;
		1323	buffer [0] = w;
		1324	buffer [1] = h;
		1325
		1326	for (unsigned int i = 0; i < w * h; ++i)
		1327	buffer [i + 2] = asbuf [i];
		1328
		1329	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1330	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1331	free (buffer);
		1332	}
		1333	else
		1334	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1335
		1336	destroy_asimage (&result);
		1337	#endif
		1338
		1339	#ifdef HAVE_PIXBUF
		1340	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1341	if (!pixbuf)
		1342	{
		1343	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1344	return;
		1345	}
		1346
		1347	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1348	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1349
		1350	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1351	{
		1352	rxvt_warn ("Icon image too big, continuing without.\n");
		1353	g_object_unref (pixbuf);
		1354	return;
		1355	}
		1356
		1357	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1358	{
		1359	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1360	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1361	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1362
		1363	buffer [0] = w;
		1364	buffer [1] = h;
		1365	for (int i = 0; i < h; i++)
		1366	{
		1367	for (int j = 0; j < w; j++)
		1368	{
		1369	unsigned char pixel = row + j channels;
		1370	long value;
		1371
		1372	if (channels == 4)
		1373	value = pixel[3];
		1374	else
		1375	value = (unsigned char)0x00ff;
		1376
		1377	value = (value << 8) + pixel[0];
		1378	value = (value << 8) + pixel[1];
		1379	value = (value << 8) + pixel[2];
		1380	buffer[(i * w + j) + 2] = value;
		1381	}
		1382
		1383	row += rowstride;
		1384	}
		1385
		1386	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1387	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1388	free (buffer);
		1389	}
		1390	else
		1391	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1392
		1393	g_object_unref (pixbuf);
		1394	#endif
		1395	}
		1396
1053	/----------------------------------------------------------------------/	1397	/----------------------------------------------------------------------/
1054	/* rxvt_Create_Windows () - Open and map the window */	1398	/* rxvt_Create_Windows () - Open and map the window */
1055	void	1399	void
1056	rxvt_term::create_windows (int argc, const char const argv)	1400	rxvt_term::create_windows (int argc, const char const argv)
1057	{	1401	{
…		…
1065	Window top, parent;	1409	Window top, parent;
1066		1410
1067	dLocal (Display *, dpy);	1411	dLocal (Display *, dpy);
1068		1412
1069	/* grab colors before netscape does */	1413	/* grab colors before netscape does */
1070	Get_Colours ();	1414	get_colours ();
1071		1415
1072	if (!set_fonts ())	1416	if (!set_fonts ())
1073	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1417	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1074		1418
1075	parent = display->root;	1419	parent = display->root;
…		…
1123	this->parent[0] = top;	1467	this->parent[0] = top;
1124		1468
1125	old_width = szHint.width;	1469	old_width = szHint.width;
1126	old_height = szHint.height;	1470	old_height = szHint.height;
1127		1471
1128	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1472	set_title (rs [Rs_title]);
1129	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1473	set_icon_name (rs [Rs_iconName]);
1130		1474
1131	classHint.res_name = (char *)rs[Rs_name];	1475	classHint.res_name = (char *)rs[Rs_name];
1132	classHint.res_class = (char *)RESCLASS;	1476	classHint.res_class = (char *)RESCLASS;
1133		1477
1134	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1478	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
…		…
1136	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1480	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1137	wmHint.window_group = top;	1481	wmHint.window_group = top;
1138		1482
1139	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1483	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1140	&szHint, &wmHint, &classHint);	1484	&szHint, &wmHint, &classHint);
		1485	#if ENABLE_EWMH
		1486	/*
		1487	* set up icon hint
		1488	* rs [Rs_iconfile] is path to icon
		1489	*/
		1490
		1491	if (rs [Rs_iconfile])
		1492	{
		1493	set_icon (rs [Rs_iconfile]);
		1494	}
		1495	#endif
1141		1496
1142	#if ENABLE_FRILLS	1497	#if ENABLE_FRILLS
1143	if (mwmhints.flags)	1498	if (mwmhints.flags)
1144	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1499	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1145	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1500	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1150	#if ENABLE_EWMH	1505	#if ENABLE_EWMH
1151	xa[XA_NET_WM_PING],	1506	xa[XA_NET_WM_PING],
1152	#endif	1507	#endif
1153	};	1508	};
1154		1509
1155	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1510	XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1156		1511
1157	#if ENABLE_FRILLS	1512	#if ENABLE_FRILLS
1158	if (rs[Rs_transient_for])	1513	if (rs[Rs_transient_for])
1159	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1514	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1160	#endif	1515	#endif
…		…
1221	pix_colors = pix_colors_unfocused;	1576	pix_colors = pix_colors_unfocused;
1222	#endif	1577	#endif
1223		1578
1224	pointer_unblank ();	1579	pointer_unblank ();
1225	scr_recolour ();	1580	scr_recolour ();
1226	}
1227
1228	/* ------------------------------------------------------------------------- *
1229	* GET TTY CURRENT STATE *
1230	* ------------------------------------------------------------------------- */
1231	void
1232	rxvt_get_ttymode (struct termios *tio, int erase)
1233	{
1234	/*
1235	* standard System V termios interface
1236	*/
1237	if (tcgetattr (STDIN_FILENO, tio) < 0)
1238	{
1239	// return error - use system defaults,
1240	// where possible, and zero elsewhere
1241	memset (tio, 0, sizeof (struct termios));
1242
1243	tio->c_cc[VINTR] = CINTR;
1244	tio->c_cc[VQUIT] = CQUIT;
1245	tio->c_cc[VERASE] = CERASE;
1246	#ifdef VERASE2
1247	tio->c_cc[VERASE2] = CERASE2;
1248	#endif
1249	tio->c_cc[VKILL] = CKILL;
1250	tio->c_cc[VSTART] = CSTART;
1251	tio->c_cc[VSTOP] = CSTOP;
1252	tio->c_cc[VSUSP] = CSUSP;
1253	# ifdef VDSUSP
1254	tio->c_cc[VDSUSP] = CDSUSP;
1255	# endif
1256	# ifdef VREPRINT
1257	tio->c_cc[VREPRINT] = CRPRNT;
1258	# endif
1259	# ifdef VDISCRD
1260	tio->c_cc[VDISCRD] = CFLUSH;
1261	# endif
1262	# ifdef VWERSE
1263	tio->c_cc[VWERSE] = CWERASE;
1264	# endif
1265	# ifdef VLNEXT
1266	tio->c_cc[VLNEXT] = CLNEXT;
1267	# endif
1268	}
1269
1270	tio->c_cc[VEOF] = CEOF;
1271	tio->c_cc[VEOL] = VDISABLE;
1272	# ifdef VEOL2
1273	tio->c_cc[VEOL2] = VDISABLE;
1274	# endif
1275	# ifdef VSWTC
1276	tio->c_cc[VSWTC] = VDISABLE;
1277	# endif
1278	# ifdef VSWTCH
1279	tio->c_cc[VSWTCH] = VDISABLE;
1280	# endif
1281	# if VMIN != VEOF
1282	tio->c_cc[VMIN] = 1;
1283	# endif
1284	# if VTIME != VEOL
1285	tio->c_cc[VTIME] = 0;
1286	# endif
1287
1288	if (erase != -1)
1289	tio->c_cc[VERASE] = (char)erase;
1290
1291	/* input modes */
1292	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1293	# ifdef IMAXBEL
1294	\| IMAXBEL
1295	# endif
1296	\| IXON);
1297
1298	/* output modes */
1299	tio->c_oflag = (OPOST \| ONLCR);
1300
1301	/* control modes */
1302	tio->c_cflag = (CS8 \| CREAD);
1303
1304	/* line discipline modes */
1305	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1306	# if defined (ECHOCTL) && defined (ECHOKE)
1307	\| ECHOCTL \| ECHOKE
1308	# endif
1309	\| ECHOE \| ECHOK);
1310
1311	/*
1312	* Debugging
1313	*/
1314	#ifdef DEBUG_TTYMODE
1315	/* c_iflag bits */
1316	fprintf (stderr, "Input flags\n");
1317
1318	/* cpp token stringize doesn't work on all machines <sigh> */
1319	# define FOO(flag,name) \
1320	if ((tio->c_iflag) & flag) \
1321	fprintf (stderr, "%s ", name)
1322
1323	/* c_iflag bits */
1324	FOO (IGNBRK, "IGNBRK");
1325	FOO (BRKINT, "BRKINT");
1326	FOO (IGNPAR, "IGNPAR");
1327	FOO (PARMRK, "PARMRK");
1328	FOO (INPCK, "INPCK");
1329	FOO (ISTRIP, "ISTRIP");
1330	FOO (INLCR, "INLCR");
1331	FOO (IGNCR, "IGNCR");
1332	FOO (ICRNL, "ICRNL");
1333	FOO (IXON, "IXON");
1334	FOO (IXOFF, "IXOFF");
1335	# ifdef IUCLC
1336	FOO (IUCLC, "IUCLC");
1337	# endif
1338	# ifdef IXANY
1339	FOO (IXANY, "IXANY");
1340	# endif
1341	# ifdef IMAXBEL
1342	FOO (IMAXBEL, "IMAXBEL");
1343	# endif
1344
1345	fprintf (stderr, "\n");
1346
1347	# undef FOO
1348	# define FOO(entry, name) \
1349	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1350
1351	FOO (VINTR, "VINTR");
1352	FOO (VQUIT, "VQUIT");
1353	FOO (VERASE, "VERASE");
1354	FOO (VKILL, "VKILL");
1355	FOO (VEOF, "VEOF");
1356	FOO (VEOL, "VEOL");
1357	# ifdef VEOL2
1358	FOO (VEOL2, "VEOL2");
1359	# endif
1360	# ifdef VSWTC
1361	FOO (VSWTC, "VSWTC");
1362	# endif
1363	# ifdef VSWTCH
1364	FOO (VSWTCH, "VSWTCH");
1365	# endif
1366	FOO (VSTART, "VSTART");
1367	FOO (VSTOP, "VSTOP");
1368	FOO (VSUSP, "VSUSP");
1369	# ifdef VDSUSP
1370	FOO (VDSUSP, "VDSUSP");
1371	# endif
1372	# ifdef VREPRINT
1373	FOO (VREPRINT, "VREPRINT");
1374	# endif
1375	# ifdef VDISCRD
1376	FOO (VDISCRD, "VDISCRD");
1377	# endif
1378	# ifdef VWERSE
1379	FOO (VWERSE, "VWERSE");
1380	# endif
1381	# ifdef VLNEXT
1382	FOO (VLNEXT, "VLNEXT");
1383	# endif
1384
1385	fprintf (stderr, "\n");
1386	# undef FOO
1387	#endif /* DEBUG_TTYMODE */
1388	}	1581	}
1389		1582
1390	/----------------------------------------------------------------------/	1583	/----------------------------------------------------------------------/
1391	/*	1584	/*
1392	* Run the command in a subprocess and return a file descriptor for the	1585	* Run the command in a subprocess and return a file descriptor for the
…		…
1413	else	1606	else
1414	#endif	1607	#endif
1415	if (!pty->get ())	1608	if (!pty->get ())
1416	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1609	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1417		1610
1418	int er;	1611	struct termios tio = def_tio;
1419		1612
1420	#ifndef NO_BACKSPACE_KEY	1613	#ifndef NO_BACKSPACE_KEY
1421	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1614	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1422	er = rs[Rs_backspace_key][0];	1615	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1423	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1616	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1424	er = '\177'; /* the initial state anyway */	1617	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1425	else
1426	#endif	1618	#endif
1427	er = -1;
1428		1619
1429	rxvt_get_ttymode (&tio, er);
1430	/* init terminal attributes */	1620	/* init terminal attributes */
1431	cfsetospeed (&tio, BAUDRATE);	1621	cfsetospeed (&tio, BAUDRATE);
1432	cfsetispeed (&tio, BAUDRATE);	1622	cfsetispeed (&tio, BAUDRATE);
1433	tcsetattr (pty->tty, TCSANOW, &tio);	1623	tcsetattr (pty->tty, TCSANOW, &tio);
1434	pty->set_utf8_mode (enc_utf8);	1624	pty->set_utf8_mode (enc_utf8);
…		…
1521	signal (SIGQUIT, SIG_DFL);	1711	signal (SIGQUIT, SIG_DFL);
1522	signal (SIGCHLD, SIG_DFL);	1712	signal (SIGCHLD, SIG_DFL);
1523	signal (SIGHUP, SIG_DFL);	1713	signal (SIGHUP, SIG_DFL);
1524	signal (SIGPIPE, SIG_DFL);	1714	signal (SIGPIPE, SIG_DFL);
1525	/*	1715	/*
1526	* mimick login's behavior by disabling the job control signals	1716	* mimic login's behavior by disabling the job control signals
1527	* a shell that wants them can turn them back on	1717	* a shell that wants them can turn them back on
1528	*/	1718	*/
1529	#ifdef SIGTSTP	1719	#ifdef SIGTSTP
1530	signal (SIGTSTP, SIG_IGN);	1720	signal (SIGTSTP, SIG_IGN);
1531	signal (SIGTTIN, SIG_IGN);	1721	signal (SIGTTIN, SIG_IGN);
1532	signal (SIGTTOU, SIG_IGN);	1722	signal (SIGTTOU, SIG_IGN);
1533	#endif /* SIGTSTP */	1723	#endif /* SIGTSTP */
1534		1724
1535	// unblock signals (signals are blocked by iom.C
1536	sigset_t ss;
1537	sigemptyset (&ss);
1538	sigprocmask (SIG_SETMASK, &ss, 0);
1539
1540	/* command interpreter path */	1725	/* command interpreter path */
1541	if (argv)	1726	if (argv)
1542	{	1727	{
1543	# ifdef DEBUG_CMD	1728	# ifdef DEBUG_CMD
1544	int i;	1729	int i;
…		…
1555	const char argv0, shell;	1740	const char argv0, shell;
1556		1741
1557	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1742	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1558	shell = "/bin/sh";	1743	shell = "/bin/sh";
1559		1744
1560	argv0 = (const char *)rxvt_basename (shell);	1745	argv0 = rxvt_basename (shell);
1561		1746
1562	if (option (Opt_loginShell))	1747	if (option (Opt_loginShell))
1563	{	1748	{
1564	login = (char *)rxvt_malloc (strlen (argv0) + 2);	1749	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1565		1750

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.244 by ayin, Sat Jan 26 14:24:43 2008 UTC vs. Revision 1.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.244 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC