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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC

…		…
31	* Initialisation routines.	31	* Initialisation routines.
32	*/	32	*/
33		33
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
		36	#include "rxvtutil.h"
36	#include "init.h"	37	#include "init.h"
37		38
38	#include <signal.h>	39	#include <csignal>
39		40
40	const char *const def_colorName[] =	41	const char *const def_colorName[] =
41	{	42	{
42	COLOR_FOREGROUND,	43	COLOR_FOREGROUND,
43	COLOR_BACKGROUND,	44	COLOR_BACKGROUND,
…		…
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,
…		…
167	#if TINTING	171	#if TINTING
168	NULL,	172	NULL,
169	#endif	173	#endif
170	};	174	};
171		175
172	const char *const xa_names[NUM_XA] =	176	const char *const xa_names[] =
173	{	177	{
174	"TEXT",	178	"TEXT",
175	"COMPOUND_TEXT",	179	"COMPOUND_TEXT",
176	"UTF8_STRING",	180	"UTF8_STRING",
177	"MULTIPLE",	181	"MULTIPLE",
178	"TARGETS",	182	"TARGETS",
179	"TIMESTAMP",	183	"TIMESTAMP",
180	"VT_SELECTION",	184	"VT_SELECTION",
181	"INCR",	185	"INCR",
182	"WM_DELETE_WINDOW",	186	"WM_DELETE_WINDOW",
		187	"CLIPBOARD",
		188	#if ENABLE_FRILLS
		189	"_NET_WM_PID",
		190	"_MOTIF_WM_HINTS",
		191	"_NET_WM_NAME",
		192	"_NET_WM_ICON_NAME",
		193	#endif
		194	#if USE_XIM
		195	"WM_LOCALE_NAME",
		196	#endif
183	#ifdef TRANSPARENT	197	#ifdef TRANSPARENT
184	"_XROOTPMAP_ID",	198	"_XROOTPMAP_ID",
		199	"ESETROOT_PMAP_ID",
185	#endif	200	#endif
186	#ifdef OFFIX_DND	201	#ifdef OFFIX_DND
187	"DndProtocol",	202	"DndProtocol",
188	"DndSelection",	203	"DndSelection",
189	#endif	204	#endif
190	"CLIPBOARD"
191	};	205	};
192		206
193	bool	207	bool
194	rxvt_term::init_vars ()	208	rxvt_term::init_vars ()
195	{	209	{
…		…
367	#if ENABLE_FRILLS	381	#if ENABLE_FRILLS
368	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	382	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	383	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	384	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	385	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372	#endif
373
374	#ifndef NO_LINESPACE
375	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	386	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	387	TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377	#endif	388	#endif
378		389
379	#ifdef POINTER_BLANK	390	#ifdef POINTER_BLANK
…		…
590		601
591	this->locale = rxvt_strdup (this->locale);	602	this->locale = rxvt_strdup (this->locale);
592	SET_LOCALE (this->locale);	603	SET_LOCALE (this->locale);
593	mbstate.reset ();	604	mbstate.reset ();
594	#endif	605	#endif
595	#if 0	606
596	#if HAVE_NL_LANGINFO	607	#if HAVE_NL_LANGINFO
		608	char *codeset = strdup (nl_langinfo (CODESET));
		609	// /^UTF.?8/i
		610	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
		611	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
		612	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
		613	&& (codeset[3] == '8' \|\| codeset[4] == '8');
597	free (codeset);	614	free (codeset);
598	codeset = strdup (nl_langinfo (CODESET));
599	enc_utf8 = !strcasecmp (codeset, "UTF-8")
600	\|\| !strcasecmp (codeset, "UTF8");
601	#else	615	#else
602	enc_utf8 = 1;	616	enc_utf8 = 0;
603	#endif
604	#endif	617	#endif
605	}	618	}
606		619
607	void	620	void
608	rxvt_term::init_xlocale ()	621	rxvt_term::init_xlocale ()
…		…
610	#ifdef USE_XIM	623	#ifdef USE_XIM
611	if (!locale)	624	if (!locale)
612	rxvt_warn ("setting locale failed, working without locale support.\n");	625	rxvt_warn ("setting locale failed, working without locale support.\n");
613	else	626	else
614	{	627	{
615	Atom wmlocale;	628	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		629
622	if (!XSupportsLocale ())	630	if (!XSupportsLocale ())
623	{	631	{
624	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	632	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625	return;	633	return;
…		…
639	{	647	{
640	/*	648	/*
641	* Initialize the command connection.	649	* Initialize the command connection.
642	* This should be called after the X server connection is established.	650	* This should be called after the X server connection is established.
643	*/	651	*/
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		652
658	#ifdef META8_OPTION	653	#ifdef META8_OPTION
659	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	654	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660	#endif	655	#endif
661		656
…		…
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
		931	#ifdef USING_W11LIB
		932	/* enable W11 callbacks */
		933	W11AddEventHandler (display->display, rxvt_W11_process_x_event);
		934	#endif
		935
		936	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
		937	XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
917		938
918	if (options & Opt_transparent)	939	if (options & Opt_transparent)
919	{	940	{
920	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	941	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
921	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	942	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
…		…
990	wmHint.window_group = TermWin.parent[0];	1011	wmHint.window_group = TermWin.parent[0];
991		1012
992	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1013	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
993	(char **)argv, argc, &szHint, &wmHint, &classHint);	1014	(char **)argv, argc, &szHint, &wmHint, &classHint);
994		1015
		1016	/* Enable delete window protocol */
		1017	XSetWMProtocols (display->display, TermWin.parent[0],
		1018	&xa[XA_WMDELETEWINDOW], 1);
		1019
995	#if ENABLE_FRILLS	1020	#if ENABLE_FRILLS
996	long pid = getpid ();	1021	long pid = getpid ();
997		1022
998	XChangeProperty (display->display, TermWin.parent[0],	1023	XChangeProperty (display->display, TermWin.parent[0],
999	display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,	1024	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000	PropModeReplace, (unsigned char *)&pid, 1);	1025	PropModeReplace, (unsigned char *)&pid, 1);
1001	#endif	1026	#endif
1002		1027
1003	XSelectInput (display->display, TermWin.parent[0],	1028	XSelectInput (display->display, TermWin.parent[0],
1004	KeyPressMask	1029	KeyPressMask
…		…
1010	\| StructureNotifyMask);	1035	\| StructureNotifyMask);
1011	termwin_ev.start (display, TermWin.parent[0]);	1036	termwin_ev.start (display, TermWin.parent[0]);
1012		1037
1013	#if ENABLE_FRILLS	1038	#if ENABLE_FRILLS
1014	if (mwmhints.flags)	1039	if (mwmhints.flags)
1015	{	1040	XChangeProperty (display->display, TermWin.parent[0], 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);	1041	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019	}
1020	#endif	1042	#endif
1021		1043
1022	/* vt cursor: Black-on-White is standard, but this is more popular */	1044	/* vt cursor: Black-on-White is standard, but this is more popular */
1023	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1045	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1024		1046
1025	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1047	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
1026	/* cursor (menuBar/scrollBar): Black-on-White */	1048	/* cursor (menuBar/scrollBar): Black-on-White */
1027	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1049	leftptr_cursor = XCreateFontCursor (display->display, 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	1050	#endif
1042		1051
1043	/* the vt window */	1052	/* the vt window */
1044	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1053	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1045	window_vt_x,	1054	window_vt_x,
…		…
1376	* the slave.	1385	* the slave.
1377	*/	1386	*/
1378	void	1387	void
1379	rxvt_term::run_command (const char const argv)	1388	rxvt_term::run_command (const char const argv)
1380	{	1389	{
1381	int er;
1382
1383	if (!pty.get ())	1390	if (!pty.get ())
1384	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1391	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1392
		1393	pty.set_utf8_mode (enc_utf8);
		1394
		1395	/* set initial window size */
		1396	tt_winch ();
		1397
		1398	int er;
1385		1399
1386	#ifndef NO_BACKSPACE_KEY	1400	#ifndef NO_BACKSPACE_KEY
1387	if (key_backspace[0] && !key_backspace[1])	1401	if (key_backspace[0] && !key_backspace[1])
1388	er = key_backspace[0];	1402	er = key_backspace[0];
1389	else if (strcmp (key_backspace, "DEC") == 0)	1403	else if (strcmp (key_backspace, "DEC") == 0)
…		…
1391	else	1405	else
1392	#endif	1406	#endif
1393	er = -1;	1407	er = -1;
1394		1408
1395	rxvt_get_ttymode (&tio, er);	1409	rxvt_get_ttymode (&tio, er);
1396
1397	/* set initial window size */
1398	tt_winch ();
1399		1410
1400	sw_chld.start (SIGCHLD);	1411	sw_chld.start (SIGCHLD);
1401		1412
1402	#ifndef __QNX__	1413	#ifndef __QNX__
1403	/* spin off the command interpreter */	1414	/* spin off the command interpreter */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs. Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC