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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.226 by ayin, Tue Dec 11 17:42:04 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>
45		44
…		…
268	NULL, // Color_underline	267	NULL, // Color_underline
269	#endif	268	#endif
270	#ifdef OPTION_HC	269	#ifdef OPTION_HC
271	NULL,	270	NULL,
272	#endif	271	#endif
273	#ifdef KEEP_SCROLLCOLOR
274	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
275	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
276	#endif /* KEEP_SCROLLCOLOR */	275	#endif
277	#if ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
278	NULL,	277	NULL,
279	#endif	278	#endif
280	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
281	"rgb:00/00/00",	280	"rgb:00/00/00",
282	#endif	281	#endif
283	};	282	};
284		283
285	bool	284	void
286	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
287	{	286	{
288	pix_colors = //	287	pix_colors = pix_colors_focused;
289	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
290	#ifdef OFF_FOCUS_FADING
291	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
292	#endif
293
294		288
295	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
296	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
297	want_refresh = 1;	291	want_refresh = 1;
298	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
299	ncol = 80;	293	ncol = 80;
300	nrow = 24;	294	nrow = 24;
301	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
302	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
303	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
		298	letterSpace = LETTERSPACE;
304	saveLines = SAVELINES;	299	saveLines = SAVELINES;
305	numpix_colors = TOTAL_COLORS;
306		300
307	refresh_type = SLOW_REFRESH;	301	refresh_type = SLOW_REFRESH;
308		302
309	oldcursor.row = oldcursor.col = -1;	303	oldcursor.row = oldcursor.col = -1;
310	last_bot = last_state = -1;
311		304
312	set_option (Opt_scrollBar);	305	set_option (Opt_scrollBar);
313	set_option (Opt_scrollTtyOutput);	306	set_option (Opt_scrollTtyOutput);
314	set_option (Opt_jumpScroll);	307	set_option (Opt_jumpScroll);
315	set_option (Opt_skipScroll);	308	set_option (Opt_skipScroll);
316	set_option (Opt_secondaryScreen);	309	set_option (Opt_secondaryScreen);
317	set_option (Opt_secondaryScroll);	310	set_option (Opt_secondaryScroll);
318	set_option (Opt_pastableTabs);	311	set_option (Opt_pastableTabs);
319	set_option (Opt_intensityStyles);	312	set_option (Opt_intensityStyles);
		313	set_option (Opt_iso14755);
320	set_option (Opt_iso14755_52);	314	set_option (Opt_iso14755_52);
321		315	set_option (Opt_buffered);
322	return true;
323	}	316	}
324		317
325	void	318	static void
326	rxvt_term::init_secondary ()	319	init_secondary ()
327	{	320	{
328	int i;	321	int i;
329		322
330	/*
331	* Close all unused file descriptors
332	* We don't want them, we don't need them.
333	*/
334	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
335	{	324	{
336	/* TODO: BOO HISS */
337	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
338	}	326	}
339	else if (i != STDIN_FILENO)	327	else if (i != STDIN_FILENO)
340	{	328	{
341	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
342	close (i);	330	close (i);
343	}	331	}
344		332
345	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	dup2 (STDERR_FILENO, STDOUT_FILENO);
346
347	#if 0 // schmorp sayz closing filies is murder
348	for (i = STDERR_FILENO + 1; i < num_fds; i++)
349	{
350	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
351	if (i == 4 \|\| i == 7)
352	continue;
353	#endif
354	close (i);
355	}
356	#endif
357	}	334	}
358		335
359	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
360	const char **	337	const char **
361	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
…		…
417	#if XFT	394	#if XFT
418	if (rs[Rs_depth])	395	if (rs[Rs_depth])
419	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
420	#endif	397	#endif
421		398
422	#ifdef HAVE_AFTERIMAGE
423	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424	#endif
425	free (r_argv);	399	free (r_argv);
426		400
427	for (int i = NUM_RESOURCES; i--; )	401	for (int i = NUM_RESOURCES; i--; )
428	if (rs [i] == resval_undef)	402	if (rs [i] == resval_undef)
429	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
430		409
431	#if ENABLE_PERL	410	#if ENABLE_PERL
432	if (!rs[Rs_perl_ext_1])	411	if (!rs[Rs_perl_ext_1])
433	rs[Rs_perl_ext_1] = "default";	412	rs[Rs_perl_ext_1] = "default";
434		413
…		…
446	*/	425	*/
447	if (cmd_argv && cmd_argv[0])	426	if (cmd_argv && cmd_argv[0])
448	{	427	{
449	if (!rs[Rs_title])	428	if (!rs[Rs_title])
450	rs[Rs_title] = rxvt_basename (cmd_argv[0]);	429	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		430
451	if (!rs[Rs_iconName])	431	if (!rs[Rs_iconName])
452	rs[Rs_iconName] = rs[Rs_title];	432	rs[Rs_iconName] = rs[Rs_title];
453	}	433	}
454	else	434	else
455	{	435	{
456	if (!rs[Rs_title])	436	if (!rs[Rs_title])
457	rs[Rs_title] = rs[Rs_name];	437	rs[Rs_title] = rs[Rs_name];
		438
458	if (!rs[Rs_iconName])	439	if (!rs[Rs_iconName])
459	rs[Rs_iconName] = rs[Rs_name];	440	rs[Rs_iconName] = rs[Rs_name];
460	}	441	}
461		442
462	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	443	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
469	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)
470	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());	451	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
471		452
472	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	453	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
473	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]);
474	#endif	458	#endif
475		459
476	#ifdef POINTER_BLANK	460	#ifdef POINTER_BLANK
477	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	461	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
478	pointerBlankDelay = i;	462	pointerBlankDelay = i;
…		…
481	#endif	465	#endif
482		466
483	/* no point having a scrollbar without having any scrollback! */	467	/* no point having a scrollbar without having any scrollback! */
484	if (!saveLines)	468	if (!saveLines)
485	set_option (Opt_scrollBar, 0);	469	set_option (Opt_scrollBar, 0);
486
487	#ifdef PRINTPIPE
488	if (!rs[Rs_print_pipe])
489	rs[Rs_print_pipe] = PRINTPIPE;
490	#endif
491		470
492	if (!rs[Rs_cutchars])	471	if (!rs[Rs_cutchars])
493	rs[Rs_cutchars] = CUTCHARS;	472	rs[Rs_cutchars] = CUTCHARS;
494		473
495	#ifndef NO_BACKSPACE_KEY	474	#ifndef NO_BACKSPACE_KEY
…		…
508	# else	487	# else
509	rs[Rs_delete_key] = "\033[3~";	488	rs[Rs_delete_key] = "\033[3~";
510	# endif	489	# endif
511	#endif	490	#endif
512		491
513	#ifdef HAVE_SCROLLBARS	492	scrollBar.setup (this);
514	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
515	#endif
516		493
517	#ifdef XTERM_REVERSE_VIDEO	494	#ifdef XTERM_REVERSE_VIDEO
518	/* this is how xterm implements reverseVideo */	495	/* this is how xterm implements reverseVideo */
519	if (option (Opt_reverseVideo))	496	if (option (Opt_reverseVideo))
520	{	497	{
…		…
558	return cmd_argv;	535	return cmd_argv;
559	}	536	}
560		537
561	/----------------------------------------------------------------------/	538	/----------------------------------------------------------------------/
562	void	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 ();
		661	}
		662
		663	/----------------------------------------------------------------------/
		664	void
563	rxvt_term::init_env ()	665	rxvt_term::init_env ()
564	{	666	{
565	int i;	667	int i;
566	char *val;	668	char *val;
567		669
…		…
742	run_command (argv);	844	run_command (argv);
743	}	845	}
744		846
745	/----------------------------------------------------------------------/	847	/----------------------------------------------------------------------/
746	void	848	void
747	rxvt_term::Get_Colours ()	849	rxvt_term::get_colours ()
748	{	850	{
749	int i;	851	int i;
750		852
751	#ifdef OFF_FOCUS_FADING	853	#ifdef OFF_FOCUS_FADING
752	pix_colors = pix_colors_focused;	854	pix_colors = pix_colors_focused;
…		…
812	* get scrollBar shadow colors	914	* get scrollBar shadow colors
813	*	915	*
814	* The calculations of topShadow/bottomShadow values are adapted	916	* The calculations of topShadow/bottomShadow values are adapted
815	* from the fvwm window manager.	917	* from the fvwm window manager.
816	*/	918	*/
817	#ifdef KEEP_SCROLLCOLOR	919	#ifdef RXVT_SCROLLBAR
818	if (depth <= 2)	920	if (depth <= 2)
819	{	921	{
820	/* Monochrome */	922	/* Monochrome */
821	alias_color (Color_scroll, Color_fg);	923	alias_color (Color_scroll, Color_fg);
822	alias_color (Color_topShadow, Color_bg);	924	alias_color (Color_topShadow, Color_bg);
…		…
837	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),
838	cscroll.a)	940	cscroll.a)
839	))	941	))
840	alias_color (Color_topShadow, Color_White);	942	alias_color (Color_topShadow, Color_White);
841	}	943	}
842	#endif /* KEEP_SCROLLCOLOR */	944	#endif
843		945
844	#ifdef OFF_FOCUS_FADING	946	#ifdef OFF_FOCUS_FADING
845	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	947	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
846	update_fade_color (i);	948	update_fade_color (i);
847	#endif	949	#endif
…		…
969	Window top, parent;	1071	Window top, parent;
970		1072
971	dLocal (Display *, dpy);	1073	dLocal (Display *, dpy);
972		1074
973	/* grab colors before netscape does */	1075	/* grab colors before netscape does */
974	Get_Colours ();	1076	get_colours ();
975		1077
976	if (!set_fonts ())	1078	if (!set_fonts ())
977	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");
978		1080
979	parent = display->root;	1081	parent = display->root;
…		…
1027	this->parent[0] = top;	1129	this->parent[0] = top;
1028		1130
1029	old_width = szHint.width;	1131	old_width = szHint.width;
1030	old_height = szHint.height;	1132	old_height = szHint.height;
1031		1133
1032	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1134	set_title (rs [Rs_title]);
1033	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1135	set_icon_name (rs [Rs_iconName]);
1034		1136
1035	classHint.res_name = (char *)rs[Rs_name];	1137	classHint.res_name = (char *)rs[Rs_name];
1036	classHint.res_class = (char *)RESCLASS;	1138	classHint.res_class = (char *)RESCLASS;
1037		1139
1038	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1140	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
…		…
1040	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1142	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1041	wmHint.window_group = top;	1143	wmHint.window_group = top;
1042		1144
1043	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1145	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1044	&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
1045		1197
1046	#if ENABLE_FRILLS	1198	#if ENABLE_FRILLS
1047	if (mwmhints.flags)	1199	if (mwmhints.flags)
1048	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,
1049	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1201	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1083		1235
1084	termwin_ev.start (display, top);	1236	termwin_ev.start (display, top);
1085		1237
1086	/* 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 */
1087	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1239	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1088
1089	#ifdef HAVE_SCROLLBARS
1090	/* cursor scrollBar: Black-on-White */
1091	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1092	#endif
1093		1240
1094	/* the vt window */	1241	/* the vt window */
1095	vt = XCreateSimpleWindow (dpy, top,	1242	vt = XCreateSimpleWindow (dpy, top,
1096	window_vt_x, window_vt_y,	1243	window_vt_x, window_vt_y,
1097	width, height,	1244	width, height,
…		…
1122	GCForeground \| GCBackground \| GCGraphicsExposures,	1269	GCForeground \| GCBackground \| GCGraphicsExposures,
1123	&gcvalue);	1270	&gcvalue);
1124		1271
1125	drawable = new rxvt_drawable (this, vt);	1272	drawable = new rxvt_drawable (this, vt);
1126		1273
1127	#ifdef RXVT_SCROLLBAR
1128	gcvalue.foreground = pix_colors[Color_topShadow];
1129	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130	gcvalue.foreground = pix_colors[Color_bottomShadow];
1131	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1133	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1134	#endif
1135
1136	#ifdef OFF_FOCUS_FADING	1274	#ifdef OFF_FOCUS_FADING
1137	// initially we are in unfocused state	1275	// initially we are in unfocused state
1138	if (rs[Rs_fade])	1276	if (rs[Rs_fade])
1139	pix_colors = pix_colors_unfocused;	1277	pix_colors = pix_colors_unfocused;
1140	#endif	1278	#endif
…		…
1145		1283
1146	/* ------------------------------------------------------------------------- *	1284	/* ------------------------------------------------------------------------- *
1147	* GET TTY CURRENT STATE *	1285	* GET TTY CURRENT STATE *
1148	* ------------------------------------------------------------------------- */	1286	* ------------------------------------------------------------------------- */
1149	void	1287	void
1150	rxvt_get_ttymode (ttymode_t *tio, int erase)	1288	rxvt_get_ttymode (struct termios *tio, int erase)
1151	{	1289	{
1152	/*	1290	/*
1153	* standard System V termios interface	1291	* standard System V termios interface
1154	*/	1292	*/
1155	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1293	if (tcgetattr (STDIN_FILENO, tio) < 0)
1156	{	1294	{
1157	// return error - use system defaults,	1295	// return error - use system defaults,
1158	// where possible, and zero elsewhere	1296	// where possible, and zero elsewhere
1159	memset (tio, 0, sizeof (ttymode_t));	1297	memset (tio, 0, sizeof (struct termios));
1160		1298
1161	tio->c_cc[VINTR] = CINTR;	1299	tio->c_cc[VINTR] = CINTR;
1162	tio->c_cc[VQUIT] = CQUIT;	1300	tio->c_cc[VQUIT] = CQUIT;
1163	tio->c_cc[VERASE] = CERASE;	1301	tio->c_cc[VERASE] = CERASE;
1164	#ifdef VERASE2	1302	#ifdef VERASE2
…		…
1343	else	1481	else
1344	#endif	1482	#endif
1345	er = -1;	1483	er = -1;
1346		1484
1347	rxvt_get_ttymode (&tio, er);	1485	rxvt_get_ttymode (&tio, er);
1348	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);
1349	pty->set_utf8_mode (enc_utf8);	1490	pty->set_utf8_mode (enc_utf8);
1350		1491
1351	/* set initial window size */	1492	/* set initial window size */
1352	tt_winch ();	1493	tt_winch ();
1353		1494
…		…
1445	signal (SIGTSTP, SIG_IGN);	1586	signal (SIGTSTP, SIG_IGN);
1446	signal (SIGTTIN, SIG_IGN);	1587	signal (SIGTTIN, SIG_IGN);
1447	signal (SIGTTOU, SIG_IGN);	1588	signal (SIGTTOU, SIG_IGN);
1448	#endif /* SIGTSTP */	1589	#endif /* SIGTSTP */
1449		1590
1450	// unblock signals (signals are blocked by iom.C
1451	sigset_t ss;
1452	sigemptyset (&ss);
1453	sigprocmask (SIG_SETMASK, &ss, 0);
1454
1455	/* command interpreter path */	1591	/* command interpreter path */
1456	if (argv)	1592	if (argv)
1457	{	1593	{
1458	# ifdef DEBUG_CMD	1594	# ifdef DEBUG_CMD
1459	int i;	1595	int i;
…		…
1470	const char argv0, shell;	1606	const char argv0, shell;
1471		1607
1472	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1608	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1473	shell = "/bin/sh";	1609	shell = "/bin/sh";
1474		1610
1475	argv0 = (const char *)rxvt_basename (shell);	1611	argv0 = rxvt_basename (shell);
1476		1612
1477	if (option (Opt_loginShell))	1613	if (option (Opt_loginShell))
1478	{	1614	{
1479	login = (char *)rxvt_malloc (strlen (argv0) + 2);	1615	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1480		1616

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.226 by ayin, Tue Dec 11 17:42:04 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.226 by ayin, Tue Dec 11 17:42:04 2007 UTC vs.
Revision 1.261 by sf-exg, Sat Jan 30 20:52:36 2010 UTC