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

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