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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 2012 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC

…		…
168	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	168	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169	#endif	169	#endif
170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	171	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172	#endif	172	#endif
173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175	#endif	175	#endif
176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177	#ifdef USE_XIM	177	#if USE_XIM
178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
179	#endif	179	#endif
180	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
182	#endif	182	#endif
…		…
226		226
227	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
228	bg_destroy ();	228	bg_destroy ();
229	#endif	229	#endif
230		230
		231	#if HAVE_IMG
		232	delete bg_img;
		233	#endif
		234
231	if (display)	235	if (display)
232	{	236	{
233	selection_clear ();	237	selection_clear ();
234	selection_clear (true);	238	selection_clear (true);
235		239
236	#ifdef USE_XIM	240	#if USE_XIM
237	im_destroy ();	241	im_destroy ();
238	#endif	242	#endif
239	scrollBar.destroy ();	243	scrollBar.destroy ();
240	if (gc) XFreeGC (dpy, gc);	244	if (gc) XFreeGC (dpy, gc);
241		245
…		…
311	{	315	{
312	#if USE_XIM	316	#if USE_XIM
313	im_ev.stop (display);	317	im_ev.stop (display);
314	#endif	318	#endif
315	scrollbar_ev.stop (display);	319	scrollbar_ev.stop (display);
316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	320	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
317	rootwin_ev.stop (display);	321	rootwin_ev.stop (display);
318	#endif	322	#endif
319	termwin_ev.stop (display);	323	termwin_ev.stop (display);
320	vt_ev.stop (display);	324	vt_ev.stop (display);
321	}	325	}
…		…
362	}	366	}
363		367
364	/----------------------------------------------------------------------/	368	/----------------------------------------------------------------------/
365	/*	369	/*
366	* Exit gracefully, clearing the utmp entry and restoring tty attributes	370	* Exit gracefully, clearing the utmp entry and restoring tty attributes
367	* TODO: if debugging, this should free up any known resources if we can
368	*/	371	*/
369	static XErrorHandler old_xerror_handler;	372	static XErrorHandler old_xerror_handler;
370		373
371	static void	374	static void
372	rxvt_emergency_cleanup ()	375	rxvt_emergency_cleanup ()
…		…
374	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	377	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375	(*t)->emergency_cleanup ();	378	(*t)->emergency_cleanup ();
376	}	379	}
377		380
378	#if !ENABLE_MINIMAL	381	#if !ENABLE_MINIMAL
379	static void	382	static void ecb_cold
380	print_x_error (Display dpy, XErrorEvent event)	383	print_x_error (Display dpy, XErrorEvent event)
381	{	384	{
382	char buffer[BUFSIZ];	385	char buffer[BUFSIZ];
383	char mesg[BUFSIZ];	386	char mesg[BUFSIZ];
384	char number[32];	387	char number[32];
385	const char mtype[] = "XlibMessage";	388
386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	389	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		390
		391	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		392	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		393
		394	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		395	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389	rxvt_warn ("%s: %s\n", mesg, buffer);	396	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		397
390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	398	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	399	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
392	sprintf(number, "%d", event->request_code);	400
393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394	rxvt_warn ("(which is %s)\n", buffer);
395	if (event->request_code >= 128) {	401	if (event->request_code >= 128)
		402	{
		403	#if 0
		404	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		405	int nexts;
		406	char **exts = XListExtensions (dpy, &nexts);
		407
		408	while (nexts)
		409	{
		410	char *extname = exts [nexts - 1];
		411	int major, first_event, first_error;
		412
		413	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		414	{
		415	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		416	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		417
		418	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		419	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		420	rxvt_warn ("+ (which is %s)\n", buffer);
		421
		422	break;
		423	}
		424
		425	printf ("nextss %d %s\n", nexts, extname);//D
		426	--nexts;
		427	++exts;
		428	}
		429	#else
		430	int nexts = 0;
		431	char **exts = 0;
		432	#endif
		433
		434	if (!nexts)
		435	{
		436	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		437
396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	438	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397	mesg, BUFSIZ);	439	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	440
		441	#if 0
		442	sprintf (number, "RENDER.%d", event->minor_code);
		443	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		444	rxvt_warn ("+ (which is %s)\n", buffer);
		445	#endif
		446	}
		447
		448	XFreeExtensionList (exts);
399	}	449	}
		450	else
		451	{
		452	sprintf (number, "%d", event->request_code);
		453	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		454	rxvt_warn ("+ (which is %s)\n", buffer);
		455	}
		456
400	if ((event->error_code == BadWindow) \|\|	457	if (event->error_code == BadWindow
401	(event->error_code == BadPixmap) \|\|	458	\|\| event->error_code == BadPixmap
402	(event->error_code == BadCursor) \|\|	459	\|\| event->error_code == BadCursor
403	(event->error_code == BadFont) \|\|	460	\|\| event->error_code == BadFont
404	(event->error_code == BadDrawable) \|\|	461	\|\| event->error_code == BadDrawable
405	(event->error_code == BadColor) \|\|	462	\|\| event->error_code == BadColor
406	(event->error_code == BadGC) \|\|	463	\|\| event->error_code == BadGC
407	(event->error_code == BadIDChoice) \|\|	464	\|\| event->error_code == BadIDChoice
408	(event->error_code == BadValue) \|\|	465	\|\| event->error_code == BadValue
409	(event->error_code == BadAtom)) {	466	\|\| event->error_code == BadAtom)
		467	{
410	if (event->error_code == BadValue)	468	if (event->error_code == BadValue)
411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	469	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412	mesg, BUFSIZ);
413	else if (event->error_code == BadAtom)	470	else if (event->error_code == BadAtom)
414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	471	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415	mesg, BUFSIZ);
416	else	472	else
417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	473	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418	mesg, BUFSIZ);
419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420	}
421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422	mesg, BUFSIZ);
423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424	}
425	#endif
426		474
427	int	475	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		476	}
		477	}
		478	#endif
		479
		480	int ecb_cold
428	rxvt_xerror_handler (Display display, XErrorEvent event)	481	rxvt_xerror_handler (Display display, XErrorEvent event)
429	{	482	{
430	if (GET_R->allowedxerror == -1)	483	if (GET_R->allowedxerror == -1)
431	GET_R->allowedxerror = event->error_code;	484	GET_R->allowedxerror = event->error_code;
432	else	485	else
…		…
441	}	494	}
442		495
443	return 0;	496	return 0;
444	}	497	}
445		498
446	int	499	int ecb_cold
447	rxvt_xioerror_handler (Display *display)	500	rxvt_xioerror_handler (Display *display)
448	{	501	{
449	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	502	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450	DisplayString (display));	503	DisplayString (display));
451	rxvt_emergency_cleanup ();	504	rxvt_emergency_cleanup ();
…		…
571	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	624	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
572	// TODO: handle this with exceptions and tolerate the memory loss	625	// TODO: handle this with exceptions and tolerate the memory loss
573	XSetIOErrorHandler (rxvt_xioerror_handler);	626	XSetIOErrorHandler (rxvt_xioerror_handler);
574		627
575	XrmInitialize ();	628	XrmInitialize ();
		629
		630	#if HAVE_PIXBUF
		631	g_type_init ();
		632	#endif
576	}	633	}
577		634
578	/----------------------------------------------------------------------/	635	/----------------------------------------------------------------------/
579	/*	636	/*
580	* window size/position calculations for XSizeHint and other storage.	637	* window size/position calculations for XSizeHint and other storage.
…		…
764		821
765	delete fontset[0];	822	delete fontset[0];
766	fontset[0] = fs;	823	fontset[0] = fs;
767		824
768	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	825	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
769	prop.width += letterSpace;	826	prop.width = max (prop.width + letterSpace, 1);
770		827
771	fs->set_prop (prop, false);	828	fs->set_prop (prop, false);
772		829
773	fwidth = prop.width;	830	fwidth = prop.width;
774	fheight = prop.height + lineSpace;	831	fheight = prop.height + lineSpace;
…		…
961		1018
962	for (i = Color_Black; i <= Color_White; i++)	1019	for (i = Color_Black; i <= Color_White; i++)
963	if (pix_colors[Color_bg] == pix_colors[i])	1020	if (pix_colors[Color_bg] == pix_colors[i])
964	{	1021	{
965	sprintf (bstr, "%d", i - Color_Black);	1022	sprintf (bstr, "%d", i - Color_Black);
966	#ifdef BG_IMAGE_FROM_FILE	1023	#if BG_IMAGE_FROM_FILE
967	xpmb = "default;";	1024	xpmb = "default;";
968	#endif	1025	#endif
969	break;	1026	break;
970	}	1027	}
971		1028
…		…
1074		1131
1075	XMoveResizeWindow (dpy, vt,	1132	XMoveResizeWindow (dpy, vt,
1076	window_vt_x, window_vt_y,	1133	window_vt_x, window_vt_y,
1077	vt_width, vt_height);	1134	vt_width, vt_height);
1078		1135
		1136	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1137
1079	#ifdef HAVE_BG_PIXMAP	1138	#ifdef HAVE_BG_PIXMAP
1080	if (bg_window_size_sensitive ())	1139	if (bg_window_size_sensitive ())
1081	update_background ();	1140	update_background ();
1082	#endif	1141	#endif
1083	}	1142	}
1084		1143
1085	if (fix_screen \|\| old_height == 0)	1144	if (fix_screen \|\| old_height == 0)
1086	scr_reset ();	1145	scr_reset ();
1087		1146
1088	#ifdef USE_XIM	1147	#if USE_XIM
1089	im_set_position ();	1148	im_set_position ();
1090	#endif	1149	#endif
1091	}	1150	}
1092		1151
1093	/*	1152	/*
…		…
1118	}	1177	}
1119		1178
1120	/* -------------------------------------------------------------------- *	1179	/* -------------------------------------------------------------------- *
1121	* - X INPUT METHOD ROUTINES - *	1180	* - X INPUT METHOD ROUTINES - *
1122	* -------------------------------------------------------------------- */	1181	* -------------------------------------------------------------------- */
1123	#ifdef USE_XIM	1182	#if USE_XIM
1124		1183
1125	void	1184	void
1126	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1185	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127	{	1186	{
1128	fg = pix_colors [Color_fg];	1187	fg = pix_colors [Color_fg];
…		…
1620	{	1679	{
1621	Window cr;	1680	Window cr;
1622	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1681	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1623	}	1682	}
1624		1683
1625	Pixmap
1626	rxvt_term::get_pixmap_property (Atom property)
1627	{
1628	Pixmap pixmap = None;
1629
1630	int aformat;
1631	unsigned long nitems, bytes_after;
1632	Atom atype;
1633	unsigned char *prop;
1634	int result = XGetWindowProperty (dpy, display->root, property,
1635	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1636	&nitems, &bytes_after, &prop);
1637	if (result == Success)
1638	{
1639	if (atype == XA_PIXMAP)
1640	pixmap = (Pixmap )prop;
1641	XFree (prop);
1642	}
1643
1644	return pixmap;
1645	}
1646
1647	#ifdef HAVE_BG_PIXMAP	1684	#ifdef HAVE_BG_PIXMAP
1648		1685
1649	void	1686	void
1650	rxvt_term::update_background ()	1687	rxvt_term::update_background ()
1651	{	1688	{
1652	if (update_background_ev.is_active ())	1689	if (update_background_ev.is_active ())
1653	return;	1690	return;
1654		1691
1655	bg_invalidate ();	1692	bg_flags &= BG_INHIBIT_RENDER;
1656		1693
1657	if (!mapped)	1694	if (!mapped)
1658	return;	1695	return;
1659		1696
1660	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1697	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 2012 UTC vs. Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 2012 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC