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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.117 by root, Thu Jul 7 19:37:47 2005 UTC

…		…
181	"MULTIPLE",	181	"MULTIPLE",
182	"TARGETS",	182	"TARGETS",
183	"TIMESTAMP",	183	"TIMESTAMP",
184	"VT_SELECTION",	184	"VT_SELECTION",
185	"INCR",	185	"INCR",
		186	"WM_PROTOCOLS",
186	"WM_DELETE_WINDOW",	187	"WM_DELETE_WINDOW",
187	"CLIPBOARD",	188	"CLIPBOARD",
188	#if ENABLE_FRILLS	189	#if ENABLE_FRILLS
		190	"_MOTIF_WM_HINTS",
		191	#endif
		192	#if ENABLE_EWMH
189	"_NET_WM_PID",	193	"_NET_WM_PID",
190	"_MOTIF_WM_HINTS",
191	"_NET_WM_NAME",	194	"_NET_WM_NAME",
192	"_NET_WM_ICON_NAME",	195	"_NET_WM_ICON_NAME",
		196	"_NET_WM_PING",
193	#endif	197	#endif
194	#if USE_XIM	198	#if USE_XIM
195	"WM_LOCALE_NAME",	199	"WM_LOCALE_NAME",
196	#endif	200	#endif
197	#ifdef TRANSPARENT	201	#ifdef TRANSPARENT
…		…
199	"ESETROOT_PMAP_ID",	203	"ESETROOT_PMAP_ID",
200	#endif	204	#endif
201	#ifdef OFFIX_DND	205	#ifdef OFFIX_DND
202	"DndProtocol",	206	"DndProtocol",
203	"DndSelection",	207	"DndSelection",
		208	#endif
		209	#if ENABLE_XEMBED
		210	"_XEMBED",
		211	"_XEMBED_INFO",
204	#endif	212	#endif
205	};	213	};
206		214
207	bool	215	bool
208	rxvt_term::init_vars ()	216	rxvt_term::init_vars ()
…		…
336	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337	rs[Rs_display_name] = ":0";	345	rs[Rs_display_name] = ":0";
338		346
339	get_options (r_argc, r_argv);	347	get_options (r_argc, r_argv);
340		348
341	#ifdef LOCAL_X_IS_UNIX
342	if (rs[Rs_display_name][0] == ':')
343	{
344	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345	strcpy (val, "unix");
346	strcat (val, rs[Rs_display_name]);
347	display = displays.get (val);
348	free (val);
349	}
350	#endif
351
352	if (!display
353	&& ! (display = displays.get (rs[Rs_display_name])))	349	if (!(display = displays.get (rs[Rs_display_name])))
354	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	350	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355		351
356	extract_resources ();	352	extract_resources ();
357	free (r_argv);	353	free (r_argv);
358		354
…		…
925	#endif	921	#endif
926	XGCValues gcvalue;	922	XGCValues gcvalue;
927	long vt_emask;	923	long vt_emask;
928	XSetWindowAttributes attributes;	924	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;	925	XWindowAttributes gattr;
930	Window top;	926	Window top, parent;
931	dDisp;	927	dDisp;
932		928
933	#ifdef USING_W11LIB	929	#ifdef USING_W11LIB
934	/* enable W11 callbacks */	930	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);	931	W11AddEventHandler (disp, rxvt_W11_process_x_event);
…		…
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	958	mwmhints.flags = MWM_HINTS_DECORATIONS;
963	mwmhints.decorations = 0;	959	mwmhints.decorations = 0;
964	}	960	}
965	}	961	}
966	else	962	else
967	{
968	mwmhints.flags = 0;	963	mwmhints.flags = 0;
969	}
970	#endif	964	#endif
971		965
972	/* grab colors before netscape does */	966	/* grab colors before netscape does */
973	Get_Colours ();	967	Get_Colours ();
974		968
975	if (!set_fonts ())	969	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	970	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977		971
978	#if ENABLE_FRILLS	972	parent = DefaultRootWindow (disp);
		973
		974	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	975	if (rs[Rs_embed])
980	{	976	{
981	XWindowAttributes wattr;	977	XWindowAttributes wattr;
982		978
983	top = strtol (rs[Rs_embed], 0, 0);	979	parent = strtol (rs[Rs_embed], 0, 0);
984		980
985	if (!XGetWindowAttributes (disp, top, &wattr))	981	if (!XGetWindowAttributes (disp, parent, &wattr))
986	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	982	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987		983
988	window_calc (wattr.width, wattr.height);	984	window_calc (wattr.width, wattr.height);
		985	}
989		986
990	#if 0	987	#endif
991	if (wattr.map_state == IsViewable)	988	window_calc (0, 0);
992	{	989
993	TermWin.mapped = 1;	990	/* sub-window placement & size in rxvt_resize_subwindows () */
994	refresh_type = FAST_REFRESH;	991	#ifdef PREFER_24BIT
995	XClearWindow (disp, top);	992	attributes.background_pixel = pix_colors_focused[Color_border];
996	// TODO: make XMapNotify-event-code a function and call it	993	attributes.border_pixel = pix_colors_focused[Color_border];
997	// TODO: how can I detetc visibility without unmpa/map?	994	attributes.colormap = display->cmap;
998	// TODO: focusin etc.	995	top = XCreateWindow (disp, parent,
999	}	996	szHint.x, szHint.y,
		997	szHint.width, szHint.height,
		998	TermWin.ext_bwidth,
		999	display->depth, InputOutput,
		1000	display->visual,
		1001	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1000	#else	1002	#else
1001	// it'S easiets just to unmap/map to get all state correctly set-up	1003	top = XCreateSimpleWindow (disp, parent,
1002	XUnmapWindow (disp, top);
1003	#endif
1004	}
1005	else
1006	#endif
1007	{
1008	window_calc (0, 0);
1009
1010	/* sub-window placement & size in rxvt_resize_subwindows () */
1011	#ifdef PREFER_24BIT
1012	attributes.background_pixel = pix_colors_focused[Color_border];
1013	attributes.border_pixel = pix_colors_focused[Color_border];
1014	attributes.colormap = display->cmap;
1015	top = XCreateWindow (disp, DefaultRootWindow (disp),
1016	szHint.x, szHint.y,	1004	szHint.x, szHint.y,
1017	szHint.width, szHint.height,	1005	szHint.width, szHint.height,
1018	TermWin.ext_bwidth,	1006	TermWin.ext_bwidth,
1019	display->depth, InputOutput,
1020	display->visual,
1021	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1022	#else
1023	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1024	szHint.x, szHint.y,
1025	szHint.width, szHint.height,
1026	TermWin.ext_bwidth,
1027	pix_colors_focused[Color_border],	1007	pix_colors_focused[Color_border],
1028	pix_colors_focused[Color_border]);	1008	pix_colors_focused[Color_border]);
1029	#endif	1009	#endif
1030	}
1031		1010
1032	TermWin.parent[0] = top;	1011	TermWin.parent[0] = top;
1033		1012
1034	old_width = szHint.width;	1013	old_width = szHint.width;
1035	old_height = szHint.height;	1014	old_height = szHint.height;
…		…
1043	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1022	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1044	wmHint.input = True;	1023	wmHint.input = True;
1045	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1024	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1046	wmHint.window_group = top;	1025	wmHint.window_group = top;
1047		1026
1048	XSetWMProperties (disp, top, NULL, NULL,	1027	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1049	(char **)argv, argc, &szHint, &wmHint, &classHint);	1028	&szHint, &wmHint, &classHint);
1050		1029
1051	/* Enable delete window protocol */	1030	Atom protocols[] = {
1052	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);	1031	xa[XA_WM_DELETE_WINDOW],
		1032	#if ENABLE_EWMH
		1033	xa[XA_NET_WM_PING],
		1034	#endif
		1035	};
1053		1036
1054	#if ENABLE_FRILLS	1037	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1038
		1039	#if ENABLE_EWMH
1055	long pid = getpid ();	1040	long pid = getpid ();
1056		1041
1057	XChangeProperty (disp, top,	1042	XChangeProperty (disp, top,
1058	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1043	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1059	PropModeReplace, (unsigned char *)&pid, 1);	1044	PropModeReplace, (unsigned char *)&pid, 1);
		1045
		1046	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1060	#endif	1047	#endif
1061		1048
1062	XSelectInput (disp, top,	1049	XSelectInput (disp, top,
1063	KeyPressMask	1050	KeyPressMask
1064	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1051	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1065	\| KeyReleaseMask	1052	\| KeyReleaseMask
1066	#endif	1053	#endif
1067	\| FocusChangeMask \| VisibilityChangeMask	1054	\| FocusChangeMask \| VisibilityChangeMask
1068	\| ExposureMask
1069	\| StructureNotifyMask);	1055	\| ExposureMask \| StructureNotifyMask);
		1056
1070	termwin_ev.start (display, top);	1057	termwin_ev.start (display, top);
1071		1058
1072	#if ENABLE_FRILLS	1059	#if ENABLE_FRILLS
1073	if (mwmhints.flags)	1060	if (mwmhints.flags)
1074	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1061	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1099	attributes.bit_gravity = NorthWestGravity;	1086	attributes.bit_gravity = NorthWestGravity;
1100	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1087	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1101		1088
1102	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1089	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1103		1090
1104	pointer_unblank ();
1105
1106	#ifdef POINTER_BLANK	1091	#ifdef POINTER_BLANK
1107	if (options & Opt_pointerBlank)	1092	if (options & Opt_pointerBlank)
1108	vt_emask \|= PointerMotionMask;	1093	vt_emask \|= PointerMotionMask;
1109	else	1094	else
1110	#endif	1095	#endif
…		…
1179	// initially we are in unfocused state	1164	// initially we are in unfocused state
1180	if (rs[Rs_fade])	1165	if (rs[Rs_fade])
1181	pix_colors = pix_colors_unfocused;	1166	pix_colors = pix_colors_unfocused;
1182	#endif	1167	#endif
1183		1168
		1169	pointer_unblank ();
1184	scr_recolour ();	1170	scr_recolour ();
		1171
		1172	#if ENABLE_XEMBED
		1173	if (rs[Rs_embed])
		1174	{
		1175	long info[2] = { 0, XEMBED_MAPPED };
		1176
		1177	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1178	32, PropModeReplace, (unsigned char *)&info, 2);
		1179	}
		1180	#endif
1185	}	1181	}
1186		1182
1187	/* ------------------------------------------------------------------------- *	1183	/* ------------------------------------------------------------------------- *
1188	* GET TTY CURRENT STATE *	1184	* GET TTY CURRENT STATE *
1189	* ------------------------------------------------------------------------- */	1185	* ------------------------------------------------------------------------- */

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs. Revision 1.117 by root, Thu Jul 7 19:37:47 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.117 by root, Thu Jul 7 19:37:47 2005 UTC