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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.142 by root, Fri Jan 13 04:59:04 2006 UTC