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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.93 by root, Sun Oct 24 14:02:44 2004 UTC vs.
Revision 1.140 by root, Thu Jan 12 01:30:53 2006 UTC

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.93 by root, Sun Oct 24 14:02:44 2004 UTC vs.
Revision 1.140 by root, Thu Jan 12 01:30:53 2006 UTC