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