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