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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.138 by root, Wed Jan 11 02:24:12 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.
…		…
31	* Initialisation routines.	31	* Initialisation routines.
32	*/	32	*/
33		33
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 "init.h"	37	#include "init.h"
37		38
		39	#include <limits>
		40
38	#include <signal.h>	41	#include <csignal>
39		42
40	const char *const def_colorName[] =	43	const char *const def_colorName[] =
41	{	44	{
42	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
43	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
44	/* low-intensity colors */	47	/* low-intensity colors */
45	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
46	#ifndef NO_BRIGHTCOLOR
47	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
48	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
49	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
50	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
51	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
59	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
60	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
61	# else	63	# else
62	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
63	# endif	65	# endif
64	#endif /* NO_BRIGHTCOLOR */
65	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
66	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
67	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
68	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
69	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
155	NULL, /* Color_BD */	156	NULL, /* Color_BD */
156	NULL, /* Color_IT */	157	NULL, /* Color_IT */
157	NULL, /* Color_UL */	158	NULL, /* Color_UL */
158	NULL, /* Color_RV */	159	NULL, /* Color_RV */
159	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		161	#if ENABLE_FRILLS
		162	NULL, // Color_underline
		163	#endif
160	#ifdef OPTION_HC	164	#ifdef OPTION_HC
161	NULL,	165	NULL,
162	#endif	166	#endif
163	#ifdef KEEP_SCROLLCOLOR	167	#ifdef KEEP_SCROLLCOLOR
164	COLOR_SCROLLBAR,	168	COLOR_SCROLLBAR,
165	COLOR_SCROLLTROUGH,	169	COLOR_SCROLLTROUGH,
166	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
167	#if TINTING	171	#if TINTING
168	NULL,	172	NULL,
		173	#endif
		174	#if OFF_FOCUS_FADING
		175	"black",
169	#endif	176	#endif
170	};	177	};
171		178
172	const char *const xa_names[] =	179	const char *const xa_names[] =
173	{	180	{
…		…
177	"MULTIPLE",	184	"MULTIPLE",
178	"TARGETS",	185	"TARGETS",
179	"TIMESTAMP",	186	"TIMESTAMP",
180	"VT_SELECTION",	187	"VT_SELECTION",
181	"INCR",	188	"INCR",
		189	"WM_PROTOCOLS",
182	"WM_DELETE_WINDOW",	190	"WM_DELETE_WINDOW",
183	"CLIPBOARD",	191	"CLIPBOARD",
184	#if ENABLE_FRILLS	192	#if ENABLE_FRILLS
		193	"_MOTIF_WM_HINTS",
		194	#endif
		195	#if ENABLE_EWMH
185	"_NET_WM_PID",	196	"_NET_WM_PID",
186	"_MOTIF_WM_HINTS",
187	"_NET_WM_NAME",	197	"_NET_WM_NAME",
188	"_NET_WM_ICON_NAME",	198	"_NET_WM_ICON_NAME",
		199	"_NET_WM_PING",
189	#endif	200	#endif
190	#if USE_XIM	201	#if USE_XIM
191	"WM_LOCALE_NAME",	202	"WM_LOCALE_NAME",
192	#endif	203	#endif
193	#ifdef TRANSPARENT	204	#ifdef TRANSPARENT
194	"_XROOTPMAP_ID",	205	"_XROOTPMAP_ID",
195	"_XSETROOT_ID",	206	"ESETROOT_PMAP_ID",
196	#endif	207	#endif
197	#ifdef OFFIX_DND	208	#ifdef OFFIX_DND
198	"DndProtocol",	209	"DndProtocol",
199	"DndSelection",	210	"DndSelection",
200	#endif	211	#endif
		212	#if ENABLE_XEMBED
		213	"_XEMBED",
		214	"_XEMBED_INFO",
		215	#endif
201	};	216	};
202		217
203	bool	218	bool
204	rxvt_term::init_vars ()	219	rxvt_term::init_vars ()
205	{	220	{
206	sw_term.start (SIGTERM);
207
208	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209	#ifdef OFF_FOCUS_FADING	222	#ifdef OFF_FOCUS_FADING
210	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211	#endif	224	#endif
212	pix_colors = pix_colors_focused;	225	pix_colors = pix_colors_focused;
213		226
214	if (pix_colors == NULL)	227	if (pix_colors == NULL)
215	return false;	228	return false;
216		229
217	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
218	TermWin.pixmap = None;	231	pixmap = None;
219	#endif	232	#endif
220		233
221	MEvent.time = CurrentTime;	234	MEvent.time = CurrentTime;
222	MEvent.button = AnyButton;	235	MEvent.button = AnyButton;
223	options = DEFAULT_OPTIONS;	236	options = DEFAULT_OPTIONS;
224	want_refresh = 1;	237	want_refresh = 1;
225	cmd_pid = -1;
226	pty.pty = pty.tty = -1;
227	priv_modes = SavedModes = PrivMode_Default;	238	priv_modes = SavedModes = PrivMode_Default;
228	TermWin.focus = 0;	239	focus = 0;
229	TermWin.ncol = 80;	240	ncol = 80;
230	TermWin.nrow = 24;	241	nrow = 24;
231	TermWin.int_bwidth = INTERNALBORDERWIDTH;	242	int_bwidth = INTERNALBORDERWIDTH;
232	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	243	ext_bwidth = EXTERNALBORDERWIDTH;
233	TermWin.lineSpace = LINESPACE;	244	lineSpace = LINESPACE;
234	TermWin.saveLines = SAVELINES;	245	saveLines = SAVELINES;
235	numpix_colors = TOTAL_COLORS;	246	numpix_colors = TOTAL_COLORS;
236		247
237	refresh_limit = 1;	248	refresh_limit = 1;
238	refresh_type = SLOW_REFRESH;	249	refresh_type = SLOW_REFRESH;
239	prev_nrow = prev_ncol = 0;	250	prev_nrow = prev_ncol = 0;
…		…
248	last_bot = last_state = -1;	259	last_bot = last_state = -1;
249		260
250	#ifdef MENUBAR	261	#ifdef MENUBAR
251	menu_readonly = 1;	262	menu_readonly = 1;
252	# if ! (MENUBAR_MAX > 1)	263	# if ! (MENUBAR_MAX > 1)
253	CurrentBar = & (BarList);	264	CurrentBar = &BarList;
254	# endif /* (MENUBAR_MAX > 1) */	265	# endif /* (MENUBAR_MAX > 1) */
255	#endif	266	#endif
256		267
257	return true;	268	return true;
258	}	269	}
…		…
328	rs[Rs_name] = rxvt_r_basename (argv[0]);	339	rs[Rs_name] = rxvt_r_basename (argv[0]);
329		340
330	/*	341	/*
331	* Open display, get options/resources and create the window	342	* Open display, get options/resources and create the window
332	*/	343	*/
		344	{
		345	TEMP_ENV;
		346
333	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334	rs[Rs_display_name] = ":0";	348	rs[Rs_display_name] = ":0";
335		349
336	get_options (r_argc, r_argv);	350	get_options (r_argc, r_argv);
		351
		352	if (!(display = displays.get (rs[Rs_display_name])))
		353	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		354	}
		355
		356	extract_resources ();
337	free (r_argv);	357	free (r_argv);
338
339	#ifdef LOCAL_X_IS_UNIX
340	if (rs[Rs_display_name][0] == ':')
341	{
342	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
343	strcpy (val, "unix");
344	strcat (val, rs[Rs_display_name]);
345	display = displays.get (val);
346	free (val);
347	}
348	#endif
349
350	if (!display
351	&& ! (display = displays.get (rs[Rs_display_name])))
352	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354	extract_resources (display->display, rs[Rs_name]);
355		358
356	/*	359	/*
357	* set any defaults not already set	360	* set any defaults not already set
358	*/	361	*/
359	if (cmd_argv && cmd_argv[0])	362	if (cmd_argv && cmd_argv[0])
…		…
370	if (!rs[Rs_iconName])	373	if (!rs[Rs_iconName])
371	rs[Rs_iconName] = rs[Rs_name];	374	rs[Rs_iconName] = rs[Rs_name];
372	}	375	}
373		376
374	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	377	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
375	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	378	saveLines = min (i, MAX_SAVELINES);
376		379
377	#if ENABLE_FRILLS	380	#if ENABLE_FRILLS
378	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	381	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
379	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	382	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		383
380	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	384	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	385	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382	#endif
383		386
384	#ifndef NO_LINESPACE
385	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	387	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	388	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387	#endif	389	#endif
388		390
389	#ifdef POINTER_BLANK	391	#ifdef POINTER_BLANK
390	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	392	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391	pointerBlankDelay = i;	393	pointerBlankDelay = i;
392	else	394	else
393	pointerBlankDelay = 2;	395	pointerBlankDelay = 2;
394	#endif	396	#endif
395		397
396	/* no point having a scrollbar without having any scrollback! */	398	/* no point having a scrollbar without having any scrollback! */
397	if (!TermWin.saveLines)	399	if (!saveLines)
398	options &= ~Opt_scrollBar;	400	set_option (Opt_scrollBar, 0);
399		401
400	#ifdef PRINTPIPE	402	#ifdef PRINTPIPE
401	if (!rs[Rs_print_pipe])	403	if (!rs[Rs_print_pipe])
402	rs[Rs_print_pipe] = PRINTPIPE;	404	rs[Rs_print_pipe] = PRINTPIPE;
403	#endif	405	#endif
…		…
446	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	448	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447	#endif	449	#endif
448		450
449	#ifdef XTERM_REVERSE_VIDEO	451	#ifdef XTERM_REVERSE_VIDEO
450	/* this is how xterm implements reverseVideo */	452	/* this is how xterm implements reverseVideo */
451	if (options & Opt_reverseVideo)	453	if (OPTION (Opt_reverseVideo))
452	{	454	{
453	if (!rs[Rs_color + Color_fg])	455	if (!rs[Rs_color + Color_fg])
454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	456	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455	if (!rs[Rs_color + Color_bg])	457	if (!rs[Rs_color + Color_bg])
456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	458	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
461	if (!rs[Rs_color + i])	463	if (!rs[Rs_color + i])
462	rs[Rs_color + i] = def_colorName[i];	464	rs[Rs_color + i] = def_colorName[i];
463		465
464	#ifndef XTERM_REVERSE_VIDEO	466	#ifndef XTERM_REVERSE_VIDEO
465	/* this is how we implement reverseVideo */	467	/* this is how we implement reverseVideo */
466	if (options & Opt_reverseVideo)	468	if (OPTION (Opt_reverseVideo))
467	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	469	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468	#endif	470	#endif
469		471
470	/* convenient aliases for setting fg/bg to colors */	472	/* convenient aliases for setting fg/bg to colors */
471	color_aliases (Color_fg);	473	color_aliases (Color_fg);
472	color_aliases (Color_bg);	474	color_aliases (Color_bg);
…		…
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	524	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		525
524	sprintf (env_display, "DISPLAY=%s", val);	526	sprintf (env_display, "DISPLAY=%s", val);
525		527
526	/* avoiding the math library:	528	/* avoiding the math library:
527	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	529	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	530	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529	;	531	;
530	MAX_IT (i, 1);	532	max_it (i, 1);
531	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	533	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
532		534
533	sprintf (env_windowid, "WINDOWID=%u",	535	sprintf (env_windowid, "WINDOWID=%u",
534	(unsigned int)TermWin.parent[0]);	536	(unsigned int)parent[0]);
535		537
536	/* add entries to the environment:	538	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	539	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	540	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	541	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
578	* This should support all European type languages.	580	* This should support all European type languages.
579	*/	581	*/
580	void	582	void
581	rxvt_term::set_locale (const char *locale)	583	rxvt_term::set_locale (const char *locale)
582	{	584	{
		585	TEMP_ENV;
		586
583	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	587	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
584	free (this->locale);	588	free (this->locale);
585	this->locale = setlocale (LC_CTYPE, locale);	589	this->locale = setlocale (LC_CTYPE, locale);
586		590
587	if (!this->locale)	591	if (!this->locale)
588	{	592	{
589	if (*locale)	593	if (*locale)
590	{	594	{
591	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	595	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592	setlocale (LC_CTYPE, "");	596	setlocale (LC_CTYPE, "C");
593	}	597	}
594	else	598	else
595	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	599	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596		600
597	this->locale = "";	601	this->locale = "C";
598	}	602	}
599		603
600		604
601	this->locale = rxvt_strdup (this->locale);	605	this->locale = rxvt_strdup (this->locale);
602	SET_LOCALE (this->locale);	606	SET_LOCALE (this->locale);
603	mbstate.reset ();	607	mbstate.reset ();
604	#endif	608	#endif
605		609
606	#if 0
607	#if HAVE_NL_LANGINFO	610	#if HAVE_NL_LANGINFO
608	char *codeset = strdup (nl_langinfo (CODESET));	611	char *codeset = strdup (nl_langinfo (CODESET));
609	enc_utf8 = !strcasecmp (codeset, "UTF-8")	612	// /^UTF.?8/i
610	\|\| !strcasecmp (codeset, "UTF8");	613	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
		614	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
		615	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
		616	&& (codeset[3] == '8' \|\| codeset[4] == '8');
611	free (codeset);	617	free (codeset);
612	#else	618	#else
613	enc_utf8 = 0;	619	enc_utf8 = 0;
614	#endif	620	#endif
615	#endif
616	}	621	}
617		622
618	void	623	void
619	rxvt_term::init_xlocale ()	624	rxvt_term::init_xlocale ()
620	{	625	{
		626	TEMP_ENV;
		627
621	#ifdef USE_XIM	628	#ifdef USE_XIM
622	if (!locale)	629	if (!locale)
623	rxvt_warn ("setting locale failed, working without locale support.\n");	630	rxvt_warn ("setting locale failed, working without locale support.\n");
624	else	631	else
625	{	632	{
…		…
647	* Initialize the command connection.	654	* Initialize the command connection.
648	* This should be called after the X server connection is established.	655	* This should be called after the X server connection is established.
649	*/	656	*/
650		657
651	#ifdef META8_OPTION	658	#ifdef META8_OPTION
652	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	659	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653	#endif	660	#endif
654		661
655	get_ourmods ();	662	get_ourmods ();
656		663
657	if (!(options & Opt_scrollTtyOutput))	664	if (!OPTION (Opt_scrollTtyOutput))
658	priv_modes \|= PrivMode_TtyOutputInh;	665	priv_modes \|= PrivMode_TtyOutputInh;
659	if (options & Opt_scrollTtyKeypress)	666	if (OPTION (Opt_scrollTtyKeypress))
660	priv_modes \|= PrivMode_Keypress;	667	priv_modes \|= PrivMode_Keypress;
661	if (!(options & Opt_jumpScroll))	668	if (!OPTION (Opt_jumpScroll))
662	priv_modes \|= PrivMode_smoothScroll;	669	priv_modes \|= PrivMode_smoothScroll;
663		670
664	#ifndef NO_BACKSPACE_KEY	671	#ifndef NO_BACKSPACE_KEY
665	if (strcmp (key_backspace, "DEC") == 0)	672	if (strcmp (key_backspace, "DEC") == 0)
666	priv_modes \|= PrivMode_HaveBackSpace;	673	priv_modes \|= PrivMode_HaveBackSpace;
…		…
670	if (scrollbar_visible ())	677	if (scrollbar_visible ())
671	{	678	{
672	priv_modes \|= PrivMode_scrollBar;	679	priv_modes \|= PrivMode_scrollBar;
673	SavedModes \|= PrivMode_scrollBar;	680	SavedModes \|= PrivMode_scrollBar;
674	}	681	}
		682
675	if (menubar_visible ())	683	if (menubar_visible ())
676	{	684	{
677	priv_modes \|= PrivMode_menuBar;	685	priv_modes \|= PrivMode_menuBar;
678	SavedModes \|= PrivMode_menuBar;	686	SavedModes \|= PrivMode_menuBar;
679	}	687	}
680
681	#ifdef CURSOR_BLINK
682	if (options & Opt_cursorBlink)
683	(void)gettimeofday (&lastcursorchange, NULL);
684	#endif
685		688
686	run_command (argv);	689	run_command (argv);
687	}	690	}
688		691
689	/----------------------------------------------------------------------/	692	/----------------------------------------------------------------------/
…		…
704	continue;	707	continue;
705		708
706	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	709	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707	{	710	{
708	#ifndef XTERM_REVERSE_VIDEO	711	#ifndef XTERM_REVERSE_VIDEO
709	if (i < 2 && (options & Opt_reverseVideo))	712	if (i < 2 && OPTION (Opt_reverseVideo))
710	rs[Rs_color + i] = def_colorName[!i];	713	rs[Rs_color + i] = def_colorName[!i];
711	else	714	else
712	#endif	715	#endif
713	rs[Rs_color + i] = def_colorName[i];	716	rs[Rs_color + i] = def_colorName[i];
714		717
…		…
739	}	742	}
740	}	743	}
741	}	744	}
742		745
743	pix_colors[i] = xcol;	746	pix_colors[i] = xcol;
		747	SET_PIXCOLOR (i);
		748	}
		749
744	#ifdef OFF_FOCUS_FADING	750	#ifdef OFF_FOCUS_FADING
745	if (rs[Rs_fade])	751	if (rs[Rs_fade])
		752	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
746	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	753	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
747	#endif	754	#endif
748	SET_PIXCOLOR (i);
749	}
750		755
751	if (display->depth <= 2)	756	if (display->depth <= 2)
752	{	757	{
753	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	758	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
754	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	759	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
…		…
762	* from the fvwm window manager.	767	* from the fvwm window manager.
763	*/	768	*/
764	#ifdef KEEP_SCROLLCOLOR	769	#ifdef KEEP_SCROLLCOLOR
765		770
766	if (display->depth <= 2)	771	if (display->depth <= 2)
		772	{
767	{ /* Monochrome */	773	/* Monochrome */
768	pix_colors[Color_scroll] = pix_colors[Color_fg];	774	pix_colors[Color_scroll] = pix_colors[Color_fg];
769	pix_colors[Color_topShadow] = pix_colors[Color_bg];	775	pix_colors[Color_topShadow] = pix_colors[Color_bg];
770	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	776	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
771	}	777	}
772	else	778	else
…		…
808	int i = atoi (rs[Rs_color + idx]);	814	int i = atoi (rs[Rs_color + idx]);
809		815
810	if (i >= 8 && i <= 15)	816	if (i >= 8 && i <= 15)
811	{ /* bright colors */	817	{ /* bright colors */
812	i -= 8;	818	i -= 8;
813	#ifndef NO_BRIGHTCOLOR
814	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	819	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815	return;	820	return;
816	#endif
817	}	821	}
818		822
819	if (i >= 0 && i <= 7) /* normal colors */	823	if (i >= 0 && i <= 7) /* normal colors */
820	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	824	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821	}	825	}
…		…
827	* Use resource ``modifier'' to override the Meta modifier	831	* Use resource ``modifier'' to override the Meta modifier
828	*/	832	*/
829	void	833	void
830	rxvt_term::get_ourmods ()	834	rxvt_term::get_ourmods ()
831	{	835	{
832	int i, j, k;	836	int i, j, k;
833	int requestedmeta, realmeta, realalt;	837	int requestedmeta, realmeta, realalt;
834	const char cm, rsmod;	838	const char cm, rsmod;
835	XModifierKeymap *map;	839	XModifierKeymap *map;
836	KeyCode *kc;	840	KeyCode *kc;
837	const unsigned int modmasks[] =	841	const unsigned int modmasks[] =
838	{	842	{
839	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	843	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840	};	844	};
841		845
842	requestedmeta = realmeta = realalt = 0;	846	requestedmeta = realmeta = realalt = 0;
843	rsmod = rs[Rs_modifier];	847	rsmod = rs[Rs_modifier];
		848
844	if (rsmod	849	if (rsmod
845	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	850	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846	requestedmeta = rsmod[3] - '0';	851	requestedmeta = rsmod[3] - '0';
847		852
848	map = XGetModifierMapping (display->display);	853	map = XGetModifierMapping (display->display);
849	kc = map->modifiermap;	854	kc = map->modifiermap;
		855
850	for (i = 1; i < 6; i++)	856	for (i = 1; i < 6; i++)
851	{	857	{
852	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	858	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
		859
853	for (j = map->max_keypermod; j--; k++)	860	for (j = map->max_keypermod; j--; k++)
854	{	861	{
855	if (kc[k] == 0)	862	if (kc[k] == 0)
856	break;	863	break;
		864
857	switch (XKeycodeToKeysym (display->display, kc[k], 0))	865	switch (XKeycodeToKeysym (display->display, kc[k], 0))
858	{	866	{
859	case XK_Num_Lock:	867	case XK_Num_Lock:
860	ModNumLockMask = modmasks[i - 1];	868	ModNumLockMask = modmasks[i - 1];
861	/* FALLTHROUGH */	869	continue;
862	default:	870
863	continue; /* for (;;) */	871	case XK_ISO_Level3_Shift:
		872	ModLevel3Mask = modmasks[i - 1];
		873	continue;
		874
864	case XK_Meta_L:	875	case XK_Meta_L:
865	case XK_Meta_R:	876	case XK_Meta_R:
866	cm = "meta";	877	cm = "meta";
867	realmeta = i;	878	realmeta = i;
868	break;	879	break;
		880
869	case XK_Alt_L:	881	case XK_Alt_L:
870	case XK_Alt_R:	882	case XK_Alt_R:
871	cm = "alt";	883	cm = "alt";
872	realalt = i;	884	realalt = i;
873	break;	885	break;
		886
874	case XK_Super_L:	887	case XK_Super_L:
875	case XK_Super_R:	888	case XK_Super_R:
876	cm = "super";	889	cm = "super";
877	break;	890	break;
		891
878	case XK_Hyper_L:	892	case XK_Hyper_L:
879	case XK_Hyper_R:	893	case XK_Hyper_R:
880	cm = "hyper";	894	cm = "hyper";
881	break;	895	break;
		896
		897	default:
		898	continue;
882	}	899	}
		900
883	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)	901	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884	requestedmeta = i;	902	requestedmeta = i;
885	}	903	}
886	}	904	}
		905
887	XFreeModifiermap (map);	906	XFreeModifiermap (map);
		907
888	i = (requestedmeta ? requestedmeta	908	i = requestedmeta ? requestedmeta
889	: (realmeta ? realmeta	909	: realmeta ? realmeta
890	: (realalt ? realalt : 0)));	910	: realalt ? realalt
		911	: 0;
		912
891	if (i)	913	if (i)
892	ModMetaMask = modmasks[i - 1];	914	ModMetaMask = modmasks[i - 1];
893	}	915	}
894		916
895	/----------------------------------------------------------------------/	917	/----------------------------------------------------------------------/
…		…
905	#endif	927	#endif
906	XGCValues gcvalue;	928	XGCValues gcvalue;
907	long vt_emask;	929	long vt_emask;
908	XSetWindowAttributes attributes;	930	XSetWindowAttributes attributes;
909	XWindowAttributes gattr;	931	XWindowAttributes gattr;
		932	Window top, parent;
		933	dDisp;
910		934
911	#ifdef USING_W11LIB	935	#ifdef USING_W11LIB
912	/* enable W11 callbacks */	936	/* enable W11 callbacks */
913	W11AddEventHandler (display->display, rxvt_W11_process_x_event);	937	W11AddEventHandler (disp, rxvt_W11_process_x_event);
914	#endif	938	#endif
915		939
916	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	940	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917	XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);	941	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
918		942
919	if (options & Opt_transparent)	943	if (OPTION (Opt_transparent))
920	{	944	{
921	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	945	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
922	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	946	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
923	}	947	}
924		948
925	#if ENABLE_FRILLS	949	#if ENABLE_FRILLS
926	if (options & Opt_borderLess)	950	if (OPTION (Opt_borderLess))
927	{	951	{
928	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	952	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
929		953
930	if (prop == None)	954	if (prop == None)
931	{	955	{
932	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	956	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
933	#ifdef PREFER_24BIT	957	#ifdef PREFER_24BIT
…		…
940	mwmhints.flags = MWM_HINTS_DECORATIONS;	964	mwmhints.flags = MWM_HINTS_DECORATIONS;
941	mwmhints.decorations = 0;	965	mwmhints.decorations = 0;
942	}	966	}
943	}	967	}
944	else	968	else
945	{
946	mwmhints.flags = 0;	969	mwmhints.flags = 0;
947	}
948	#endif	970	#endif
949		971
950	/* grab colors before netscape does */	972	/* grab colors before netscape does */
951	Get_Colours ();	973	Get_Colours ();
952		974
953	if (!set_fonts ())	975	if (!set_fonts ())
954	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
955		977
		978	parent = DefaultRootWindow (disp);
		979
		980	#if ENABLE_XEMBED
		981	if (rs[Rs_embed])
		982	{
		983	XWindowAttributes wattr;
		984
		985	parent = strtol (rs[Rs_embed], 0, 0);
		986
		987	if (!XGetWindowAttributes (disp, parent, &wattr))
		988	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
		989
		990	window_calc (wattr.width, wattr.height);
		991	}
		992	#endif
		993
956	window_calc (0, 0);	994	window_calc (0, 0);
957	old_width = szHint.width;
958	old_height = szHint.height;
959		995
960	/* sub-window placement & size in rxvt_resize_subwindows () */	996	/* sub-window placement & size in rxvt_resize_subwindows () */
961
962	#ifdef PREFER_24BIT	997	#ifdef PREFER_24BIT
963	attributes.background_pixel = pix_colors_focused[Color_border];	998	attributes.background_pixel = pix_colors_focused[Color_border];
964	attributes.border_pixel = pix_colors_focused[Color_border];	999	attributes.border_pixel = pix_colors_focused[Color_border];
965	attributes.colormap = display->cmap;	1000	attributes.colormap = display->cmap;
966	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),	1001	top = XCreateWindow (disp, parent,
967	szHint.x, szHint.y,	1002	szHint.x, szHint.y,
968	szHint.width, szHint.height,	1003	szHint.width, szHint.height,
969	TermWin.ext_bwidth,	1004	ext_bwidth,
970	display->depth, InputOutput,	1005	display->depth, InputOutput,
971	display->visual,	1006	display->visual,
972	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	1007	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
973	#else	1008	#else
974	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),	1009	top = XCreateSimpleWindow (disp, parent,
975	szHint.x, szHint.y,	1010	szHint.x, szHint.y,
976	szHint.width, szHint.height,	1011	szHint.width, szHint.height,
977	TermWin.ext_bwidth,	1012	ext_bwidth,
978	pix_colors_focused[Color_border],	1013	pix_colors_focused[Color_border],
979	pix_colors_focused[Color_border]);	1014	pix_colors_focused[Color_border]);
980	#endif	1015	#endif
		1016
		1017	this->parent[0] = top;
		1018
		1019	old_width = szHint.width;
		1020	old_height = szHint.height;
981		1021
982	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1022	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1023	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984		1024
985	classHint.res_name = (char *)rs[Rs_name];	1025	classHint.res_name = (char *)rs[Rs_name];
986	classHint.res_class = (char *)RESCLASS;	1026	classHint.res_class = (char *)RESCLASS;
987		1027
988	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1028	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
989	wmHint.input = True;	1029	wmHint.input = True;
990	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1030	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
991	wmHint.window_group = TermWin.parent[0];	1031	wmHint.window_group = top;
992		1032
993	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1033	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
994	(char **)argv, argc, &szHint, &wmHint, &classHint);	1034	&szHint, &wmHint, &classHint);
995		1035
996	/* Enable delete window protocol */	1036	Atom protocols[] = {
997	XSetWMProtocols (display->display, TermWin.parent[0],	1037	xa[XA_WM_DELETE_WINDOW],
998	&xa[XA_WMDELETEWINDOW], 1);	1038	#if ENABLE_EWMH
		1039	xa[XA_NET_WM_PING],
		1040	#endif
		1041	};
		1042
		1043	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
999		1044
1000	#if ENABLE_FRILLS	1045	#if ENABLE_FRILLS
		1046	if (rs[Rs_transient_for])
		1047	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1048	#endif
		1049
		1050	#if ENABLE_EWMH
1001	long pid = getpid ();	1051	long pid = getpid ();
1002		1052
1003	XChangeProperty (display->display, TermWin.parent[0],	1053	XChangeProperty (disp, top,
1004	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1054	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005	PropModeReplace, (unsigned char *)&pid, 1);	1055	PropModeReplace, (unsigned char *)&pid, 1);
1006	#endif
1007		1056
1008	XSelectInput (display->display, TermWin.parent[0],	1057	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		1058	#endif
		1059
		1060	XSelectInput (disp, top,
1009	KeyPressMask	1061	KeyPressMask
1010	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1062	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1011	\| KeyReleaseMask	1063	\| KeyReleaseMask
1012	#endif	1064	#endif
1013	\| FocusChangeMask \| VisibilityChangeMask	1065	\| FocusChangeMask \| VisibilityChangeMask
1014	\| ExposureMask
1015	\| StructureNotifyMask);	1066	\| ExposureMask \| StructureNotifyMask);
		1067
1016	termwin_ev.start (display, TermWin.parent[0]);	1068	termwin_ev.start (display, top);
1017		1069
1018	#if ENABLE_FRILLS	1070	#if ENABLE_FRILLS
1019	if (mwmhints.flags)	1071	if (mwmhints.flags)
1020	XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1072	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1021	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1073	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1022	#endif	1074	#endif
1023		1075
1024	/* vt cursor: Black-on-White is standard, but this is more popular */	1076	/* vt cursor: Black-on-White is standard, but this is more popular */
1025	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1077	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1026		1078
1027	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1079	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
1028	/* cursor (menuBar/scrollBar): Black-on-White */	1080	/* cursor (menuBar/scrollBar): Black-on-White */
1029	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1081	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1030	#endif
1031
1032	#ifdef POINTER_BLANK
1033	{
1034	XColor blackcolour;
1035	blackcolour.red = 0;
1036	blackcolour.green = 0;
1037	blackcolour.blue = 0;
1038	Font f = XLoadFont (display->display, "fixed");
1039	blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040	&blackcolour, &blackcolour);
1041	XUnloadFont (display->display, f);
1042	}
1043	#endif	1082	#endif
1044		1083
1045	/* the vt window */	1084	/* the vt window */
1046	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1085	vt = XCreateSimpleWindow (disp, top,
1047	window_vt_x,	1086	window_vt_x,
1048	window_vt_y,	1087	window_vt_y,
1049	TermWin_TotalWidth (),	1088	width,
1050	TermWin_TotalHeight (),	1089	height,
1051	0,	1090	0,
1052	pix_colors_focused[Color_fg],	1091	pix_colors_focused[Color_fg],
1053	pix_colors_focused[Color_bg]);	1092	pix_colors_focused[Color_bg]);
1054	#ifdef DEBUG_X	1093	#ifdef DEBUG_X
1055	XStoreName (display->display, TermWin.vt, "vt window");	1094	XStoreName (disp, vt, "vt window");
1056	#endif	1095	#endif
1057		1096
1058	attributes.bit_gravity = NorthWestGravity;	1097	attributes.bit_gravity = NorthWestGravity;
1059	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1098	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1060		1099
1061	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1100	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1062		1101
1063	pointer_unblank ();	1102	if (OPTION (Opt_pointerBlank)
1064		1103	#ifdef ENABLE_PERL
1065	#ifdef POINTER_BLANK	1104	\|\| perl.self
1066	if (options & Opt_pointerBlank)	1105	#endif
		1106	)
1067	vt_emask \|= PointerMotionMask;	1107	vt_emask \|= PointerMotionMask;
1068	else	1108	else
1069	#endif
1070	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1109	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1071		1110
1072	XSelectInput (display->display, TermWin.vt, vt_emask);	1111	XSelectInput (disp, vt, vt_emask);
1073	vt_ev.start (display, TermWin.vt);	1112	vt_ev.start (display, vt);
1074		1113
1075	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1114	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076	if (menuBar_height ())	1115	if (menuBar_height ())
1077	{	1116	{
1078	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],	1117	menuBar.win = XCreateSimpleWindow (disp, top,
1079	window_vt_x, 0,	1118	window_vt_x, 0,
1080	TermWin_TotalWidth (),	1119	width,
1081	menuBar_TotalHeight (),	1120	menuBar_TotalHeight (),
1082	0,	1121	0,
1083	pix_colors_focused[Color_fg],	1122	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_scroll]);	1123	pix_colors_focused[Color_scroll]);
1085		1124
1086	#ifdef DEBUG_X	1125	#ifdef DEBUG_X
1087	XStoreName (display->display, menuBar.win, "menubar");	1126	XStoreName (disp, menuBar.win, "menubar");
1088	#endif	1127	#endif
1089		1128
1090	menuBar.drawable = new rxvt_drawable (display, menuBar.win);	1129	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091		1130
1092	XDefineCursor (display->display, menuBar.win,	1131	XDefineCursor (disp, menuBar.win,
1093	XCreateFontCursor (display->display, XC_left_ptr));	1132	XCreateFontCursor (disp, XC_left_ptr));
1094		1133
1095	XSelectInput (display->display, menuBar.win,	1134	XSelectInput (disp, menuBar.win,
1096	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask	1135	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1097	\| Button1MotionMask));
1098	menubar_ev.start (display, menuBar.win);	1136	menubar_ev.start (display, menuBar.win);
1099	}	1137	}
1100	#endif	1138	#endif
1101		1139
1102	#ifdef XPM_BACKGROUND	1140	#ifdef XPM_BACKGROUND
1103	if (rs[Rs_backgroundPixmap] != NULL	1141	if (rs[Rs_backgroundPixmap] != NULL
1104	&& ! (options & Opt_transparent))	1142	&& ! OPTION (Opt_transparent))
1105	{	1143	{
1106	const char *p = rs[Rs_backgroundPixmap];	1144	const char *p = rs[Rs_backgroundPixmap];
1107		1145
1108	if ((p = strchr (p, ';')) != NULL)	1146	if ((p = strchr (p, ';')) != NULL)
1109	{	1147	{
…		…
1118		1156
1119	/* graphics context for the vt window */	1157	/* graphics context for the vt window */
1120	gcvalue.foreground = pix_colors[Color_fg];	1158	gcvalue.foreground = pix_colors[Color_fg];
1121	gcvalue.background = pix_colors[Color_bg];	1159	gcvalue.background = pix_colors[Color_bg];
1122	gcvalue.graphics_exposures = 1;	1160	gcvalue.graphics_exposures = 1;
1123	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1161	gc = XCreateGC (disp, vt,
1124	GCForeground \| GCBackground \| GCGraphicsExposures,	1162	GCForeground \| GCBackground \| GCGraphicsExposures,
1125	&gcvalue);	1163	&gcvalue);
1126		1164
1127	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1165	drawable = new rxvt_drawable (display, vt);
1128		1166
1129	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1167	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1130	gcvalue.foreground = pix_colors[Color_topShadow];	1168	gcvalue.foreground = pix_colors[Color_topShadow];
1131	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1169	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1132	gcvalue.foreground = pix_colors[Color_bottomShadow];	1170	gcvalue.foreground = pix_colors[Color_bottomShadow];
1133	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1171	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1134	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1172	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1135	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1173	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1136	#endif	1174	#endif
1137		1175
1138	#ifdef OFF_FOCUS_FADING	1176	#ifdef OFF_FOCUS_FADING
1139	// initially we are in unfocused state	1177	// initially we are in unfocused state
1140	if (rs[Rs_fade])	1178	if (rs[Rs_fade])
1141	pix_colors = pix_colors_unfocused;	1179	pix_colors = pix_colors_unfocused;
1142	#endif	1180	#endif
1143		1181
		1182	pointer_unblank ();
1144	scr_recolour ();	1183	scr_recolour ();
		1184
		1185	#if ENABLE_XEMBED
		1186	if (rs[Rs_embed])
		1187	{
		1188	long info[2] = { 0, XEMBED_MAPPED };
		1189
		1190	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1191	32, PropModeReplace, (unsigned char *)&info, 2);
		1192	}
		1193	#endif
1145	}	1194	}
1146		1195
1147	/* ------------------------------------------------------------------------- *	1196	/* ------------------------------------------------------------------------- *
1148	* GET TTY CURRENT STATE *	1197	* GET TTY CURRENT STATE *
1149	* ------------------------------------------------------------------------- */	1198	* ------------------------------------------------------------------------- */
…		…
1154	/*	1203	/*
1155	* standard System V termios interface	1204	* standard System V termios interface
1156	*/	1205	*/
1157	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1206	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1158	{	1207	{
1159	/* return error - use system defaults */	1208	// return error - use system defaults,
		1209	// where possible, and zero elsewhere
		1210	memset (tio, 0, sizeof (ttymode_t));
		1211
1160	tio->c_cc[VINTR] = CINTR;	1212	tio->c_cc[VINTR] = CINTR;
1161	tio->c_cc[VQUIT] = CQUIT;	1213	tio->c_cc[VQUIT] = CQUIT;
1162	tio->c_cc[VERASE] = CERASE;	1214	tio->c_cc[VERASE] = CERASE;
		1215	#ifdef VERASE2
		1216	tio->c_cc[VERASE2] = CERASE2;
		1217	#endif
1163	tio->c_cc[VKILL] = CKILL;	1218	tio->c_cc[VKILL] = CKILL;
1164	tio->c_cc[VSTART] = CSTART;	1219	tio->c_cc[VSTART] = CSTART;
1165	tio->c_cc[VSTOP] = CSTOP;	1220	tio->c_cc[VSTOP] = CSTOP;
1166	tio->c_cc[VSUSP] = CSUSP;	1221	tio->c_cc[VSUSP] = CSUSP;
1167	# ifdef VDSUSP	1222	# ifdef VDSUSP
1168
1169	tio->c_cc[VDSUSP] = CDSUSP;	1223	tio->c_cc[VDSUSP] = CDSUSP;
1170	# endif	1224	# endif
1171	# ifdef VREPRINT	1225	# ifdef VREPRINT
1172
1173	tio->c_cc[VREPRINT] = CRPRNT;	1226	tio->c_cc[VREPRINT] = CRPRNT;
1174	# endif	1227	# endif
1175	# ifdef VDISCRD	1228	# ifdef VDISCRD
1176
1177	tio->c_cc[VDISCRD] = CFLUSH;	1229	tio->c_cc[VDISCRD] = CFLUSH;
1178	# endif	1230	# endif
1179	# ifdef VWERSE	1231	# ifdef VWERSE
1180
1181	tio->c_cc[VWERSE] = CWERASE;	1232	tio->c_cc[VWERSE] = CWERASE;
1182	# endif	1233	# endif
1183	# ifdef VLNEXT	1234	# ifdef VLNEXT
1184
1185	tio->c_cc[VLNEXT] = CLNEXT;	1235	tio->c_cc[VLNEXT] = CLNEXT;
1186	# endif	1236	# endif
1187
1188	}	1237	}
		1238
1189	tio->c_cc[VEOF] = CEOF;	1239	tio->c_cc[VEOF] = CEOF;
1190	tio->c_cc[VEOL] = VDISABLE;	1240	tio->c_cc[VEOL] = VDISABLE;
1191	# ifdef VEOL2	1241	# ifdef VEOL2
1192
1193	tio->c_cc[VEOL2] = VDISABLE;	1242	tio->c_cc[VEOL2] = VDISABLE;
1194	# endif	1243	# endif
1195	# ifdef VSWTC	1244	# ifdef VSWTC
1196
1197	tio->c_cc[VSWTC] = VDISABLE;	1245	tio->c_cc[VSWTC] = VDISABLE;
1198	# endif	1246	# endif
1199	# ifdef VSWTCH	1247	# ifdef VSWTCH
1200
1201	tio->c_cc[VSWTCH] = VDISABLE;	1248	tio->c_cc[VSWTCH] = VDISABLE;
1202	# endif	1249	# endif
1203	# if VMIN != VEOF	1250	# if VMIN != VEOF
1204
1205	tio->c_cc[VMIN] = 1;	1251	tio->c_cc[VMIN] = 1;
1206	# endif	1252	# endif
1207	# if VTIME != VEOL	1253	# if VTIME != VEOL
1208
1209	tio->c_cc[VTIME] = 0;	1254	tio->c_cc[VTIME] = 0;
1210	# endif	1255	# endif
1211		1256
1212	if (erase != -1)	1257	if (erase != -1)
1213	tio->c_cc[VERASE] = (char)erase;	1258	tio->c_cc[VERASE] = (char)erase;
…		…
1241	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1286	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1242	{	1287	{
1243	tio->sg.sg_erase = CERASE; /* ^H */	1288	tio->sg.sg_erase = CERASE; /* ^H */
1244	tio->sg.sg_kill = CKILL; /* ^U */	1289	tio->sg.sg_kill = CKILL; /* ^U */
1245	}	1290	}
		1291
1246	if (erase != -1)	1292	if (erase != -1)
1247	tio->sg.sg_erase = (char)erase;	1293	tio->sg.sg_erase = (char)erase;
1248		1294
1249	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1295	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1250		1296
…		…
1256	tio->tc.t_startc = CSTART; /* ^Q */	1302	tio->tc.t_startc = CSTART; /* ^Q */
1257	tio->tc.t_stopc = CSTOP; /* ^S */	1303	tio->tc.t_stopc = CSTOP; /* ^S */
1258	tio->tc.t_eofc = CEOF; /* ^D */	1304	tio->tc.t_eofc = CEOF; /* ^D */
1259	tio->tc.t_brkc = -1;	1305	tio->tc.t_brkc = -1;
1260	}	1306	}
		1307
1261	/* get local special chars */	1308	/* get local special chars */
1262	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1309	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1263	{	1310	{
1264	tio->lc.t_suspc = CSUSP; /* ^Z */	1311	tio->lc.t_suspc = CSUSP; /* ^Z */
1265	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1312	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1269	tio->lc.t_lnextc = CLNEXT; /* ^V */	1316	tio->lc.t_lnextc = CLNEXT; /* ^V */
1270	}	1317	}
1271	/* get line discipline */	1318	/* get line discipline */
1272	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1319	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1273	# ifdef NTTYDISC	1320	# ifdef NTTYDISC
1274
1275	tio->line = NTTYDISC;	1321	tio->line = NTTYDISC;
1276	# endif /* NTTYDISC */	1322	# endif /* NTTYDISC */
1277		1323
1278	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1324	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1279	#endif /* HAVE_TERMIOS_H */	1325	#endif /* HAVE_TERMIOS_H */
…		…
1302	FOO (IGNCR, "IGNCR");	1348	FOO (IGNCR, "IGNCR");
1303	FOO (ICRNL, "ICRNL");	1349	FOO (ICRNL, "ICRNL");
1304	FOO (IXON, "IXON");	1350	FOO (IXON, "IXON");
1305	FOO (IXOFF, "IXOFF");	1351	FOO (IXOFF, "IXOFF");
1306	# ifdef IUCLC	1352	# ifdef IUCLC
1307
1308	FOO (IUCLC, "IUCLC");	1353	FOO (IUCLC, "IUCLC");
1309	# endif	1354	# endif
1310	# ifdef IXANY	1355	# ifdef IXANY
1311
1312	FOO (IXANY, "IXANY");	1356	FOO (IXANY, "IXANY");
1313	# endif	1357	# endif
1314	# ifdef IMAXBEL	1358	# ifdef IMAXBEL
1315
1316	FOO (IMAXBEL, "IMAXBEL");	1359	FOO (IMAXBEL, "IMAXBEL");
1317	# endif	1360	# endif
1318		1361
1319	fprintf (stderr, "\n");	1362	fprintf (stderr, "\n");
1320		1363
…		…
1327	FOO (VERASE, "VERASE");	1370	FOO (VERASE, "VERASE");
1328	FOO (VKILL, "VKILL");	1371	FOO (VKILL, "VKILL");
1329	FOO (VEOF, "VEOF");	1372	FOO (VEOF, "VEOF");
1330	FOO (VEOL, "VEOL");	1373	FOO (VEOL, "VEOL");
1331	# ifdef VEOL2	1374	# ifdef VEOL2
1332
1333	FOO (VEOL2, "VEOL2");	1375	FOO (VEOL2, "VEOL2");
1334	# endif	1376	# endif
1335	# ifdef VSWTC	1377	# ifdef VSWTC
1336
1337	FOO (VSWTC, "VSWTC");	1378	FOO (VSWTC, "VSWTC");
1338	# endif	1379	# endif
1339	# ifdef VSWTCH	1380	# ifdef VSWTCH
1340
1341	FOO (VSWTCH, "VSWTCH");	1381	FOO (VSWTCH, "VSWTCH");
1342	# endif	1382	# endif
1343
1344	FOO (VSTART, "VSTART");	1383	FOO (VSTART, "VSTART");
1345	FOO (VSTOP, "VSTOP");	1384	FOO (VSTOP, "VSTOP");
1346	FOO (VSUSP, "VSUSP");	1385	FOO (VSUSP, "VSUSP");
1347	# ifdef VDSUSP	1386	# ifdef VDSUSP
1348
1349	FOO (VDSUSP, "VDSUSP");	1387	FOO (VDSUSP, "VDSUSP");
1350	# endif	1388	# endif
1351	# ifdef VREPRINT	1389	# ifdef VREPRINT
1352
1353	FOO (VREPRINT, "VREPRINT");	1390	FOO (VREPRINT, "VREPRINT");
1354	# endif	1391	# endif
1355	# ifdef VDISCRD	1392	# ifdef VDISCRD
1356
1357	FOO (VDISCRD, "VDISCRD");	1393	FOO (VDISCRD, "VDISCRD");
1358	# endif	1394	# endif
1359	# ifdef VWERSE	1395	# ifdef VWERSE
1360
1361	FOO (VWERSE, "VWERSE");	1396	FOO (VWERSE, "VWERSE");
1362	# endif	1397	# endif
1363	# ifdef VLNEXT	1398	# ifdef VLNEXT
1364
1365	FOO (VLNEXT, "VLNEXT");	1399	FOO (VLNEXT, "VLNEXT");
1366	# endif	1400	# endif
1367		1401
1368	fprintf (stderr, "\n");	1402	fprintf (stderr, "\n");
1369	# undef FOO	1403	# undef FOO
…		…
1378	* the slave.	1412	* the slave.
1379	*/	1413	*/
1380	void	1414	void
1381	rxvt_term::run_command (const char const argv)	1415	rxvt_term::run_command (const char const argv)
1382	{	1416	{
		1417	TEMP_ENV; // not very temporary...
		1418
		1419	#if ENABLE_FRILLS
		1420	if (rs[Rs_pty_fd])
		1421	{
		1422	pty.pty = atoi (rs[Rs_pty_fd]);
		1423
		1424	if (pty.pty >= 0)
		1425	{
		1426	if (getfd_hook)
		1427	pty.pty = (*getfd_hook) (pty.pty);
		1428
		1429	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))
		1430	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1431	}
		1432	}
		1433	else
		1434	#endif
		1435	if (!pty.get ())
		1436	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1437
		1438	pty.set_utf8_mode (enc_utf8);
		1439
		1440	/* set initial window size */
		1441	tt_winch ();
		1442
1383	int er;	1443	int er;
1384
1385	if (!pty.get ())
1386	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387		1444
1388	#ifndef NO_BACKSPACE_KEY	1445	#ifndef NO_BACKSPACE_KEY
1389	if (key_backspace[0] && !key_backspace[1])	1446	if (key_backspace[0] && !key_backspace[1])
1390	er = key_backspace[0];	1447	er = key_backspace[0];
1391	else if (strcmp (key_backspace, "DEC") == 0)	1448	else if (strcmp (key_backspace, "DEC") == 0)
…		…
1394	#endif	1451	#endif
1395	er = -1;	1452	er = -1;
1396		1453
1397	rxvt_get_ttymode (&tio, er);	1454	rxvt_get_ttymode (&tio, er);
1398		1455
1399	/* set initial window size */	1456	#if ENABLE_FRILLS
1400	tt_winch ();	1457	if (rs[Rs_pty_fd])
1401		1458	return;
1402	sw_chld.start (SIGCHLD);	1459	#endif
1403		1460
1404	#ifndef __QNX__	1461	#ifndef __QNX__
1405	/* spin off the command interpreter */	1462	/* spin off the command interpreter */
1406	switch (cmd_pid = fork ())	1463	switch (cmd_pid = fork ())
1407	{	1464	{
1408	case -1:	1465	case -1:
		1466	{
		1467	cmd_pid = 0;
1409	rxvt_fatal ("can't fork, aborting.\n");	1468	rxvt_fatal ("can't fork, aborting.\n");
		1469	}
1410	case 0:	1470	case 0:
1411	init_env ();	1471	init_env ();
1412		1472
1413	if (!pty.make_controlling_tty ())	1473	if (!pty.make_controlling_tty ())
1414	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1474	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
…		…
1477	{	1537	{
1478	char *login;	1538	char *login;
1479		1539
1480	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1540	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1481		1541
1482	if (options & Opt_console)	1542	if (OPTION (Opt_console))
1483	{ /* be virtual console, fail silently */	1543	{ /* be virtual console, fail silently */
1484	#ifdef TIOCCONS	1544	#ifdef TIOCCONS
1485	unsigned int on = 1;	1545	unsigned int on = 1;
1486		1546
1487	ioctl (STDIN_FILENO, TIOCCONS, &on);	1547	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1530	execvp (argv[0], (char const )argv);	1590	execvp (argv[0], (char const )argv);
1531	/* no error message: STDERR is closed! */	1591	/* no error message: STDERR is closed! */
1532	}	1592	}
1533	else	1593	else
1534	{	1594	{
1535	const char argv0, shell;	1595	const char argv0, shell;
1536		1596
1537	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1597	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1538	shell = "/bin/sh";	1598	shell = "/bin/sh";
1539		1599
1540	argv0 = (const char *)rxvt_r_basename (shell);	1600	argv0 = (const char *)rxvt_r_basename (shell);
1541		1601
1542	if (options & Opt_loginShell)	1602	if (OPTION (Opt_loginShell))
1543	{	1603	{
1544	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1604	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1545		1605
1546	login[0] = '-';	1606	login[0] = '-';
1547	strcpy (&login[1], argv0);	1607	strcpy (&login[1], argv0);
1548	argv0 = login;	1608	argv0 = login;
1549	}	1609	}
		1610
1550	execlp (shell, argv0, NULL);	1611	execlp (shell, argv0, NULL);
1551	/* no error message: STDERR is closed! */	1612	/* no error message: STDERR is closed! */
1552	}	1613	}
1553		1614
1554	#else /* __QNX__ uses qnxspawn () */	1615	#else /* __QNX__ uses qnxspawn () */
…		…
1582	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')	1643	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1583	command = "/bin/sh";	1644	command = "/bin/sh";
1584		1645
1585	arg_a[0] = my_basename (command);	1646	arg_a[0] = my_basename (command);
1586		1647
1587	if (options & Opt_loginShell)	1648	if (OPTION (Opt_loginShell))
1588	{	1649	{
1589	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));	1650	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1590		1651
1591	login[0] = '-';	1652	login[0] = '-';
1592	strcpy (&login[1], arg_a[0]);	1653	strcpy (&login[1], arg_a[0]);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC vs. Revision 1.138 by root, Wed Jan 11 02:24:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.138 by root, Wed Jan 11 02:24:12 2006 UTC