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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.369 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC

…		…
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <locale.h>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	struct termios rxvt_term::def_tio;	54	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
58		56
…		…
170	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);
171	#endif	169	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	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);
174	#endif	172	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	175	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	177	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	179	#endif
182	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	182	#endif
…		…
228		226
229	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
230	bg_destroy ();	228	bg_destroy ();
231	#endif	229	#endif
232		230
		231	#if HAVE_IMG
		232	delete bg_img;
		233	#endif
		234
233	if (display)	235	if (display)
234	{	236	{
235	selection_clear ();	237	selection_clear ();
236	selection_clear (true);	238	selection_clear (true);
237		239
238	#ifdef USE_XIM	240	#if USE_XIM
239	im_destroy ();	241	im_destroy ();
240	#endif	242	#endif
241	scrollBar.destroy ();	243	scrollBar.destroy ();
242	if (gc) XFreeGC (dpy, gc);	244	if (gc) XFreeGC (dpy, gc);
243		245
…		…
313	{	315	{
314	#if USE_XIM	316	#if USE_XIM
315	im_ev.stop (display);	317	im_ev.stop (display);
316	#endif	318	#endif
317	scrollbar_ev.stop (display);	319	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	320	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	321	rootwin_ev.stop (display);
320	#endif	322	#endif
321	termwin_ev.stop (display);	323	termwin_ev.stop (display);
322	vt_ev.stop (display);	324	vt_ev.stop (display);
323	}	325	}
…		…
364	}	366	}
365		367
366	/----------------------------------------------------------------------/	368	/----------------------------------------------------------------------/
367	/*	369	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	370	* Exit gracefully, clearing the utmp entry and restoring tty attributes
369	* TODO: if debugging, this should free up any known resources if we can
370	*/	371	*/
371	static XErrorHandler old_xerror_handler;	372	static XErrorHandler old_xerror_handler;
372		373
373	static void	374	static void
374	rxvt_emergency_cleanup ()	375	rxvt_emergency_cleanup ()
…		…
376	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++)
377	(*t)->emergency_cleanup ();	378	(*t)->emergency_cleanup ();
378	}	379	}
379		380
380	#if !ENABLE_MINIMAL	381	#if !ENABLE_MINIMAL
381	static void	382	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	383	print_x_error (Display dpy, XErrorEvent event)
383	{	384	{
384	char buffer[BUFSIZ];	385	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	386	char mesg[BUFSIZ];
386	char number[32];	387	char number[32];
387	const char mtype[] = "XlibMessage";	388
388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390	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);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	396	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		397
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	398	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	399	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394	sprintf(number, "%d", event->request_code);	400
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);
397	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
398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	438	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399	mesg, BUFSIZ);	439	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400	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);
401	}	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
402	if ((event->error_code == BadWindow) \|\|	457	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	458	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	459	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	460	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	461	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	462	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	463	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	464	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	465	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	466	\|\| event->error_code == BadAtom)
		467	{
412	if (event->error_code == BadValue)	468	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	469	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	470	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	471	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	472	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	473	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422	}
423	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424	mesg, BUFSIZ);
425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426	}
427	#endif
428		474
429	int	475	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		476	}
		477	}
		478	#endif
		479
		480	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	481	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	482	{
432	if (GET_R->allowedxerror == -1)	483	if (GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	484	GET_R->allowedxerror = event->error_code;
434	else	485	else
…		…
443	}	494	}
444		495
445	return 0;	496	return 0;
446	}	497	}
447		498
448	int	499	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	500	rxvt_xioerror_handler (Display *display)
450	{	501	{
451	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",
452	DisplayString (display));	503	DisplayString (display));
453	rxvt_emergency_cleanup ();	504	rxvt_emergency_cleanup ();
…		…
573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	624	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574	// TODO: handle this with exceptions and tolerate the memory loss	625	// TODO: handle this with exceptions and tolerate the memory loss
575	XSetIOErrorHandler (rxvt_xioerror_handler);	626	XSetIOErrorHandler (rxvt_xioerror_handler);
576		627
577	XrmInitialize ();	628	XrmInitialize ();
		629
		630	#if HAVE_PIXBUF
		631	g_type_init ();
		632	#endif
578	}	633	}
579		634
580	/----------------------------------------------------------------------/	635	/----------------------------------------------------------------------/
581	/*	636	/*
582	* window size/position calculations for XSizeHint and other storage.	637	* window size/position calculations for XSizeHint and other storage.
…		…
766		821
767	delete fontset[0];	822	delete fontset[0];
768	fontset[0] = fs;	823	fontset[0] = fs;
769		824
770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	825	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771	prop.height += lineSpace;	826	prop.width = max (prop.width + letterSpace, 1);
772	prop.width += letterSpace;
773		827
774	fs->set_prop (prop, false);	828	fs->set_prop (prop, false);
775		829
776	fwidth = prop.width;	830	fwidth = prop.width;
777	fheight = prop.height;	831	fheight = prop.height + lineSpace;
778	fbase = prop.ascent;	832	fbase = prop.ascent;
779		833
780	for (int style = 1; style < 4; style++)	834	for (int style = 1; style < 4; style++)
781	{	835	{
782	#if ENABLE_STYLES	836	#if ENABLE_STYLES
…		…
964		1018
965	for (i = Color_Black; i <= Color_White; i++)	1019	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_bg] == pix_colors[i])	1020	if (pix_colors[Color_bg] == pix_colors[i])
967	{	1021	{
968	sprintf (bstr, "%d", i - Color_Black);	1022	sprintf (bstr, "%d", i - Color_Black);
969	#ifdef BG_IMAGE_FROM_FILE	1023	#if BG_IMAGE_FROM_FILE
970	xpmb = "default;";	1024	xpmb = "default;";
971	#endif	1025	#endif
972	break;	1026	break;
973	}	1027	}
974		1028
…		…
1077		1131
1078	XMoveResizeWindow (dpy, vt,	1132	XMoveResizeWindow (dpy, vt,
1079	window_vt_x, window_vt_y,	1133	window_vt_x, window_vt_y,
1080	vt_width, vt_height);	1134	vt_width, vt_height);
1081		1135
		1136	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1137
1082	#ifdef HAVE_BG_PIXMAP	1138	#ifdef HAVE_BG_PIXMAP
1083	if (bg_window_size_sensitive ())	1139	if (bg_window_size_sensitive ())
1084	update_background ();	1140	update_background ();
1085	#endif	1141	#endif
1086	}	1142	}
1087		1143
1088	if (fix_screen \|\| old_height == 0)	1144	if (fix_screen \|\| old_height == 0)
1089	scr_reset ();	1145	scr_reset ();
1090		1146
1091	#ifdef USE_XIM	1147	#if USE_XIM
1092	im_set_position ();	1148	im_set_position ();
1093	#endif	1149	#endif
1094	}	1150	}
1095		1151
1096	/*	1152	/*
…		…
1121	}	1177	}
1122		1178
1123	/* -------------------------------------------------------------------- *	1179	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1180	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1181	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1182	#if USE_XIM
1127		1183
1128	void	1184	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1185	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1186	{
1131	fg = pix_colors [Color_fg];	1187	fg = pix_colors [Color_fg];
…		…
1528	im_destroy ();	1584	im_destroy ();
1529		1585
1530	if (Input_Context)	1586	if (Input_Context)
1531	return;	1587	return;
1532		1588
1533	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1534	if (rs[Rs_imLocale])	1589	if (rs[Rs_imLocale])
1535	SET_LOCALE (rs[Rs_imLocale]);	1590	SET_LOCALE (rs[Rs_imLocale]);
1536	#endif
1537		1591
1538	p = rs[Rs_inputMethod];	1592	p = rs[Rs_inputMethod];
1539	if (p && *p)	1593	if (p && *p)
1540	{	1594	{
1541	bool found = false;	1595	bool found = false;
…		…
1568		1622
1569	/* try with no modifiers base IF the user didn't specify an IM */	1623	/* try with no modifiers base IF the user didn't specify an IM */
1570	if (im_get_ic ("@im=none"))	1624	if (im_get_ic ("@im=none"))
1571	goto done;	1625	goto done;
1572		1626
1573	done: ;	1627	done:
1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1575	if (rs[Rs_imLocale])	1628	if (rs[Rs_imLocale])
1576	SET_LOCALE (locale);	1629	SET_LOCALE (locale);
1577	#endif
1578	}	1630	}
1579		1631
1580	void	1632	void
1581	rxvt_term::im_set_position ()	1633	rxvt_term::im_set_position ()
1582	{	1634	{
…		…
1627	{	1679	{
1628	Window cr;	1680	Window cr;
1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1681	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630	}	1682	}
1631		1683
1632	Pixmap
1633	rxvt_term::get_pixmap_property (Atom property)
1634	{
1635	Pixmap pixmap = None;
1636
1637	int aformat;
1638	unsigned long nitems, bytes_after;
1639	Atom atype;
1640	unsigned char *prop;
1641	int result = XGetWindowProperty (dpy, display->root, property,
1642	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643	&nitems, &bytes_after, &prop);
1644	if (result == Success)
1645	{
1646	if (atype == XA_PIXMAP)
1647	pixmap = (Pixmap )prop;
1648	XFree (prop);
1649	}
1650
1651	return pixmap;
1652	}
1653
1654	#ifdef HAVE_BG_PIXMAP	1684	#ifdef HAVE_BG_PIXMAP
1655		1685
1656	void	1686	void
1657	rxvt_term::update_background ()	1687	rxvt_term::update_background ()
1658	{	1688	{
1659	if (update_background_ev.is_active ())	1689	if (update_background_ev.is_active ())
1660	return;	1690	return;
1661		1691
1662	bg_invalidate ();	1692	bg_flags &= BG_INHIBIT_RENDER;
1663		1693
1664	if (!mapped)	1694	if (!mapped)
1665	return;	1695	return;
1666		1696
1667	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.369 by sf-exg, Thu Jan 19 13:33:43 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.369 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC