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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.133 by root, Fri Jan 6 05:28:55 2006 UTC

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.133 by root, Fri Jan 6 05:28:55 2006 UTC