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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	17	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	36	#include "rxvtutil.h"
37	#include "init.h"	37	#include "init.h"
38		38
		39	#include <limits>
		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
43	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
45	/* low-intensity colors */	47	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	48	"rgb:00/00/00", // 0: black (Black)
47	#ifndef NO_BRIGHTCOLOR	49	"rgb:cd/00/00", // 1: red (Red3)
48	"Red3", /* 1: red (#CD0000) */	50	"rgb:00/cd/00", // 2: green (Green3)
49	"Green3", /* 2: green (#00CD00) */	51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)
50	"Yellow3", /* 3: yellow (#CDCD00) */	52	"rgb:00/00/cd", // 4: blue (Blue3)
51	"Blue3", /* 4: blue (#0000CD) */	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
52	"Magenta3", /* 5: magenta (#CD00CD) */	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
53	"Cyan3", /* 6: cyan (#00CDCD) */	55	# ifdef XTERM_COLORS
54	# ifdef XTERM_COLORS	56	"rgb:e5/e5/e5", // 7: white (Grey90)
55	"Grey90", /* 7: white (#E5E5E5) */	57	# else
56	# else	58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57	"AntiqueWhite", /* 7: white (#FAEBD7) */
58	# endif	59	# endif
59	/* high-intensity colors */	60	/* high-intensity colors */
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"rgb:4d/4d/4d", // 8: bright black (Grey30)
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"rgb:40/40/40", // 8: bright black (Grey25)
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */	66	"rgb:ff/00/00", // 1/9: bright red (Reed)
66	"Red", /* 1/9: bright red (#FF0000) */	67	"rgb:00/ff/00", // 2/10: bright green (Green)
67	"Green", /* 2/10: bright green (#00FF00) */	68	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	69	"rgb:00/00/ff", // 4/12: bright blue (Blue)
69	"Blue", /* 4/12: bright blue (#0000FF) */	70	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	71	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	72	"rgb:ff/ff/ff", // 7/15: bright white (White)
72	"White", /* 7/15: bright white (#FFFFFF) */
73		73
74	// 88 xterm colours	74	// 88 xterm colours
75	"rgb:00/00/00",	75	"rgb:00/00/00",
76	"rgb:00/00/8b",	76	"rgb:00/00/8b",
77	"rgb:00/00/cd",	77	"rgb:00/00/cd",
…		…
170	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	171	#if TINTING
172	NULL,	172	NULL,
173	#endif	173	#endif
174	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
175	"black",	175	"rgb:00/00/00",
176	#endif
177	};
178
179	const char *const xa_names[] =
180	{
181	"TEXT",
182	"COMPOUND_TEXT",
183	"UTF8_STRING",
184	"MULTIPLE",
185	"TARGETS",
186	"TIMESTAMP",
187	"VT_SELECTION",
188	"INCR",
189	"WM_PROTOCOLS",
190	"WM_DELETE_WINDOW",
191	"CLIPBOARD",
192	#if ENABLE_FRILLS
193	"_MOTIF_WM_HINTS",
194	#endif
195	#if ENABLE_EWMH
196	"_NET_WM_PID",
197	"_NET_WM_NAME",
198	"_NET_WM_ICON_NAME",
199	"_NET_WM_PING",
200	#endif
201	#if USE_XIM
202	"WM_LOCALE_NAME",
203	#endif
204	#ifdef TRANSPARENT
205	"_XROOTPMAP_ID",
206	"ESETROOT_PMAP_ID",
207	#endif
208	#ifdef OFFIX_DND
209	"DndProtocol",
210	"DndSelection",
211	#endif
212	#if ENABLE_XEMBED
213	"_XEMBED",
214	"_XEMBED_INFO",
215	#endif	176	#endif
216	};	177	};
217		178
218	bool	179	bool
219	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
220	{	181	{
221	sw_term.start (SIGTERM);	182	pix_colors = //
222	sw_int.start (SIGINT);
223
224	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
226	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227	#endif	186	#endif
228	pix_colors = pix_colors_focused;
229
230	if (pix_colors == NULL)
231	return false;
232		187
233	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
234	TermWin.pixmap = None;	189	pixmap = None;
235	#endif	190	#endif
236		191
237	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
238	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
239	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
240	want_refresh = 1;	195	want_refresh = 1;
241	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
242	TermWin.focus = 0;
243	TermWin.ncol = 80;	197	ncol = 80;
244	TermWin.nrow = 24;	198	nrow = 24;
245	TermWin.int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
246	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
247	TermWin.lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
248	TermWin.saveLines = SAVELINES;	202	saveLines = SAVELINES;
249	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
250		204
251	refresh_limit = 1;	205	refresh_limit = 1;
252	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
253	prev_nrow = prev_ncol = 0;
254		207
255	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
256	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
257	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
258	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
259	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
260	#endif	213	#endif
261		214
262	last_bot = last_state = -1;	215	last_bot = last_state = -1;
263
264	#ifdef MENUBAR
265	menu_readonly = 1;
266	# if ! (MENUBAR_MAX > 1)
267	CurrentBar = &BarList;
268	# endif /* (MENUBAR_MAX > 1) */
269	#endif
270		216
271	return true;	217	return true;
272	}	218	}
273		219
274	void	220	void
…		…
342	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
343		289
344	/*	290	/*
345	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
346	*/	292	*/
		293
347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
349		296
350	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
351		298
352	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
353	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354		301
		302	xa = display->xa;
		303
		304	#if XFT
		305	if (rs[Rs_depth])
		306	set (display, strtol (rs[Rs_depth], 0, 0));
		307	else
		308	#endif
		309	set (display);
		310
355	extract_resources ();	311	extract_resources ();
		312
356	free (r_argv);	313	free (r_argv);
		314
		315	#if ENABLE_PERL
		316	if (!rs[Rs_perl_ext_1])
		317	rs[Rs_perl_ext_1] = "default";
		318
		319	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		320	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		321	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		322	{
		323	rxvt_perl.init (this);
		324	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		325	}
		326	#endif
357		327
358	/*	328	/*
359	* set any defaults not already set	329	* set any defaults not already set
360	*/	330	*/
361	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
372	if (!rs[Rs_iconName])	342	if (!rs[Rs_iconName])
373	rs[Rs_iconName] = rs[Rs_name];	343	rs[Rs_iconName] = rs[Rs_name];
374	}	344	}
375		345
376	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	346	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	347	saveLines = min (i, MAX_SAVELINES);
378		348
379	#if ENABLE_FRILLS	349	#if ENABLE_FRILLS
380	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	350	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
381	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	351	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		352
382	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	353	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
383	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	354	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		355
384	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	356	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	357	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386	#endif	358	#endif
387		359
388	#ifdef POINTER_BLANK	360	#ifdef POINTER_BLANK
389	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	361	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390	pointerBlankDelay = i;	362	pointerBlankDelay = i;
391	else	363	else
392	pointerBlankDelay = 2;	364	pointerBlankDelay = 2;
393	#endif	365	#endif
394		366
395	/* no point having a scrollbar without having any scrollback! */	367	/* no point having a scrollbar without having any scrollback! */
396	if (!TermWin.saveLines)	368	if (!saveLines)
397	options &= ~Opt_scrollBar;	369	set_option (Opt_scrollBar, 0);
398		370
399	#ifdef PRINTPIPE	371	#ifdef PRINTPIPE
400	if (!rs[Rs_print_pipe])	372	if (!rs[Rs_print_pipe])
401	rs[Rs_print_pipe] = PRINTPIPE;	373	rs[Rs_print_pipe] = PRINTPIPE;
402	#endif	374	#endif
…		…
445	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446	#endif	418	#endif
447		419
448	#ifdef XTERM_REVERSE_VIDEO	420	#ifdef XTERM_REVERSE_VIDEO
449	/* this is how xterm implements reverseVideo */	421	/* this is how xterm implements reverseVideo */
450	if (options & Opt_reverseVideo)	422	if (OPTION (Opt_reverseVideo))
451	{	423	{
452	if (!rs[Rs_color + Color_fg])	424	if (!rs[Rs_color + Color_fg])
453	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454	if (!rs[Rs_color + Color_bg])	426	if (!rs[Rs_color + Color_bg])
455	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
460	if (!rs[Rs_color + i])	432	if (!rs[Rs_color + i])
461	rs[Rs_color + i] = def_colorName[i];	433	rs[Rs_color + i] = def_colorName[i];
462		434
463	#ifndef XTERM_REVERSE_VIDEO	435	#ifndef XTERM_REVERSE_VIDEO
464	/* this is how we implement reverseVideo */	436	/* this is how we implement reverseVideo */
465	if (options & Opt_reverseVideo)	437	if (OPTION (Opt_reverseVideo))
466	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
467	#endif	439	#endif
468		440
469	/* convenient aliases for setting fg/bg to colors */	441	/* convenient aliases for setting fg/bg to colors */
470	color_aliases (Color_fg);	442	color_aliases (Color_fg);
471	color_aliases (Color_bg);	443	color_aliases (Color_bg);
…		…
510	val = rxvt_network_display (rs[Rs_display_name]);	482	val = rxvt_network_display (rs[Rs_display_name]);
511	rs[Rs_display_name] = (const char *)val;	483	rs[Rs_display_name] = (const char *)val;
512		484
513	if (val == NULL)	485	if (val == NULL)
514	#endif /* DISPLAY_IS_IP */	486	#endif /* DISPLAY_IS_IP */
515	val = XDisplayString (display->display);	487	val = XDisplayString (xdisp);
516		488
517	if (rs[Rs_display_name] == NULL)	489	if (rs[Rs_display_name] == NULL)
518	rs[Rs_display_name] = val; /* use broken `:0' value */	490	rs[Rs_display_name] = val; /* use broken `:0' value */
519		491
520	i = strlen (val);	492	i = strlen (val);
521	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
522		494
523	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
524		496
525	/* avoiding the math library:	497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
526	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
527	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
528	;
529	MAX_IT (i, 1);
530	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
531
532	sprintf (env_windowid, "WINDOWID=%u",
533	(unsigned int)TermWin.parent[0]);
534		498
535	/* add entries to the environment:	499	/* add entries to the environment:
536	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
537	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
538	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
540	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
541	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
542	*/	506	*/
543	putenv (env_display);	507	putenv (env_display);
544	putenv (env_windowid);	508	putenv (env_windowid);
		509
545	if (env_colorfgbg)	510	if (env_colorfgbg)
546	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
547		512
548	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
549	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
550	#endif	515	#endif
551		516
552	if (display->depth <= 2)	517	if (depth <= 2)
553	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
554	else	519	else
555	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
556		521
557	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
577	* This should support all European type languages.	542	* This should support all European type languages.
578	*/	543	*/
579	void	544	void
580	rxvt_term::set_locale (const char *locale)	545	rxvt_term::set_locale (const char *locale)
581	{	546	{
		547	set_environ (envv);
		548
582	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	549	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
583	free (this->locale);	550	free (this->locale);
584	this->locale = setlocale (LC_CTYPE, locale);	551	this->locale = setlocale (LC_CTYPE, locale);
585		552
586	if (!this->locale)	553	if (!this->locale)
587	{	554	{
588	if (*locale)	555	if (*locale)
589	{	556	{
590	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	557	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
591	setlocale (LC_CTYPE, "");	558	setlocale (LC_CTYPE, "C");
592	}	559	}
593	else	560	else
594	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	561	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
595		562
596	this->locale = "";	563	this->locale = "C";
597	}	564	}
598		565
599		566
600	this->locale = rxvt_strdup (this->locale);	567	this->locale = rxvt_strdup (this->locale);
601	SET_LOCALE (this->locale);	568	SET_LOCALE (this->locale);
…		…
616	}	583	}
617		584
618	void	585	void
619	rxvt_term::init_xlocale ()	586	rxvt_term::init_xlocale ()
620	{	587	{
		588	set_environ (envv);
		589
621	#ifdef USE_XIM	590	#ifdef USE_XIM
622	if (!locale)	591	if (!locale)
623	rxvt_warn ("setting locale failed, working without locale support.\n");	592	rxvt_warn ("setting locale failed, working without locale support.\n");
624	else	593	else
625	{	594	{
…		…
647	* Initialize the command connection.	616	* Initialize the command connection.
648	* This should be called after the X server connection is established.	617	* This should be called after the X server connection is established.
649	*/	618	*/
650		619
651	#ifdef META8_OPTION	620	#ifdef META8_OPTION
652	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653	#endif	622	#endif
654		623
655	get_ourmods ();	624	get_ourmods ();
656		625
657	if (!(options & Opt_scrollTtyOutput))	626	if (!OPTION (Opt_scrollTtyOutput))
658	priv_modes \|= PrivMode_TtyOutputInh;	627	priv_modes \|= PrivMode_TtyOutputInh;
659	if (options & Opt_scrollTtyKeypress)	628	if (OPTION (Opt_scrollTtyKeypress))
660	priv_modes \|= PrivMode_Keypress;	629	priv_modes \|= PrivMode_Keypress;
661	if (!(options & Opt_jumpScroll))	630	if (!OPTION (Opt_jumpScroll))
662	priv_modes \|= PrivMode_smoothScroll;	631	priv_modes \|= PrivMode_smoothScroll;
663		632
664	#ifndef NO_BACKSPACE_KEY	633	#ifndef NO_BACKSPACE_KEY
665	if (strcmp (key_backspace, "DEC") == 0)	634	if (strcmp (key_backspace, "DEC") == 0)
666	priv_modes \|= PrivMode_HaveBackSpace;	635	priv_modes \|= PrivMode_HaveBackSpace;
667	#endif	636	#endif
668		637
669	/* add value for scrollBar */	638	/* add value for scrollBar */
670	if (scrollbar_visible ())	639	if (scrollBar.state)
671	{	640	{
672	priv_modes \|= PrivMode_scrollBar;	641	priv_modes \|= PrivMode_scrollBar;
673	SavedModes \|= PrivMode_scrollBar;	642	SavedModes \|= PrivMode_scrollBar;
674	}	643	}
675
676	if (menubar_visible ())
677	{
678	priv_modes \|= PrivMode_menuBar;
679	SavedModes \|= PrivMode_menuBar;
680	}
681
682	#ifdef CURSOR_BLINK
683	if (options & Opt_cursorBlink)
684	(void)gettimeofday (&lastcursorchange, NULL);
685	#endif
686		644
687	run_command (argv);	645	run_command (argv);
688	}	646	}
689		647
690	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
…		…
695		653
696	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
697	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
698	#endif	656	#endif
699		657
700	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701	{	659	{
702	rxvt_color xcol;	660	rxvt_color xcol;
703		661
704	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
705	continue;	663	continue;
706		664
707	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	665	if (!set_color (xcol, rs[Rs_color + i]))
708	{	666	{
709	#ifndef XTERM_REVERSE_VIDEO	667	#ifndef XTERM_REVERSE_VIDEO
710	if (i < 2 && (options & Opt_reverseVideo))	668	if (i < 2 && OPTION (Opt_reverseVideo))
711	rs[Rs_color + i] = def_colorName[!i];	669	rs[Rs_color + i] = def_colorName[!i];
712	else	670	else
713	#endif	671	#endif
714	rs[Rs_color + i] = def_colorName[i];	672	rs[Rs_color + i] = def_colorName[i];
715		673
716	if (!rs[Rs_color + i])	674	if (!rs[Rs_color + i])
717	continue;	675	continue;
718		676
719	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	677	if (!set_color (xcol, rs[Rs_color + i]))
720	{	678	{
721	switch (i)	679	switch (i)
722	{	680	{
723	case Color_fg:	681	case Color_fg:
724	case Color_bg:	682	case Color_bg:
725	/* fatal: need bg/fg color */	683	/* fatal: need bg/fg color */
726	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	684	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727	/* NOTREACHED */
728	break;	685	break;
729	#ifndef NO_CURSORCOLOR	686	#ifndef NO_CURSORCOLOR
730	case Color_cursor2:	687	case Color_cursor2:
731	xcol = pix_colors[Color_fg];	688	xcol = pix_colors[Color_fg];
732	break;	689	break;
…		…
745	SET_PIXCOLOR (i);	702	SET_PIXCOLOR (i);
746	}	703	}
747		704
748	#ifdef OFF_FOCUS_FADING	705	#ifdef OFF_FOCUS_FADING
749	if (rs[Rs_fade])	706	if (rs[Rs_fade])
750	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	707	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		708	{
		709	rxvt_rgba c;
		710	pix_colors[Color_fade].get (this, c);
751	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	711	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
		712	}
752	#endif	713	#endif
753		714
754	if (display->depth <= 2)	715	if (depth <= 2)
755	{	716	{
756	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	717	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
757	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	718	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	719	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759	}	720	}
760		721
761	/*	722	/*
762	* get scrollBar/menuBar shadow colors	723	* get scrollBar shadow colors
763	*	724	*
764	* The calculations of topShadow/bottomShadow values are adapted	725	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	726	* from the fvwm window manager.
766	*/	727	*/
767	#ifdef KEEP_SCROLLCOLOR	728	#ifdef KEEP_SCROLLCOLOR
768		729
769	if (display->depth <= 2)	730	if (depth <= 2)
770	{	731	{
771	/* Monochrome */	732	/* Monochrome */
772	pix_colors[Color_scroll] = pix_colors[Color_fg];	733	pix_colors[Color_scroll] = pix_colors[Color_fg];
773	pix_colors[Color_topShadow] = pix_colors[Color_bg];	734	pix_colors[Color_topShadow] = pix_colors[Color_bg];
774	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	735	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
779	/* xcol[0] == white	740	/* xcol[0] == white
780	* xcol[1] == top shadow	741	* xcol[1] == top shadow
781	* xcol[2] == bot shadow */	742	* xcol[2] == bot shadow */
782		743
783	xcol[1] = pix_colors[Color_scroll];	744	xcol[1] = pix_colors[Color_scroll];
784	xcol[0].set (display, 65535, 65535, 65535);	745	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
785		746
786	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	747	rxvt_rgba c0, c1;
787		748
788	xcol[0].get (display, pr0, pg0, pb0);	749	xcol[0].get (this, c0);
789	xcol[1].get (display, pr1, pg1, pb1);	750	xcol[1].get (this, c1);
790		751
791	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	752	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
792		753
793	/* topShadowColor */	754	/* topShadowColor */
794	if (!xcol[1].set (display,	755	if (!xcol[1].set (this,
		756	rxvt_rgba (
795	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	757	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
796	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	758	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
797	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	759	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
		760	c1.a) // pa1 vs. pa0: arbitrary
		761	));
798	xcol[1] = pix_colors[Color_White];	762	xcol[1] = pix_colors[Color_White];
799		763
800	pix_colors[Color_topShadow] = xcol[1];	764	pix_colors[Color_topShadow] = xcol[1];
801	}	765	}
802	#endif /* KEEP_SCROLLCOLOR */	766	#endif /* KEEP_SCROLLCOLOR */
…		…
812	int i = atoi (rs[Rs_color + idx]);	776	int i = atoi (rs[Rs_color + idx]);
813		777
814	if (i >= 8 && i <= 15)	778	if (i >= 8 && i <= 15)
815	{ /* bright colors */	779	{ /* bright colors */
816	i -= 8;	780	i -= 8;
817	#ifndef NO_BRIGHTCOLOR
818	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	781	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819	return;	782	return;
820	#endif
821	}	783	}
822		784
823	if (i >= 0 && i <= 7) /* normal colors */	785	if (i >= 0 && i <= 7) /* normal colors */
824	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	786	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825	}	787	}
…		…
848		810
849	if (rsmod	811	if (rsmod
850	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	812	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851	requestedmeta = rsmod[3] - '0';	813	requestedmeta = rsmod[3] - '0';
852		814
853	map = XGetModifierMapping (display->display);	815	map = XGetModifierMapping (xdisp);
854	kc = map->modifiermap;	816	kc = map->modifiermap;
855		817
856	for (i = 1; i < 6; i++)	818	for (i = 1; i < 6; i++)
857	{	819	{
858	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	820	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
860	for (j = map->max_keypermod; j--; k++)	822	for (j = map->max_keypermod; j--; k++)
861	{	823	{
862	if (kc[k] == 0)	824	if (kc[k] == 0)
863	break;	825	break;
864		826
865	switch (XKeycodeToKeysym (display->display, kc[k], 0))	827	switch (XKeycodeToKeysym (xdisp, kc[k], 0))
866	{	828	{
867	case XK_Num_Lock:	829	case XK_Num_Lock:
868	ModNumLockMask = modmasks[i - 1];	830	ModNumLockMask = modmasks[i - 1];
869	continue;	831	continue;
870		832
…		…
920	rxvt_term::create_windows (int argc, const char const argv)	882	rxvt_term::create_windows (int argc, const char const argv)
921	{	883	{
922	XClassHint classHint;	884	XClassHint classHint;
923	XWMHints wmHint;	885	XWMHints wmHint;
924	#if ENABLE_FRILLS	886	#if ENABLE_FRILLS
925	Atom prop = None;
926	MWMHints mwmhints;	887	MWMHints mwmhints;
927	#endif	888	#endif
928	XGCValues gcvalue;	889	XGCValues gcvalue;
929	long vt_emask;
930	XSetWindowAttributes attributes;	890	XSetWindowAttributes attributes;
931	XWindowAttributes gattr;
932	Window top, parent;	891	Window top, parent;
933	dDisp;
934		892
935	#ifdef USING_W11LIB	893	dLocal (Display *, xdisp);
936	/* enable W11 callbacks */
937	W11AddEventHandler (disp, rxvt_W11_process_x_event);
938	#endif
939		894
940	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	895	/* grab colors before netscape does */
941	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	896	Get_Colours ();
942		897
943	if (options & Opt_transparent)	898	if (!set_fonts ())
944	{	899	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	900
946	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	901	parent = display->root;
947	}	902
		903	attributes.override_redirect = !!OPTION (Opt_override_redirect);
948		904
949	#if ENABLE_FRILLS	905	#if ENABLE_FRILLS
950	if (options & Opt_borderLess)	906	if (OPTION (Opt_borderLess))
951	{	907	{
952	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	908	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
953
954	if (prop == None)
955	{	909	{
956	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	910	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
957	#ifdef PREFER_24BIT
958	attributes.override_redirect = TRUE;	911	attributes.override_redirect = true;
959	#endif
960	mwmhints.flags = 0;	912	mwmhints.flags = 0;
961	}	913	}
962	else	914	else
963	{	915	{
964	mwmhints.flags = MWM_HINTS_DECORATIONS;	916	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
967	}	919	}
968	else	920	else
969	mwmhints.flags = 0;	921	mwmhints.flags = 0;
970	#endif	922	#endif
971		923
972	/* grab colors before netscape does */
973	Get_Colours ();
974
975	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978	parent = DefaultRootWindow (disp);
979
980	#if ENABLE_XEMBED	924	#if ENABLE_XEMBED
981	if (rs[Rs_embed])	925	if (rs[Rs_embed])
982	{	926	{
983	XWindowAttributes wattr;	927	XWindowAttributes wattr;
984		928
985	parent = strtol (rs[Rs_embed], 0, 0);	929	parent = strtol (rs[Rs_embed], 0, 0);
986		930
987	if (!XGetWindowAttributes (disp, parent, &wattr))	931	if (!XGetWindowAttributes (xdisp, parent, &wattr))
988	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	932	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989		933
990	window_calc (wattr.width, wattr.height);	934	window_calc (wattr.width, wattr.height);
991	}	935	}
992
993	#endif	936	#endif
		937
994	window_calc (0, 0);	938	window_calc (0, 0);
995		939
996	/* sub-window placement & size in rxvt_resize_subwindows () */	940	/* sub-window placement & size in rxvt_resize_subwindows () */
997	#ifdef PREFER_24BIT
998	attributes.background_pixel = pix_colors_focused[Color_border];	941	attributes.background_pixel = pix_colors_focused [Color_border];
999	attributes.border_pixel = pix_colors_focused[Color_border];	942	attributes.border_pixel = pix_colors_focused [Color_border];
1000	attributes.colormap = display->cmap;	943	attributes.colormap = cmap;
		944
1001	top = XCreateWindow (disp, parent,	945	top = XCreateWindow (xdisp, parent,
1002	szHint.x, szHint.y,	946	szHint.x, szHint.y,
1003	szHint.width, szHint.height,	947	szHint.width, szHint.height,
1004	TermWin.ext_bwidth,	948	ext_bwidth,
1005	display->depth, InputOutput,	949	depth, InputOutput, visual,
1006	display->visual,
1007	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	950	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1008	#else	951	&attributes);
1009	top = XCreateSimpleWindow (disp, parent,
1010	szHint.x, szHint.y,
1011	szHint.width, szHint.height,
1012	TermWin.ext_bwidth,
1013	pix_colors_focused[Color_border],
1014	pix_colors_focused[Color_border]);
1015	#endif
1016		952
1017	TermWin.parent[0] = top;	953	this->parent[0] = top;
1018		954
1019	old_width = szHint.width;	955	old_width = szHint.width;
1020	old_height = szHint.height;	956	old_height = szHint.height;
1021		957
1022	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	958	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	959	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024		960
1025	classHint.res_name = (char *)rs[Rs_name];	961	classHint.res_name = (char *)rs[Rs_name];
1026	classHint.res_class = (char *)RESCLASS;	962	classHint.res_class = (char *)RESCLASS;
1027		963
1028	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	964	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1029	wmHint.input = True;	965	wmHint.input = True;
1030	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	966	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031	wmHint.window_group = top;	967	wmHint.window_group = top;
1032		968
1033	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	969	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1034	&szHint, &wmHint, &classHint);	970	&szHint, &wmHint, &classHint);
		971
		972	#if ENABLE_FRILLS
		973	if (mwmhints.flags)
		974	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		975	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		976	#endif
1035		977
1036	Atom protocols[] = {	978	Atom protocols[] = {
1037	xa[XA_WM_DELETE_WINDOW],	979	xa[XA_WM_DELETE_WINDOW],
1038	#if ENABLE_EWMH	980	#if ENABLE_EWMH
1039	xa[XA_NET_WM_PING],	981	xa[XA_NET_WM_PING],
1040	#endif	982	#endif
1041	};	983	};
1042		984
1043	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	985	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		986
		987	#if ENABLE_FRILLS
		988	if (rs[Rs_transient_for])
		989	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		990	#endif
1044		991
1045	#if ENABLE_EWMH	992	#if ENABLE_EWMH
1046	long pid = getpid ();	993	long pid = getpid ();
1047		994
1048	XChangeProperty (disp, top,	995	XChangeProperty (xdisp, top,
1049	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	996	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1050	PropModeReplace, (unsigned char *)&pid, 1);	997	PropModeReplace, (unsigned char *)&pid, 1);
1051		998
1052	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	999	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1053	#endif	1000	#endif
1054		1001
1055	XSelectInput (disp, top,	1002	XSelectInput (xdisp, top,
1056	KeyPressMask	1003	KeyPressMask
1057	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1004	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1058	\| KeyReleaseMask	1005	\| KeyReleaseMask
1059	#endif	1006	#endif
1060	\| FocusChangeMask \| VisibilityChangeMask	1007	\| FocusChangeMask \| VisibilityChangeMask
1061	\| ExposureMask \| StructureNotifyMask);	1008	\| ExposureMask \| StructureNotifyMask);
1062		1009
1063	termwin_ev.start (display, top);	1010	termwin_ev.start (display, top);
1064		1011
1065	#if ENABLE_FRILLS
1066	if (mwmhints.flags)
1067	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1068	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1069	#endif
1070
1071	/* vt cursor: Black-on-White is standard, but this is more popular */	1012	/* vt cursor: Black-on-White is standard, but this is more popular */
1072	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1013	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1073		1014
1074	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1015	#ifdef HAVE_SCROLLBARS
1075	/* cursor (menuBar/scrollBar): Black-on-White */	1016	/* cursor scrollBar: Black-on-White */
1076	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1017	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1077	#endif	1018	#endif
1078		1019
1079	/* the vt window */	1020	/* the vt window */
1080	TermWin.vt = XCreateSimpleWindow (disp, top,	1021	vt = XCreateSimpleWindow (xdisp, top,
1081	window_vt_x,
1082	window_vt_y,	1022	window_vt_x, window_vt_y,
1083	TermWin_TotalWidth (),	1023	width, height,
1084	TermWin_TotalHeight (),
1085	0,	1024	0,
1086	pix_colors_focused[Color_fg],	1025	pix_colors_focused[Color_fg],
1087	pix_colors_focused[Color_bg]);	1026	pix_colors_focused[Color_bg]);
1088	#ifdef DEBUG_X
1089	XStoreName (disp, TermWin.vt, "vt window");
1090	#endif
1091		1027
1092	attributes.bit_gravity = NorthWestGravity;	1028	attributes.bit_gravity = NorthWestGravity;
1093	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1029	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1094		1030
1095	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1031	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1096		1032
1097	#ifdef POINTER_BLANK	1033	if (OPTION (Opt_pointerBlank))
1098	if (options & Opt_pointerBlank)
1099	vt_emask \|= PointerMotionMask;	1034	vt_emask \|= PointerMotionMask;
1100	else	1035	else
1101	#endif
1102	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1036	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1103		1037
1104	XSelectInput (disp, TermWin.vt, vt_emask);	1038	vt_select_input ();
		1039
1105	vt_ev.start (display, TermWin.vt);	1040	vt_ev.start (display, vt);
1106
1107	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108	if (menuBar_height ())
1109	{
1110	menuBar.win = XCreateSimpleWindow (disp, top,
1111	window_vt_x, 0,
1112	TermWin_TotalWidth (),
1113	menuBar_TotalHeight (),
1114	0,
1115	pix_colors_focused[Color_fg],
1116	pix_colors_focused[Color_scroll]);
1117
1118	#ifdef DEBUG_X
1119	XStoreName (disp, menuBar.win, "menubar");
1120	#endif
1121
1122	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1123
1124	XDefineCursor (disp, menuBar.win,
1125	XCreateFontCursor (disp, XC_left_ptr));
1126
1127	XSelectInput (disp, menuBar.win,
1128	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1129	menubar_ev.start (display, menuBar.win);
1130	}
1131	#endif
1132		1041
1133	#ifdef XPM_BACKGROUND	1042	#ifdef XPM_BACKGROUND
1134	if (rs[Rs_backgroundPixmap] != NULL	1043	if (rs[Rs_backgroundPixmap] != NULL
1135	&& ! (options & Opt_transparent))	1044	&& !OPTION (Opt_transparent))
1136	{	1045	{
1137	const char *p = rs[Rs_backgroundPixmap];	1046	const char *p = rs[Rs_backgroundPixmap];
1138		1047
1139	if ((p = strchr (p, ';')) != NULL)	1048	if ((p = strchr (p, ';')) != NULL)
1140	{	1049	{
…		…
1146	scr_touch (true);	1055	scr_touch (true);
1147	}	1056	}
1148	#endif	1057	#endif
1149		1058
1150	/* graphics context for the vt window */	1059	/* graphics context for the vt window */
1151	gcvalue.foreground = pix_colors[Color_fg];	1060	gcvalue.foreground = pix_colors[Color_fg];
1152	gcvalue.background = pix_colors[Color_bg];	1061	gcvalue.background = pix_colors[Color_bg];
1153	gcvalue.graphics_exposures = 1;	1062	gcvalue.graphics_exposures = 1;
		1063
1154	TermWin.gc = XCreateGC (disp, TermWin.vt,	1064	gc = XCreateGC (xdisp, vt,
1155	GCForeground \| GCBackground \| GCGraphicsExposures,	1065	GCForeground \| GCBackground \| GCGraphicsExposures,
1156	&gcvalue);	1066	&gcvalue);
1157		1067
1158	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1068	drawable = new rxvt_drawable (this, vt);
1159		1069
1160	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1070	#ifdef RXVT_SCROLLBAR
1161	gcvalue.foreground = pix_colors[Color_topShadow];	1071	gcvalue.foreground = pix_colors[Color_topShadow];
1162	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1072	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1163	gcvalue.foreground = pix_colors[Color_bottomShadow];	1073	gcvalue.foreground = pix_colors[Color_bottomShadow];
1164	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1074	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1165	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1075	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1166	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1076	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1167	#endif	1077	#endif
1168		1078
1169	#ifdef OFF_FOCUS_FADING	1079	#ifdef OFF_FOCUS_FADING
1170	// initially we are in unfocused state	1080	// initially we are in unfocused state
1171	if (rs[Rs_fade])	1081	if (rs[Rs_fade])
1172	pix_colors = pix_colors_unfocused;	1082	pix_colors = pix_colors_unfocused;
1173	#endif	1083	#endif
1174		1084
1175	pointer_unblank ();	1085	pointer_unblank ();
1176	scr_recolour ();	1086	scr_recolour ();
1177
1178	#if ENABLE_XEMBED
1179	if (rs[Rs_embed])
1180	{
1181	long info[2] = { 0, XEMBED_MAPPED };
1182
1183	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184	32, PropModeReplace, (unsigned char *)&info, 2);
1185	}
1186	#endif
1187	}	1087	}
1188		1088
1189	/* ------------------------------------------------------------------------- *	1089	/* ------------------------------------------------------------------------- *
1190	* GET TTY CURRENT STATE *	1090	* GET TTY CURRENT STATE *
1191	* ------------------------------------------------------------------------- */	1091	* ------------------------------------------------------------------------- */
…		…
1196	/*	1096	/*
1197	* standard System V termios interface	1097	* standard System V termios interface
1198	*/	1098	*/
1199	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1099	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200	{	1100	{
1201	/* return error - use system defaults */	1101	// return error - use system defaults,
		1102	// where possible, and zero elsewhere
		1103	memset (tio, 0, sizeof (ttymode_t));
		1104
1202	tio->c_cc[VINTR] = CINTR;	1105	tio->c_cc[VINTR] = CINTR;
1203	tio->c_cc[VQUIT] = CQUIT;	1106	tio->c_cc[VQUIT] = CQUIT;
1204	tio->c_cc[VERASE] = CERASE;	1107	tio->c_cc[VERASE] = CERASE;
		1108	#ifdef VERASE2
		1109	tio->c_cc[VERASE2] = CERASE2;
		1110	#endif
1205	tio->c_cc[VKILL] = CKILL;	1111	tio->c_cc[VKILL] = CKILL;
1206	tio->c_cc[VSTART] = CSTART;	1112	tio->c_cc[VSTART] = CSTART;
1207	tio->c_cc[VSTOP] = CSTOP;	1113	tio->c_cc[VSTOP] = CSTOP;
1208	tio->c_cc[VSUSP] = CSUSP;	1114	tio->c_cc[VSUSP] = CSUSP;
1209	# ifdef VDSUSP	1115	# ifdef VDSUSP
…		…
1402	rxvt_term::run_command (const char const argv)	1308	rxvt_term::run_command (const char const argv)
1403	{	1309	{
1404	#if ENABLE_FRILLS	1310	#if ENABLE_FRILLS
1405	if (rs[Rs_pty_fd])	1311	if (rs[Rs_pty_fd])
1406	{	1312	{
1407	pty.pty = atoi (rs[Rs_pty_fd]);	1313	pty->pty = atoi (rs[Rs_pty_fd]);
1408	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1314
		1315	if (pty->pty >= 0)
		1316	{
		1317	if (getfd_hook)
		1318	pty->pty = (*getfd_hook) (pty->pty);
		1319
		1320	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1321	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1322	}
1409	}	1323	}
1410	else	1324	else
1411	#endif	1325	#endif
1412	if (!pty.get ())	1326	if (!pty->get ())
1413	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1327	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1414		1328
1415	pty.set_utf8_mode (enc_utf8);	1329	pty->set_utf8_mode (enc_utf8);
1416		1330
1417	/* set initial window size */	1331	/* set initial window size */
1418	tt_winch ();	1332	tt_winch ();
1419		1333
1420	int er;	1334	int er;
…		…
1433	#if ENABLE_FRILLS	1347	#if ENABLE_FRILLS
1434	if (rs[Rs_pty_fd])	1348	if (rs[Rs_pty_fd])
1435	return;	1349	return;
1436	#endif	1350	#endif
1437		1351
1438	sw_chld.start (SIGCHLD);
1439
1440	#ifndef __QNX__
1441	/* spin off the command interpreter */	1352	/* spin off the command interpreter */
1442	switch (cmd_pid = fork ())	1353	switch (cmd_pid = fork ())
1443	{	1354	{
1444	case -1:	1355	case -1:
1445	{	1356	{
…		…
1447	rxvt_fatal ("can't fork, aborting.\n");	1358	rxvt_fatal ("can't fork, aborting.\n");
1448	}	1359	}
1449	case 0:	1360	case 0:
1450	init_env ();	1361	init_env ();
1451		1362
1452	if (!pty.make_controlling_tty ())	1363	if (!pty->make_controlling_tty ())
1453	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1364	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1454	else	1365	else
1455	{	1366	{
1456	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1367	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1457	dup2 (pty.tty, STDIN_FILENO);	1368	dup2 (pty->tty, STDIN_FILENO);
1458	dup2 (pty.tty, STDOUT_FILENO);	1369	dup2 (pty->tty, STDOUT_FILENO);
1459	dup2 (pty.tty, STDERR_FILENO);	1370	dup2 (pty->tty, STDERR_FILENO);
1460		1371
1461	// close all our file handles that we do no longer need	1372	// close all our file handles that we do no longer need
1462	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1373	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1463	{	1374	{
1464	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1375	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1465	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1376	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1466	}	1377	}
1467		1378
1468	run_child (argv);	1379	run_child (argv);
1469	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1380	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1470	}	1381	}
1471		1382
1472	_exit (EXIT_FAILURE);	1383	_exit (EXIT_FAILURE);
1473		1384
1474	default:	1385	default:
1475	{	1386	if (!OPTION (Opt_utmpInhibit))
1476	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1477	int fdstdin;
1478		1388
1479	fdstdin = dup (STDIN_FILENO);	1389	pty->close_tty ();
1480	dup2 (pty.tty, STDIN_FILENO);
1481	#endif
1482		1390
1483	#ifdef UTMP_SUPPORT	1391	child_ev.start (cmd_pid);
1484	privileged_utmp (SAVE);
1485	#endif
1486		1392
1487	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1393	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1488
1489	dup2 (fdstdin, STDIN_FILENO);
1490	close (fdstdin);
1491	#endif
1492	}
1493
1494	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1495	break;	1394	break;
1496	}	1395	}
1497	#else /* __QNX__ uses qnxspawn () */
1498	fchmod (pty.tty, 0622);
1499	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1500	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1501
1502	if (run_child (argv) == -1)
1503	exit (EXIT_FAILURE);
1504	#endif
1505	}	1396	}
1506		1397
1507	/* ------------------------------------------------------------------------- *	1398	/* ------------------------------------------------------------------------- *
1508	* CHILD PROCESS OPERATIONS *	1399	* CHILD PROCESS OPERATIONS *
1509	* ------------------------------------------------------------------------- */	1400	* ------------------------------------------------------------------------- */
…		…
1516	{	1407	{
1517	char *login;	1408	char *login;
1518		1409
1519	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1410	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1520		1411
1521	if (options & Opt_console)	1412	if (OPTION (Opt_console))
1522	{ /* be virtual console, fail silently */	1413	{ /* be virtual console, fail silently */
1523	#ifdef TIOCCONS	1414	#ifdef TIOCCONS
1524	unsigned int on = 1;	1415	unsigned int on = 1;
1525		1416
1526	ioctl (STDIN_FILENO, TIOCCONS, &on);	1417	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1553	// unblock signals (signals are blocked by iom.C	1444	// unblock signals (signals are blocked by iom.C
1554	sigset_t ss;	1445	sigset_t ss;
1555	sigemptyset (&ss);	1446	sigemptyset (&ss);
1556	sigprocmask (SIG_SETMASK, &ss, 0);	1447	sigprocmask (SIG_SETMASK, &ss, 0);
1557		1448
1558	#ifndef __QNX__
1559	/* command interpreter path */	1449	/* command interpreter path */
1560	if (argv != NULL)	1450	if (argv != NULL)
1561	{	1451	{
1562	# ifdef DEBUG_CMD	1452	# ifdef DEBUG_CMD
1563	int i;	1453	int i;
…		…
1569	execvp (argv[0], (char const )argv);	1459	execvp (argv[0], (char const )argv);
1570	/* no error message: STDERR is closed! */	1460	/* no error message: STDERR is closed! */
1571	}	1461	}
1572	else	1462	else
1573	{	1463	{
1574	const char argv0, shell;	1464	const char argv0, shell;
1575		1465
1576	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1466	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1577	shell = "/bin/sh";	1467	shell = "/bin/sh";
1578		1468
1579	argv0 = (const char *)rxvt_r_basename (shell);	1469	argv0 = (const char *)rxvt_r_basename (shell);
1580		1470
1581	if (options & Opt_loginShell)	1471	if (OPTION (Opt_loginShell))
1582	{	1472	{
1583	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1473	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1584		1474
1585	login[0] = '-';	1475	login[0] = '-';
1586	strcpy (&login[1], argv0);	1476	strcpy (&login[1], argv0);
1587	argv0 = login;	1477	argv0 = login;
1588	}	1478	}
		1479
1589	execlp (shell, argv0, NULL);	1480	execlp (shell, argv0, NULL);
1590	/* no error message: STDERR is closed! */	1481	/* no error message: STDERR is closed! */
1591	}	1482	}
1592		1483
1593	#else /* __QNX__ uses qnxspawn () */
1594
1595	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1596	char *command = NULL, fullcommand[_MAX_PATH];
1597	char *arg_v, arg_a[2] = { NULL, NULL };
1598
1599	if (argv != NULL)
1600	{
1601	if (access (argv[0], X_OK) == -1)
1602	{
1603	if (strchr (argv[0], '/') == NULL)
1604	{
1605	searchenv (argv[0], "PATH", fullcommand);
1606
1607	if (fullcommand[0] != '\0')
1608	command = fullcommand;
1609	}
1610
1611	if (access (command, X_OK) == -1)
1612	return -1;
1613	}
1614	else
1615	command = argv[0];
1616
1617	arg_v = argv;
1618	}
1619	else
1620	{
1621	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1622	command = "/bin/sh";
1623
1624	arg_a[0] = my_basename (command);
1625
1626	if (options & Opt_loginShell)
1627	{
1628	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1629
1630	login[0] = '-';
1631	strcpy (&login[1], arg_a[0]);
1632	arg_a[0] = login;
1633	}
1634
1635	arg_v = arg_a;
1636	}
1637
1638	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1639	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1640	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1641	command, arg_v, environ, iov_a, 0);
1642	if (login)
1643	free (login);
1644
1645	pty.close_tty ();
1646	return pty.pty;
1647	#endif
1648
1649	return -1;	1484	return -1;
1650	}	1485	}
1651		1486
1652	/----------------------- end-of-file (C source) -----------------------/	1487	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC vs. Revision 1.162 by root, Tue Jan 31 16:19:16 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 2006 UTC