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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
186	#endif	187	#endif
187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194		194
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
…		…
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
228		228
229	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	230	bg_destroy ();
231	#endif
232	#ifdef HAVE_AFTERIMAGE
233	if (asv)
234	destroy_asvisual (asv, 0);
235	if (asimman)
236	destroy_image_manager (asimman, 0);
237	#endif	231	#endif
238		232
239	if (display)	233	if (display)
240	{	234	{
241	selection_clear ();	235	selection_clear ();
…		…
247	scrollBar.destroy ();	241	scrollBar.destroy ();
248	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
249		243
250	delete drawable;	244	delete drawable;
251	// destroy all windows	245	// destroy all windows
252	if (parent[0])	246	if (parent)
253	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
254		248
255	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
256	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
257	{	251	{
258	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
278	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
279	free (env_display);	273	free (env_display);
280	free (env_term);	274	free (env_term);
281	free (locale);	275	free (locale);
282	free (v_buffer);	276	free (v_buffer);
283	free (incr_buf);	277
		278	delete selection_req;
284		279
285	delete envv;	280	delete envv;
286	delete argv;	281	delete argv;
287		282
288	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
324	#endif	319	#endif
325	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
327	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
328	#endif	323	#endif
329	incr_ev.stop ();
330	termwin_ev.stop (display);	324	termwin_ev.stop (display);
331	vt_ev.stop (display);	325	vt_ev.stop (display);
332	}	326	}
333		327
334	flush_ev.stop ();	328	flush_ev.stop ();
…		…
356	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
357	{	351	{
358	make_current ();	352	make_current ();
359		353
360	delete this;	354	delete this;
		355	}
		356
		357	void
		358	rxvt_term::set_option (uint8_t opt, bool set)
		359	{
		360	if (!opt)
		361	return;
		362
		363	uint8_t mask = 1 << (opt & 7);
		364	uint8_t &val = options [opt >> 3];
		365
		366	val = val & ~mask \| (set ? mask : 0);
361	}	367	}
362		368
363	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
364	/*	370	/*
365	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
379	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
380	{	386	{
381	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
382	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
383	char number[32];	389	char number[32];
384	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
385	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387	rxvt_warn ("An X Error occured, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
389	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
392	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
394	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
395	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396	mesg, BUFSIZ);	402	mesg, BUFSIZ);
397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398	}	404	}
399	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
400	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
401	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
402	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
403	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
404	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
405	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
406	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
407	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
408	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
409	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
410	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411	mesg, BUFSIZ);	417	mesg, BUFSIZ);
412	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
413	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414	mesg, BUFSIZ);	420	mesg, BUFSIZ);
415	else	421	else
416	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417	mesg, BUFSIZ);	423	mesg, BUFSIZ);
418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419	}	425	}
420	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421	mesg, BUFSIZ);	427	mesg, BUFSIZ);
422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423	}	429	}
424	#endif	430	#endif
425		431
426	int	432	int
…		…
473	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
474	w.stop ();	480	w.stop ();
475	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
476	}	482	}
477		483
		484	static void
		485	rxvt_get_ttymode (struct termios *tio)
		486	{
		487	if (tcgetattr (STDIN_FILENO, tio) < 0)
		488	memset (tio, 0, sizeof (struct termios));
		489
		490	for (int i = 0; i < NCCS; i++)
		491	tio->c_cc[i] = VDISABLE;
		492
		493	tio->c_cc[VINTR] = CINTR;
		494	tio->c_cc[VQUIT] = CQUIT;
		495	tio->c_cc[VERASE] = CERASE;
		496	#ifdef VERASE2
		497	tio->c_cc[VERASE2] = CERASE2;
		498	#endif
		499	tio->c_cc[VKILL] = CKILL;
		500	tio->c_cc[VEOF] = CEOF;
		501	tio->c_cc[VSTART] = CSTART;
		502	tio->c_cc[VSTOP] = CSTOP;
		503	tio->c_cc[VSUSP] = CSUSP;
		504	# ifdef VDSUSP
		505	tio->c_cc[VDSUSP] = CDSUSP;
		506	# endif
		507	# ifdef VREPRINT
		508	tio->c_cc[VREPRINT] = CRPRNT;
		509	# endif
		510	# ifdef VDISCRD
		511	tio->c_cc[VDISCRD] = CFLUSH;
		512	# endif
		513	# ifdef VWERSE
		514	tio->c_cc[VWERSE] = CWERASE;
		515	# endif
		516	# ifdef VLNEXT
		517	tio->c_cc[VLNEXT] = CLNEXT;
		518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
		522
		523	# if VMIN != VEOF
		524	tio->c_cc[VMIN] = 1;
		525	# endif
		526	# if VTIME != VEOL
		527	tio->c_cc[VTIME] = 0;
		528	# endif
		529
		530	/* input modes */
		531	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		532	# ifdef IMAXBEL
		533	\| IMAXBEL
		534	# endif
		535	\| IXON);
		536
		537	/* output modes */
		538	tio->c_oflag = (OPOST \| ONLCR);
		539
		540	/* control modes */
		541	tio->c_cflag = (CS8 \| CREAD);
		542
		543	/* local modes */
		544	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		545	# if defined (ECHOCTL) && defined (ECHOKE)
		546	\| ECHOCTL \| ECHOKE
		547	# endif
		548	\| ECHOE \| ECHOK);
		549	}
		550
478	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
479		552
480	void	553	void
481	rxvt_init ()	554	rxvt_init ()
482	{	555	{
483	ptytty::init ();	556	assert (("fontMask must not overlap other RS masks",
		557	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
484		558
		559	rxvt_get_ttymode (&rxvt_term::def_tio);
		560
		561	// get rid of stdin/stdout as we don't need them, to free resources
		562	dup2 (STDERR_FILENO, STDIN_FILENO);
		563	dup2 (STDERR_FILENO, STDOUT_FILENO);
		564
485	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
486	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487		567
488	rxvt_environ = environ;	568	rxvt_environ = environ;
489		569
490	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
491	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
492		572
493	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
497	/* signal (SIGURG, SIG_DFL); */
498		575
499	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
501	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
502		579
…		…
658	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
659	#endif	736	#endif
660	}	737	}
661		738
662	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
663	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
664	*
665	* init = 1 - initialize
666	*
667	* fontname == FONT_UP - switch to bigger font
668	* fontname == FONT_DN - switch to smaller font
669	*/
670	bool	741	bool
671	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
672	{	743	{
673	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
674	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
688	#endif	759	#endif
689		760
690	delete fontset[0];	761	delete fontset[0];
691	fontset[0] = fs;	762	fontset[0] = fs;
692		763
693	prop = (*fs)[1]->properties ();	764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694	prop.height += lineSpace;	765	prop.height += lineSpace;
695	prop.width += letterSpace;	766	prop.width += letterSpace;
696		767
697	fs->set_prop (prop, false);	768	fs->set_prop (prop, false);
698		769
…		…
731	#else	802	#else
732	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
733	#endif	804	#endif
734	}	805	}
735		806
736	if (parent[0])	807	if (parent)
737	{	808	{
738	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
739	scr_remap_chars ();	810	scr_remap_chars ();
740	scr_touch (true);	811	scr_touch (true);
741	}	812	}
…		…
744	}	815	}
745		816
746	void	817	void
747	rxvt_term::set_string_property (Atom prop, const char *str, int len)	818	rxvt_term::set_string_property (Atom prop, const char *str, int len)
748	{	819	{
749	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
750	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
751	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
752	}	823	}
753		824
754	void	825	void
		826	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		827	{
		828	XTextProperty ct;
		829
		830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		831	{
		832	XSetTextProperty (dpy, parent, &ct, prop);
		833	XFree (ct.value);
		834	}
		835	}
		836
		837	void
755	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	838	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756	{	839	{
757	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
758	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
759		842
760	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
761	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
762	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
763		846
764	free (s);	847	free (s);
765	free (ws);	848	free (ws);
…		…
769	/----------------------------------------------------------------------/	852	/----------------------------------------------------------------------/
770	/* xterm sequences - title, iconName, color (exptl) */	853	/* xterm sequences - title, iconName, color (exptl) */
771	void	854	void
772	rxvt_term::set_title (const char *str)	855	rxvt_term::set_title (const char *str)
773	{	856	{
774	set_string_property (XA_WM_NAME, str);	857	set_mbstring_property (XA_WM_NAME, str);
775	#if ENABLE_EWMH	858	#if ENABLE_EWMH
776	set_utf8_property (xa[XA_NET_WM_NAME], str);	859	set_utf8_property (xa[XA_NET_WM_NAME], str);
777	#endif	860	#endif
778	}	861	}
779		862
780	void	863	void
781	rxvt_term::set_icon_name (const char *str)	864	rxvt_term::set_icon_name (const char *str)
782	{	865	{
783	set_string_property (XA_WM_ICON_NAME, str);	866	set_mbstring_property (XA_WM_ICON_NAME, str);
784	#if ENABLE_EWMH	867	#if ENABLE_EWMH
785	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786	#endif	869	#endif
787	}	870	}
788		871
…		…
860	void	943	void
861	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
862	{	945	{
863	unsigned int i;	946	unsigned int i;
864	const char *xpmb = "";	947	const char *xpmb = "";
865	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
866		950
867	strcpy (fstr, "default");
868	strcpy (bstr, "default");
869	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
870	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
871	{	953	{
872	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
873	break;	955	break;
874	}	956	}
875		957
876	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
877	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
878	{	960	{
879	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
880	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
881	xpmb = "default;";	963	xpmb = "default;";
882	#endif	964	#endif
883	break;	965	break;
884	}	966	}
…		…
920		1002
921	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1003	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922	if (set_hint)	1004	if (set_hint)
923	{	1005	{
924	szHint.flags &= ~(PBaseSize \| PResizeInc);	1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
925	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
926	szHint.flags \|= PBaseSize \| PResizeInc;	1008	szHint.flags \|= PBaseSize \| PResizeInc;
927	}	1009	}
928		1010
929	if (!ignoreparent)	1011	if (!ignoreparent)
930	{	1012	{
…		…
936	int x, y, x1, y1;	1018	int x, y, x1, y1;
937	int dx, dy;	1019	int dx, dy;
938	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
939	Window unused_cr;	1021	Window unused_cr;
940		1022
941	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
942	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
943	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
944	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
945	/*	1027	/*
946	* if display->root isn't the parent window, a WM will probably have offset	1028	* if display->root isn't the parent window, a WM will probably have offset
947	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
948	*/	1030	*/
…		…
965	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
966	dy = 0;	1048	dy = 0;
967	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
968	dy /= 2;	1050	dy /= 2;
969		1051
970	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
971	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
972	#else	1054	#else
973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
974	#endif	1056	#endif
975	}	1057	}
976		1058
977	if (set_hint)	1059	if (set_hint)
978	XSetWMNormalHints (dpy, parent[0], &szHint);	1060	XSetWMNormalHints (dpy, parent, &szHint);
979		1061
980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
981		1063
982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
983	{	1065	{
…		…
987	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
988	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
989	width, height);	1071	width, height);
990		1072
991	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
992	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
993	update_background ();	1075	update_background ();
994	#endif	1076	#endif
995	}	1077	}
996		1078
997	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
998	scr_reset ();	1080	scr_reset ();
999
1000	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001	//scr_touch (false);
1002
1003	#ifdef HAVE_BG_PIXMAP
1004	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005	// if (bgPixmap.pixmap)
1006	// scr_touch (false);
1007	#endif
1008		1081
1009	#ifdef USE_XIM	1082	#ifdef USE_XIM
1010	IMSetPosition ();	1083	IMSetPosition ();
1011	#endif	1084	#endif
1012	}	1085	}
…		…
1095		1168
1096	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1097	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1098		1171
1099	if (win != None)	1172	if (win != None)
1100	return True;	1173	return true;
1101	}	1174	}
1102		1175
1103	return False;	1176	return false;
1104	}	1177	}
1105		1178
1106	void	1179	void
1107	rxvt_term::IMSendSpot ()	1180	rxvt_term::IMSendSpot ()
1108	{	1181	{
…		…
1165		1238
1166	term->make_current ();	1239	term->make_current ();
1167		1240
1168	if (text)	1241	if (text)
1169	{	1242	{
1170	void *str;	1243	wchar_t *str;
1171		1244
1172	if (!text->encoding_is_wchar && text->string.multi_byte)	1245	if (!text->encoding_is_wchar && text->string.multi_byte)
1173	{	1246	{
1174	// of course, X makes it ugly again	1247	// of course, X makes it ugly again
1175	if (term->rs[Rs_imLocale])	1248	if (term->rs[Rs_imLocale])
1176	SET_LOCALE (term->rs[Rs_imLocale]);	1249	SET_LOCALE (term->rs[Rs_imLocale]);
1177		1250
1178	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1251	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1179	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1252	mbstowcs (str, text->string.multi_byte, text->length + 1);
1180		1253
1181	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1182	SET_LOCALE (term->locale);	1255	SET_LOCALE (term->locale);
1183	}	1256	}
1184	else	1257	else
1185	str = (void *)text->string.wide_char;	1258	str = text->string.wide_char;
1186		1259
1187	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1260	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1188	DT_INT, call_data->caret,	1261	DT_INT, call_data->caret,
1189	DT_INT, call_data->chg_first,	1262	DT_INT, call_data->chg_first,
1190	DT_INT, call_data->chg_length,	1263	DT_INT, call_data->chg_length,
…		…
1228	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1229	unsigned long fg, bg;	1302	unsigned long fg, bg;
1230	const char *p;	1303	const char *p;
1231	char **s;	1304	char **s;
1232	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1233	#ifdef ENABLE_XIM_ONTHESPOT
1234	XIMCallback xcb[4];
1235	#endif
1236		1306
1237	set_environ (envv);	1307	set_environ (envv);
1238		1308
1239	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1240	return false;	1310	return false;
…		…
1261	p = pet[pi];	1331	p = pet[pi];
1262		1332
1263	if (!p)	1333	if (!p)
1264	continue;	1334	continue;
1265		1335
1266	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1267		1337
1268	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1269	{	1339	{
1270	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1271	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1283	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1284		1354
1285	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1286	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1287	{	1357	{
1288	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1289		1359
1290	found = 1;	1360	found = 1;
1291	goto foundpet;	1361	goto foundpet;
1292	}	1362	}
1293		1363
1294	}	1364	}
1295		1365
1296	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1297	}	1367	}
1298		1368
1299	foundpet:	1369	foundpet:
1300		1370
1301	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1380	NULL);	1450	NULL);
1381	}	1451	}
1382	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1383	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1384	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1385	im_set_position (spot);	1457	im_set_position (spot);
1386		1458
1387	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1459	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1460	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1461	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1404	#endif	1476	#endif
1405		1477
1406	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1407	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1408	XNClientWindow, vt,	1480	XNClientWindow, vt,
1409	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1410	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1411	preedit_attr,	1483	preedit_attr,
1412	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1413	status_attr, NULL);	1485	status_attr, NULL);
1414		1486
…		…
1457	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1458	if (p && *p)	1530	if (p && *p)
1459	{	1531	{
1460	bool found = false;	1532	bool found = false;
1461		1533
1462	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1463		1535
1464	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1465	{	1537	{
1466	if (*s[i])	1538	if (*s[i])
1467	{	1539	{
…		…
1473	break;	1545	break;
1474	}	1546	}
1475	}	1547	}
1476	}	1548	}
1477		1549
1478	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1479		1551
1480	if (found)	1552	if (found)
1481	goto done;	1553	goto done;
1482	}	1554	}
1483		1555
…		…
1543		1615
1544	void	1616	void
1545	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1546	{	1618	{
1547	Window cr;	1619	Window cr;
1548	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550	}	1621	}
1551		1622
1552	Pixmap	1623	Pixmap
1553	rxvt_term::get_pixmap_property (int prop_id)	1624	rxvt_term::get_pixmap_property (Atom property)
1554	{	1625	{
1555	if (prop_id > 0 && prop_id < NUM_XA)	1626	Pixmap pixmap = None;
1556	if (xa[prop_id])	1627
1557	{
1558	int aformat;	1628	int aformat;
1559	unsigned long nitems, bytes_after;	1629	unsigned long nitems, bytes_after;
1560	Atom atype;	1630	Atom atype;
1561	unsigned char *prop = NULL;	1631	unsigned char *prop;
1562	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1632	int result = XGetWindowProperty (dpy, display->root, property,
1563	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564	&nitems, &bytes_after, &prop);	1634	&nitems, &bytes_after, &prop);
1565	if (result == Success && prop && atype == XA_PIXMAP)	1635	if (result == Success)
		1636	{
		1637	if (atype == XA_PIXMAP)
1566	return (Pixmap )prop;	1638	pixmap = (Pixmap )prop;
		1639	XFree (prop);
1567	}	1640	}
1568		1641
1569	return None;	1642	return pixmap;
1570	}	1643	}
1571		1644
1572	#ifdef HAVE_BG_PIXMAP	1645	#ifdef HAVE_BG_PIXMAP
1573	# if TRACE_PIXMAPS
1574	# undef update_background
1575	void
1576	rxvt_term::trace_update_background (const char *file, int line)
1577	{
1578	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579	update_background ();
1580	}
1581	# endif
1582		1646
1583	void	1647	void
1584	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1585	{	1649	{
1586	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1587	return;	1651	return;
1588		1652
1589	bgPixmap.invalidate ();	1653	bg_invalidate ();
1590		1654
1591	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592		1656
1593	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1594	bgPixmap.render ();	1658	bg_render ();
1595	else	1659	else
1596	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1597	}	1661	}
1598		1662
1599	void	1663	void
1600	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1601	{	1665	{
1602	make_current ();	1666	make_current ();
1603		1667
1604	update_background_ev.stop ();	1668	update_background_ev.stop ();
1605	bgPixmap.render ();	1669	bg_render ();
1606	refresh_check ();	1670	refresh_check ();
1607	}	1671	}
1608		1672
1609	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1610		1674

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs. Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC