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

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