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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC vs.
Revision 1.261 by sf-exg, Sat Jan 30 20:52:36 2010 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>
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
		56	#ifdef HAVE_NL_LANGINFO
		57	# include <langinfo.h>
		58	#endif
45		59
46	#ifdef DISPLAY_IS_IP	60	#ifdef DISPLAY_IS_IP
47	/* On Solaris link with -lsocket and -lnsl */	61	/* On Solaris link with -lsocket and -lnsl */
48	#include <sys/types.h>	62	#include <sys/types.h>
49	#include <sys/socket.h>	63	#include <sys/socket.h>
…		…
141	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
142	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
143	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
144	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
145	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
146	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
147	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
148	# else	162	# else
149	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150	# endif	164	# endif
151	/* high-intensity colors */	165	/* high-intensity colors */
152	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
153	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
237	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
238		252
239	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
240	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
241	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
242	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
243	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
244	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
245	NULL, /* Color_border */	259	NULL, /* Color_border */
246	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
247	NULL, /* Color_BD */	261	NULL, /* Color_BD */
248	NULL, /* Color_IT */	262	NULL, /* Color_IT */
249	NULL, /* Color_UL */	263	NULL, /* Color_UL */
250	NULL, /* Color_RV */	264	NULL, /* Color_RV */
251	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
253	NULL, // Color_underline	267	NULL, // Color_underline
254	#endif	268	#endif
255	#ifdef OPTION_HC	269	#ifdef OPTION_HC
256	NULL,	270	NULL,
257	#endif	271	#endif
258	#ifdef KEEP_SCROLLCOLOR
259	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
260	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
261	#endif /* KEEP_SCROLLCOLOR */	275	#endif
262	#if ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
263	NULL,	277	NULL,
264	#endif	278	#endif
265	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
266	"rgb:00/00/00",	280	"rgb:00/00/00",
267	#endif	281	#endif
268	};	282	};
269		283
270	bool	284	void
271	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
272	{	286	{
273	pix_colors = //	287	pix_colors = pix_colors_focused;
274	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275	#ifdef OFF_FOCUS_FADING
276	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277	#endif
278
279		288
280	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
281	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
282	want_refresh = 1;	291	want_refresh = 1;
283	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
284	ncol = 80;	293	ncol = 80;
285	nrow = 24;	294	nrow = 24;
286	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
287	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
288	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
		298	letterSpace = LETTERSPACE;
289	saveLines = SAVELINES;	299	saveLines = SAVELINES;
290	numpix_colors = TOTAL_COLORS;
291		300
292	refresh_type = SLOW_REFRESH;	301	refresh_type = SLOW_REFRESH;
293		302
294	oldcursor.row = oldcursor.col = -1;	303	oldcursor.row = oldcursor.col = -1;
295	last_bot = last_state = -1;
296		304
297	set_option (Opt_scrollBar);	305	set_option (Opt_scrollBar);
298	set_option (Opt_scrollTtyOutput);	306	set_option (Opt_scrollTtyOutput);
299	set_option (Opt_jumpScroll);	307	set_option (Opt_jumpScroll);
300	set_option (Opt_skipScroll);	308	set_option (Opt_skipScroll);
301	set_option (Opt_secondaryScreen);	309	set_option (Opt_secondaryScreen);
302	set_option (Opt_secondaryScroll);	310	set_option (Opt_secondaryScroll);
303	set_option (Opt_pastableTabs);	311	set_option (Opt_pastableTabs);
304	set_option (Opt_intensityStyles);	312	set_option (Opt_intensityStyles);
		313	set_option (Opt_iso14755);
305	set_option (Opt_iso14755_52);	314	set_option (Opt_iso14755_52);
306		315	set_option (Opt_buffered);
307	return true;
308	}	316	}
309		317
310	void	318	static void
311	rxvt_term::init_secondary ()	319	init_secondary ()
312	{	320	{
313	int i;	321	int i;
314		322
315	/*
316	* Close all unused file descriptors
317	* We don't want them, we don't need them.
318	*/
319	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
320	{	324	{
321	/* TODO: BOO HISS */
322	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
323	}	326	}
324	else if (i != STDIN_FILENO)	327	else if (i != STDIN_FILENO)
325	{	328	{
326	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
327	close (i);	330	close (i);
328	}	331	}
329		332
330	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332	#if 0 // schmorp sayz closing filies is murder
333	for (i = STDERR_FILENO + 1; i < num_fds; i++)
334	{
335	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336	if (i == 4 \|\| i == 7)
337	continue;
338	#endif
339	close (i);
340	}
341	#endif
342	}	334	}
343		335
344	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
345	const char **	337	const char **
346	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
…		…
356	break;	348	break;
357		349
358	if (r_argc == argc)	350	if (r_argc == argc)
359	cmd_argv = NULL;	351	cmd_argv = NULL;
360	else if (!argv[r_argc + 1])	352	else if (!argv[r_argc + 1])
361	rxvt_fatal ("-e requires an argument\n");	353	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362	else	354	else
363	{	355	{
364	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));	356	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
365		357
366	for (i = 0; i < argc - r_argc - 1; i++)	358	for (i = 0; i < argc - r_argc - 1; i++)
…		…
402	#if XFT	394	#if XFT
403	if (rs[Rs_depth])	395	if (rs[Rs_depth])
404	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
405	#endif	397	#endif
406		398
407	#ifdef HAVE_AFTERIMAGE
408	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409	#endif
410	free (r_argv);	399	free (r_argv);
411		400
412	for (int i = NUM_RESOURCES; i--; )	401	for (int i = NUM_RESOURCES; i--; )
413	if (rs [i] == resval_undef)	402	if (rs [i] == resval_undef)
414	rs [i] = 0;	403	rs [i] = 0;
		404
		405	#ifdef HAVE_AFTERIMAGE
		406	set_application_name ((char *)rs[Rs_name]);
		407	set_output_threshold (OUTPUT_LEVEL_WARNING);
		408	#endif
415		409
416	#if ENABLE_PERL	410	#if ENABLE_PERL
417	if (!rs[Rs_perl_ext_1])	411	if (!rs[Rs_perl_ext_1])
418	rs[Rs_perl_ext_1] = "default";	412	rs[Rs_perl_ext_1] = "default";
419		413
…		…
431	*/	425	*/
432	if (cmd_argv && cmd_argv[0])	426	if (cmd_argv && cmd_argv[0])
433	{	427	{
434	if (!rs[Rs_title])	428	if (!rs[Rs_title])
435	rs[Rs_title] = rxvt_basename (cmd_argv[0]);	429	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		430
436	if (!rs[Rs_iconName])	431	if (!rs[Rs_iconName])
437	rs[Rs_iconName] = rs[Rs_title];	432	rs[Rs_iconName] = rs[Rs_title];
438	}	433	}
439	else	434	else
440	{	435	{
441	if (!rs[Rs_title])	436	if (!rs[Rs_title])
442	rs[Rs_title] = rs[Rs_name];	437	rs[Rs_title] = rs[Rs_name];
		438
443	if (!rs[Rs_iconName])	439	if (!rs[Rs_iconName])
444	rs[Rs_iconName] = rs[Rs_name];	440	rs[Rs_iconName] = rs[Rs_name];
445	}	441	}
446		442
447	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	443	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
454	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	450	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
455	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());	451	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
456		452
457	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	453	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
458	lineSpace = min (i, std::numeric_limits<int16_t>::max ());	454	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
		455
		456	if (rs[Rs_letterSpace])
		457	letterSpace = atoi (rs[Rs_letterSpace]);
459	#endif	458	#endif
460		459
461	#ifdef POINTER_BLANK	460	#ifdef POINTER_BLANK
462	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	461	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
463	pointerBlankDelay = i;	462	pointerBlankDelay = i;
…		…
466	#endif	465	#endif
467		466
468	/* no point having a scrollbar without having any scrollback! */	467	/* no point having a scrollbar without having any scrollback! */
469	if (!saveLines)	468	if (!saveLines)
470	set_option (Opt_scrollBar, 0);	469	set_option (Opt_scrollBar, 0);
471
472	#ifdef PRINTPIPE
473	if (!rs[Rs_print_pipe])
474	rs[Rs_print_pipe] = PRINTPIPE;
475	#endif
476		470
477	if (!rs[Rs_cutchars])	471	if (!rs[Rs_cutchars])
478	rs[Rs_cutchars] = CUTCHARS;	472	rs[Rs_cutchars] = CUTCHARS;
479		473
480	#ifndef NO_BACKSPACE_KEY	474	#ifndef NO_BACKSPACE_KEY
…		…
493	# else	487	# else
494	rs[Rs_delete_key] = "\033[3~";	488	rs[Rs_delete_key] = "\033[3~";
495	# endif	489	# endif
496	#endif	490	#endif
497		491
498	#ifdef HAVE_SCROLLBARS	492	scrollBar.setup (this);
499	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
500	#endif
501		493
502	#ifdef XTERM_REVERSE_VIDEO	494	#ifdef XTERM_REVERSE_VIDEO
503	/* this is how xterm implements reverseVideo */	495	/* this is how xterm implements reverseVideo */
504	if (option (Opt_reverseVideo))	496	if (option (Opt_reverseVideo))
505	{	497	{
…		…
525	color_aliases (Color_fg);	517	color_aliases (Color_fg);
526	color_aliases (Color_bg);	518	color_aliases (Color_bg);
527	#ifndef NO_CURSORCOLOR	519	#ifndef NO_CURSORCOLOR
528	color_aliases (Color_cursor);	520	color_aliases (Color_cursor);
529	color_aliases (Color_cursor2);	521	color_aliases (Color_cursor2);
530	#endif /* NO_CURSORCOLOR */	522	#endif /* NO_CURSORCOLOR */
531	color_aliases (Color_pointer_fg);	523	color_aliases (Color_pointer_fg);
532	color_aliases (Color_pointer_bg);	524	color_aliases (Color_pointer_bg);
533	color_aliases (Color_border);	525	color_aliases (Color_border);
534	#ifndef NO_BOLD_UNDERLINE_REVERSE	526	#ifndef NO_BOLD_UNDERLINE_REVERSE
535	color_aliases (Color_BD);	527	color_aliases (Color_BD);
536	color_aliases (Color_UL);	528	color_aliases (Color_UL);
537	color_aliases (Color_RV);	529	color_aliases (Color_RV);
538	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	530	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
539		531
540	if (!rs[Rs_color + Color_border])	532	if (!rs[Rs_color + Color_border])
541	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	533	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
542		534
543	return cmd_argv;	535	return cmd_argv;
		536	}
		537
		538	/----------------------------------------------------------------------/
		539	void
		540	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		541	{
		542	this->envv = envv;
		543
		544	SET_R (this);
		545	set_locale ("");
		546	set_environ (envv); // a few things in X do not call setlocale :(
		547
		548	init_vars ();
		549
		550	init_secondary ();
		551
		552	const char **cmd_argv = init_resources (argc, argv);
		553
		554	#ifdef KEYSYM_RESOURCE
		555	keyboard->register_done ();
		556	#endif
		557
		558	if (const char *path = rs[Rs_chdir])
		559	if (*path) // ignored if empty
		560	{
		561	if (*path != '/')
		562	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		563
		564	if (chdir (path))
		565	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		566	}
		567
		568	if (option (Opt_scrollBar))
		569	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		570
		571	pty = ptytty::create ();
		572
		573	create_windows (argc, argv);
		574
		575	init_xlocale ();
		576
		577	scr_poweron (); // initialize screen
		578
		579	#if 0
		580	XSynchronize (dpy, True);
		581	#endif
		582
		583	if (option (Opt_scrollBar))
		584	scrollBar.resize (); /* create and map scrollbar */
		585	#ifdef HAVE_BG_PIXMAP
		586	{
		587	bgPixmap.set_target (this);
		588	bgPixmap.invalidate ();
		589
		590	#ifdef ENABLE_TRANSPARENCY
		591	if (option (Opt_transparent))
		592	{
		593	bgPixmap.set_transparent ();
		594
		595	#ifdef HAVE_AFTERIMAGE
		596	if (rs [Rs_blurradius])
		597	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		598	#endif
		599	if (ISSET_PIXCOLOR (Color_tint))
		600	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		601
		602	if (rs [Rs_shade])
		603	bgPixmap.set_shade (rs [Rs_shade]);
		604
		605	bgPixmap.set_root_pixmap ();
		606	XSelectInput (dpy, display->root, PropertyChangeMask);
		607	rootwin_ev.start (display, display->root);
		608	}
		609	#endif
		610
		611	#ifdef BG_IMAGE_FROM_FILE
		612	if (rs[Rs_backgroundPixmap])
		613	{
		614	const char *p = rs[Rs_backgroundPixmap];
		615
		616	if ((p = strchr (p, ';')) != 0)
		617	{
		618	p++;
		619	bgPixmap.set_geometry (p);
		620	}
		621	else
		622	bgPixmap.set_defaultGeometry ();
		623
		624	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		625	if (!bgPixmap.window_position_sensitive ())
		626	update_background ();
		627	}
		628	#endif
		629	}
		630	#endif
		631
		632	#if ENABLE_PERL
		633	rootwin_ev.start (display, display->root);
		634	#endif
		635
		636	set_colorfgbg ();
		637
		638	init_command (cmd_argv);
		639
		640	free (cmd_argv);
		641
		642	if (pty->pty >= 0)
		643	pty_ev.start (pty->pty, ev::READ);
		644
		645	HOOK_INVOKE ((this, HOOK_START, DT_END));
		646
		647	#if ENABLE_XEMBED
		648	if (rs[Rs_embed])
		649	{
		650	long info[2] = { 0, XEMBED_MAPPED };
		651
		652	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		653	32, PropModeReplace, (unsigned char *)&info, 2);
		654	}
		655	#endif
		656
		657	XMapWindow (dpy, vt);
		658	XMapWindow (dpy, parent[0]);
		659
		660	refresh_check ();
544	}	661	}
545		662
546	/----------------------------------------------------------------------/	663	/----------------------------------------------------------------------/
547	void	664	void
548	rxvt_term::init_env ()	665	rxvt_term::init_env ()
…		…
563	*/	680	*/
564	val = rxvt_network_display (rs[Rs_display_name]);	681	val = rxvt_network_display (rs[Rs_display_name]);
565	rs[Rs_display_name] = (const char *)val;	682	rs[Rs_display_name] = (const char *)val;
566		683
567	if (val == NULL)	684	if (val == NULL)
568	#endif /* DISPLAY_IS_IP */	685	#endif /* DISPLAY_IS_IP */
569	val = XDisplayString (dpy);	686	val = XDisplayString (dpy);
570		687
571	if (rs[Rs_display_name] == NULL)	688	if (rs[Rs_display_name] == NULL)
572	rs[Rs_display_name] = val; /* use broken `:0' value */	689	rs[Rs_display_name] = val; /* use broken `:0' value */
573		690
…		…
613	#ifdef HAVE_UNSETENV	730	#ifdef HAVE_UNSETENV
614	/* avoid passing old settings and confusing term size */	731	/* avoid passing old settings and confusing term size */
615	unsetenv ("LINES");	732	unsetenv ("LINES");
616	unsetenv ("COLUMNS");	733	unsetenv ("COLUMNS");
617	unsetenv ("TERMCAP"); /* terminfo should be okay */	734	unsetenv ("TERMCAP"); /* terminfo should be okay */
618	#endif /* HAVE_UNSETENV */	735	#endif /* HAVE_UNSETENV */
619	}	736	}
620		737
621	/----------------------------------------------------------------------/	738	/----------------------------------------------------------------------/
622	/*	739	/*
623	* This is more or less stolen straight from XFree86 xterm.	740	* This is more or less stolen straight from XFree86 xterm.
…		…
644		761
645	this->locale = "C";	762	this->locale = "C";
646	}	763	}
647		764
648		765
649	this->locale = rxvt_strdup (this->locale);	766	this->locale = strdup (this->locale);
650	SET_LOCALE (this->locale);	767	SET_LOCALE (this->locale);
651	mbstate.reset ();	768	mbstate.reset ();
652	#endif	769	#endif
653		770
654	#if HAVE_NL_LANGINFO	771	#if HAVE_NL_LANGINFO
…		…
727	run_command (argv);	844	run_command (argv);
728	}	845	}
729		846
730	/----------------------------------------------------------------------/	847	/----------------------------------------------------------------------/
731	void	848	void
732	rxvt_term::Get_Colours ()	849	rxvt_term::get_colours ()
733	{	850	{
734	int i;	851	int i;
735		852
736	#ifdef OFF_FOCUS_FADING	853	#ifdef OFF_FOCUS_FADING
737	pix_colors = pix_colors_focused;	854	pix_colors = pix_colors_focused;
738	#endif	855	#endif
739		856
740	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	857	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
741	{	858	{
742	const char *name = rs[Rs_color + i];	859	const char *name = rs[Rs_color + i];
743		860
744	if (!name)	861	if (!name)
…		…
797	* get scrollBar shadow colors	914	* get scrollBar shadow colors
798	*	915	*
799	* The calculations of topShadow/bottomShadow values are adapted	916	* The calculations of topShadow/bottomShadow values are adapted
800	* from the fvwm window manager.	917	* from the fvwm window manager.
801	*/	918	*/
802	#ifdef KEEP_SCROLLCOLOR	919	#ifdef RXVT_SCROLLBAR
803	if (depth <= 2)	920	if (depth <= 2)
804	{	921	{
805	/* Monochrome */	922	/* Monochrome */
806	alias_color (Color_scroll, Color_fg);	923	alias_color (Color_scroll, Color_fg);
807	alias_color (Color_topShadow, Color_bg);	924	alias_color (Color_topShadow, Color_bg);
…		…
822	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	939	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
823	cscroll.a)	940	cscroll.a)
824	))	941	))
825	alias_color (Color_topShadow, Color_White);	942	alias_color (Color_topShadow, Color_White);
826	}	943	}
827	#endif /* KEEP_SCROLLCOLOR */	944	#endif
828		945
829	#ifdef OFF_FOCUS_FADING	946	#ifdef OFF_FOCUS_FADING
830	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	947	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831	update_fade_color (i);	948	update_fade_color (i);
832	#endif	949	#endif
…		…
840	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	957	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
841	{	958	{
842	int i = atoi (rs[Rs_color + idx]);	959	int i = atoi (rs[Rs_color + idx]);
843		960
844	if (i >= 8 && i <= 15)	961	if (i >= 8 && i <= 15)
845	{ /* bright colors */	962	/* bright colors */
846	i -= 8;
847	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	963	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
848	return;	964	else if (i >= 0 && i <= 7)
849	}	965	/* normal colors */
850
851	if (i >= 0 && i <= 7) /* normal colors */
852	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	966	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
853	}	967	}
854	}	968	}
855		969
856	/----------------------------------------------------------------------/	970	/----------------------------------------------------------------------/
…		…
957	Window top, parent;	1071	Window top, parent;
958		1072
959	dLocal (Display *, dpy);	1073	dLocal (Display *, dpy);
960		1074
961	/* grab colors before netscape does */	1075	/* grab colors before netscape does */
962	Get_Colours ();	1076	get_colours ();
963		1077
964	if (!set_fonts ())	1078	if (!set_fonts ())
965	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1079	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
966		1080
967	parent = display->root;	1081	parent = display->root;
…		…
1015	this->parent[0] = top;	1129	this->parent[0] = top;
1016		1130
1017	old_width = szHint.width;	1131	old_width = szHint.width;
1018	old_height = szHint.height;	1132	old_height = szHint.height;
1019		1133
1020	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1134	set_title (rs [Rs_title]);
1021	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1135	set_icon_name (rs [Rs_iconName]);
1022		1136
1023	classHint.res_name = (char *)rs[Rs_name];	1137	classHint.res_name = (char *)rs[Rs_name];
1024	classHint.res_class = (char *)RESCLASS;	1138	classHint.res_class = (char *)RESCLASS;
1025		1139
1026	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1140	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
…		…
1028	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1142	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1029	wmHint.window_group = top;	1143	wmHint.window_group = top;
1030		1144
1031	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1145	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1032	&szHint, &wmHint, &classHint);	1146	&szHint, &wmHint, &classHint);
		1147	#if ENABLE_EWMH
		1148	# ifdef HAVE_AFTERIMAGE
		1149	/*
		1150	* set up icon hint
		1151	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources
		1152	*/
		1153
		1154	if (rs [Rs_iconfile])
		1155	{
		1156	init_asv ();
		1157
		1158	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1159	if (asv && im)
		1160	{
		1161	int w = im->width;
		1162	int h = im->height;
		1163	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1164	ASImage *result = scale_asimage (asv, im,
		1165	w, h, ASA_ARGB32,
		1166	100, ASIMAGE_QUALITY_DEFAULT);
		1167	destroy_asimage (&im);
		1168
		1169	if (buffer && result)
		1170	{
		1171	ARGB32 *asbuf = result->alt.argb32;
		1172	buffer [0] = w;
		1173	buffer [1] = h;
		1174
		1175	for (unsigned int i = 0; i < w * h; ++i)
		1176	buffer [i + 2] = asbuf [i];
		1177
		1178	destroy_asimage (&result);
		1179	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1180	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1181	free (buffer);
		1182	}
		1183	else
		1184	{
		1185	if (!buffer)
		1186	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1187
		1188	if (!result)
		1189	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1190	}
		1191	}
		1192	else
		1193	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1194	}
		1195	# endif
		1196	#endif
1033		1197
1034	#if ENABLE_FRILLS	1198	#if ENABLE_FRILLS
1035	if (mwmhints.flags)	1199	if (mwmhints.flags)
1036	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1200	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1037	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1201	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1071		1235
1072	termwin_ev.start (display, top);	1236	termwin_ev.start (display, top);
1073		1237
1074	/* vt cursor: Black-on-White is standard, but this is more popular */	1238	/* vt cursor: Black-on-White is standard, but this is more popular */
1075	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1239	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1076
1077	#ifdef HAVE_SCROLLBARS
1078	/* cursor scrollBar: Black-on-White */
1079	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1080	#endif
1081		1240
1082	/* the vt window */	1241	/* the vt window */
1083	vt = XCreateSimpleWindow (dpy, top,	1242	vt = XCreateSimpleWindow (dpy, top,
1084	window_vt_x, window_vt_y,	1243	window_vt_x, window_vt_y,
1085	width, height,	1244	width, height,
…		…
1110	GCForeground \| GCBackground \| GCGraphicsExposures,	1269	GCForeground \| GCBackground \| GCGraphicsExposures,
1111	&gcvalue);	1270	&gcvalue);
1112		1271
1113	drawable = new rxvt_drawable (this, vt);	1272	drawable = new rxvt_drawable (this, vt);
1114		1273
1115	#ifdef RXVT_SCROLLBAR
1116	gcvalue.foreground = pix_colors[Color_topShadow];
1117	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1118	gcvalue.foreground = pix_colors[Color_bottomShadow];
1119	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1120	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1121	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1122	#endif
1123
1124	#ifdef OFF_FOCUS_FADING	1274	#ifdef OFF_FOCUS_FADING
1125	// initially we are in unfocused state	1275	// initially we are in unfocused state
1126	if (rs[Rs_fade])	1276	if (rs[Rs_fade])
1127	pix_colors = pix_colors_unfocused;	1277	pix_colors = pix_colors_unfocused;
1128	#endif	1278	#endif
…		…
1133		1283
1134	/* ------------------------------------------------------------------------- *	1284	/* ------------------------------------------------------------------------- *
1135	* GET TTY CURRENT STATE *	1285	* GET TTY CURRENT STATE *
1136	* ------------------------------------------------------------------------- */	1286	* ------------------------------------------------------------------------- */
1137	void	1287	void
1138	rxvt_get_ttymode (ttymode_t *tio, int erase)	1288	rxvt_get_ttymode (struct termios *tio, int erase)
1139	{	1289	{
1140	/*	1290	/*
1141	* standard System V termios interface	1291	* standard System V termios interface
1142	*/	1292	*/
1143	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1293	if (tcgetattr (STDIN_FILENO, tio) < 0)
1144	{	1294	{
1145	// return error - use system defaults,	1295	// return error - use system defaults,
1146	// where possible, and zero elsewhere	1296	// where possible, and zero elsewhere
1147	memset (tio, 0, sizeof (ttymode_t));	1297	memset (tio, 0, sizeof (struct termios));
1148		1298
1149	tio->c_cc[VINTR] = CINTR;	1299	tio->c_cc[VINTR] = CINTR;
1150	tio->c_cc[VQUIT] = CQUIT;	1300	tio->c_cc[VQUIT] = CQUIT;
1151	tio->c_cc[VERASE] = CERASE;	1301	tio->c_cc[VERASE] = CERASE;
1152	#ifdef VERASE2	1302	#ifdef VERASE2
…		…
1216		1366
1217	/*	1367	/*
1218	* Debugging	1368	* Debugging
1219	*/	1369	*/
1220	#ifdef DEBUG_TTYMODE	1370	#ifdef DEBUG_TTYMODE
1221	#ifdef HAVE_TERMIOS_H
1222	/* c_iflag bits */	1371	/* c_iflag bits */
1223	fprintf (stderr, "Input flags\n");	1372	fprintf (stderr, "Input flags\n");
1224		1373
1225	/* cpp token stringize doesn't work on all machines <sigh> */	1374	/* cpp token stringize doesn't work on all machines <sigh> */
1226	# define FOO(flag,name) \	1375	# define FOO(flag,name) \
…		…
1289	FOO (VLNEXT, "VLNEXT");	1438	FOO (VLNEXT, "VLNEXT");
1290	# endif	1439	# endif
1291		1440
1292	fprintf (stderr, "\n");	1441	fprintf (stderr, "\n");
1293	# undef FOO	1442	# undef FOO
1294	# endif /* HAVE_TERMIOS_H */	1443	#endif /* DEBUG_TTYMODE */
1295	#endif /* DEBUG_TTYMODE */
1296	}	1444	}
1297		1445
1298	/----------------------------------------------------------------------/	1446	/----------------------------------------------------------------------/
1299	/*	1447	/*
1300	* Run the command in a subprocess and return a file descriptor for the	1448	* Run the command in a subprocess and return a file descriptor for the
…		…
1333	else	1481	else
1334	#endif	1482	#endif
1335	er = -1;	1483	er = -1;
1336		1484
1337	rxvt_get_ttymode (&tio, er);	1485	rxvt_get_ttymode (&tio, er);
1338	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1486	/* init terminal attributes */
		1487	cfsetospeed (&tio, BAUDRATE);
		1488	cfsetispeed (&tio, BAUDRATE);
		1489	tcsetattr (pty->tty, TCSANOW, &tio);
1339	pty->set_utf8_mode (enc_utf8);	1490	pty->set_utf8_mode (enc_utf8);
1340		1491
1341	/* set initial window size */	1492	/* set initial window size */
1342	tt_winch ();	1493	tt_winch ();
1343		1494
…		…
1403	rxvt_term::run_child (const char const argv)	1554	rxvt_term::run_child (const char const argv)
1404	{	1555	{
1405	char *login;	1556	char *login;
1406		1557
1407	if (option (Opt_console))	1558	if (option (Opt_console))
		1559	{
1408	{ /* be virtual console, fail silently */	1560	/* be virtual console, fail silently */
1409	#ifdef TIOCCONS	1561	#ifdef TIOCCONS
1410	unsigned int on = 1;	1562	unsigned int on = 1;
1411		1563
1412	ioctl (STDIN_FILENO, TIOCCONS, &on);	1564	ioctl (STDIN_FILENO, TIOCCONS, &on);
1413	#elif defined (SRIOCSREDIR)	1565	#elif defined (SRIOCSREDIR)
…		…
1415		1567
1416	fd = open (CONSOLE, O_WRONLY, 0);	1568	fd = open (CONSOLE, O_WRONLY, 0);
1417	if (fd >= 0)	1569	if (fd >= 0)
1418	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1570	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419	close (fd);	1571	close (fd);
1420	#endif /* SRIOCSREDIR */	1572	#endif /* SRIOCSREDIR */
1421	}	1573	}
1422		1574
1423	/* reset signals and spin off the command interpreter */	1575	/* reset signals and spin off the command interpreter */
1424	signal (SIGINT, SIG_DFL);	1576	signal (SIGINT, SIG_DFL);
1425	signal (SIGQUIT, SIG_DFL);	1577	signal (SIGQUIT, SIG_DFL);
…		…
1432	*/	1584	*/
1433	#ifdef SIGTSTP	1585	#ifdef SIGTSTP
1434	signal (SIGTSTP, SIG_IGN);	1586	signal (SIGTSTP, SIG_IGN);
1435	signal (SIGTTIN, SIG_IGN);	1587	signal (SIGTTIN, SIG_IGN);
1436	signal (SIGTTOU, SIG_IGN);	1588	signal (SIGTTOU, SIG_IGN);
1437	#endif /* SIGTSTP */	1589	#endif /* SIGTSTP */
1438
1439	// unblock signals (signals are blocked by iom.C
1440	sigset_t ss;
1441	sigemptyset (&ss);
1442	sigprocmask (SIG_SETMASK, &ss, 0);
1443		1590
1444	/* command interpreter path */	1591	/* command interpreter path */
1445	if (argv)	1592	if (argv)
1446	{	1593	{
1447	# ifdef DEBUG_CMD	1594	# ifdef DEBUG_CMD
…		…
1459	const char argv0, shell;	1606	const char argv0, shell;
1460		1607
1461	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1608	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1462	shell = "/bin/sh";	1609	shell = "/bin/sh";
1463		1610
1464	argv0 = (const char *)rxvt_basename (shell);	1611	argv0 = rxvt_basename (shell);
1465		1612
1466	if (option (Opt_loginShell))	1613	if (option (Opt_loginShell))
1467	{	1614	{
1468	login = (char *)rxvt_malloc (strlen (argv0) + 2);	1615	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469		1616

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC vs. Revision 1.261 by sf-exg, Sat Jan 30 20:52:36 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC vs.
Revision 1.261 by sf-exg, Sat Jan 30 20:52:36 2010 UTC