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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

…		…
36	#include "keyboard.h"	36	#include "keyboard.h"
37	#include "rxvtperl.h"	37	#include "rxvtperl.h"
38		38
39	#include <limits>	39	#include <limits>
40		40
41	#include <cassert>	41	#include <assert.h>
42	#include <csignal>	42	#include <signal.h>
43	#include <cstring>	43	#include <string.h>
44		44
45	#include <termios.h>	45	#include <termios.h>
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 <clocale>	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
…		…
233	if (display)	231	if (display)
234	{	232	{
235	selection_clear ();	233	selection_clear ();
236	selection_clear (true);	234	selection_clear (true);
237		235
238	#ifdef USE_XIM	236	#if USE_XIM
239	im_destroy ();	237	im_destroy ();
240	#endif	238	#endif
241	scrollBar.destroy ();	239	scrollBar.destroy ();
242	if (gc) XFreeGC (dpy, gc);	240	if (gc) XFreeGC (dpy, gc);
243		241
…		…
313	{	311	{
314	#if USE_XIM	312	#if USE_XIM
315	im_ev.stop (display);	313	im_ev.stop (display);
316	#endif	314	#endif
317	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	316	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	317	rootwin_ev.stop (display);
320	#endif	318	#endif
321	termwin_ev.stop (display);	319	termwin_ev.stop (display);
322	vt_ev.stop (display);	320	vt_ev.stop (display);
323	}	321	}
…		…
350		348
351	delete this;	349	delete this;
352	}	350	}
353		351
354	void	352	void
355	rxvt_term::set_option (uint8_t opt, bool set)	353	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356	{	354	{
357	if (!opt)	355	if (!opt)
358	return;	356	return;
359		357
360	uint8_t mask = 1 << (opt & 7);	358	uint8_t mask = 1 << (opt & 7);
…		…
364	}	362	}
365		363
366	/----------------------------------------------------------------------/	364	/----------------------------------------------------------------------/
367	/*	365	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	366	* 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	*/	367	*/
371	static XErrorHandler old_xerror_handler;	368	static XErrorHandler old_xerror_handler;
372		369
373	static void	370	static void
374	rxvt_emergency_cleanup ()	371	rxvt_emergency_cleanup ()
…		…
376	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	373	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377	(*t)->emergency_cleanup ();	374	(*t)->emergency_cleanup ();
378	}	375	}
379		376
380	#if !ENABLE_MINIMAL	377	#if !ENABLE_MINIMAL
381	static void	378	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	379	print_x_error (Display dpy, XErrorEvent event)
383	{	380	{
384	char buffer[BUFSIZ];	381	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	382	char mesg[BUFSIZ];
386	char number[32];	383	char number[32];
387	const char mtype[] = "XlibMessage";	384
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");	385	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		386
		387	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		388	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		389
		390	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		391	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	392	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		393
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	394	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	395	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394	sprintf(number, "%d", event->request_code);	396
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);
397	if (event->request_code >= 128) {	397	if (event->request_code >= 128)
		398	{
		399	#if 0
		400	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		401	int nexts;
		402	char **exts = XListExtensions (dpy, &nexts);
		403
		404	while (nexts)
		405	{
		406	char *extname = exts [nexts - 1];
		407	int major, first_event, first_error;
		408
		409	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		410	{
		411	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		412	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		413
		414	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		415	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		416	rxvt_warn ("+ (which is %s)\n", buffer);
		417
		418	break;
		419	}
		420
		421	printf ("nextss %d %s\n", nexts, extname);//D
		422	--nexts;
		423	++exts;
		424	}
		425	#else
		426	int nexts = 0;
		427	char **exts = 0;
		428	#endif
		429
		430	if (!nexts)
		431	{
		432	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		433
398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	434	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399	mesg, BUFSIZ);	435	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	436
		437	#if 0
		438	sprintf (number, "RENDER.%d", event->minor_code);
		439	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		440	rxvt_warn ("+ (which is %s)\n", buffer);
		441	#endif
		442	}
		443
		444	XFreeExtensionList (exts);
401	}	445	}
		446	else
		447	{
		448	sprintf (number, "%d", event->request_code);
		449	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		450	rxvt_warn ("+ (which is %s)\n", buffer);
		451	}
		452
402	if ((event->error_code == BadWindow) \|\|	453	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	454	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	455	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	456	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	457	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	458	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	459	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	460	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	461	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	462	\|\| event->error_code == BadAtom)
		463	{
412	if (event->error_code == BadValue)	464	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	465	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	466	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	467	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	468	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	469	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		470
429	int	471	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		472	}
		473	}
		474	#endif
		475
		476	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	477	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	478	{
432	if (GET_R->allowedxerror == -1)	479	if (GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	480	GET_R->allowedxerror = event->error_code;
434	else	481	else
…		…
443	}	490	}
444		491
445	return 0;	492	return 0;
446	}	493	}
447		494
448	int	495	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	496	rxvt_xioerror_handler (Display *display)
450	{	497	{
451	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	498	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452	DisplayString (display));	499	DisplayString (display));
453	rxvt_emergency_cleanup ();	500	rxvt_emergency_cleanup ();
…		…
573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	620	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574	// TODO: handle this with exceptions and tolerate the memory loss	621	// TODO: handle this with exceptions and tolerate the memory loss
575	XSetIOErrorHandler (rxvt_xioerror_handler);	622	XSetIOErrorHandler (rxvt_xioerror_handler);
576		623
577	XrmInitialize ();	624	XrmInitialize ();
		625
		626	#if HAVE_PIXBUF
		627	g_type_init ();
		628	#endif
578	}	629	}
579		630
580	/----------------------------------------------------------------------/	631	/----------------------------------------------------------------------/
581	/*	632	/*
582	* window size/position calculations for XSizeHint and other storage.	633	* window size/position calculations for XSizeHint and other storage.
…		…
766		817
767	delete fontset[0];	818	delete fontset[0];
768	fontset[0] = fs;	819	fontset[0] = fs;
769		820
770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	821	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771	prop.height += lineSpace;	822	prop.width = max (prop.width + letterSpace, 1);
772	prop.width += letterSpace;
773		823
774	fs->set_prop (prop, false);	824	fs->set_prop (prop, false);
775		825
776	fwidth = prop.width;	826	fwidth = prop.width;
777	fheight = prop.height;	827	fheight = prop.height + lineSpace;
778	fbase = prop.ascent;	828	fbase = prop.ascent;
779		829
780	for (int style = 1; style < 4; style++)	830	for (int style = 1; style < 4; style++)
781	{	831	{
782	#if ENABLE_STYLES	832	#if ENABLE_STYLES
…		…
964		1014
965	for (i = Color_Black; i <= Color_White; i++)	1015	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_bg] == pix_colors[i])	1016	if (pix_colors[Color_bg] == pix_colors[i])
967	{	1017	{
968	sprintf (bstr, "%d", i - Color_Black);	1018	sprintf (bstr, "%d", i - Color_Black);
969	#ifdef BG_IMAGE_FROM_FILE	1019	#if BG_IMAGE_FROM_FILE
970	xpmb = "default;";	1020	xpmb = "default;";
971	#endif	1021	#endif
972	break;	1022	break;
973	}	1023	}
974		1024
…		…
1077		1127
1078	XMoveResizeWindow (dpy, vt,	1128	XMoveResizeWindow (dpy, vt,
1079	window_vt_x, window_vt_y,	1129	window_vt_x, window_vt_y,
1080	vt_width, vt_height);	1130	vt_width, vt_height);
1081		1131
		1132	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1133
1082	#ifdef HAVE_BG_PIXMAP	1134	#ifdef HAVE_BG_PIXMAP
1083	if (bg_window_size_sensitive ())	1135	if (bg_window_size_sensitive ())
1084	update_background ();	1136	update_background ();
1085	#endif	1137	#endif
1086	}	1138	}
1087		1139
1088	if (fix_screen \|\| old_height == 0)	1140	if (fix_screen \|\| old_height == 0)
1089	scr_reset ();	1141	scr_reset ();
1090		1142
1091	#ifdef USE_XIM	1143	#if USE_XIM
1092	im_set_position ();	1144	im_set_position ();
1093	#endif	1145	#endif
1094	}	1146	}
1095		1147
1096	/*	1148	/*
…		…
1121	}	1173	}
1122		1174
1123	/* -------------------------------------------------------------------- *	1175	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1176	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1177	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1178	#if USE_XIM
1127		1179
1128	void	1180	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1181	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1182	{
1131	fg = pix_colors [Color_fg];	1183	fg = pix_colors [Color_fg];
…		…
1528	im_destroy ();	1580	im_destroy ();
1529		1581
1530	if (Input_Context)	1582	if (Input_Context)
1531	return;	1583	return;
1532		1584
1533	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1534	if (rs[Rs_imLocale])	1585	if (rs[Rs_imLocale])
1535	SET_LOCALE (rs[Rs_imLocale]);	1586	SET_LOCALE (rs[Rs_imLocale]);
1536	#endif
1537		1587
1538	p = rs[Rs_inputMethod];	1588	p = rs[Rs_inputMethod];
1539	if (p && *p)	1589	if (p && *p)
1540	{	1590	{
1541	bool found = false;	1591	bool found = false;
…		…
1568		1618
1569	/* try with no modifiers base IF the user didn't specify an IM */	1619	/* try with no modifiers base IF the user didn't specify an IM */
1570	if (im_get_ic ("@im=none"))	1620	if (im_get_ic ("@im=none"))
1571	goto done;	1621	goto done;
1572		1622
1573	done: ;	1623	done:
1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1575	if (rs[Rs_imLocale])	1624	if (rs[Rs_imLocale])
1576	SET_LOCALE (locale);	1625	SET_LOCALE (locale);
1577	#endif
1578	}	1626	}
1579		1627
1580	void	1628	void
1581	rxvt_term::im_set_position ()	1629	rxvt_term::im_set_position ()
1582	{	1630	{
…		…
1627	{	1675	{
1628	Window cr;	1676	Window cr;
1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1677	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630	}	1678	}
1631		1679
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	1680	#ifdef HAVE_BG_PIXMAP
1655		1681
1656	void	1682	void
1657	rxvt_term::update_background ()	1683	rxvt_term::update_background ()
1658	{	1684	{

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs. Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC