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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.255 by root, Tue Nov 4 13:20:40 2008 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16	* - QNX support
17	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18	*	16	*
19	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
20	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
21	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
22	* (at your option) any later version.	20	* (at your option) any later version.
…		…
36		34
37	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
38	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
39	#include "rxvtutil.h"	37	#include "rxvtutil.h"
40	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
41		40
42	#include <limits>	41	#include <limits>
43		42
44	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
45		46
46	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
47	# define X_LOCALE	48	# define X_LOCALE
48	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
49	#else	50	#else
…		…
154	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
155	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
156	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
157	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
158	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
159	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
160	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
161	# else	162	# else
162	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163	# endif	164	# endif
164	/* high-intensity colors */	165	/* high-intensity colors */
165	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
166	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
250	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
251		252
252	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
253	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
254	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
255	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
256	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
257	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
258	NULL, /* Color_border */	259	NULL, /* Color_border */
259	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
260	NULL, /* Color_BD */	261	NULL, /* Color_BD */
261	NULL, /* Color_IT */	262	NULL, /* Color_IT */
262	NULL, /* Color_UL */	263	NULL, /* Color_UL */
263	NULL, /* Color_RV */	264	NULL, /* Color_RV */
264	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
266	NULL, // Color_underline	267	NULL, // Color_underline
267	#endif	268	#endif
268	#ifdef OPTION_HC	269	#ifdef OPTION_HC
269	NULL,	270	NULL,
270	#endif	271	#endif
271	#ifdef KEEP_SCROLLCOLOR
272	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
273	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
274	#endif /* KEEP_SCROLLCOLOR */	275	#endif
275	#if ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
276	NULL,	277	NULL,
277	#endif	278	#endif
278	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
279	"rgb:00/00/00",	280	"rgb:00/00/00",
280	#endif	281	#endif
281	};	282	};
282		283
283	bool	284	void
284	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
285	{	286	{
286	pix_colors = //	287	pix_colors = pix_colors_focused;
287	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288	#ifdef OFF_FOCUS_FADING
289	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290	#endif
291
292		288
293	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
294	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
295	want_refresh = 1;	291	want_refresh = 1;
296	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
…		…
298	nrow = 24;	294	nrow = 24;
299	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
300	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
301	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
302	saveLines = SAVELINES;	298	saveLines = SAVELINES;
303	numpix_colors = TOTAL_COLORS;
304		299
305	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
306		301
307	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
308	last_bot = last_state = -1;
309		303
310	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
311	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
312	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
313	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
314	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
315	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
316	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
317	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
318	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
319		313	set_option (Opt_buffered);
320	return true;
321	}	314	}
322		315
323	void	316	static void
324	rxvt_term::init_secondary ()	317	init_secondary ()
325	{	318	{
326	int i;	319	int i;
327		320
328	/*
329	* Close all unused file descriptors
330	* We don't want them, we don't need them.
331	*/
332	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
333	{	322	{
334	/* TODO: BOO HISS */
335	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
336	}	324	}
337	else if (i != STDIN_FILENO)	325	else if (i != STDIN_FILENO)
338	{	326	{
339	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
340	close (i);	328	close (i);
341	}	329	}
342		330
343	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345	#if 0 // schmorp sayz closing filies is murder
346	for (i = STDERR_FILENO + 1; i < num_fds; i++)
347	{
348	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349	if (i == 4 \|\| i == 7)
350	continue;
351	#endif
352	close (i);
353	}
354	#endif
355	}	332	}
356		333
357	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
358	const char **	335	const char **
359	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
…		…
369	break;	346	break;
370		347
371	if (r_argc == argc)	348	if (r_argc == argc)
372	cmd_argv = NULL;	349	cmd_argv = NULL;
373	else if (!argv[r_argc + 1])	350	else if (!argv[r_argc + 1])
374	rxvt_fatal ("-e requires an argument\n");	351	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375	else	352	else
376	{	353	{
377	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));	354	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
378		355
379	for (i = 0; i < argc - r_argc - 1; i++)	356	for (i = 0; i < argc - r_argc - 1; i++)
…		…
415	#if XFT	392	#if XFT
416	if (rs[Rs_depth])	393	if (rs[Rs_depth])
417	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
418	#endif	395	#endif
419		396
420	#ifdef HAVE_AFTERIMAGE
421	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422	#endif
423	free (r_argv);	397	free (r_argv);
424		398
425	for (int i = NUM_RESOURCES; i--; )	399	for (int i = NUM_RESOURCES; i--; )
426	if (rs [i] == resval_undef)	400	if (rs [i] == resval_undef)
427	rs [i] = 0;	401	rs [i] = 0;
		402
		403	#ifdef HAVE_AFTERIMAGE
		404	set_application_name ((char *)rs[Rs_name]);
		405	set_output_threshold (OUTPUT_LEVEL_WARNING);
		406	#endif
428		407
429	#if ENABLE_PERL	408	#if ENABLE_PERL
430	if (!rs[Rs_perl_ext_1])	409	if (!rs[Rs_perl_ext_1])
431	rs[Rs_perl_ext_1] = "default";	410	rs[Rs_perl_ext_1] = "default";
432		411
…		…
444	*/	423	*/
445	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
446	{	425	{
447	if (!rs[Rs_title])	426	if (!rs[Rs_title])
448	rs[Rs_title] = rxvt_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		428
449	if (!rs[Rs_iconName])	429	if (!rs[Rs_iconName])
450	rs[Rs_iconName] = rs[Rs_title];	430	rs[Rs_iconName] = rs[Rs_title];
451	}	431	}
452	else	432	else
453	{	433	{
454	if (!rs[Rs_title])	434	if (!rs[Rs_title])
455	rs[Rs_title] = rs[Rs_name];	435	rs[Rs_title] = rs[Rs_name];
		436
456	if (!rs[Rs_iconName])	437	if (!rs[Rs_iconName])
457	rs[Rs_iconName] = rs[Rs_name];	438	rs[Rs_iconName] = rs[Rs_name];
458	}	439	}
459		440
460	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	441	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
479	#endif	460	#endif
480		461
481	/* no point having a scrollbar without having any scrollback! */	462	/* no point having a scrollbar without having any scrollback! */
482	if (!saveLines)	463	if (!saveLines)
483	set_option (Opt_scrollBar, 0);	464	set_option (Opt_scrollBar, 0);
484
485	#ifdef PRINTPIPE
486	if (!rs[Rs_print_pipe])
487	rs[Rs_print_pipe] = PRINTPIPE;
488	#endif
489		465
490	if (!rs[Rs_cutchars])	466	if (!rs[Rs_cutchars])
491	rs[Rs_cutchars] = CUTCHARS;	467	rs[Rs_cutchars] = CUTCHARS;
492		468
493	#ifndef NO_BACKSPACE_KEY	469	#ifndef NO_BACKSPACE_KEY
…		…
506	# else	482	# else
507	rs[Rs_delete_key] = "\033[3~";	483	rs[Rs_delete_key] = "\033[3~";
508	# endif	484	# endif
509	#endif	485	#endif
510		486
511	#ifdef HAVE_SCROLLBARS	487	scrollBar.setup (this);
512	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513	#endif
514		488
515	#ifdef XTERM_REVERSE_VIDEO	489	#ifdef XTERM_REVERSE_VIDEO
516	/* this is how xterm implements reverseVideo */	490	/* this is how xterm implements reverseVideo */
517	if (option (Opt_reverseVideo))	491	if (option (Opt_reverseVideo))
518	{	492	{
…		…
538	color_aliases (Color_fg);	512	color_aliases (Color_fg);
539	color_aliases (Color_bg);	513	color_aliases (Color_bg);
540	#ifndef NO_CURSORCOLOR	514	#ifndef NO_CURSORCOLOR
541	color_aliases (Color_cursor);	515	color_aliases (Color_cursor);
542	color_aliases (Color_cursor2);	516	color_aliases (Color_cursor2);
543	#endif /* NO_CURSORCOLOR */	517	#endif /* NO_CURSORCOLOR */
544	color_aliases (Color_pointer_fg);	518	color_aliases (Color_pointer_fg);
545	color_aliases (Color_pointer_bg);	519	color_aliases (Color_pointer_bg);
546	color_aliases (Color_border);	520	color_aliases (Color_border);
547	#ifndef NO_BOLD_UNDERLINE_REVERSE	521	#ifndef NO_BOLD_UNDERLINE_REVERSE
548	color_aliases (Color_BD);	522	color_aliases (Color_BD);
549	color_aliases (Color_UL);	523	color_aliases (Color_UL);
550	color_aliases (Color_RV);	524	color_aliases (Color_RV);
551	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	525	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552		526
553	if (!rs[Rs_color + Color_border])	527	if (!rs[Rs_color + Color_border])
554	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	528	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555		529
556	return cmd_argv;	530	return cmd_argv;
		531	}
		532
		533	/----------------------------------------------------------------------/
		534	void
		535	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		536	{
		537	this->envv = envv;
		538
		539	SET_R (this);
		540	set_locale ("");
		541	set_environ (envv); // a few things in X do not call setlocale :(
		542
		543	init_vars ();
		544
		545	init_secondary ();
		546
		547	const char **cmd_argv = init_resources (argc, argv);
		548
		549	#ifdef KEYSYM_RESOURCE
		550	keyboard->register_done ();
		551	#endif
		552
		553	if (const char *path = rs[Rs_chdir])
		554	if (*path) // ignored if empty
		555	{
		556	if (*path != '/')
		557	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		558
		559	if (chdir (path))
		560	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		561	}
		562
		563	if (option (Opt_scrollBar))
		564	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		565
		566	pty = ptytty::create ();
		567
		568	create_windows (argc, argv);
		569
		570	init_xlocale ();
		571
		572	scr_reset (); // initialize screen
		573
		574	#if 0
		575	XSynchronize (dpy, True);
		576	#endif
		577
		578	if (option (Opt_scrollBar))
		579	scrollBar.resize (); /* create and map scrollbar */
		580	#ifdef HAVE_BG_PIXMAP
		581	{
		582	bgPixmap.set_target (this);
		583	bgPixmap.invalidate ();
		584
		585	#ifdef ENABLE_TRANSPARENCY
		586	if (option (Opt_transparent))
		587	{
		588	bgPixmap.set_transparent ();
		589
		590	#ifdef HAVE_AFTERIMAGE
		591	if (rs [Rs_blurradius])
		592	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		593	#endif
		594	if (ISSET_PIXCOLOR (Color_tint))
		595	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		596
		597	if (rs [Rs_shade])
		598	bgPixmap.set_shade (rs [Rs_shade]);
		599
		600	bgPixmap.set_root_pixmap ();
		601	XSelectInput (dpy, display->root, PropertyChangeMask);
		602	rootwin_ev.start (display, display->root);
		603	}
		604	#endif
		605
		606	#ifdef BG_IMAGE_FROM_FILE
		607	if (rs[Rs_backgroundPixmap])
		608	{
		609	const char *p = rs[Rs_backgroundPixmap];
		610
		611	if ((p = strchr (p, ';')) != 0)
		612	{
		613	p++;
		614	bgPixmap.set_geometry (p);
		615	}
		616	else
		617	bgPixmap.set_defaultGeometry ();
		618
		619	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		620	if (!bgPixmap.window_position_sensitive ())
		621	update_background ();
		622	}
		623	#endif
		624	}
		625	#endif
		626
		627	#if ENABLE_PERL
		628	rootwin_ev.start (display, display->root);
		629	#endif
		630
		631	set_colorfgbg ();
		632
		633	init_command (cmd_argv);
		634
		635	free (cmd_argv);
		636
		637	if (pty->pty >= 0)
		638	pty_ev.start (pty->pty, ev::READ);
		639
		640	HOOK_INVOKE ((this, HOOK_START, DT_END));
		641
		642	#if ENABLE_XEMBED
		643	if (rs[Rs_embed])
		644	{
		645	long info[2] = { 0, XEMBED_MAPPED };
		646
		647	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		648	32, PropModeReplace, (unsigned char *)&info, 2);
		649	}
		650	#endif
		651
		652	XMapWindow (dpy, vt);
		653	XMapWindow (dpy, parent[0]);
		654
		655	refresh_check ();
557	}	656	}
558		657
559	/----------------------------------------------------------------------/	658	/----------------------------------------------------------------------/
560	void	659	void
561	rxvt_term::init_env ()	660	rxvt_term::init_env ()
…		…
576	*/	675	*/
577	val = rxvt_network_display (rs[Rs_display_name]);	676	val = rxvt_network_display (rs[Rs_display_name]);
578	rs[Rs_display_name] = (const char *)val;	677	rs[Rs_display_name] = (const char *)val;
579		678
580	if (val == NULL)	679	if (val == NULL)
581	#endif /* DISPLAY_IS_IP */	680	#endif /* DISPLAY_IS_IP */
582	val = XDisplayString (dpy);	681	val = XDisplayString (dpy);
583		682
584	if (rs[Rs_display_name] == NULL)	683	if (rs[Rs_display_name] == NULL)
585	rs[Rs_display_name] = val; /* use broken `:0' value */	684	rs[Rs_display_name] = val; /* use broken `:0' value */
586		685
…		…
626	#ifdef HAVE_UNSETENV	725	#ifdef HAVE_UNSETENV
627	/* avoid passing old settings and confusing term size */	726	/* avoid passing old settings and confusing term size */
628	unsetenv ("LINES");	727	unsetenv ("LINES");
629	unsetenv ("COLUMNS");	728	unsetenv ("COLUMNS");
630	unsetenv ("TERMCAP"); /* terminfo should be okay */	729	unsetenv ("TERMCAP"); /* terminfo should be okay */
631	#endif /* HAVE_UNSETENV */	730	#endif /* HAVE_UNSETENV */
632	}	731	}
633		732
634	/----------------------------------------------------------------------/	733	/----------------------------------------------------------------------/
635	/*	734	/*
636	* This is more or less stolen straight from XFree86 xterm.	735	* This is more or less stolen straight from XFree86 xterm.
…		…
657		756
658	this->locale = "C";	757	this->locale = "C";
659	}	758	}
660		759
661		760
662	this->locale = rxvt_strdup (this->locale);	761	this->locale = strdup (this->locale);
663	SET_LOCALE (this->locale);	762	SET_LOCALE (this->locale);
664	mbstate.reset ();	763	mbstate.reset ();
665	#endif	764	#endif
666		765
667	#if HAVE_NL_LANGINFO	766	#if HAVE_NL_LANGINFO
…		…
740	run_command (argv);	839	run_command (argv);
741	}	840	}
742		841
743	/----------------------------------------------------------------------/	842	/----------------------------------------------------------------------/
744	void	843	void
745	rxvt_term::Get_Colours ()	844	rxvt_term::get_colours ()
746	{	845	{
747	int i;	846	int i;
748		847
749	#ifdef OFF_FOCUS_FADING	848	#ifdef OFF_FOCUS_FADING
750	pix_colors = pix_colors_focused;	849	pix_colors = pix_colors_focused;
751	#endif	850	#endif
752		851
753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	852	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754	{	853	{
755	const char *name = rs[Rs_color + i];	854	const char *name = rs[Rs_color + i];
756		855
757	if (!name)	856	if (!name)
…		…
810	* get scrollBar shadow colors	909	* get scrollBar shadow colors
811	*	910	*
812	* The calculations of topShadow/bottomShadow values are adapted	911	* The calculations of topShadow/bottomShadow values are adapted
813	* from the fvwm window manager.	912	* from the fvwm window manager.
814	*/	913	*/
815	#ifdef KEEP_SCROLLCOLOR	914	#ifdef RXVT_SCROLLBAR
816	if (depth <= 2)	915	if (depth <= 2)
817	{	916	{
818	/* Monochrome */	917	/* Monochrome */
819	alias_color (Color_scroll, Color_fg);	918	alias_color (Color_scroll, Color_fg);
820	alias_color (Color_topShadow, Color_bg);	919	alias_color (Color_topShadow, Color_bg);
…		…
835	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	934	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836	cscroll.a)	935	cscroll.a)
837	))	936	))
838	alias_color (Color_topShadow, Color_White);	937	alias_color (Color_topShadow, Color_White);
839	}	938	}
840	#endif /* KEEP_SCROLLCOLOR */	939	#endif
841		940
842	#ifdef OFF_FOCUS_FADING	941	#ifdef OFF_FOCUS_FADING
843	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	942	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844	update_fade_color (i);	943	update_fade_color (i);
845	#endif	944	#endif
…		…
853	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	952	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854	{	953	{
855	int i = atoi (rs[Rs_color + idx]);	954	int i = atoi (rs[Rs_color + idx]);
856		955
857	if (i >= 8 && i <= 15)	956	if (i >= 8 && i <= 15)
858	{ /* bright colors */	957	/* bright colors */
859	i -= 8;
860	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	958	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861	return;	959	else if (i >= 0 && i <= 7)
862	}	960	/* normal colors */
863
864	if (i >= 0 && i <= 7) /* normal colors */
865	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	961	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866	}	962	}
867	}	963	}
868		964
869	/----------------------------------------------------------------------/	965	/----------------------------------------------------------------------/
…		…
970	Window top, parent;	1066	Window top, parent;
971		1067
972	dLocal (Display *, dpy);	1068	dLocal (Display *, dpy);
973		1069
974	/* grab colors before netscape does */	1070	/* grab colors before netscape does */
975	Get_Colours ();	1071	get_colours ();
976		1072
977	if (!set_fonts ())	1073	if (!set_fonts ())
978	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1074	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979		1075
980	parent = display->root;	1076	parent = display->root;
…		…
1041	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1137	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1042	wmHint.window_group = top;	1138	wmHint.window_group = top;
1043		1139
1044	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1140	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045	&szHint, &wmHint, &classHint);	1141	&szHint, &wmHint, &classHint);
		1142	#if ENABLE_EWMH
		1143	# ifdef HAVE_AFTERIMAGE
		1144	/*
		1145	* set up icon hint
		1146	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources
		1147	*/
		1148
		1149	if (rs [Rs_iconfile])
		1150	{
		1151	init_asv ();
		1152
		1153	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1154	if (asv && im)
		1155	{
		1156	int w = im->width;
		1157	int h = im->height;
		1158	long* buffer = (long )malloc ((2 + w h) * sizeof (long));
		1159	ASImage *result = scale_asimage (asv, im,
		1160	w, h, ASA_ARGB32,
		1161	100, ASIMAGE_QUALITY_DEFAULT);
		1162	destroy_asimage (&im);
		1163
		1164	if (buffer && result)
		1165	{
		1166	ARGB32 *asbuf = result->alt.argb32;
		1167	buffer [0] = w;
		1168	buffer [1] = h;
		1169
		1170	for (unsigned int i = 0; i < w * h; ++i)
		1171	buffer [i + 2] = asbuf [i];
		1172
		1173	destroy_asimage (&result);
		1174	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1175	PropModeReplace, (const unsigned char) buffer, 2 + w h);
		1176	free (buffer);
		1177	}
		1178	else
		1179	{
		1180	if (!buffer)
		1181	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1182
		1183	if (!result)
		1184	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1185	}
		1186	}
		1187	else
		1188	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1189	}
		1190	# endif
		1191	#endif
1046		1192
1047	#if ENABLE_FRILLS	1193	#if ENABLE_FRILLS
1048	if (mwmhints.flags)	1194	if (mwmhints.flags)
1049	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1195	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1196	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1084		1230
1085	termwin_ev.start (display, top);	1231	termwin_ev.start (display, top);
1086		1232
1087	/* vt cursor: Black-on-White is standard, but this is more popular */	1233	/* vt cursor: Black-on-White is standard, but this is more popular */
1088	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1234	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089
1090	#ifdef HAVE_SCROLLBARS
1091	/* cursor scrollBar: Black-on-White */
1092	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093	#endif
1094		1235
1095	/* the vt window */	1236	/* the vt window */
1096	vt = XCreateSimpleWindow (dpy, top,	1237	vt = XCreateSimpleWindow (dpy, top,
1097	window_vt_x, window_vt_y,	1238	window_vt_x, window_vt_y,
1098	width, height,	1239	width, height,
…		…
1123	GCForeground \| GCBackground \| GCGraphicsExposures,	1264	GCForeground \| GCBackground \| GCGraphicsExposures,
1124	&gcvalue);	1265	&gcvalue);
1125		1266
1126	drawable = new rxvt_drawable (this, vt);	1267	drawable = new rxvt_drawable (this, vt);
1127		1268
1128	#ifdef RXVT_SCROLLBAR
1129	gcvalue.foreground = pix_colors[Color_topShadow];
1130	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131	gcvalue.foreground = pix_colors[Color_bottomShadow];
1132	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135	#endif
1136
1137	#ifdef OFF_FOCUS_FADING	1269	#ifdef OFF_FOCUS_FADING
1138	// initially we are in unfocused state	1270	// initially we are in unfocused state
1139	if (rs[Rs_fade])	1271	if (rs[Rs_fade])
1140	pix_colors = pix_colors_unfocused;	1272	pix_colors = pix_colors_unfocused;
1141	#endif	1273	#endif
…		…
1146		1278
1147	/* ------------------------------------------------------------------------- *	1279	/* ------------------------------------------------------------------------- *
1148	* GET TTY CURRENT STATE *	1280	* GET TTY CURRENT STATE *
1149	* ------------------------------------------------------------------------- */	1281	* ------------------------------------------------------------------------- */
1150	void	1282	void
1151	rxvt_get_ttymode (ttymode_t *tio, int erase)	1283	rxvt_get_ttymode (struct termios *tio, int erase)
1152	{	1284	{
1153	/*	1285	/*
1154	* standard System V termios interface	1286	* standard System V termios interface
1155	*/	1287	*/
1156	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1288	if (tcgetattr (STDIN_FILENO, tio) < 0)
1157	{	1289	{
1158	// return error - use system defaults,	1290	// return error - use system defaults,
1159	// where possible, and zero elsewhere	1291	// where possible, and zero elsewhere
1160	memset (tio, 0, sizeof (ttymode_t));	1292	memset (tio, 0, sizeof (struct termios));
1161		1293
1162	tio->c_cc[VINTR] = CINTR;	1294	tio->c_cc[VINTR] = CINTR;
1163	tio->c_cc[VQUIT] = CQUIT;	1295	tio->c_cc[VQUIT] = CQUIT;
1164	tio->c_cc[VERASE] = CERASE;	1296	tio->c_cc[VERASE] = CERASE;
1165	#ifdef VERASE2	1297	#ifdef VERASE2
…		…
1229		1361
1230	/*	1362	/*
1231	* Debugging	1363	* Debugging
1232	*/	1364	*/
1233	#ifdef DEBUG_TTYMODE	1365	#ifdef DEBUG_TTYMODE
1234	#ifdef HAVE_TERMIOS_H
1235	/* c_iflag bits */	1366	/* c_iflag bits */
1236	fprintf (stderr, "Input flags\n");	1367	fprintf (stderr, "Input flags\n");
1237		1368
1238	/* cpp token stringize doesn't work on all machines <sigh> */	1369	/* cpp token stringize doesn't work on all machines <sigh> */
1239	# define FOO(flag,name) \	1370	# define FOO(flag,name) \
…		…
1302	FOO (VLNEXT, "VLNEXT");	1433	FOO (VLNEXT, "VLNEXT");
1303	# endif	1434	# endif
1304		1435
1305	fprintf (stderr, "\n");	1436	fprintf (stderr, "\n");
1306	# undef FOO	1437	# undef FOO
1307	# endif /* HAVE_TERMIOS_H */	1438	#endif /* DEBUG_TTYMODE */
1308	#endif /* DEBUG_TTYMODE */
1309	}	1439	}
1310		1440
1311	/----------------------------------------------------------------------/	1441	/----------------------------------------------------------------------/
1312	/*	1442	/*
1313	* Run the command in a subprocess and return a file descriptor for the	1443	* Run the command in a subprocess and return a file descriptor for the
…		…
1346	else	1476	else
1347	#endif	1477	#endif
1348	er = -1;	1478	er = -1;
1349		1479
1350	rxvt_get_ttymode (&tio, er);	1480	rxvt_get_ttymode (&tio, er);
1351	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1481	/* init terminal attributes */
		1482	cfsetospeed (&tio, BAUDRATE);
		1483	cfsetispeed (&tio, BAUDRATE);
		1484	tcsetattr (pty->tty, TCSANOW, &tio);
1352	pty->set_utf8_mode (enc_utf8);	1485	pty->set_utf8_mode (enc_utf8);
1353		1486
1354	/* set initial window size */	1487	/* set initial window size */
1355	tt_winch ();	1488	tt_winch ();
1356		1489
…		…
1416	rxvt_term::run_child (const char const argv)	1549	rxvt_term::run_child (const char const argv)
1417	{	1550	{
1418	char *login;	1551	char *login;
1419		1552
1420	if (option (Opt_console))	1553	if (option (Opt_console))
		1554	{
1421	{ /* be virtual console, fail silently */	1555	/* be virtual console, fail silently */
1422	#ifdef TIOCCONS	1556	#ifdef TIOCCONS
1423	unsigned int on = 1;	1557	unsigned int on = 1;
1424		1558
1425	ioctl (STDIN_FILENO, TIOCCONS, &on);	1559	ioctl (STDIN_FILENO, TIOCCONS, &on);
1426	#elif defined (SRIOCSREDIR)	1560	#elif defined (SRIOCSREDIR)
…		…
1428		1562
1429	fd = open (CONSOLE, O_WRONLY, 0);	1563	fd = open (CONSOLE, O_WRONLY, 0);
1430	if (fd >= 0)	1564	if (fd >= 0)
1431	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1565	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432	close (fd);	1566	close (fd);
1433	#endif /* SRIOCSREDIR */	1567	#endif /* SRIOCSREDIR */
1434	}	1568	}
1435		1569
1436	/* reset signals and spin off the command interpreter */	1570	/* reset signals and spin off the command interpreter */
1437	signal (SIGINT, SIG_DFL);	1571	signal (SIGINT, SIG_DFL);
1438	signal (SIGQUIT, SIG_DFL);	1572	signal (SIGQUIT, SIG_DFL);
…		…
1445	*/	1579	*/
1446	#ifdef SIGTSTP	1580	#ifdef SIGTSTP
1447	signal (SIGTSTP, SIG_IGN);	1581	signal (SIGTSTP, SIG_IGN);
1448	signal (SIGTTIN, SIG_IGN);	1582	signal (SIGTTIN, SIG_IGN);
1449	signal (SIGTTOU, SIG_IGN);	1583	signal (SIGTTOU, SIG_IGN);
1450	#endif /* SIGTSTP */	1584	#endif /* SIGTSTP */
1451
1452	// unblock signals (signals are blocked by iom.C
1453	sigset_t ss;
1454	sigemptyset (&ss);
1455	sigprocmask (SIG_SETMASK, &ss, 0);
1456		1585
1457	/* command interpreter path */	1586	/* command interpreter path */
1458	if (argv)	1587	if (argv)
1459	{	1588	{
1460	# ifdef DEBUG_CMD	1589	# ifdef DEBUG_CMD

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs. Revision 1.255 by root, Tue Nov 4 13:20:40 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.255 by root, Tue Nov 4 13:20:40 2008 UTC